Mercurial > mm7
diff mm7_5.cpp @ 1577:1b6217e07b26
OnInventoryItemRightClick logic restored
author | Nomad |
---|---|
date | Tue, 10 Sep 2013 18:43:52 +0200 |
parents | e66e0c89d81b |
children | 85a099ea7975 |
line wrap: on
line diff
--- a/mm7_5.cpp Tue Sep 10 12:54:07 2013 +0200 +++ b/mm7_5.cpp Tue Sep 10 18:43:52 2013 +0200 @@ -5020,7 +5020,7 @@ auto item = &player->pInventoryItemList[item_pid]; if (pParty->pPickedItem.uItemID == ITEM_POTION_BOTTLE) { -LABEL_116: +__show_item_desc: GameUI_DrawItemInfo(item); return; } @@ -5048,6 +5048,7 @@ no_rightlick_in_inventory = 1; return; } + goto __show_item_desc; } else if (pParty->pPickedItem.uItemID == ITEM_POTION_HARDEN_ITEM) @@ -5069,6 +5070,7 @@ no_rightlick_in_inventory = true; return; } + goto __show_item_desc; } else if (pParty->pPickedItem.uItemID >= ITEM_POTION_FLAMING_POTION && @@ -5113,6 +5115,7 @@ no_rightlick_in_inventory = true; return; } + goto __show_item_desc; } @@ -5130,7 +5133,7 @@ (pParty->pPickedItem.uItemID < ITEM_POTION_FLAMING_POTION || pParty->pPickedItem.uItemID > ITEM_POTION_SWIFT_POTION) && pParty->pPickedItem.uItemID != ITEM_POTION_SLAYING_POTION && pParty->pPickedItem.uItemID != ITEM_POTION_RECHARGE_ITEM) - goto LABEL_116; + goto __show_item_desc; } // src not reagent, dst not bottle @@ -5216,7 +5219,7 @@ v18 = pOut_y; LABEL_59: if ( !v51 ) - goto LABEL_116; + goto __show_item_desc;; if ( v51 == 1 ) { player->RemoveItemAtInventoryIndex(v18); @@ -5290,7 +5293,7 @@ player->pOwnItems[v21-1].uAttributes=ITEM_IDENTIFIED; goto LABEL_74; } - goto LABEL_116; + goto __show_item_desc; } player->RemoveItemAtInventoryIndex(v18); player->SetCondition(0x10u, 0);