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

Merge pull request #8975 from penev92/bleed_rename

Browse Source 
Some more renaming from "country" and "race" to "faction"
This commit is contained in:
Matthias Mailänder
2015-08-08 16:13:16 +02:00
parent 309e3ac99e 10aee9ffa9
commit 88b98fa8ef
11 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Transforms.cs
View File

@@ -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<BuildingInfo>();
race = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : self.Owner.Faction.InternalName;
faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : 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<WithMakeAnimation>();