fix of reloading bug #878

OpenXcom · Feb 6, 2015 · 247915f · 247915f
1 parent 76b0d50
commit 247915f
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/Savegame/CraftWeapon.cpp b/src/Savegame/CraftWeapon.cpp
@@ -130,15 +130,14 @@ void CraftWeapon::setRearming(bool rearming)
  */
 int CraftWeapon::rearm(const int available, const int clipSize)
 {
-	int needed = 0;
+	int ammoUsed = _rules->getRearmRate();
 
 	if (clipSize > 0)
-	{	// +(clipSize - 1) for correct rounding up
-		needed = std::min(_rules->getRearmRate(), _rules->getAmmoMax() - _ammo + clipSize - 1) / clipSize;
+	{	// +(clipSize - 1) correction for rounding up
+		int needed = std::min(_rules->getRearmRate(), _rules->getAmmoMax() - _ammo + clipSize - 1) / clipSize;
+		ammoUsed = ((needed > available)? available : needed) * clipSize;
 	}
 
-	int ammoUsed = (available >= needed)? _rules->getRearmRate() : available * clipSize;
-
 	setAmmo(_ammo + ammoUsed);
 
 	_rearming = _ammo < _rules->getAmmoMax();