Mercurial > mm7

comparison mm7_5.cpp @ 816:cfc65feef029

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
comparison
equal deleted inserted replaced
813:d37b03507b3b 816:cfc65feef029
4807 if ( !v4 ) 4807 if ( !v4 )
4808 { 4808 {
4809 //v51 = (unsigned __int64 *)player->pEquipment.uMainHand; 4809 //v51 = (unsigned __int64 *)player->pEquipment.uMainHand;
4810 int main_hand_idx = player->pEquipment.uMainHand; 4810 int main_hand_idx = player->pEquipment.uMainHand;
4811 v59 = 1; 4811 v59 = 1;
4812 if ( player->HasItemEquipped(EQUIP_TWO_HANDED) ) 4812 if ( player->HasItemEquipped(EQUIP_MAIN_HAND) )
4813 { 4813 {
4814 auto main_hand_skill = pItemsTable->pItems[player->pInventoryItems[main_hand_idx - 1].uItemID].uSkillType; 4814 auto main_hand_skill = pItemsTable->pItems[player->pInventoryItems[main_hand_idx - 1].uItemID].uSkillType;
4815 //v55 = pItemsTable->pItems[player->pInventoryItems[main_hand_idx - 1].uItemID].uSkillType; 4815 //v55 = pItemsTable->pItems[player->pInventoryItems[main_hand_idx - 1].uItemID].uSkillType;
4816 //v28 = SkillToMastery(player->pActiveSkills[v55]); 4816 //v28 = SkillToMastery(player->pActiveSkills[v55]);
4817 auto main_hand_mastery = SkillToMastery(player->pActiveSkills[main_hand_skill]); 4817 auto main_hand_mastery = SkillToMastery(player->pActiveSkills[main_hand_skill]);
5512 v48 = *(int *)&v45[36 * *(int *)v47 + 496]; 5512 v48 = *(int *)&v45[36 * *(int *)v47 + 496];
5513 if ( v48 == 520 ) 5513 if ( v48 == 520 )
5514 v77 >>= 1; 5514 v77 >>= 1;
5515 if ( v48 == 531 ) 5515 if ( v48 == 531 )
5516 v77 >>= 1; 5516 v77 >>= 1;
5517 if ( v45->GetEquippedItemEquipType(v75) == 4 && SkillToMastery(v45->pActiveSkills[8]) == 4 ) 5517 if ( v45->GetEquippedItemEquipType((ITEM_EQUIP_TYPE)v75) == EQUIP_SHIELD && SkillToMastery(v45->pActiveSkills[PLAYER_SKILL_SHIELD]) == 4 )
5518 v77 >>= 1; 5518 v77 >>= 1;
5519 } 5519 }
5520 ++v75; 5520 ++v75;
5521 v47 += 4; 5521 v47 += 4;
5522 } 5522 }