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

check name for Actor.GrantCondition()

Browse Source
This commit is contained in:
atlimit8
2020-04-26 01:19:31 -05:00
committed by abcdefg30
parent 1d2d8ed107
commit 1ef27d18c1
21 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public void Forward(Actor self, Action onComplete)
{
if (!string.IsNullOrEmpty(info.Condition) && token == Actor.InvalidConditionToken)
if (token == Actor.InvalidConditionToken)
token = self.GrantCondition(info.Condition);
var wsb = wsbs.FirstEnabledTraitOrDefault();
@@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public void Reverse(Actor self, Action onComplete)
{
if (!string.IsNullOrEmpty(info.Condition) && token == Actor.InvalidConditionToken)
if (token == Actor.InvalidConditionToken)
token = self.GrantCondition(info.Condition);
var wsb = wsbs.FirstEnabledTraitOrDefault();
@@ -114,8 +114,7 @@ namespace OpenRA.Mods.Common.Traits.Render
if (wsb != null)
wsb.DefaultAnimation.PlayFetchIndex(info.Sequence, () => 0);
if (!string.IsNullOrEmpty(info.Condition))
token = self.GrantCondition(info.Condition);
token = self.GrantCondition(info.Condition);
self.QueueActivity(queued, activity);
});