Merge pull request #12315 from obrakmann/activities-pt1

Activities re-write, part 1 (aka the boring bits)
This commit is contained in:
reaperrr
2016-11-18 13:52:06 +01:00
committed by GitHub
26 changed files with 96 additions and 100 deletions

View File

@@ -43,10 +43,13 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity;
}
public override void Cancel(Actor self)
public override bool Cancel(Actor self)
{
if (!base.Cancel(self))
return false;
Dispose();
base.Cancel(self);
return true;
}
public void Dispose()