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

Add native support for uninterruptible activities

Browse Source 
This pattern occurs a few times throughout the code, so it makes sense to bake it into the Activity class itself.
This commit is contained in:
Oliver Brakmann
2016-10-29 17:38:10 +02:00
parent 3e9bf7aa4d
commit 2c66ee8c13
20 changed files with 76 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -32,6 +32,7 @@ namespace OpenRA.Mods.Common.Activities
this.start = start;
this.end = end;
this.length = length;
IsInterruptible = false;
}
public override Activity Tick(Actor self)
@@ -62,8 +63,5 @@ namespace OpenRA.Mods.Common.Activities
{
yield return Target.FromPos(end);
}
// Cannot be cancelled
public override void Cancel(Actor self) { }
}
}

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

@@ -272,10 +272,10 @@ namespace OpenRA.Mods.Common.Activities
return Pair.New(nextCell, subCell);
}
public override void Cancel(Actor self)
public override bool Cancel(Actor self)
{
path = NoPath;
base.Cancel(self);
return base.Cancel(self);
}
public override IEnumerable<Target> GetTargets(Actor self)
@@ -331,10 +331,10 @@ namespace OpenRA.Mods.Common.Activities
}
}
public override void Cancel(Actor self)
public override bool Cancel(Actor self)
{
Move.Cancel(self);
base.Cancel(self);
return base.Cancel(self);
}
public override void Queue(Activity activity)

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

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