diff --git a/OpenRA.Mods.Common/Activities/Transform.cs b/OpenRA.Mods.Common/Activities/Transform.cs index 3542d6b47a..3aa8c8e215 100644 --- a/OpenRA.Mods.Common/Activities/Transform.cs +++ b/OpenRA.Mods.Common/Activities/Transform.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Activities public string Notification = null; public int ForceHealthPercentage = 0; public bool SkipMakeAnims = false; - public string Race = null; + public string Faction = null; public Transform(Actor self, string toActor) { @@ -64,8 +64,8 @@ namespace OpenRA.Mods.Common.Activities if (SkipMakeAnims) init.Add(new SkipMakeAnimsInit()); - if (Race != null) - init.Add(new FactionInit(Race)); + if (Faction != null) + init.Add(new FactionInit(Faction)); var health = self.TraitOrDefault(); if (health != null) diff --git a/OpenRA.Mods.Common/Traits/Transforms.cs b/OpenRA.Mods.Common/Traits/Transforms.cs index 76bc970b27..2a33b2c1de 100644 --- a/OpenRA.Mods.Common/Traits/Transforms.cs +++ b/OpenRA.Mods.Common/Traits/Transforms.cs @@ -55,14 +55,14 @@ namespace OpenRA.Mods.Common.Traits readonly Actor self; readonly TransformsInfo info; readonly BuildingInfo buildingInfo; - readonly string race; + readonly string faction; public Transforms(ActorInitializer init, TransformsInfo info) { self = init.Self; this.info = info; buildingInfo = self.World.Map.Rules.Actors[info.IntoActor].Traits.GetOrDefault(); - race = init.Contains() ? init.Get() : self.Owner.Faction.InternalName; + faction = init.Contains() ? init.Get() : self.Owner.Faction.InternalName; } public string VoicePhraseForOrder(Actor self, Order order) @@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Traits Facing = info.Facing, Sounds = info.TransformSounds, Notification = info.TransformNotification, - Race = race + Faction = faction }; var makeAnimation = self.TraitOrDefault();