Mercurial > mm7

diff Actor.cpp @ 1633:384a6b9d1333

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Tue, 17 Sep 2013 12:40:37 +0200
parents c58916c53d8e
children ccde94f02b75
line wrap: on
line diff
--- a/Actor.cpp	Tue Sep 17 12:37:07 2013 +0200
+++ b/Actor.cpp	Tue Sep 17 12:40:37 2013 +0200
@@ -5327,7 +5327,7 @@
     player->ReceiveDamage(uDamageAmount, (DAMAGE_TYPE)a2);
   v50 = 24;
   v59 = 20 * v61 / (signed int)pMonster->pMonsterInfo.uHP;
-  if ( (player->_48EA46_calc_special_bonus_by_items(24) || hit_will_stun != v41)
+  if ( (player->GetSpecialItemBonus(24) || hit_will_stun != v41)
     && stru_50C198.GetMagicalResistance(pMonster, 3u) )
   {
     LODWORD(v42) = 20;