From 87af95b67cb45b72bffd77f7744dc1a10cb3f25a Mon Sep 17 00:00:00 2001
From: Lane Kolbly <lane@rscheme.org>
Date: Sun, 23 Jul 2017 04:46:38 -0500
Subject: Updated armor cover calculation. (#3858)

* Updated armor damage calculation.

+ Added lua docs, added casts from float to int.

* Changed verbage in docstring and comment.
---
 src/Entities/Player.cpp | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'src/Entities/Player.cpp')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index e4192140a..77ce378da 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -940,6 +940,22 @@ void cPlayer::SetFlying(bool a_IsFlying)
 
 
 
+void cPlayer::ApplyArmorDamage(int DamageBlocked)
+{
+	short ArmorDamage = static_cast<short>(DamageBlocked / 4);
+	if (ArmorDamage == 0)
+	{
+		ArmorDamage = 1;
+	}
+	m_Inventory.DamageItem(cInventory::invArmorOffset + 0, ArmorDamage);
+	m_Inventory.DamageItem(cInventory::invArmorOffset + 1, ArmorDamage);
+	m_Inventory.DamageItem(cInventory::invArmorOffset + 2, ArmorDamage);
+	m_Inventory.DamageItem(cInventory::invArmorOffset + 3, ArmorDamage);
+}
+
+
+
+
 
 bool cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
 {
@@ -976,17 +992,6 @@ bool cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
 		AddFoodExhaustion(0.3f);
 		SendHealth();
 
-		// Damage armor
-		short ArmorDamage = static_cast<short>(a_TDI.RawDamage / 4);
-		if (ArmorDamage == 0)
-		{
-			ArmorDamage = 1;
-		}
-		m_Inventory.DamageItem(cInventory::invArmorOffset + 0, ArmorDamage);
-		m_Inventory.DamageItem(cInventory::invArmorOffset + 1, ArmorDamage);
-		m_Inventory.DamageItem(cInventory::invArmorOffset + 2, ArmorDamage);
-		m_Inventory.DamageItem(cInventory::invArmorOffset + 3, ArmorDamage);
-
 		// Tell the wolves
 		if (a_TDI.Attacker != nullptr)
 		{
-- 
cgit v1.2.3