From 78455a3dce7b0ea15c7c3ffaa725f02423181c70 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Mon, 24 May 2010 14:03:47 +1200
Subject: [PATCH] IsSpecial -> NonCombatant

---
 OpenRA.FileFormats/Map/PlayerReference.cs          | 2 +-
 OpenRA.Game/Player.cs                              | 4 ++--
 OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs | 2 +-
 OpenRA.Game/Widgets/PostGameWidget.cs              | 2 +-
 OpenRA.Game/Widgets/WorldTooltipWidget.cs          | 2 +-
 OpenRA.Mods.RA/ConquestVictoryConditions.cs        | 2 +-
 mods/ra/maps/shellmap/map.yaml                     | 4 ++--
 mods/ra/maps/snowyridge/map.yaml                   | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/OpenRA.FileFormats/Map/PlayerReference.cs b/OpenRA.FileFormats/Map/PlayerReference.cs
index 512806dd15..53ff1d5911 100644
--- a/OpenRA.FileFormats/Map/PlayerReference.cs
+++ b/OpenRA.FileFormats/Map/PlayerReference.cs
@@ -26,7 +26,7 @@ namespace OpenRA.FileFormats
 		public readonly string Palette;
 		public readonly string Race;
 		public readonly bool OwnsWorld = false;
-		public readonly bool IsSpecial = false;
+		public readonly bool NonCombatant = false;
 		
 		public PlayerReference(MiniYaml my)
 		{
diff --git a/OpenRA.Game/Player.cs b/OpenRA.Game/Player.cs
index e089d3c58a..ce00a04fae 100644
--- a/OpenRA.Game/Player.cs
+++ b/OpenRA.Game/Player.cs
@@ -41,7 +41,7 @@ namespace OpenRA
 		public readonly string InternalName;
 		public readonly CountryInfo Country;
 		public readonly int Index;
-		public readonly bool IsSpecial = false;
+		public readonly bool NonCombatant = false;
 		
 		public ShroudRenderer Shroud;
 		public World World { get; private set; }
@@ -57,7 +57,7 @@ namespace OpenRA
 			Palette = pr.Palette;
 			Color = world.PlayerColors().Where(c => c.Name == pr.Palette).FirstOrDefault().Color;
 			PlayerName = InternalName = pr.Name;
-			IsSpecial = pr.IsSpecial;
+			NonCombatant = pr.NonCombatant;
 			Country = world.GetCountries()
 				.FirstOrDefault(c => pr.Race == c.Race);
 		}
diff --git a/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs b/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs
index 5863bf3fb5..c32fe8154e 100644
--- a/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs
+++ b/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs
@@ -57,7 +57,7 @@ namespace OpenRA.Widgets.Delegates
 
 			y += 35;
 
-			foreach (var p in Game.world.players.Values.Where(a => a != Game.world.LocalPlayer && !a.IsSpecial))
+			foreach (var p in Game.world.players.Values.Where(a => a != Game.world.LocalPlayer && !a.NonCombatant))
 			{
 				var pp = p;
 				var label = new LabelWidget
diff --git a/OpenRA.Game/Widgets/PostGameWidget.cs b/OpenRA.Game/Widgets/PostGameWidget.cs
index 52e58b927a..5af57b5370 100644
--- a/OpenRA.Game/Widgets/PostGameWidget.cs
+++ b/OpenRA.Game/Widgets/PostGameWidget.cs
@@ -45,7 +45,7 @@ namespace OpenRA.Widgets
 			if (world.players.Count > 2)	/* more than just us + neutral */
 			{
 				var conds = world.Queries.WithTrait<IVictoryConditions>()
-					.Where(c => !c.Actor.Owner.IsSpecial);
+					.Where(c => !c.Actor.Owner.NonCombatant);
 
 				if (conds.Any(c => c.Actor.Owner == world.LocalPlayer && c.Trait.HasLost))
 					DrawText("YOU ARE DEFEATED");
diff --git a/OpenRA.Game/Widgets/WorldTooltipWidget.cs b/OpenRA.Game/Widgets/WorldTooltipWidget.cs
index cb5ed861cc..4fd4386f8c 100644
--- a/OpenRA.Game/Widgets/WorldTooltipWidget.cs
+++ b/OpenRA.Game/Widgets/WorldTooltipWidget.cs
@@ -48,7 +48,7 @@ namespace OpenRA.Widgets
 				? actor.Info.Traits.Get<ValuedInfo>().Description
 				: actor.Info.Name;
 			var text2 = (actor.Owner == world.LocalPlayer)
-				? "" : (actor.Owner.IsSpecial ? "{0}" : "{0} ({1})").F(actor.Owner.PlayerName, world.LocalPlayer.Stances[actor.Owner]);
+				? "" : (actor.Owner.NonCombatant ? "{0}" : "{0} ({1})").F(actor.Owner.PlayerName, world.LocalPlayer.Stances[actor.Owner]);
 
 			var renderer = Game.chrome.renderer;
 
diff --git a/OpenRA.Mods.RA/ConquestVictoryConditions.cs b/OpenRA.Mods.RA/ConquestVictoryConditions.cs
index 18fc3b4462..ed86c7d536 100644
--- a/OpenRA.Mods.RA/ConquestVictoryConditions.cs
+++ b/OpenRA.Mods.RA/ConquestVictoryConditions.cs
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA
 			var hasAnything = self.World.Queries.OwnedBy[self.Owner]
 				.WithTrait<MustBeDestroyed>().Any();
 
-			var hasLost = !hasAnything && !self.Owner.IsSpecial;
+			var hasLost = !hasAnything && !self.Owner.NonCombatant;
 
 			if (hasLost && !HasLost)
 				Surrender(self);
diff --git a/mods/ra/maps/shellmap/map.yaml b/mods/ra/maps/shellmap/map.yaml
index 6a3f197793..98c44e67b3 100644
--- a/mods/ra/maps/shellmap/map.yaml
+++ b/mods/ra/maps/shellmap/map.yaml
@@ -1,6 +1,6 @@
 Selectable: False
 
-MapFormat: 1
+MapFormat: 2
 
 Title: <none>
 
@@ -22,7 +22,7 @@ Players:
 		Palette: neutral
 		Race: allies
 		OwnsWorld:true
-		IsSpecial:true
+		NonCombatant:true
 	PlayerReference@GoodGuy:
 		Name: GoodGuy
 		Palette: player1
diff --git a/mods/ra/maps/snowyridge/map.yaml b/mods/ra/maps/snowyridge/map.yaml
index ade58c837b..54246a3db3 100644
--- a/mods/ra/maps/snowyridge/map.yaml
+++ b/mods/ra/maps/snowyridge/map.yaml
@@ -1,6 +1,6 @@
 Selectable: True
 
-MapFormat: 1
+MapFormat: 2
 
 Title: Snowy Ridge
 
@@ -24,7 +24,7 @@ Players:
 		Palette: neutral
 		Race: allies
 		OwnsWorld:true
-		IsSpecial:true
+		NonCombatant:true
 
 Actors:
 	Actor0: tc02 Neutral 25,39