Mercurial > mm7

comparison UI/UIPopup.cpp @ 1989:33787c8938a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Single and Two-handed ENUM
author zipi
date Sat, 02 Nov 2013 17:45:58 +0000
parents c1c74df0a33e
children 2e6c63bdcfa9
comparison
equal deleted inserted replaced
1988:7e2dd49832b5 1989:33787c8938a5
238 sprintfex(out_text, pGlobalTXT_LocalizationStrings[463], pItemsTable->pItems[inspect_item->uItemID].pUnidentifiedName); //"Type: %s" 238 sprintfex(out_text, pGlobalTXT_LocalizationStrings[463], pItemsTable->pItems[inspect_item->uItemID].pUnidentifiedName); //"Type: %s"
239 out_text[100] = 0; 239 out_text[100] = 0;
240 out_text[200] = 0; 240 out_text[200] = 0;
241 switch (inspect_item->GetItemEquipType()) 241 switch (inspect_item->GetItemEquipType())
242 { 242 {
243 case EQUIP_OFF_HAND: 243 case EQUIP_SINGLE_HANDED:
244 case EQUIP_MAIN_HAND: 244 case EQUIP_TWO_HANDED:
245 sprintfex(out_text + 100, "%s: +%d %s: %dd%d", pGlobalTXT_LocalizationStrings[LOCSTR_ATTACK], 245 sprintfex(out_text + 100, "%s: +%d %s: %dd%d", pGlobalTXT_LocalizationStrings[LOCSTR_ATTACK],
246 (int)inspect_item->GetDamageMod(), pGlobalTXT_LocalizationStrings[53], 246 (int)inspect_item->GetDamageMod(), pGlobalTXT_LocalizationStrings[53],
247 (int)inspect_item->GetDamageDice(), (int)inspect_item->GetDamageRoll()); //"Damage" 247 (int)inspect_item->GetDamageDice(), (int)inspect_item->GetDamageRoll()); //"Damage"
248 if (inspect_item->GetDamageMod()) 248 if (inspect_item->GetDamageMod())
249 { 249 {
1686 { 1686 {
1687 if (item->uItemID < ITEM_POTION_BOTTLE || item->uItemID > ITEM_POTION_REJUVENATION) // bottle and all potions 1687 if (item->uItemID < ITEM_POTION_BOTTLE || item->uItemID > ITEM_POTION_REJUVENATION) // bottle and all potions
1688 { 1688 {
1689 if (item->IsBroken() || // cant harden broken items 1689 if (item->IsBroken() || // cant harden broken items
1690 item->uItemID >= ITEM_ARTIFACT_PUCK || // cant harden artifacts 1690 item->uItemID >= ITEM_ARTIFACT_PUCK || // cant harden artifacts
1691 item->GetItemEquipType() < EQUIP_OFF_HAND || 1691 item->GetItemEquipType() < EQUIP_SINGLE_HANDED ||
1692 item->GetItemEquipType() > EQUIP_WAND) 1692 item->GetItemEquipType() > EQUIP_WAND)
1693 { 1693 {
1694 pMouse->RemoveHoldingItem(); 1694 pMouse->RemoveHoldingItem();
1695 no_rightlick_in_inventory = true; 1695 no_rightlick_in_inventory = true;
1696 return; 1696 return;