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

Merge pull request #7090 from Mailaender/d2k-infantry-noidle-stand

Browse Source 
Fixed infantry without idle animation never returning to stand
This commit is contained in:
reaperrr
2014-12-09 20:08:10 +01:00
parent f56876cd23 9bfd82e868
commit 8f076131c8
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

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