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

Fix setting MayYieldReservation when there is no reservation

Browse Source
This commit is contained in:
Oliver Brakmann
2016-09-15 20:50:56 +02:00
parent 9fbda6b598
commit 852d947764
4 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Activities
{
inner = ActivityUtils.SequenceActivities(
aircraft.GetResupplyActivities(host)
.Append(new CallFunc(() => aircraft.MayYieldReservation = true))
.Append(new AllowYieldingReservation(self))
.Append(new WaitFor(() => NextActivity != null || aircraft.ReservedActor == null))
.ToArray());
}
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Activities
// HACK: Append NextActivity to TakeOff to avoid moving to the Rallypoint (if NextActivity is non-null).
inner = ActivityUtils.SequenceActivities(
aircraft.GetResupplyActivities(host)
.Append(new CallFunc(() => aircraft.MayYieldReservation = true))
.Append(new AllowYieldingReservation(self))
.Append(new TakeOff(self)).Append(NextActivity).ToArray());
}
}