epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Player.Country to Player.Faction

Browse Source
This commit is contained in:
penev92
2015-07-15 04:06:52 +03:00
parent 2e1c1533a5
commit bb648decc3
48 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Player.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA
public readonly string PlayerName;
public readonly string InternalName;
public readonly FactionInfo Country;
public readonly FactionInfo Faction;
public readonly bool NonCombatant = false;
public readonly bool Playable = true;
public readonly int ClientIndex;
@@ -95,7 +95,7 @@ namespace OpenRA
Color = client.Color;
PlayerName = client.Name;
botType = client.Bot;
Country = ChooseCountry(world, client.Race, !pr.LockFaction);
Faction = ChooseCountry(world, client.Race, !pr.LockFaction);
DisplayCountry = ChooseDisplayCountry(world, client.Race);
}
else
@@ -108,7 +108,7 @@ namespace OpenRA
Playable = pr.Playable;
Spectating = pr.Spectating;
botType = pr.Bot;
Country = ChooseCountry(world, pr.Faction, false);
Faction = ChooseCountry(world, pr.Faction, false);
DisplayCountry = ChooseDisplayCountry(world, pr.Faction);
}