Mercurial > mm7

diff Actor.cpp @ 1550:cdb7fafede0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::CalculateMeleeDamageTo extracted 2 almost identical sections to a separate function, variable cleanup, changed parameter types
author Grumpy7
date Sat, 07 Sep 2013 09:45:09 +0200
parents 61458df2cb4f
children e303d8a9bcdc
line wrap: on
line diff
--- a/Actor.cpp	Sat Sep 07 09:16:55 2013 +0200
+++ b/Actor.cpp	Sat Sep 07 09:45:09 2013 +0200
@@ -5076,7 +5076,7 @@
     v50 = pMonster->pMonsterInfo.uID;
     a2 = 4;
     //v27 = player->CalculateMeleeDamageTo(0, 0, v50);
-    uDamageAmount = player->CalculateMeleeDamageTo(0, 0, v50);
+    uDamageAmount = player->CalculateMeleeDamageTo(false, false, v50);
     //if ( !v57 )
       goto LABEL_67;
     //goto LABEL_69;
@@ -5138,7 +5138,7 @@
     if ( (signed int)SkillToMastery(v16) >= 3 )
       a4 = player->pActiveSkills[7] & 0x3F;
     a2 = 4;
-    uDamageAmount = player->CalculateMeleeDamageTo(1, 1, 0);
+    uDamageAmount = player->CalculateMeleeDamageTo(true, true, 0);
     goto LABEL_67;
   }
   if ( v15 != SPELL_BOW_ARROW )