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

Activity.Cancel returns void instead of bool.

Browse Source
This commit is contained in:
tovl
2019-03-09 15:49:12 +01:00
committed by Paul Chote
parent a17cd0fa06
commit 705795abde
13 changed files with 31 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.Common/Activities/Wait.cs
View File

@@ -27,17 +27,11 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
if (IsCanceling)
return NextActivity;
return (remainingTicks-- == 0) ? NextActivity : this;
}
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!base.Cancel(self, keepQueue))
return false;
remainingTicks = 0;
return true;
}
}
public class WaitFor : Activity
@@ -53,16 +47,10 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
if (IsCanceling)
return NextActivity;
return (f == null || f()) ? NextActivity : this;
}
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!base.Cancel(self, keepQueue))
return false;
f = null;
return true;
}
}
}