move Session back to Game

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -72,7 +72,6 @@
     <Compile Include="Primitives\DisposableAction.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Thirdparty\Random.cs" />
-    <Compile Include="Session.cs" />
     <Compile Include="Support\Log.cs" />
     <Compile Include="Support\Stopwatch.cs" />
     <Compile Include="Support\Timer.cs" />

OpenRA.Game/Game.cs

@@ -187,7 +187,7 @@ namespace OpenRA
 			LobbyInfo = session;
 
 			if( !world.GameHasStarted )
-				world.SharedRandom = new OpenRA.Thirdparty.Random( LobbyInfo.GlobalSettings.RandomSeed );
+				world.SharedRandom = new XRandom( LobbyInfo.GlobalSettings.RandomSeed );
 
 			if (orderManager.Connection.ConnectionState == ConnectionState.Connected)
 				world.SetLocalPlayer(orderManager.Connection.LocalClientId);

OpenRA.Game/Network/Session.cs

@@ -9,9 +9,9 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Linq;
+using System.Drawing;
 
-namespace OpenRA.FileFormats
+namespace OpenRA.Network
 {
 	// todo: ship most of this back to the Game assembly;
 	// it was only in FileFormats due to the original server model,
@@ -31,8 +31,8 @@ namespace OpenRA.FileFormats
 		public class Client
 		{
 			public int Index;
-			public System.Drawing.Color Color1;
+			public Color Color1;
-			public System.Drawing.Color Color2;
+			public Color Color2;
 			public string Country;
 			public int SpawnPoint;
 			public string Name;

OpenRA.Game/OpenRA.Game.csproj

@@ -234,6 +234,7 @@
     <Compile Include="ActorReference.cs" />
     <Compile Include="ModData.cs" />
     <Compile Include="Map.cs" />
+    <Compile Include="Network\Session.cs" />
     <Compile Include="ObjectCreator.cs" />
     <Compile Include="Network\SyncReport.cs" />
     <Compile Include="Traits\PrimaryBuilding.cs" />

OpenRA.Game/Player.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
+using OpenRA.Network;
 using OpenRA.Traits;
 
 namespace OpenRA

OpenRA.Game/Server/Server.cs

@@ -19,6 +19,7 @@ using System.Net.Sockets;
 using System.Threading;
 using OpenRA.FileFormats;
 using OpenRA.GameRules;
+using OpenRA.Network;
 
 namespace OpenRA.Server
 {