Mercurial > mm7

diff mm7_5.cpp @ 2293:b0f10ef66e00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stru319::CalcMagicalDamageToActor moved to Actor class
author Grumpy7
date Sun, 16 Mar 2014 19:42:29 +0100
parents ab8797ea43b6
children a07bf9afa652
line wrap: on
line diff
--- a/mm7_5.cpp	Sun Mar 16 19:37:28 2014 +0100
+++ b/mm7_5.cpp	Sun Mar 16 19:42:29 2014 +0100
@@ -275,7 +275,7 @@
       if ( pSpriteObjects[PID_ID(uObjID)].spell_id )
       {
         v6 = _43AFE3_calc_spell_damage(pSpriteObjects[PID_ID(uObjID)].spell_id, pSpriteObjects[PID_ID(uObjID)].spell_level, pSpriteObjects[PID_ID(uObjID)].spell_skill, pActors[uActorID].sCurrentHP);
-        damage = stru_50C198.CalcMagicalDamageToActor(&pActors[uActorID], (DAMAGE_TYPE)0, v6);
+        damage = pActors[uActorID].CalcMagicalDamageToActor((DAMAGE_TYPE)0, v6);
         pActors[uActorID].sCurrentHP -= damage;
         if ( damage )
         {
@@ -361,7 +361,7 @@
           v12 = pActors[PID_ID(v17)].pMonsterInfo.field_3C_some_special_attack;
         else
           v12 = 4;
-        v14 = stru_50C198.CalcMagicalDamageToActor(&pActors[actor_id], (DAMAGE_TYPE)v12, v10);
+        v14 = pActors[actor_id].CalcMagicalDamageToActor((DAMAGE_TYPE)v12, v10);
         pActors[actor_id].sCurrentHP -= v14;
         if ( v14 )
         {