Merge pull request #8659 from penev92/bleed_playerReference

Rename PlayerReference.Race to Faction

OpenRA.Game/Map/MapPlayers.cs

@@ -37,7 +37,7 @@ namespace OpenRA
 					"Neutral", new PlayerReference
 					{
 						Name = "Neutral",
-						Race = firstRace,
+						Faction = firstRace,
 						OwnsWorld = true,
 						NonCombatant = true
 					}
@@ -46,7 +46,7 @@ namespace OpenRA
 					"Creeps", new PlayerReference
 					{
 						Name = "Creeps",
-						Race = firstRace,
+						Faction = firstRace,
 						NonCombatant = true,
 						Enemies = Exts.MakeArray(playerCount, i => "Multi{0}".F(i))
 					}
@@ -58,7 +58,7 @@ namespace OpenRA
 				var p = new PlayerReference
 				{
 					Name = "Multi{0}".F(index),
-					Race = "Random",
+					Faction = "Random",
 					Playable = true,
 					Enemies = new[] { "Creeps" }
 				};

OpenRA.Game/Map/PlayerReference.cs

@@ -16,17 +16,17 @@ namespace OpenRA
 	{
 		public string Name;
 		public string Palette;
-		public bool OwnsWorld = false;
-		public bool NonCombatant = false;
-		public bool Playable = false;
-		public bool Spectating = false;
 		public string Bot = null;
 		public string StartingUnitsClass = null;
 		public bool AllowBots = true;
+		public bool Playable = false;
 		public bool Required = false;
+		public bool OwnsWorld = false;
+		public bool Spectating = false;
+		public bool NonCombatant = false;
 
-		public bool LockRace = false;
-		public string Race;
+		public bool LockFaction = false;
+		public string Faction;
 
 		// ColorRamp naming retained for backward compatibility
 		public bool LockColor = false;