Mercurial > mm7

comparison mm7_6.cpp @ 1567:9f8b3e904e14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
author Grumpy7
date Sun, 08 Sep 2013 05:22:33 +0200
parents 30db6d265ceb
children 2d9c8f609a3c
comparison
equal deleted inserted replaced
1566:1e5086f7d401 1567:9f8b3e904e14
1116 if (pParty->Invisible()) 1116 if (pParty->Invisible())
1117 pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].Reset(); 1117 pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].Reset();
1118 1118
1119 //v31 = player->pEquipment.uBow; 1119 //v31 = player->pEquipment.uBow;
1120 int bow_idx = player->pEquipment.uBow; 1120 int bow_idx = player->pEquipment.uBow;
1121 if (bow_idx && player->pInventoryItemList[bow_idx - 1].Broken()) 1121 if (bow_idx && player->pInventoryItemList[bow_idx - 1].IsBroken())
1122 bow_idx = 0; 1122 bow_idx = 0;
1123 1123
1124 //v32 = 0; 1124 //v32 = 0;
1125 int wand_item_id = 0; 1125 int wand_item_id = 0;
1126 //v33 = 0; 1126 //v33 = 0;
1130 int main_hand_idx = player->pEquipment.uMainHand; 1130 int main_hand_idx = player->pEquipment.uMainHand;
1131 if (main_hand_idx) 1131 if (main_hand_idx)
1132 { 1132 {
1133 auto item = &player->pInventoryItemList[main_hand_idx - 1]; 1133 auto item = &player->pInventoryItemList[main_hand_idx - 1];
1134 //v5 = (char *)v1 + 36 * v4; 1134 //v5 = (char *)v1 + 36 * v4;
1135 if (!item->Broken()) 1135 if (!item->IsBroken())
1136 { 1136 {
1137 //v28b = &v1->pInventoryItems[v4].uItemID; 1137 //v28b = &v1->pInventoryItems[v4].uItemID;
1138 //v6 = v1->pInventoryItems[v4].uItemID;//*((int *)v5 + 124); 1138 //v6 = v1->pInventoryItems[v4].uItemID;//*((int *)v5 + 124);
1139 if (pItemsTable->pItems[item->uItemID].uEquipType == EQUIP_WAND) 1139 if (pItemsTable->pItems[item->uItemID].uEquipType == EQUIP_WAND)
1140 { 1140 {