Merge pull request #8661 from penev92/bleed_renameCountry

Rename the Country trait to Faction
2015-07-14 21:05:52 +02:00
parent 4ed7a4ce8a 0e871a4b6b
commit 380cf22477
59 changed files with 187 additions and 168 deletions
--- a/OpenRA.Game/Map/MapPlayers.cs
+++ b/OpenRA.Game/Map/MapPlayers.cs
@@ -29,7 +29,7 @@ namespace OpenRA
 		public MapPlayers(Ruleset rules, int playerCount)
 		{
 			var firstRace = rules.Actors["world"].Traits
-				.WithInterface<CountryInfo>().First(c => c.Selectable).Race;
+				.WithInterface<FactionInfo>().First(f => f.Selectable).InternalName;

 			Players = new Dictionary<string, PlayerReference>
 			{