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

Make WithMoveAnimation work with WithSpriteBody as well

Browse Source
This commit is contained in:
reaperrr
2015-07-05 00:09:46 +02:00
parent 632d8cd898
commit 8ae541339b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Render/WithMoveAnimation.cs
View File

@@ -13,7 +13,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
public class WithMoveAnimationInfo : ITraitInfo, Requires<WithFacingSpriteBodyInfo>, Requires<IMoveInfo> public class WithMoveAnimationInfo : ITraitInfo, Requires<WithSpriteBodyInfo>, Requires<IMoveInfo>
{ {
[Desc("Displayed while moving.")] [Desc("Displayed while moving.")]
[SequenceReference] public readonly string MoveSequence = "move"; [SequenceReference] public readonly string MoveSequence = "move";
@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
readonly WithMoveAnimationInfo info; readonly WithMoveAnimationInfo info;
readonly IMove movement; readonly IMove movement;
readonly WithFacingSpriteBody wfsb; readonly WithSpriteBody wsb;
WPos cachedPosition; WPos cachedPosition;
@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
this.info = info; this.info = info;
movement = init.Self.Trait<IMove>(); movement = init.Self.Trait<IMove>();
wfsb = init.Self.Trait<WithFacingSpriteBody>(); wsb = init.Self.Trait<WithSpriteBody>();
cachedPosition = init.Self.CenterPosition; cachedPosition = init.Self.CenterPosition;
} }
@@ -45,10 +45,10 @@ namespace OpenRA.Mods.Common.Traits
// Flying units set IsMoving whenever they are airborne, which isn't enough for our purposes // Flying units set IsMoving whenever they are airborne, which isn't enough for our purposes
var isMoving = movement.IsMoving && !self.IsDead && (oldCachedPosition - cachedPosition).HorizontalLengthSquared != 0; var isMoving = movement.IsMoving && !self.IsDead && (oldCachedPosition - cachedPosition).HorizontalLengthSquared != 0;
if (isMoving ^ (wfsb.DefaultAnimation.CurrentSequence.Name != info.MoveSequence)) if (isMoving ^ (wsb.DefaultAnimation.CurrentSequence.Name != info.MoveSequence))
return; return;
wfsb.DefaultAnimation.ReplaceAnim(isMoving ? info.MoveSequence : wfsb.Info.Sequence); wsb.DefaultAnimation.ReplaceAnim(isMoving ? info.MoveSequence : wsb.Info.Sequence);
} }
} }
} }