From 122e5d8e1bddcfab7fd4ac5549851a6bea0b549f Mon Sep 17 00:00:00 2001 From: MaxED Date: Tue, 24 Jul 2012 18:09:28 +0000 Subject: [PATCH] Set PlatformTarget of ColorPicker, UDMFControls, TagExplorer and VisplaneExplorer to x86 (this should make Siberian_Tiger's work a little bit easier, I suppose...) VisplaneExplorer: fixed a crash when user tries to enable Visplane Explorer mode in a map created via New Map command. --- Source/Core/Builder.sln | 28 +++++++++++++------ Source/Plugins/ColorPicker/ColorPicker.csproj | 2 ++ Source/Plugins/TagExplorer/TagExplorer.csproj | 6 ++-- .../Plugins/UMDFControls/UDMFControls.csproj | 6 ++-- .../Plugins/VisplaneExplorer/BuilderPlug.cs | 9 ++++-- .../VisplaneExplorer/VisplaneExplorer.csproj | 4 +-- .../VisplaneExplorer/VisplaneExplorerMode.cs | 2 +- 7 files changed, 40 insertions(+), 17 deletions(-) diff --git a/Source/Core/Builder.sln b/Source/Core/Builder.sln index ed3d7843..a681d591 100644 --- a/Source/Core/Builder.sln +++ b/Source/Core/Builder.sln @@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UDMFControls", "..\Plugins\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPicker", "..\Plugins\ColorPicker\ColorPicker.csproj", "{A4761900-0EA3-4FE4-A919-847FD5080EFC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisplaneExplorer", "..\Plugins\VisplaneExplorer\VisplaneExplorer.csproj", "{CF670175-7099-4090-A330-EE25C7230139}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,23 +57,23 @@ Global {760A9BC7-CB73-4C36-858B-994C14996FCD}.Release|x86.Build.0 = Release|x86 {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|Mixed Platforms.Build.0 = Debug|x86 {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|x86.ActiveCfg = Debug|Any CPU {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Any CPU.ActiveCfg = Release|Any CPU {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Any CPU.Build.0 = Release|Any CPU - {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Mixed Platforms.Build.0 = Release|x86 {BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|x86.ActiveCfg = Release|Any CPU {2D11C828-295C-463A-8545-CA1AD6D51518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D11C828-295C-463A-8545-CA1AD6D51518}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D11C828-295C-463A-8545-CA1AD6D51518}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2D11C828-295C-463A-8545-CA1AD6D51518}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2D11C828-295C-463A-8545-CA1AD6D51518}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {2D11C828-295C-463A-8545-CA1AD6D51518}.Debug|Mixed Platforms.Build.0 = Debug|x86 {2D11C828-295C-463A-8545-CA1AD6D51518}.Debug|x86.ActiveCfg = Debug|Any CPU {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Any CPU.ActiveCfg = Release|Any CPU {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Any CPU.Build.0 = Release|Any CPU - {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Mixed Platforms.Build.0 = Release|x86 {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|x86.ActiveCfg = Release|Any CPU {A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|Any CPU.ActiveCfg = Debug|x86 {A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 @@ -83,6 +85,16 @@ Global {A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|Mixed Platforms.Build.0 = Release|x86 {A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.ActiveCfg = Release|x86 {A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.Build.0 = Release|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Debug|Any CPU.ActiveCfg = Debug|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Debug|x86.ActiveCfg = Debug|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Debug|x86.Build.0 = Debug|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Release|Any CPU.ActiveCfg = Release|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Release|Mixed Platforms.Build.0 = Release|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Release|x86.ActiveCfg = Release|x86 + {CF670175-7099-4090-A330-EE25C7230139}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/Plugins/ColorPicker/ColorPicker.csproj b/Source/Plugins/ColorPicker/ColorPicker.csproj index f3518a8a..f2543d8f 100644 --- a/Source/Plugins/ColorPicker/ColorPicker.csproj +++ b/Source/Plugins/ColorPicker/ColorPicker.csproj @@ -20,6 +20,7 @@ ..\..\..\Build\Plugins\ DEBUG;TRACE prompt + x86 4 @@ -30,6 +31,7 @@ ..\..\..\Build\Plugins\ TRACE prompt + x86 4 diff --git a/Source/Plugins/TagExplorer/TagExplorer.csproj b/Source/Plugins/TagExplorer/TagExplorer.csproj index 12f8f9a0..857d438b 100644 --- a/Source/Plugins/TagExplorer/TagExplorer.csproj +++ b/Source/Plugins/TagExplorer/TagExplorer.csproj @@ -13,21 +13,23 @@ v3.5 512 - + true full false ..\..\..\Build\Plugins\ DEBUG;TRACE prompt + x86 4 - + pdbonly true ..\..\..\Build\Plugins\ TRACE prompt + x86 4 diff --git a/Source/Plugins/UMDFControls/UDMFControls.csproj b/Source/Plugins/UMDFControls/UDMFControls.csproj index 9062181c..e31fa8c0 100644 --- a/Source/Plugins/UMDFControls/UDMFControls.csproj +++ b/Source/Plugins/UMDFControls/UDMFControls.csproj @@ -13,21 +13,23 @@ v3.5 512 - + true full false ..\..\..\Build\Plugins\ DEBUG;TRACE prompt + x86 4 - + pdbonly true ..\..\..\Build\Plugins\ TRACE prompt + x86 4 diff --git a/Source/Plugins/VisplaneExplorer/BuilderPlug.cs b/Source/Plugins/VisplaneExplorer/BuilderPlug.cs index b82afa4e..5f713a50 100644 --- a/Source/Plugins/VisplaneExplorer/BuilderPlug.cs +++ b/Source/Plugins/VisplaneExplorer/BuilderPlug.cs @@ -74,7 +74,7 @@ namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer { base.OnInitialize(); - General.Actions.BindMethods(this); + //General.Actions.BindMethods(this); //mxd. But... we have no methods to bind! // Load interface controls interfaceform = new InterfaceForm(); @@ -86,6 +86,11 @@ namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer me = this; } + //mxd. This, actually, can also happen + public override void OnMapNewBegin() { + OnMapOpenBegin(); + } + // Some things cannot be initialized at plugin start, so we do them here public override void OnMapOpenBegin() { @@ -118,7 +123,7 @@ namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer interfaceform = null; vpo.Dispose(); vpo = null; - General.Actions.UnbindMethods(this); + //General.Actions.UnbindMethods(this); //mxd. But... we have no methods to unbind! base.Dispose(); } diff --git a/Source/Plugins/VisplaneExplorer/VisplaneExplorer.csproj b/Source/Plugins/VisplaneExplorer/VisplaneExplorer.csproj index afd2c58d..5e22aa99 100644 --- a/Source/Plugins/VisplaneExplorer/VisplaneExplorer.csproj +++ b/Source/Plugins/VisplaneExplorer/VisplaneExplorer.csproj @@ -14,7 +14,7 @@ 512 Client - + true full false @@ -26,7 +26,7 @@ false true - + pdbonly true ..\..\..\Build\Plugins\ diff --git a/Source/Plugins/VisplaneExplorer/VisplaneExplorerMode.cs b/Source/Plugins/VisplaneExplorer/VisplaneExplorerMode.cs index a1ff7d1a..0f592ac3 100644 --- a/Source/Plugins/VisplaneExplorer/VisplaneExplorerMode.cs +++ b/Source/Plugins/VisplaneExplorer/VisplaneExplorerMode.cs @@ -389,7 +389,7 @@ namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer } // Processing - public override void OnProcess(double deltatime) + public override void OnProcess(float deltatime) { base.OnProcess(deltatime); if(DateTime.Now >= nextupdate)