From fc324baf5f9ae9f0ab5a0ae8caab899e6ecbcef4 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 29 Aug 2013 20:11:52 +1200 Subject: [PATCH] Rename IsReloadable -> ReloadsAutomatically. --- OpenRA.Mods.RA/AI/States/AirStates.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.RA/AI/States/AirStates.cs b/OpenRA.Mods.RA/AI/States/AirStates.cs index 87c1f13176..99d7a7dcb1 100644 --- a/OpenRA.Mods.RA/AI/States/AirStates.cs +++ b/OpenRA.Mods.RA/AI/States/AirStates.cs @@ -113,7 +113,7 @@ namespace OpenRA.Mods.RA.AI return limitedAmmo != null && limitedAmmo.HasAmmo(); } - protected static bool IsReloadable(Actor a) + protected static bool ReloadsAutomatically(Actor a) { return a.HasTrait(); } @@ -205,7 +205,7 @@ namespace OpenRA.Mods.RA.AI if (BusyAttack(a)) continue; - if (!IsReloadable(a)) + if (!ReloadsAutomatically(a)) { if (!HasAmmo(a)) { @@ -238,8 +238,7 @@ namespace OpenRA.Mods.RA.AI foreach (var a in owner.units) { - // TODO: This looks wrong - don't we want IsReloadable non-negated? - if (!IsReloadable(a) && !FullAmmo(a)) + if (!ReloadsAutomatically(a) && !FullAmmo(a)) { if (IsRearm(a)) continue;