From c1827e5d2587645cb45d4c84559dd28bb1da991e Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Wed, 17 Mar 2010 23:06:29 +1300
Subject: [PATCH] actually WORKS now

---
 .../Traits/World/PlayerColorPalette.cs        |  7 +++++--
 OpenRA.Game/World.cs                          |  2 +-
 mods/cnc/system.yaml                          | 21 ++++++++++---------
 mods/ra/rules.yaml                            | 19 +++++++++--------
 settings-netplay-ra.ini                       |  5 ++++-
 5 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/OpenRA.Game/Traits/World/PlayerColorPalette.cs b/OpenRA.Game/Traits/World/PlayerColorPalette.cs
index 11541a78b6..a8ce474938 100644
--- a/OpenRA.Game/Traits/World/PlayerColorPalette.cs
+++ b/OpenRA.Game/Traits/World/PlayerColorPalette.cs
@@ -34,6 +34,8 @@ namespace OpenRA.Traits
 		public readonly bool SplitRamp = false;
 
 		public readonly int[] DisplayColor = null;
+		public readonly bool Playable = true;
+
 		public object Create(Actor self) { return new PlayerColorPalette(self, this); }
 	}
 
@@ -50,8 +52,9 @@ namespace OpenRA.Traits
 			
 			wr.AddPalette(info.Name, newpal);
 
-			Player.RegisterPlayerColor(info.Name, info.DisplayName,
-				ArrayToColor(info.DisplayColor));
+			if (info.Playable)
+				Player.RegisterPlayerColor(info.Name, info.DisplayName,
+					ArrayToColor(info.DisplayColor));
 		}
 
 		static Color ArrayToColor(int[] x) { return Color.FromArgb(x[0], x[1], x[2]); }
diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs
index 2b1e45d797..eb86d09351 100644
--- a/OpenRA.Game/World.cs
+++ b/OpenRA.Game/World.cs
@@ -53,7 +53,7 @@ namespace OpenRA
 
 		public Player NeutralPlayer
 		{
-			get { return players[0]; }		// todo, perhaps.
+			get { return players.Single(p => p.Value.InternalName == "Neutral").Value; }
 		}
 
 		public void SetLocalPlayer(int index)
diff --git a/mods/cnc/system.yaml b/mods/cnc/system.yaml
index af81741cc8..ec0fa154fd 100644
--- a/mods/cnc/system.yaml
+++ b/mods/cnc/system.yaml
@@ -99,28 +99,29 @@ World:
 		SplitRamp: yes
 	PlayerColorPalette@player7:
 		Name: player7
-		DisplayName: Gray
-		BasePalette: terrain
-		DisplayColor: 133,113,101
-		Color1: 238,238,238
-		Color2: 44,28,24
-		SplitRamp: yes
-	PlayerColorPalette@player8:
-		Name: player8
 		DisplayName: White
 		BasePalette: terrain
 		DisplayColor: 255,255,255
 		Color1: 255,255,255
 		Color2: 75,75,75
 		SplitRamp: yes
-	PlayerColorPalette@player9:
-		Name: player9
+	PlayerColorPalette@player8:
+		Name: player8
 		DisplayName: Black
 		BasePalette: terrain
 		DisplayColor: 30,30,30
 		Color1: 80,80,80
 		Color2: 5,5,5
 		SplitRamp: yes
+	PlayerColorPalette@neutral:
+		Name: neutral
+		DisplayName: Neutral
+		BasePalette: terrain
+		DisplayColor: 133,113,101
+		Color1: 238,238,238
+		Color2: 44,28,24
+		SplitRamp: yes
+		Playable: no
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: temperat.pal
diff --git a/mods/ra/rules.yaml b/mods/ra/rules.yaml
index 7623d73202..7419442567 100644
--- a/mods/ra/rules.yaml
+++ b/mods/ra/rules.yaml
@@ -130,25 +130,26 @@ World:
 		Color2: 20,20,20
 	PlayerColorPalette@player7:
 		Name: player7
-		DisplayName: Gray
-		BasePalette: terrain
-		DisplayColor: 133,113,101
-		Color1: 238,238,238
-		Color2: 44,28,24
-	PlayerColorPalette@player8:
-		Name: player8
 		DisplayName: White
 		BasePalette: terrain
 		DisplayColor: 255,255,255
 		Color1: 255,255,255
 		Color2: 75,75,75
-	PlayerColorPalette@player9:
-		Name: player9
+	PlayerColorPalette@player8:
+		Name: player8
 		DisplayName: Black
 		BasePalette: terrain
 		DisplayColor: 30,30,30
 		Color1: 80,80,80
 		Color2: 5,5,5
+	PlayerColorPalette@neutral:
+		Name: neutral
+		DisplayName: Neutral
+		BasePalette: terrain
+		DisplayColor: 133,113,101
+		Color1: 238,238,238
+		Color2: 44,28,24
+		Playable: no
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: temperat.pal
diff --git a/settings-netplay-ra.ini b/settings-netplay-ra.ini
index be73876bc4..7fa0e49af2 100644
--- a/settings-netplay-ra.ini
+++ b/settings-netplay-ra.ini
@@ -1,4 +1,7 @@
 [Settings]
 NetworkHost=localhost
 NetworkPort=1234
-InitialMods=ra
\ No newline at end of file
+InitialMods=ra
+Width=800
+Height=600
+Fullscreen=false
\ No newline at end of file