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

Rename PlayerReference.Race and LockRace to Faction and LockFaction

Browse Source
This commit is contained in:
penev92
2015-07-05 23:08:49 +03:00
parent b4c1625f1c
commit 1d49c23af0
14 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits
Name = "Everyone",
NonCombatant = true,
Spectating = true,
Race = "Random",
Faction = "Random",
Allies = w.Players.Where(p => !p.NonCombatant && p.Playable).Select(p => p.InternalName).ToArray()
}));

2
OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs
View File

@@ -178,7 +178,7 @@ namespace OpenRA.Mods.Common.Traits
var pr = new PlayerReference
{
Name = "Multi{0}".F(index),
Race = "Random",
Faction = "Random",
Playable = true,
Enemies = new[] { "Creeps" }
};

4
OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits
this.worldRenderer = worldRenderer;
if (!actor.InitDict.Contains<RaceInit>())
actor.InitDict.Add(new RaceInit(owner.Race));
actor.InitDict.Add(new RaceInit(owner.Faction));
if (!actor.InitDict.Contains<OwnerInit>())
actor.InitDict.Add(new OwnerInit(owner.Name));
@@ -119,7 +119,7 @@ namespace OpenRA.Mods.Common.Traits
Func<object, bool> saveInit = init =>
{
var race = init as RaceInit;
if (race != null && race.Race == Owner.Race)
if (race != null && race.Race == Owner.Faction)
return false;
// TODO: Other default values will need to be filtered