Mercurial > mm7

diff Player.cpp @ 288:9a6052fecad4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Mon, 18 Feb 2013 19:16:15 +0600
parents 64770a1eb8e9
children 92d443ed0cba
line wrap: on
line diff
--- a/Player.cpp	Mon Feb 18 00:37:49 2013 +0600
+++ b/Player.cpp	Mon Feb 18 19:16:15 2013 +0600
@@ -3350,17 +3350,13 @@
 //----- (0048D62C) --------------------------------------------------------
 int Player::GetEquippedItemEquipType(unsigned int uEquipSlot)
 {
-  return pItemsTable->pItems[*(int *)&this->pInventoryItems[36 * *(&this->pEquipment.uOffHand
-                                                                               + uEquipSlot)
-                                                                             + 5]].uEquipType;
+  return pItemsTable->pItems[pInventoryItems[pEquipment.pIndices[uEquipSlot]-1].uItemID].uEquipType;
 }
 
 //----- (0048D651) --------------------------------------------------------
 int Player::GetEquippedItemSkillType(enum ITEM_EQUIP_TYPE uEquipSlot)
 {
-  return pItemsTable->pItems[*(int *)&this->pInventoryItems[36 * *(&this->pEquipment.uOffHand
-                                                                               + uEquipSlot)
-                                                                             + 5]].uSkillType;
+  return pItemsTable->pItems[pInventoryItems[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uSkillType;
 }
 
 //----- (0048D676) --------------------------------------------------------