From 9cdefee4039236a6c968ca45ec9a3031023c9b0c Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Fri, 5 Feb 2010 19:36:18 +1300
Subject: [PATCH] fixing up various issues

---
 OpenRA.Server/Server.cs               |   4 ++++
 OpenRa.Game/Game.cs                   |   3 +++
 OpenRa.Game/GameRules/UserSettings.cs |   2 +-
 OpenRa.Game/MainWindow.cs             |   2 ++
 mods/cnc/mod.yaml                     |   3 +--
 mods/cnc/temperat_ra.pal              | Bin 0 -> 768 bytes
 settings-netplay-cnc.ini              |   5 +++++
 7 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 mods/cnc/temperat_ra.pal
 create mode 100644 settings-netplay-cnc.ini

diff --git a/OpenRA.Server/Server.cs b/OpenRA.Server/Server.cs
index eb8ba243ec..9c7c9d678f 100644
--- a/OpenRA.Server/Server.cs
+++ b/OpenRA.Server/Server.cs
@@ -30,6 +30,10 @@ namespace OpenRA.Server
 			lobbyInfo = new Session();
 			lobbyInfo.GlobalSettings.Mods = defaultMods;
 
+			Console.WriteLine("Initial mods: ");
+			foreach( var m in lobbyInfo.GlobalSettings.Mods )
+				Console.WriteLine("- {0}", m);
+
 			listener.Start();
 
 			Console.WriteLine("Server started.");
diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs
index 0493ed03cf..df659350fe 100644
--- a/OpenRa.Game/Game.cs
+++ b/OpenRa.Game/Game.cs
@@ -103,6 +103,7 @@ namespace OpenRa
 
 		internal static void Initialize(string mapName, Renderer renderer, int2 clientSize, int localPlayer, Controller controller)
 		{
+			
 			Game.renderer = renderer;
 			Game.clientSize = clientSize;
 
@@ -189,6 +190,8 @@ namespace OpenRa
 		public static void SyncLobbyInfo(string data)
 		{
 			var session = new Session();
+			session.GlobalSettings.Mods = Settings.InitialMods;
+
 			var ys = MiniYaml.FromString(data);
 			foreach (var y in ys)
 			{
diff --git a/OpenRa.Game/GameRules/UserSettings.cs b/OpenRa.Game/GameRules/UserSettings.cs
index 8f0957429f..0b1344bab1 100644
--- a/OpenRa.Game/GameRules/UserSettings.cs
+++ b/OpenRa.Game/GameRules/UserSettings.cs
@@ -26,10 +26,10 @@ namespace OpenRa.GameRules
 		public readonly int Player = 1;
 		public readonly string Replay = "";
 		public readonly string PlayerName = "";
+		public readonly string[] InitialMods = { "ra" };
 		
 		// Gameplay options
 		public readonly bool RepairRequiresConyard = true;
 		public readonly bool PowerDownBuildings = true;
-
 	}
 }
diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs
index d86b80700c..a91281d69b 100755
--- a/OpenRa.Game/MainWindow.cs
+++ b/OpenRa.Game/MainWindow.cs
@@ -48,7 +48,9 @@ namespace OpenRa
 				Directory.SetCurrentDirectory("..");
 			}
 
+			
 			LoadUserSettings(settings);
+			Game.LobbyInfo.GlobalSettings.Mods = Game.Settings.InitialMods;
 			
 			// Load the default mod to access required files
 			Game.LoadModPackages(new Manifest(Game.LobbyInfo.GlobalSettings.Mods));
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 6dc22cb34c..68d0bf27bd 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -10,9 +10,8 @@ Packages:
 	mods/cnc/packages/conquer.mix
 	mods/cnc/packages/general.mix
 	mods/cnc/packages/sounds.mix
-	mods/cnc/packages/transit.mix
 	mods/cnc/packages/tempicnh.mix
-	main.mix
+	~main.mix
 	redalert.mix
 	hires.mix
 	local.mix
diff --git a/mods/cnc/temperat_ra.pal b/mods/cnc/temperat_ra.pal
new file mode 100644
index 0000000000000000000000000000000000000000..bb63fcdd50490a6ace83199cf15196a1e551c57e
GIT binary patch
literal 768
zcmWlX>5{7;5QV#v7<b|Zh>8wGj7yAT)^T#DeE+w)r215IPWK<`0|4kh^=V|qs}{yR
z)(Lb-lJ&FKUJv_zUDw@qyWJUvvA0aqv~1gUJjZc7*Y*7nAt!YFz;OeFbVv?icwh<A
z!4GpBMG=lLi5S6{#Sz1d#hk?~BV3D9!c%=@B`Z0XB#{M?Wu6Pl1uGR7GE-U&?-j2*
z-uERfJ6ZNb)a6l@a>&#yrBF(A>NpHXDaS@#I@Nd0Wgd^`;d&jf%X9gAl*_evOxb)+
z$By(3u4P>FKolrvh+r4Tb`)C3H+|P|tPP!Cw7b&dNO||^+K;aZ;Qrmtqq_9sd@8#-
zS6`{jlPZngKhM`~zFp3juIXx_szMa3APJ3v<lrA%$2Iq$q0RtD00Qs#ds&wI{XR|8
zFbr+mDy5{9RaF&5!5E{I#&N76YSx<jyomF?I!#;-dD*Z`YHo4N4hQUcp>6y7y}eu4
z)B1pQgjK@N@^`!cj?=5{uSa#M#E|ipWGciGMU@wD2j!NV?p?gK!j0jJZs6*~z9i0h
zNKzEVw&xp`9oAJKIO4gPr+X5cL9q3Gu&nX9R@1*wEl&Bg@ogWD#^JQ{<h`lBWi}Rg
zpkWgu5qO1br?$B+YJF6HbMYSVZyPMN^C)+73S$Hvg2n-1LB0dJffxV*(C-ePo4A$p
zJU<`Lm44v80iFOi0R0eW00kfbH~<4M_Z!>VI`+=<421MGttfJm#3KaJG+<ej7nql{
L`pSgl`ak~%DU?vj

literal 0
HcmV?d00001

diff --git a/settings-netplay-cnc.ini b/settings-netplay-cnc.ini
new file mode 100644
index 0000000000..33aca0eb41
--- /dev/null
+++ b/settings-netplay-cnc.ini
@@ -0,0 +1,5 @@
+[Settings]
+NetworkHost=localhost
+NetworkPort=1234
+UseAftermath=yes
+InitialMods=cnc
\ No newline at end of file