Merge 9e1544c87d into 5a08031caf

Source/player.cpp

@@ -961,45 +961,32 @@ bool DoBlock(Player &player)
 	return false;
 }
 
-void DamageArmor(Player &player)
+void DamageArmor(Player &player, int numDurLost)
 {
-	if (&player != MyPlayer) {
+	if (&player != MyPlayer)
 		return;
-	}
 
-	if (player.InvBody[INVLOC_CHEST].isEmpty() && player.InvBody[INVLOC_HEAD].isEmpty()) {
+	Item &armor = player.InvBody[INVLOC_CHEST];
+	Item &helmet = player.InvBody[INVLOC_HEAD];
+
+	if (armor.isEmpty() && helmet.isEmpty())
 		return;
-	}
 
-	bool targetHead = FlipCoin(3);
+	const bool coin = FlipCoin(3);
-	if (!player.InvBody[INVLOC_CHEST].isEmpty() && player.InvBody[INVLOC_HEAD].isEmpty()) {
+	const bool targetHelmet = armor.isEmpty() ? true : helmet.isEmpty() ? false
-		targetHead = false;
+	                                                                    : coin;
-	}
+	int slot = targetHelmet ? INVLOC_HEAD : INVLOC_CHEST;
-	if (player.InvBody[INVLOC_CHEST].isEmpty() && !player.InvBody[INVLOC_HEAD].isEmpty()) {
+	Item &item = player.InvBody[slot];
-		targetHead = true;
-	}
 
-	Item *pi;
+	if (item._iMaxDur == DUR_INDESTRUCTIBLE)
-	if (targetHead) {
-		pi = &player.InvBody[INVLOC_HEAD];
-	} else {
-		pi = &player.InvBody[INVLOC_CHEST];
-	}
-	if (pi->_iDurability == DUR_INDESTRUCTIBLE) {
 		return;
-	}
 
-	pi->_iDurability--;
+	item._iDurability -= numDurLost;
-	if (pi->_iDurability != 0) {
-		return;
-	}
 
-	if (targetHead) {
+	if (item._iDurability <= 0) {
-		RemoveEquipment(player, INVLOC_HEAD, true);
+		RemoveEquipment(player, static_cast<inv_body_loc>(slot), true);
-	} else {
+		CalcPlrInv(player, true);
-		RemoveEquipment(player, INVLOC_CHEST, true);
 	}
-	CalcPlrInv(player, true);
 }
 
 bool DoSpell(Player &player)
@@ -1032,7 +1019,7 @@ bool DoGotHit(Player &player)
 		StartStand(player, player._pdir);
 		ClearStateVariables(player);
 		if (!FlipCoin(4)) {
-			DamageArmor(player);
+			DamageArmor(player, 1);
 		}
 
 		return true;