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

Remove RenderInfantry dependency on Mobile.

Browse Source
This commit is contained in:
Paul Chote
2014-03-19 13:44:51 +13:00
parent 2b3e116f74
commit c223e23572
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Render/RenderInfantry.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render namespace OpenRA.Mods.RA.Render
{ {
public class RenderInfantryInfo : RenderSimpleInfo, Requires<MobileInfo> public class RenderInfantryInfo : RenderSimpleInfo, Requires<IMoveInfo>
{ {
public readonly int MinIdleWaitTicks = 30; public readonly int MinIdleWaitTicks = 30;
public readonly int MaxIdleWaitTicks = 110; public readonly int MaxIdleWaitTicks = 110;
@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Render
IdleAnimating IdleAnimating
} }
Mobile mobile; IMove move;
RenderInfantryInfo info; RenderInfantryInfo info;
public bool IsMoving { get; set; } public bool IsMoving { get; set; }
protected bool dirty = false; protected bool dirty = false;
@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA.Render
this.info = info; this.info = info;
anim.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0); anim.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
State = AnimationState.Waiting; State = AnimationState.Waiting;
mobile = self.Trait<Mobile>(); move = self.Trait<IMove>();
self.Trait<IBodyOrientation>().SetAutodetectedFacings(anim.CurrentSequence.Facings); self.Trait<IBodyOrientation>().SetAutodetectedFacings(anim.CurrentSequence.Facings);
} }
@@ -83,12 +83,12 @@ namespace OpenRA.Mods.RA.Render
{ {
base.Tick(self); base.Tick(self);
if ((State == AnimationState.Moving || dirty) && !mobile.IsMoving) if ((State == AnimationState.Moving || dirty) && !move.IsMoving)
{ {
State = AnimationState.Waiting; State = AnimationState.Waiting;
anim.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0); anim.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
} }
else if ((State != AnimationState.Moving || dirty) && mobile.IsMoving) else if ((State != AnimationState.Moving || dirty) && move.IsMoving)
{ {
State = AnimationState.Moving; State = AnimationState.Moving;
anim.PlayRepeating(NormalizeInfantrySequence(self, "run")); anim.PlayRepeating(NormalizeInfantrySequence(self, "run"));