# HG changeset patch # User Grumpy7 # Date 1378779414 -7200 # Node ID 11bb463837b1ca57e2f6f30db2d93cfd9e298f31 # Parent 33a82b36c3e86646fba5f16674e5acd17353ee2c _48EA46_calc_special_bonus_by_items renamed to GetSpecialItemBonus, forgot to commit actor.cpp diff -r 33a82b36c3e8 -r 11bb463837b1 Actor.cpp --- 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; diff -r 33a82b36c3e8 -r 11bb463837b1 Player.cpp --- 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;