Mercurial > mm7

diff Actor.cpp @ 1384:b51332ab228f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed a few member variables in Player to slightly less confusing names
author Grumpy7
date Tue, 16 Jul 2013 20:51:29 +0200
parents d6cf8ead9242
children 204cce84300b
line wrap: on
line diff
--- a/Actor.cpp	Tue Jul 16 00:40:01 2013 +0200
+++ b/Actor.cpp	Tue Jul 16 20:51:29 2013 +0200
@@ -5051,7 +5051,7 @@
     v59 = 1;
     if ( player->HasItemEquipped(EQUIP_MAIN_HAND) )
     {
-      auto main_hand_skill = pItemsTable->pItems[player->pInventoryItems[main_hand_idx - 1].uItemID].uSkillType;
+      auto main_hand_skill = pItemsTable->pItems[player->pInventoryItemList[main_hand_idx - 1].uItemID].uSkillType;
       //v55 = pItemsTable->pItems[player->pInventoryItems[main_hand_idx - 1].uItemID].uSkillType;
       //v28 = SkillToMastery(player->pActiveSkills[v55]);
       auto main_hand_mastery = SkillToMastery(player->pActiveSkills[main_hand_skill]);
@@ -5260,7 +5260,7 @@
       {
         if ( player->HasItemEquipped((ITEM_EQUIP_TYPE)v59) )
         {
-          auto _s = (ItemGen *)&player->pInventoryItems[v57->uShield - 1];
+          auto _s = (ItemGen *)&player->pInventoryItemList[v57->uShield - 1];
           a4 = _s->_439DF3_get_additional_damage(&a2, &v62);
           if ( v62 && pMonster->sCurrentHP > 0 )
           {