From 663c9239dfbb6e87895d4f596b320b78bbe8e0d2 Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Mon, 17 Aug 2015 00:38:10 +0300 Subject: [PATCH] Mop up remaining "race" private variables --- OpenRA.Mods.Common/Traits/Render/RenderSprites.cs | 6 +++--- OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs | 6 +++--- OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs b/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs index cba57c843f..02b95f0d37 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderSprites.cs @@ -130,7 +130,7 @@ namespace OpenRA.Mods.Common.Traits } } - readonly string race; + readonly string faction; readonly RenderSpritesInfo info; readonly List anims = new List(); string cachedImage; @@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.Traits public RenderSprites(ActorInitializer init, RenderSpritesInfo info) { this.info = info; - race = init.Contains() ? init.Get() : init.Self.Owner.Faction.InternalName; + faction = init.Contains() ? init.Get() : 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() diff --git a/OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs b/OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs index f507e97f10..2d73adb8f5 100644 --- a/OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs +++ b/OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs @@ -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(); - race = init.Contains() ? init.Get() : init.Self.Owner.Faction.InternalName; + faction = init.Contains() ? init.Get() : 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); } } } diff --git a/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs b/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs index 89082c5f05..ef5ea83004 100644 --- a/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs +++ b/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs @@ -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() ? init.Get() : init.Self.Owner.Faction.InternalName; + faction = init.Contains() ? init.Get() : 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)