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

Fix some reservation issues.

Browse Source 
- TakeOff.Tick was nulling a local variable, rather than the Reservation field - this is changed to call UnReserve which does the right thing.
- Aircraft.ResolveOrder was missing an UnReserve call before setting a new reservation.
This commit is contained in:
RoosterDragon
2015-10-27 22:00:26 +00:00
parent 549f8a9e7c
commit e2dd967757
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Activities/Air/TakeOff.cs
View File

@@ -30,12 +30,7 @@ namespace OpenRA.Mods.Common.Activities
if (NextActivity == null) if (NextActivity == null)
self.CancelActivity(); self.CancelActivity();
var reservation = aircraft.Reservation; aircraft.UnReserve();
if (reservation != null)
{
reservation.Dispose();
reservation = null;
}
var host = aircraft.GetActorBelow(); var host = aircraft.GetActorBelow();
var hasHost = host != null; var hasHost = host != null;

3
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -543,7 +543,10 @@ namespace OpenRA.Mods.Common.Traits
{ {
var res = order.TargetActor.TraitOrDefault<Reservable>(); var res = order.TargetActor.TraitOrDefault<Reservable>();
if (res != null) if (res != null)
{
UnReserve();
Reservation = res.Reserve(order.TargetActor, self, this); Reservation = res.Reserve(order.TargetActor, self, this);
}
Action enter = () => Action enter = () =>
{ {