Mercurial > mm7

comparison Conditions.cpp @ 1563:0311debb684c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
splitting Player::WearsItem into two functions
author Grumpy7
date Sun, 08 Sep 2013 02:41:10 +0200
parents b3ac17fd12de
children 9856c2f8f918
comparison
equal deleted inserted replaced
1562:c44db078127d 1563:0311debb684c
52 { 52 {
53 return true; 53 return true;
54 } 54 }
55 ITEM_TYPE itemId = thisProc->m_equipmentPairs[i * 2].m_ItemId; 55 ITEM_TYPE itemId = thisProc->m_equipmentPairs[i * 2].m_ItemId;
56 ITEM_EQUIP_TYPE slot = thisProc->m_equipmentPairs[i * 2 + 1].m_EquipSlot; 56 ITEM_EQUIP_TYPE slot = thisProc->m_equipmentPairs[i * 2 + 1].m_EquipSlot;
57 if (inPlayer->WearsItem(itemId, slot)) 57 if (slot == EQIUP_ANY)
58 { 58 {
59 return false; 59 if (inPlayer->WearsItemAnyWhere(itemId))
60 {
61 return false;
62 }
63 }
64 else
65 {
66 if (inPlayer->WearsItem(itemId, slot))
67 {
68 return false;
69 }
60 } 70 }
61 } 71 }
62 return true; 72 return true;
63 } 73 }