Mercurial > mm7

changeset 1598:11bb463837b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus, forgot to commit actor.cpp
author Grumpy7
date Tue, 10 Sep 2013 04:16:54 +0200
parents 33a82b36c3e8
children bb2378f58767
files Actor.cpp Player.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Tue Sep 10 04:08:15 2013 +0200
+++ b/Actor.cpp	Tue Sep 10 04:16:54 2013 +0200
@@ -5328,7 +5328,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;
--- a/Player.cpp	Tue Sep 10 04:08:15 2013 +0200
+++ b/Player.cpp	Tue Sep 10 04:16:54 2013 +0200
@@ -3111,7 +3111,7 @@
         if ((pInventoryItemList[inv_indx].uSpecEnchantmentType==17) || (pInventoryItemList[inv_indx].uItemID == 533)) //Elven Chainmail+Increases rate of Recovery
           return 50;
       }
-      if (enchantmentId == 24)     //XXX: never actually used on mm7
+      if (enchantmentId == 24) 
       {
         if (pInventoryItemList[inv_indx].uSpecEnchantmentType == 24) //Increased Knockback.
           return 5;