From 437e142031ddd75672d6d1a11c8232d62df45e7f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 20 Oct 2016 18:45:59 +0200 Subject: [PATCH] Reservable style fixes --- .../Traits/Buildings/Reservable.cs | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Buildings/Reservable.cs b/OpenRA.Mods.Common/Traits/Buildings/Reservable.cs index 2ba201e2f7..863a0f65a8 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/Reservable.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/Reservable.cs @@ -25,12 +25,13 @@ namespace OpenRA.Mods.Common.Traits void ITick.Tick(Actor self) { + // Nothing to do. if (reservedFor == null) - return; /* nothing to do */ + return; if (!Target.FromActor(reservedFor).IsValidFor(self)) { - /* Not likely to arrive now. */ + // Not likely to arrive now. reservedForAircraft.UnReserve(); reservedFor = null; reservedForAircraft = null; @@ -64,28 +65,17 @@ namespace OpenRA.Mods.Common.Traits return res != null && res.reservedForAircraft != null && !res.reservedForAircraft.MayYieldReservation; } - void INotifyActorDisposing.Disposing(Actor self) + private void UnReserve() { if (reservedForAircraft != null) reservedForAircraft.UnReserve(); } - void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) - { - if (reservedForAircraft != null) - reservedForAircraft.UnReserve(); - } + void INotifyActorDisposing.Disposing(Actor self) { UnReserve(); } - void INotifySold.Selling(Actor self) - { - if (reservedForAircraft != null) - reservedForAircraft.UnReserve(); - } + void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) { UnReserve(); } - void INotifySold.Sold(Actor self) - { - if (reservedForAircraft != null) - reservedForAircraft.UnReserve(); - } + void INotifySold.Selling(Actor self) { UnReserve(); } + void INotifySold.Sold(Actor self) { UnReserve(); } } }