From 5ce4bb776ef0cc7c9dc1345628c4eeab7da98aa9 Mon Sep 17 00:00:00 2001
From: Arthur Dene Ice <addtheice@gmail.com>
Date: Wed, 7 May 2014 17:45:36 -0700
Subject: [PATCH] need to watch those conversions on +=, -=, *= etc

---
 zone/attack.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zone/attack.cpp b/zone/attack.cpp
index af2ddcb5f..cb42616fa 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -568,7 +568,7 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit, ExtraAttac
 		}
 
 		if (opts) {
-			armor *= (int)(1.0f - opts->armor_pen_percent);
+			armor = (int)(armor * (1.0f - opts->armor_pen_percent));
 			armor -= opts->armor_pen_flat;
 		}
 
@@ -696,7 +696,7 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit, ExtraAttac
 			}
 		}
 
-		damage -= (int32)(aa_mit * damage);
+		damage = (int32)(damage - (aa_mit * damage));
 
 		if(damage != 0 && damage < minhit)
 			damage = minhit;