Merge pull request #7936 from obrakmann/fix7935_random_factions_in_missions

Allow non-selectable factions for players if LockRace is set
This commit is contained in:
Paul Chote
2015-04-12 17:49:39 +01:00

View File

@@ -86,7 +86,7 @@ namespace OpenRA
Color = client.Color; Color = client.Color;
PlayerName = client.Name; PlayerName = client.Name;
botType = client.Bot; botType = client.Bot;
Country = ChooseCountry(world, client.Race); Country = ChooseCountry(world, client.Race, !pr.LockRace);
pr.Race = selectedCountryName; pr.Race = selectedCountryName;
pr.RaceFlagName = client.Race; pr.RaceFlagName = client.Race;
} }