Revert "Added support for standard DamageFactor property on Armor, Po…

…werProtection and PowerDamage items." This reverts commit e781cb4.
ZDoom · Feb 10, 2020 · bb42d58 · bb42d58
1 parent e781cb4
commit bb42d58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/wadsrc/static/zscript/actors/inventory/armor.zs b/wadsrc/static/zscript/actors/inventory/armor.zs
@@ -201,8 +201,7 @@ class BasicArmor : Armor
 		// Once the armor has absorbed its part of the damage, then apply its damage factor, if any, to the player
 		if ((damage > 0) && (ArmorType != 'None')) // BasicArmor is not going to have any damage factor, so skip it.
 		{
-			damage = int(damage * DamageFactor);
-			newdamage = (damage < 1) ? 0 : ApplyDamageFactors(ArmorType, damageType, damage, damage);
+			newdamage = ApplyDamageFactors(ArmorType, damageType, damage, damage);
 		}
 	}
 }

diff --git a/wadsrc/static/zscript/actors/inventory/powerups.zs b/wadsrc/static/zscript/actors/inventory/powerups.zs
@@ -1659,8 +1659,7 @@ class PowerDamage : Powerup
 	{
 		if (!passive && damage > 0)
 		{
-			damage = int(damage * DamageFactor);
-			newdamage = (damage < 1) ? 0 : max(1, ApplyDamageFactors(GetClass(), damageType, damage, damage * 4));
+			newdamage = max(1, ApplyDamageFactors(GetClass(), damageType, damage, damage * 4));
 			if (Owner != null && newdamage > damage) Owner.A_StartSound(ActiveSound, CHAN_AUTO, CHANF_DEFAULT, 1.0, ATTN_NONE);
 		}
 	}
@@ -1754,8 +1753,7 @@ class PowerProtection : Powerup
 	{
 		if (passive && damage > 0)
 		{
-			damage = int(damage * DamageFactor);
-			newdamage = (damage < 1) ? 0 : max(0, ApplyDamageFactors(GetClass(), damageType, damage, damage / 4));
+			newdamage = max(0, ApplyDamageFactors(GetClass(), damageType, damage, damage / 4));
 			if (Owner != null && newdamage < damage) Owner.A_StartSound(ActiveSound, CHAN_AUTO, CHANF_DEFAULT, 1.0, ATTN_NONE);
 		}
 	}