Mercurial > mm7

diff Actor.cpp @ 2300:4c3f91554be8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stru319::GetMagicalResistance renamed to stru319::DoesDmgTypeDoDamage
author Grumpy7
date Sun, 16 Mar 2014 19:58:02 +0100
parents b0f10ef66e00
children df24d11208df
line wrap: on
line diff
--- a/Actor.cpp	Sun Mar 16 19:43:28 2014 +0100
+++ b/Actor.cpp	Sun Mar 16 19:58:02 2014 +0100
@@ -3643,7 +3643,7 @@
     && uDamageAmount != 0 )
     player->ReceiveDamage(uDamageAmount, attackElement);
   int knockbackValue = 20 * v61 / (signed int)pMonster->pMonsterInfo.uHP;
-  if ( (player->GetSpecialItemBonus(24) || hit_will_stun) && stru_50C198.GetMagicalResistance(pMonster, DMGT_EARTH) )
+  if ( (player->GetSpecialItemBonus(24) || hit_will_stun) && stru_50C198.DoesDmgTypeDoDamage(pMonster, DMGT_EARTH) )
   {
     extraRecoveryTime = 20;
     knockbackValue = 10;
@@ -3657,7 +3657,7 @@
       ShowStatusBarString(pTmpBuf.data(), 2u);
     }
   }
-  if ( hit_will_paralyze && pMonster->CanAct() && stru_50C198.GetMagicalResistance(pMonster, DMGT_EARTH))
+  if ( hit_will_paralyze && pMonster->CanAct() && stru_50C198.DoesDmgTypeDoDamage(pMonster, DMGT_EARTH))
   {
     v43 = player->GetActualSkillLevel(PLAYER_SKILL_MACE);
     v45 = SkillToMastery(v43);