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

Adjust existing activities for changed NextActivity semantics

Browse Source 
To make sure existing checks against NextActivity don't check the parent activity by mistake
This commit is contained in:
Oliver Brakmann
2016-12-04 20:50:00 +01:00
parent 4105f9ed22
commit e49b3d6458
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Activities/FindResources.cs
View File

@@ -51,9 +51,12 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
if (IsCanceled || NextActivity != null)
if (IsCanceled)
return NextActivity;
if (NextInQueue != null)
return NextInQueue;
var deliver = new DeliverResources(self);
if (harv.IsFull)
@@ -81,8 +84,8 @@ namespace OpenRA.Mods.Common.Activities
var randFrames = self.World.SharedRandom.Next(100, 175);
// Avoid creating an activity cycle
var next = NextActivity;
NextActivity = null;
var next = NextInQueue;
NextInQueue = null;
return ActivityUtils.SequenceActivities(next, new Wait(randFrames), this);
}
else