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

add check for NextActivity to FlyCircle

Browse Source 
prevent infinite loop

fix for ReturnToBase

cleanup
This commit is contained in:
tovl
2019-01-28 22:20:08 +01:00
committed by Paul Chote
parent b71c080285
commit ee19cb61b4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Activities/Air/FlyCircle.cs
View File

@@ -29,6 +29,9 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if (NextActivity != null && remainingTicks <= 0)
return NextActivity;
// Refuse to take off if it would land immediately again. // Refuse to take off if it would land immediately again.
if (aircraft.ForceLanding) if (aircraft.ForceLanding)
{ {
@@ -41,8 +44,6 @@ namespace OpenRA.Mods.Common.Activities
if (remainingTicks > 0) if (remainingTicks > 0)
remainingTicks--; remainingTicks--;
else if (remainingTicks == 0)
return NextActivity;
// We can't possibly turn this fast // We can't possibly turn this fast
var desiredFacing = aircraft.Facing + 64; var desiredFacing = aircraft.Facing + 64;