Merge pull request #11982 from obrakmann/fix11979-helicopter-reservations

Fix helicopter reservations
This commit is contained in:
reaperrr
2016-09-24 20:24:35 +02:00
committed by GitHub
7 changed files with 53 additions and 9 deletions

View File

@@ -111,7 +111,7 @@ namespace OpenRA.Mods.Common.Traits
public CPos TopLeft { get { return self.World.Map.CellContaining(CenterPosition); } }
public int TurnSpeed { get { return Info.TurnSpeed; } }
public Actor ReservedActor { get; private set; }
public bool MayYieldReservation;
public bool MayYieldReservation { get; private set; }
bool airborne;
bool cruising;
@@ -282,6 +282,14 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void AllowYieldingReservation()
{
if (reservation == null)
return;
MayYieldReservation = true;
}
public void UnReserve()
{
if (reservation == null)