From f275bcc279e70f9e2512f678dcc9907984c88ce0 Mon Sep 17 00:00:00 2001 From: Inky Date: Tue, 30 Apr 2019 22:27:27 +0300 Subject: [PATCH] Backed out changeset 8f53cb4efab7 --HG-- branch : develop --- .../src/interface_v3/action_handler_item.cpp | 109 +----------------- 1 file changed, 1 insertion(+), 108 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/action_handler_item.cpp b/code/ryzom/client/src/interface_v3/action_handler_item.cpp index 99c1147d3..d15ae130c 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_item.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_item.cpp @@ -430,7 +430,7 @@ static TStackMode CurrentStackMode; static void validateStackItem(CDBCtrlSheet *src, CDBCtrlSheet *dest, sint32 quantity, TStackMode stackMode); -static void checkItemCommand(const CItemSheet *itemSheet); + //===================================================================================================================== /** Send a swap item msg to the server @@ -1672,10 +1672,6 @@ class CHandlerItemCristalReload : public IActionHandler CDBCtrlSheet *pCS = dynamic_cast(CWidgetManager::getInstance()->getCtrlLaunchingModal()); if (pCS == NULL) return; - const CItemSheet *pIS = pCS->asItemSheet(); - if (pIS && pIS->Scroll.Label.empty()) - checkItemCommand(pIS); - sendToServerEnchantMessage((uint8)pCS->getInventoryIndex(), (uint16)pCS->getIndexInDB()); } }; @@ -1753,7 +1749,6 @@ class CHandlerItemMenuCheck : public IActionHandler CViewTextMenu *pCrisReload = dynamic_cast(pMenu->getView("cris_reload")); CViewTextMenu *pTeleportUse = dynamic_cast(pMenu->getView("teleport_use")); CViewTextMenu *pItemConsume = dynamic_cast(pMenu->getView("item_consume")); - CViewTextMenu *pItemExecute = dynamic_cast(pMenu->getView("item_execute")); CViewTextMenu *pXpCatalyserUse = dynamic_cast(pMenu->getView("xp_catalyser_use")); CViewTextMenu *pDrop = dynamic_cast(pMenu->getView("drop")); CViewTextMenu *pDestroy = dynamic_cast(pMenu->getView("destroy")); @@ -1781,7 +1776,6 @@ class CHandlerItemMenuCheck : public IActionHandler if(pCrisReload) pCrisReload->setActive(false); if(pTeleportUse) pTeleportUse->setActive(false); if(pItemConsume) pItemConsume->setActive(false); - if(pItemExecute) pItemExecute->setActive(false); if(pXpCatalyserUse) pXpCatalyserUse->setActive(false); if(pItemTextDisplay) pItemTextDisplay->setActive(false); if(pItemTextEdition) pItemTextEdition->setActive(false); @@ -1856,61 +1850,6 @@ class CHandlerItemMenuCheck : public IActionHandler { pItemInfos->setActive(true); } - // item has a label? - if (!pIS->Scroll.Label.empty()) - { - CGroupMenu *menu = dynamic_cast( - CWidgetManager::getInstance()->getElementFromId("ui:interface:item_menu_in_bag") - ); - // add the label to default menu - if (!pIS->Scroll.LuaCommand.empty() || !pIS->Scroll.WebCommand.empty()) - menu->setActionHandler(4, menu->getActionHandler(4)); - else - { - // replace default menu and redirect action handler - if (pCrisEnchant && pCrisEnchant->getActive()) - { - pCrisEnchant->setActive(false); - menu->setActionHandler(4, menu->getActionHandler(0)); - } - if (pCrisReload && pCrisReload->getActive()) - { - pCrisReload->setActive(false); - menu->setActionHandler(4, menu->getActionHandler(1)); - } - if (pTeleportUse && pTeleportUse->getActive()) - { - pTeleportUse->setActive(false); - menu->setActionHandler(4, menu->getActionHandler(2)); - } - if (pItemConsume && pItemConsume->getActive()) - { - pItemConsume->setActive(false); - menu->setActionHandler(4, menu->getActionHandler(3)); - } - if (pXpCatalyserUse && pXpCatalyserUse->getActive()) - { - pXpCatalyserUse->setActive(false); - menu->setActionHandler(4, menu->getActionHandler(5)); - } - if (pItemTextDisplay && pItemTextDisplay->getActive()) - { - pItemTextDisplay->setActive(false); - menu->setActionHandler(4, menu->getActionHandler(6)); - menu->setActionHandlerParam(4, menu->getActionHandlerParam(6)); - } - } - if (!bIsLockedByOwner) - { - if (pCS->getInventoryIndex() == INVENTORIES::bag) - pItemExecute->setActive(true); - // enchant and reload can be used from anywhere - if (pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL || pIS->Family == ITEMFAMILY::ITEM_SAP_RECHARGE) - pItemExecute->setActive(true); - - pItemExecute->setText(CI18N::get(pIS->Scroll.Label)); - } - } } CInventoryManager &invMngr= getInventory(); @@ -2041,7 +1980,6 @@ class CHandlerItemMenuCheck : public IActionHandler if(pCrisReload) pCrisReload->setGrayed(true); if(pTeleportUse) pTeleportUse->setGrayed(true); if(pItemConsume) pItemConsume->setGrayed(true); - if(pItemExecute) pItemExecute->setGrayed(true); if(pXpCatalyserUse) pXpCatalyserUse->setGrayed(true); if(pDrop) pDrop->setGrayed(true); if(pDestroy) pDestroy->setGrayed(true); @@ -2061,7 +1999,6 @@ class CHandlerItemMenuCheck : public IActionHandler if(pCrisReload) pCrisReload->setGrayed(false); if(pTeleportUse) pTeleportUse->setGrayed(false); if(pItemConsume) pItemConsume->setGrayed(false); - if(pItemExecute) pItemExecute->setGrayed(false); if(pXpCatalyserUse) pXpCatalyserUse->setGrayed(false); if(pDrop) pDrop->setGrayed(false); if(pDestroy) pDestroy->setGrayed(false); @@ -2242,24 +2179,6 @@ static void sendMsgStopUseXpCat( bool isRingCatalyser ) } } -// *************************************************************************** -static void checkItemCommand(const CItemSheet *itemSheet) -{ - if (itemSheet) - { - if (!itemSheet->Scroll.LuaCommand.empty()) - CLuaManager::getInstance().executeLuaScript(itemSheet->Scroll.LuaCommand); - // webig - if (!itemSheet->Scroll.WebCommand.empty()) - { - CGroupHTML *pGH = dynamic_cast( - CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html") - ); - if (pGH) pGH->browse(itemSheet->Scroll.WebCommand.c_str()); - } - } - return; -} // *************************************************************************** class CHandlerTeleportUse : public IActionHandler @@ -2288,8 +2207,6 @@ class CHandlerTeleportUse : public IActionHandler LoadingBackground = TeleportKaravanBackground; break; } - if (pIS->Scroll.Label.empty()) - checkItemCommand(pIS); } } }; @@ -2304,28 +2221,12 @@ class CHandlerItemConsume : public IActionHandler CDBCtrlSheet *pCS = dynamic_cast(CWidgetManager::getInstance()->getCtrlLaunchingModal()); if (pCS == NULL) return; - const CItemSheet *pIS = pCS->asItemSheet(); - if (pIS && pIS->Scroll.Label.empty()) - checkItemCommand(pIS); - // use the item sendMsgUseItem(uint16(pCS->getIndexInDB())); } }; REGISTER_ACTION_HANDLER( CHandlerItemConsume, "item_consume" ); -// *************************************************************************** -class CHandlerItemExecute : public IActionHandler -{ - void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */) - { - CDBCtrlSheet *pCS = dynamic_cast(CWidgetManager::getInstance()->getCtrlLaunchingModal()); - if (pCS) - checkItemCommand(pCS->asItemSheet()); - return; - } -}; -REGISTER_ACTION_HANDLER( CHandlerItemExecute, "item_execute" ); // *************************************************************************** class CHandlerValidateItemTextEdition : public IActionHandler @@ -2349,10 +2250,6 @@ class CHandlerItemTextDisplay : public IActionHandler if (pCSItem == NULL || windowName.empty()) return; - const CItemSheet *pIS = pCSItem->asItemSheet(); - if (pIS && pIS->Scroll.Label.empty()) - checkItemCommand(pIS); - CInterfaceItemEdition::getInstance()->setCurrWindow(pCSItem, windowName, false); } }; @@ -2394,10 +2291,6 @@ class CHandlerXpCatalyserUse : public IActionHandler CDBCtrlSheet *pCS = dynamic_cast(CWidgetManager::getInstance()->getCtrlLaunchingModal()); if (pCS == NULL) return; - const CItemSheet *pIS = pCS->asItemSheet(); - if (pIS && pIS->Scroll.Label.empty()) - checkItemCommand(pIS); - // use the item sendMsgUseItem(uint16(pCS->getIndexInDB())); }