PlrHitPlr cleanup

6 years ago · 3e7e9b4012
1 changed files with 5 additions and 4 deletions
--- a/Source/player.cpp
+++ b/Source/player.cpp
@ -2891,14 +2891,15 @@ BOOL PlrHitPlr(int pnum, char p)
 			StartPlrBlock(p, dir);
 		} else {
 			mind = plr[pnum]._pIMinDam;
-			maxd = random_(5, plr[pnum]._pIMaxDam - mind + 1);
-			dam = maxd + mind;
-			dam += plr[pnum]._pDamageMod + plr[pnum]._pIBonusDamMod + dam * plr[pnum]._pIBonusDam / 100;
+			maxd = plr[pnum]._pIMaxDam;
+			dam = random_(5, maxd - mind + 1) + mind;
+			dam += (dam * plr[pnum]._pIBonusDam) / 100;
+			dam += plr[pnum]._pIBonusDamMod + plr[pnum]._pDamageMod;

 			if (plr[pnum]._pClass == PC_WARRIOR) {
 				lvl = plr[pnum]._pLevel;
 				if (random_(6, 100) < lvl) {
-					dam *= 2;
+					dam <<= 1;
 				}
 			}
 			skdam = dam << 6;