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

fix infantry without idle animation not returning to stand

Browse Source
This commit is contained in:
Matthias Mailänder
2014-12-07 16:39:09 +01:00
parent 51f874fae2
commit 9bfd82e868
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ namespace OpenRA.Mods.RA.Render
protected virtual bool AllowIdleAnimation(Actor self)
{
return info.IdleAnimations.Length > 0 && !isModifyingSequence;
return !isModifyingSequence;
}
public void Attacking(Actor self, Target target)
@@ -136,16 +136,24 @@ namespace OpenRA.Mods.RA.Render
idleDelay = self.World.SharedRandom.Next(info.MinIdleWaitTicks, info.MaxIdleWaitTicks);
}
}
else if (AllowIdleAnimation(self) && idleDelay > 0 && --idleDelay == 0)
else if (AllowIdleAnimation(self))
{
if (DefaultAnimation.HasSequence(idleSequence))
if (idleSequence != null && DefaultAnimation.HasSequence(idleSequence))
{
state = AnimationState.IdleAnimating;
DefaultAnimation.PlayThen(idleSequence, () =>
if (idleDelay > 0 && --idleDelay == 0)
{
DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)));
state = AnimationState.Waiting;
});
state = AnimationState.IdleAnimating;
DefaultAnimation.PlayThen(idleSequence, () =>
{
DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)));
state = AnimationState.Waiting;
});
}
}
else
{
DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)));
state = AnimationState.Waiting;
}
}
}