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

Merge pull request #10141 from reaperrr/fix-anim-cancel

Browse Source 
Fix actors not going back to idle animation after custom animation
This commit is contained in:
abcdefg30
2015-12-07 15:13:00 +01:00
parent 22aa548d1b e9ed50a831
commit 0976972f7c
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Traits
if (--ticks <= 0)
{
if (!(info.PauseOnLowPower && self.IsDisabled()))
wsb.PlayCustomAnimation(self, info.Sequence);
wsb.PlayCustomAnimation(self, info.Sequence, () => wsb.CancelCustomAnimation(self));
ticks = info.Interval;
}
}

2
OpenRA.Mods.Common/Traits/Render/WithChargeAnimation.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Traits
public void Charging(Actor self, Target target)
{
wsb.PlayCustomAnimation(self, info.ChargeSequence);
wsb.PlayCustomAnimation(self, info.ChargeSequence, () => wsb.CancelCustomAnimation(self));
}
}
}

2
OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
{
var spriteBody = host.TraitOrDefault<WithSpriteBody>();
if (spriteBody != null && !(info.PauseOnLowPower && self.IsDisabled()))
spriteBody.PlayCustomAnimation(host, info.Sequence);
spriteBody.PlayCustomAnimation(host, info.Sequence, () => spriteBody.CancelCustomAnimation(self));
}
}
}