Done some bug fixes for the merge.

Update #5
SEModCommunity · Jun 23, 2014 · 0b088b4 · 0b088b4
2 parents b7f618b + 56e45b9
commit 0b088b4
Show file tree

Hide file tree

Showing 54 changed files with 3,598 additions and 62 deletions.
diff --git a/SEConfigTool/SEConfigTool.cs b/SEConfigTool/SEConfigTool.cs
@@ -4,12 +4,12 @@
 using System.Linq;
 using System.Windows.Forms;
 using System.IO;
+using System.Diagnostics;
 
 using SEModAPI;
 using SEModAPI.API;
 using SEModAPI.API.Definitions;
 using SEModAPI.API.Definitions.CubeBlocks;
-using SEModAPI.API.ProcessWrapper;
 using SEModAPI.API.SaveData;
 using SEModAPI.API.SaveData.Entity;
 using SEModAPI.Support;
@@ -18,7 +18,6 @@
 using Sandbox.Common.ObjectBuilders;
 using Sandbox.Common.ObjectBuilders.Definitions;
 using VRageMath;
-using System.Diagnostics;
 
 namespace SEConfigTool
 {
@@ -29,8 +28,6 @@ public partial class SEConfigTool : Form
 		private string m_standardSavePath;
 		private bool m_isClosing;
 
-		private ProcessWrapper m_processWrapper;
-
 		private SectorManager m_sectorManager;
 
 		private BlocksManager m_blockDefinitionsManager;
@@ -63,8 +60,6 @@ public SEConfigTool()
 		{
 			InitializeComponent();
 
-			m_processWrapper = new ProcessWrapper();
-
 			m_numberFormatInfo = CultureInfo.GetCultureInfo("EN-US").NumberFormat;
 			m_decimalSeparator = m_numberFormatInfo.CurrencyDecimalSeparator;
 			m_groupSeparator = m_numberFormatInfo.NumberGroupSeparator;
@@ -1189,7 +1184,7 @@ private void CHK_SavedGame_Events_Enabled_CheckedChanged(object sender, EventArg
 
 		private void BTN_SavedGame_LaunchGame_Click(object sender, EventArgs e)
 		{
-			m_processWrapper.StartGame();
+			//TODO - Finish this to only launch the game client
 		}
 
 		#endregion

diff --git a/SEConfigTool/SEConfigTool.csproj b/SEConfigTool/SEConfigTool.csproj
@@ -23,6 +23,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,11 +36,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Sandbox.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Sandbox.Common">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\SEModAPI\GameLibraries\Sandbox.Common.dll</HintPath>
     </Reference>
     <Reference Include="Sandbox.Common.XmlSerializers">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\SEModAPI\GameLibraries\Sandbox.Common.XmlSerializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -52,15 +54,15 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="VRage.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="VRage.Common">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\SEModAPI\GameLibraries\VRage.Common.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="VRage.Library">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\SEModAPI\GameLibraries\VRage.Library.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Math, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="VRage.Math">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\SEModAPI\GameLibraries\VRage.Math.dll</HintPath>
     </Reference>