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

Allow cancelling an activity without aborting the entire queue

Browse Source
This commit is contained in:
Oliver Brakmann
2017-03-05 21:43:11 +01:00
committed by Paul Chote
parent 3111b2cf9b
commit f9951f76ca
11 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Activities/Activity.cs
View File

@@ -201,7 +201,7 @@ namespace OpenRA.Activities
/// </summary> /// </summary>
protected virtual void OnLastRun(Actor self) { } protected virtual void OnLastRun(Actor self) { }
public virtual bool Cancel(Actor self) public virtual bool Cancel(Actor self, bool keepQueue = false)
{ {
if (!IsInterruptible) if (!IsInterruptible)
return false; return false;
@@ -209,9 +209,11 @@ namespace OpenRA.Activities
if (ChildActivity != null && !ChildActivity.Cancel(self)) if (ChildActivity != null && !ChildActivity.Cancel(self))
return false; return false;
State = ActivityState.Canceled; if (!keepQueue)
NextActivity = null; NextActivity = null;
ChildActivity = null; ChildActivity = null;
State = ActivityState.Canceled;
return true; return true;
} }

2
OpenRA.Mods.Common/Activities/DeliverUnit.cs
View File

@@ -207,7 +207,7 @@ namespace OpenRA.Mods.Common.Activities
}); });
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
if (!IsCanceled && innerActivity != null && !innerActivity.Cancel(self)) if (!IsCanceled && innerActivity != null && !innerActivity.Cancel(self))
return false; return false;

2
OpenRA.Mods.Common/Activities/Enter.cs
View File

@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Activities
inner.Cancel(self); inner.Cancel(self);
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
AbortOrExit(self); AbortOrExit(self);
if (nextState < EnterState.Exiting) if (nextState < EnterState.Exiting)

2
OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Activities
throw new InvalidOperationException("Invalid harvester dock state"); throw new InvalidOperationException("Invalid harvester dock state");
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
dockingState = DockingState.Undock; dockingState = DockingState.Undock;
return base.Cancel(self); return base.Cancel(self);

4
OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs
View File

@@ -46,12 +46,12 @@ namespace OpenRA.Mods.Common.Activities
return this; return this;
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
if (!IsCanceled && inner != null && !inner.Cancel(self)) if (!IsCanceled && inner != null && !inner.Cancel(self))
return false; return false;
return base.Cancel(self); return base.Cancel(self, keepQueue);
} }
public override IEnumerable<Target> GetTargets(Actor self) public override IEnumerable<Target> GetTargets(Actor self)

4
OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -334,9 +334,9 @@ namespace OpenRA.Mods.Common.Activities
} }
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
Move.Cancel(self); Move.Cancel(self, keepQueue);
return base.Cancel(self); return base.Cancel(self);
} }

2
OpenRA.Mods.Common/Activities/Move/MoveAdjacentTo.cs
View File

@@ -161,7 +161,7 @@ namespace OpenRA.Mods.Common.Activities
return Target.None; return Target.None;
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
if (!IsCanceled && inner != null && !inner.Cancel(self)) if (!IsCanceled && inner != null && !inner.Cancel(self))
return false; return false;

4
OpenRA.Mods.Common/Activities/PickupUnit.cs
View File

@@ -157,12 +157,12 @@ namespace OpenRA.Mods.Common.Activities
}); });
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
if (!IsCanceled && innerActivity != null && !innerActivity.Cancel(self)) if (!IsCanceled && innerActivity != null && !innerActivity.Cancel(self))
return false; return false;
return base.Cancel(self); return base.Cancel(self, keepQueue);
} }
} }
} }

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

@@ -30,9 +30,9 @@ namespace OpenRA.Mods.Common.Activities
return (remainingTicks-- == 0) ? NextActivity : this; return (remainingTicks-- == 0) ? NextActivity : this;
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
if (!base.Cancel(self)) if (!base.Cancel(self, keepQueue))
return false; return false;
remainingTicks = 0; remainingTicks = 0;
@@ -56,9 +56,9 @@ namespace OpenRA.Mods.Common.Activities
return (f == null || f()) ? NextActivity : this; return (f == null || f()) ? NextActivity : this;
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
if (!base.Cancel(self)) if (!base.Cancel(self, keepQueue))
return false; return false;
f = null; f = null;

4
OpenRA.Mods.Common/Activities/WaitForTransport.cs
View File

@@ -41,12 +41,12 @@ namespace OpenRA.Mods.Common.Activities
return this; return this;
} }
public override bool Cancel(Actor self) public override bool Cancel(Actor self, bool keepQueue = false)
{ {
if (!IsCanceled && inner != null && !inner.Cancel(self)) if (!IsCanceled && inner != null && !inner.Cancel(self))
return false; return false;
return base.Cancel(self); return base.Cancel(self, keepQueue);
} }
} }
} }

4
OpenRA.Mods.Common/Scripting/CallLuaFunc.cs
View File

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