Adjust existing activities for changed NextActivity semantics

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

View File

@@ -37,10 +37,10 @@ namespace OpenRA.Mods.Common.Activities
var destination = rp != null ? rp.Location :
(hasHost ? self.World.Map.CellContaining(host.CenterPosition) : self.Location);
if (NextActivity == null)
if (NextInQueue == null)
return new AttackMoveActivity(self, move.MoveTo(destination, 1));
else
return NextActivity;
return NextInQueue;
}
}
}