diff --git a/PortableTerrariaCreator/PortableTerrariaCreator/Properties/AssemblyInfo.cs b/PortableTerrariaCreator/PortableTerrariaCreator/Properties/AssemblyInfo.cs index b9050f2..90c4d19 100644 --- a/PortableTerrariaCreator/PortableTerrariaCreator/Properties/AssemblyInfo.cs +++ b/PortableTerrariaCreator/PortableTerrariaCreator/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.1.0")] -[assembly: AssemblyFileVersion("3.0.1.0")] +[assembly: AssemblyVersion("3.1.0.0")] +[assembly: AssemblyFileVersion("3.1.0.0")] [assembly: NeutralResourcesLanguage("")] diff --git a/PortableTerrariaLauncher/PortableTerrariaLauncher/GuiForm1.cs b/PortableTerrariaLauncher/PortableTerrariaLauncher/GuiForm1.cs index 757d4da..5225ed2 100644 --- a/PortableTerrariaLauncher/PortableTerrariaLauncher/GuiForm1.cs +++ b/PortableTerrariaLauncher/PortableTerrariaLauncher/GuiForm1.cs @@ -46,6 +46,8 @@ public GuiForm1() ContextMenuStrip miscMenu; void init() { + runFormScript(); + //build main panel var pb = new GuiPanelBuilder(this); @@ -408,5 +410,29 @@ void uninstallTerraria(string title) var tu = new TerrariaUninstaller(installDir); GuiHelper.RunProgressDialog("Uninstall", Text, tu, Handle); } + + //run form script + void runFormScript() + { + Stream stream; + Scripting scr; + try + { + stream = GuiHelper.GetResourceStream("script.csx"); + } + catch (ArgumentException) + { + return; + } + using (stream) + { + scr = Scripting.Create(stream); + } + scr.InvokePublicStaticMethod( + "PortableTerrariaScript.Script", + "OnForm", + new Type[] { typeof(Form) }, + new object[] { this }); + } } } diff --git a/PortableTerrariaLauncher/PortableTerrariaLauncher/Properties/AssemblyInfo.cs b/PortableTerrariaLauncher/PortableTerrariaLauncher/Properties/AssemblyInfo.cs index 4e1db82..aa6bc89 100644 --- a/PortableTerrariaLauncher/PortableTerrariaLauncher/Properties/AssemblyInfo.cs +++ b/PortableTerrariaLauncher/PortableTerrariaLauncher/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.1.0")] -[assembly: AssemblyFileVersion("3.0.1.0")] +[assembly: AssemblyVersion("3.1.0.0")] +[assembly: AssemblyFileVersion("3.1.0.0")] diff --git a/PortableTerrariaLauncher/PortableTerrariaLauncher/TerrariaInstaller.cs b/PortableTerrariaLauncher/PortableTerrariaLauncher/TerrariaInstaller.cs index 0bb0f04..67f89a0 100644 --- a/PortableTerrariaLauncher/PortableTerrariaLauncher/TerrariaInstaller.cs +++ b/PortableTerrariaLauncher/PortableTerrariaLauncher/TerrariaInstaller.cs @@ -284,8 +284,8 @@ void hkcuRegister() //register dlls registerAudioDlls(newxAudio2_6_dll, newxactengine3_6_dll); - //file that tells its registered - new FileStream(registered, FileMode.Create, FileAccess.Write); + //this file's existence tells it's registered + using (new FileStream(registered, FileMode.Create, FileAccess.Write)) { } } //registers XAudio2_6.dll and xactengine3_6.dll to HKCU static void registerAudioDlls( diff --git a/PortableTerrariaLauncher/PortableTerrariaLauncher/bin/Release/Sahlaysta.PortableTerrariaLauncher.exe b/PortableTerrariaLauncher/PortableTerrariaLauncher/bin/Release/Sahlaysta.PortableTerrariaLauncher.exe index 7bf53bb..b1180aa 100644 Binary files a/PortableTerrariaLauncher/PortableTerrariaLauncher/bin/Release/Sahlaysta.PortableTerrariaLauncher.exe and b/PortableTerrariaLauncher/PortableTerrariaLauncher/bin/Release/Sahlaysta.PortableTerrariaLauncher.exe differ