Rename IsReloadable -> ReloadsAutomatically.

This commit is contained in:
Paul Chote
2013-08-29 20:11:52 +12:00
parent ff36aa301f
commit fc324baf5f

View File

@@ -113,7 +113,7 @@ namespace OpenRA.Mods.RA.AI
return limitedAmmo != null && limitedAmmo.HasAmmo(); return limitedAmmo != null && limitedAmmo.HasAmmo();
} }
protected static bool IsReloadable(Actor a) protected static bool ReloadsAutomatically(Actor a)
{ {
return a.HasTrait<Reloads>(); return a.HasTrait<Reloads>();
} }
@@ -205,7 +205,7 @@ namespace OpenRA.Mods.RA.AI
if (BusyAttack(a)) if (BusyAttack(a))
continue; continue;
if (!IsReloadable(a)) if (!ReloadsAutomatically(a))
{ {
if (!HasAmmo(a)) if (!HasAmmo(a))
{ {
@@ -238,8 +238,7 @@ namespace OpenRA.Mods.RA.AI
foreach (var a in owner.units) foreach (var a in owner.units)
{ {
// TODO: This looks wrong - don't we want IsReloadable non-negated? if (!ReloadsAutomatically(a) && !FullAmmo(a))
if (!IsReloadable(a) && !FullAmmo(a))
{ {
if (IsRearm(a)) if (IsRearm(a))
continue; continue;