need to watch those conversions on +=, -=, *= etc

This commit is contained in:
Arthur Dene Ice
2014-05-07 17:45:36 -07:00
parent 6ba7486905
commit 5ce4bb776e
+2 -2
View File
@@ -568,7 +568,7 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit, ExtraAttac
} }
if (opts) { if (opts) {
armor *= (int)(1.0f - opts->armor_pen_percent); armor = (int)(armor * (1.0f - opts->armor_pen_percent));
armor -= opts->armor_pen_flat; 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) if(damage != 0 && damage < minhit)
damage = minhit; damage = minhit;