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

Simplify special exits of several acitivities.

Browse Source
This commit is contained in:
tovl
2019-06-30 20:53:36 +02:00
committed by teinarss
parent 3790169db9
commit 985020b4ad
9 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Activities/DeployForGrantedCondition.cs
View File

@@ -20,7 +20,6 @@ namespace OpenRA.Mods.Common.Activities
readonly GrantConditionOnDeploy deploy;
readonly bool canTurn;
readonly bool moving;
bool initiated;
public DeployForGrantedCondition(Actor self, GrantConditionOnDeploy deploy, bool moving = false)
{
@@ -38,13 +37,11 @@ namespace OpenRA.Mods.Common.Activities
public override bool Tick(Actor self)
{
if (IsCanceling || initiated || (deploy.DeployState != DeployState.Deployed && moving))
if (IsCanceling || (deploy.DeployState != DeployState.Deployed && moving))
return true;
QueueChild(new DeployInner(self, deploy));
initiated = true;
return false;
return true;
}
}