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

Mop up remaining "race" private variables

Browse Source
This commit is contained in:
Pavel Penev
2015-08-17 00:38:10 +03:00
parent 2b359b54c7
commit 663c9239df
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Render/RenderSprites.cs
View File

@@ -130,7 +130,7 @@ namespace OpenRA.Mods.Common.Traits
}
}
readonly string race;
readonly string faction;
readonly RenderSpritesInfo info;
readonly List<AnimationWrapper> anims = new List<AnimationWrapper>();
string cachedImage;
@@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.Traits
public RenderSprites(ActorInitializer init, RenderSpritesInfo info)
{
this.info = info;
race = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
}
public string GetImage(Actor self)
@@ -153,7 +153,7 @@ namespace OpenRA.Mods.Common.Traits
if (cachedImage != null)
return cachedImage;
return cachedImage = info.GetImage(self.Info, self.World.Map.SequenceProvider, race);
return cachedImage = info.GetImage(self.Info, self.World.Map.SequenceProvider, faction);
}
public void UpdatePalette()

6
OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs
View File

@@ -28,13 +28,13 @@ namespace OpenRA.Mods.RA.Traits
{
readonly ClonesProducedUnitsInfo info;
readonly Production production;
readonly string race;
readonly string faction;
public ClonesProducedUnits(ActorInitializer init, ClonesProducedUnitsInfo info)
{
this.info = info;
production = init.Self.Trait<Production>();
race = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
}
public void UnitProducedByOther(Actor self, Actor producer, Actor produced)
@@ -47,7 +47,7 @@ namespace OpenRA.Mods.RA.Traits
if (ci == null || !info.CloneableTypes.Intersect(ci.Types).Any())
return;
production.Produce(self, produced.Info, race);
production.Produce(self, produced.Info, faction);
}
}
}

6
OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs
View File

@@ -51,13 +51,13 @@ namespace OpenRA.Mods.RA.Traits
public class SpawnActorOnDeath : INotifyKilled
{
readonly SpawnActorOnDeathInfo info;
readonly string race;
readonly string faction;
public SpawnActorOnDeath(ActorInitializer init, SpawnActorOnDeathInfo info)
{
this.info = info;
race = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
}
public void Killed(Actor self, AttackInfo e)
@@ -82,7 +82,7 @@ namespace OpenRA.Mods.RA.Traits
new ParentActorInit(self),
new LocationInit(self.Location),
new CenterPositionInit(self.CenterPosition),
new FactionInit(race)
new FactionInit(faction)
};
if (info.OwnerType == OwnerType.Victim)