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

Revoke WithMakeAnimation condition at the end of the tick.

Browse Source 
This fixes traits becoming enabled for a tick
between the animation completing and the actor
being removed from the world.
This commit is contained in:
Paul Chote
2018-10-28 17:14:17 +00:00
committed by abcdefg30
parent 47a470e945
commit fc6ada38f4
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Render/WithMakeAnimation.cs
View File

@@ -67,6 +67,8 @@ namespace OpenRA.Mods.Common.Traits.Render
return; return;
wsb.PlayCustomAnimation(self, info.Sequence, () => wsb.PlayCustomAnimation(self, info.Sequence, () =>
{
self.World.AddFrameEndTask(w =>
{ {
if (token != ConditionManager.InvalidConditionToken) if (token != ConditionManager.InvalidConditionToken)
token = conditionManager.RevokeCondition(self, token); token = conditionManager.RevokeCondition(self, token);
@@ -74,6 +76,7 @@ namespace OpenRA.Mods.Common.Traits.Render
// TODO: Rewrite this to use a trait notification for save game support // TODO: Rewrite this to use a trait notification for save game support
onComplete(); onComplete();
}); });
});
} }
public void Reverse(Actor self, Action onComplete) public void Reverse(Actor self, Action onComplete)
@@ -87,6 +90,8 @@ namespace OpenRA.Mods.Common.Traits.Render
return; return;
wsb.PlayCustomAnimationBackwards(self, info.Sequence, () => wsb.PlayCustomAnimationBackwards(self, info.Sequence, () =>
{
self.World.AddFrameEndTask(w =>
{ {
if (token != ConditionManager.InvalidConditionToken) if (token != ConditionManager.InvalidConditionToken)
token = conditionManager.RevokeCondition(self, token); token = conditionManager.RevokeCondition(self, token);
@@ -94,6 +99,7 @@ namespace OpenRA.Mods.Common.Traits.Render
// TODO: Rewrite this to use a trait notification for save game support // TODO: Rewrite this to use a trait notification for save game support
onComplete(); onComplete();
}); });
});
} }
public void Reverse(Actor self, Activity activity, bool queued = true) public void Reverse(Actor self, Activity activity, bool queued = true)