Merge pull request #1417 from Kurtsley/fix-outofrange

Fix out of range message when out of ammo.
OpenApoc · Apr 18, 2024 · 978e0c5 · 978e0c5
2 parents 6bb0528 + 80ed813
commit 978e0c5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/game/ui/tileview/battleview.cpp b/game/ui/tileview/battleview.cpp
@@ -2450,9 +2450,12 @@ void BattleView::updateAttackCost()
 	}
 	else if (!weapon->canFire(*state, target))
 	{
-		calculatedAttackCost =
-		    static_cast<int>(weapon->type->launcher ? CalculatedAttackCostSpecial::NO_ARC
-		                                            : CalculatedAttackCostSpecial::OUT_OF_RANGE);
+		if (!weapon->needsReload())
+		{
+			calculatedAttackCost = static_cast<int>(
+			    weapon->type->launcher ? CalculatedAttackCostSpecial::NO_ARC
+			                           : CalculatedAttackCostSpecial::OUT_OF_RANGE);
+		}
 	}
 	else
 	{