diff --git a/OpenRA.Game/Traits/Activities/Turn.cs b/OpenRA.Game/Traits/Activities/Turn.cs index ea16305caf..6bdabeb5ab 100755 --- a/OpenRA.Game/Traits/Activities/Turn.cs +++ b/OpenRA.Game/Traits/Activities/Turn.cs @@ -26,7 +26,7 @@ namespace OpenRA.Traits.Activities public IActivity Tick( Actor self ) { var unit = self.traits.Get(); - var ROT = self.traits.WithInterface().FirstOrDefault().ROT(self); + var ROT = self.traits.Get().ROT; if( desiredFacing == unit.Facing ) return NextActivity; diff --git a/OpenRA.Game/Traits/Mobile.cs b/OpenRA.Game/Traits/Mobile.cs index 32466fc989..5da4585e6f 100644 --- a/OpenRA.Game/Traits/Mobile.cs +++ b/OpenRA.Game/Traits/Mobile.cs @@ -91,9 +91,8 @@ namespace OpenRA.Traits } } - public int ROT(Actor self){ return Info.ROT; } - - public int InitialFacing(Actor self){ return Info.InitialFacing; } + public int ROT { get { return Info.ROT; } } + public int InitialFacing { get { return Info.InitialFacing; } } public void SetPosition(Actor self, int2 cell) { diff --git a/OpenRA.Game/Traits/Production.cs b/OpenRA.Game/Traits/Production.cs index 2eb49510e3..dbb96e34e6 100755 --- a/OpenRA.Game/Traits/Production.cs +++ b/OpenRA.Game/Traits/Production.cs @@ -46,7 +46,7 @@ namespace OpenRA.Traits public virtual int CreationFacing( Actor self, Actor newUnit ) { - return newUnit.traits.Get().InitialFacing(newUnit); + return newUnit.traits.Get().InitialFacing; } public virtual bool Produce( Actor self, ActorInfo producee ) diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index 0d1372120b..671090dd17 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -110,8 +110,8 @@ namespace OpenRA.Traits float MovementCostForCell(Actor self, int2 cell); float MovementSpeedForCell(Actor self, int2 cell); IEnumerable GetCurrentPath(Actor self); - int ROT(Actor self); - int InitialFacing(Actor self); + int ROT { get; } + int InitialFacing { get; } } public interface IOffsetCenterLocation { float2 CenterOffset { get; } } diff --git a/OpenRA.Mods.RA/Aircraft.cs b/OpenRA.Mods.RA/Aircraft.cs index 5c82621abf..90a8903454 100755 --- a/OpenRA.Mods.RA/Aircraft.cs +++ b/OpenRA.Mods.RA/Aircraft.cs @@ -45,9 +45,9 @@ namespace OpenRA.Mods.RA get { return Location; } } - public int ROT(Actor self){ return Info.ROT; } + public int ROT { get { return Info.ROT; } } - public int InitialFacing(Actor self){ return Info.InitialFacing; } + public int InitialFacing { get { return Info.InitialFacing; } } public void SetPosition(Actor self, int2 cell) {