mm7: Player.cpp comparison

splitting Player::WearsItem into two functions

comparison

equal deleted inserted replaced

-:c44db078127d
+:0311debb684c
 {
 for (uint i = 0; i < 16; ++i)
 {
 if (HasItemEquipped((ITEM_EQUIP_TYPE)i) &&
 pOwnItems[pEquipment.pIndices[i]-1].uSpecEnchantmentType == uEnchantment)
-//  *(int *)&this->field_1F6[36 * pEquipment[i] + 6] != uEnchantment)
 return true;
 }
 return false;
 }
 //----- (0048D709) --------------------------------------------------------
 bool Player::WearsItem( int item_id, ITEM_EQUIP_TYPE equip_type )
 {
+return ( HasItemEquipped(equip_type) && pInventoryItemList[pEquipment.pIndices[equip_type - 1]].uItemID == item_id );
-int v6; // esi@5
+}
-if ( equip_type >= 16 )
+bool Player::WearsItemAnyWhere(int item_id)
 {
-v6 = 0;
+for (int i = 0; i < 16; i++)
-while ( !HasItemEquipped((ITEM_EQUIP_TYPE)v6)
+{
-|| pInventoryItemList[pEquipment.pIndices[v6] - 1].uItemID != item_id )
+if (WearsItem(item_id, (ITEM_EQUIP_TYPE) i))
 {
-++v6;
+return true;
-if ( (signed int)v6 >= 16 )
+}
-return 0;
+}
-}
+return false;
-return 1;
-}
-if ( HasItemEquipped(equip_type) && pInventoryItemList[pEquipment.pIndices[equip_type - 1]].uItemID == item_id )
-return 1;
-return 0;
 }
 //----- (0048D76C) --------------------------------------------------------
 bool Player::StealFromShop(ItemGen *a2, int a3, int a4, int a5, int *a6)
 {

Mercurial > mm7