diff mm7_5.cpp @ 816:cfc65feef029

* Player Recovery Times * Player Attack fixes * Debug log to timers
author Nomad
date Tue, 26 Mar 2013 12:40:27 +0200
parents 7bb33867d2cb
children 9359c114f98c
line wrap: on
line diff
--- a/mm7_5.cpp	Tue Mar 26 06:40:04 2013 +0200
+++ b/mm7_5.cpp	Tue Mar 26 12:40:27 2013 +0200
@@ -4809,7 +4809,7 @@
     //v51 = (unsigned __int64 *)player->pEquipment.uMainHand;
     int main_hand_idx = player->pEquipment.uMainHand;
     v59 = 1;
-    if ( player->HasItemEquipped(EQUIP_TWO_HANDED) )
+    if ( player->HasItemEquipped(EQUIP_MAIN_HAND) )
     {
       auto main_hand_skill = pItemsTable->pItems[player->pInventoryItems[main_hand_idx - 1].uItemID].uSkillType;
       //v55 = pItemsTable->pItems[player->pInventoryItems[main_hand_idx - 1].uItemID].uSkillType;
@@ -5514,7 +5514,7 @@
           v77 >>= 1;
         if ( v48 == 531 )
           v77 >>= 1;
-        if ( v45->GetEquippedItemEquipType(v75) == 4 && SkillToMastery(v45->pActiveSkills[8]) == 4 )
+        if ( v45->GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v75) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4 )
           v77 >>= 1;
       }
       ++v75;