Changed: introduce new proprieties menu and action handler
--HG-- branch : develop
This commit is contained in:
parent
17945d24b0
commit
59da139eb7
1 changed files with 108 additions and 1 deletions
|
@ -430,7 +430,7 @@ static TStackMode CurrentStackMode;
|
||||||
|
|
||||||
|
|
||||||
static void validateStackItem(CDBCtrlSheet *src, CDBCtrlSheet *dest, sint32 quantity, TStackMode stackMode);
|
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
|
/** Send a swap item msg to the server
|
||||||
|
@ -1672,6 +1672,10 @@ class CHandlerItemCristalReload : public IActionHandler
|
||||||
CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
|
CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
|
||||||
if (pCS == NULL) return;
|
if (pCS == NULL) return;
|
||||||
|
|
||||||
|
const CItemSheet *pIS = pCS->asItemSheet();
|
||||||
|
if (pIS && pIS->Scroll.Label.empty())
|
||||||
|
checkItemCommand(pIS);
|
||||||
|
|
||||||
sendToServerEnchantMessage((uint8)pCS->getInventoryIndex(), (uint16)pCS->getIndexInDB());
|
sendToServerEnchantMessage((uint8)pCS->getInventoryIndex(), (uint16)pCS->getIndexInDB());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1749,6 +1753,7 @@ class CHandlerItemMenuCheck : public IActionHandler
|
||||||
CViewTextMenu *pCrisReload = dynamic_cast<CViewTextMenu*>(pMenu->getView("cris_reload"));
|
CViewTextMenu *pCrisReload = dynamic_cast<CViewTextMenu*>(pMenu->getView("cris_reload"));
|
||||||
CViewTextMenu *pTeleportUse = dynamic_cast<CViewTextMenu*>(pMenu->getView("teleport_use"));
|
CViewTextMenu *pTeleportUse = dynamic_cast<CViewTextMenu*>(pMenu->getView("teleport_use"));
|
||||||
CViewTextMenu *pItemConsume = dynamic_cast<CViewTextMenu*>(pMenu->getView("item_consume"));
|
CViewTextMenu *pItemConsume = dynamic_cast<CViewTextMenu*>(pMenu->getView("item_consume"));
|
||||||
|
CViewTextMenu *pItemExecute = dynamic_cast<CViewTextMenu*>(pMenu->getView("item_execute"));
|
||||||
CViewTextMenu *pXpCatalyserUse = dynamic_cast<CViewTextMenu*>(pMenu->getView("xp_catalyser_use"));
|
CViewTextMenu *pXpCatalyserUse = dynamic_cast<CViewTextMenu*>(pMenu->getView("xp_catalyser_use"));
|
||||||
CViewTextMenu *pDrop = dynamic_cast<CViewTextMenu*>(pMenu->getView("drop"));
|
CViewTextMenu *pDrop = dynamic_cast<CViewTextMenu*>(pMenu->getView("drop"));
|
||||||
CViewTextMenu *pDestroy = dynamic_cast<CViewTextMenu*>(pMenu->getView("destroy"));
|
CViewTextMenu *pDestroy = dynamic_cast<CViewTextMenu*>(pMenu->getView("destroy"));
|
||||||
|
@ -1776,6 +1781,7 @@ class CHandlerItemMenuCheck : public IActionHandler
|
||||||
if(pCrisReload) pCrisReload->setActive(false);
|
if(pCrisReload) pCrisReload->setActive(false);
|
||||||
if(pTeleportUse) pTeleportUse->setActive(false);
|
if(pTeleportUse) pTeleportUse->setActive(false);
|
||||||
if(pItemConsume) pItemConsume->setActive(false);
|
if(pItemConsume) pItemConsume->setActive(false);
|
||||||
|
if(pItemExecute) pItemExecute->setActive(false);
|
||||||
if(pXpCatalyserUse) pXpCatalyserUse->setActive(false);
|
if(pXpCatalyserUse) pXpCatalyserUse->setActive(false);
|
||||||
if(pItemTextDisplay) pItemTextDisplay->setActive(false);
|
if(pItemTextDisplay) pItemTextDisplay->setActive(false);
|
||||||
if(pItemTextEdition) pItemTextEdition->setActive(false);
|
if(pItemTextEdition) pItemTextEdition->setActive(false);
|
||||||
|
@ -1850,6 +1856,61 @@ class CHandlerItemMenuCheck : public IActionHandler
|
||||||
{
|
{
|
||||||
pItemInfos->setActive(true);
|
pItemInfos->setActive(true);
|
||||||
}
|
}
|
||||||
|
// item has a label?
|
||||||
|
if (!pIS->Scroll.Label.empty())
|
||||||
|
{
|
||||||
|
CGroupMenu *menu = dynamic_cast<CGroupMenu *>(
|
||||||
|
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();
|
CInventoryManager &invMngr= getInventory();
|
||||||
|
@ -1980,6 +2041,7 @@ class CHandlerItemMenuCheck : public IActionHandler
|
||||||
if(pCrisReload) pCrisReload->setGrayed(true);
|
if(pCrisReload) pCrisReload->setGrayed(true);
|
||||||
if(pTeleportUse) pTeleportUse->setGrayed(true);
|
if(pTeleportUse) pTeleportUse->setGrayed(true);
|
||||||
if(pItemConsume) pItemConsume->setGrayed(true);
|
if(pItemConsume) pItemConsume->setGrayed(true);
|
||||||
|
if(pItemExecute) pItemExecute->setGrayed(true);
|
||||||
if(pXpCatalyserUse) pXpCatalyserUse->setGrayed(true);
|
if(pXpCatalyserUse) pXpCatalyserUse->setGrayed(true);
|
||||||
if(pDrop) pDrop->setGrayed(true);
|
if(pDrop) pDrop->setGrayed(true);
|
||||||
if(pDestroy) pDestroy->setGrayed(true);
|
if(pDestroy) pDestroy->setGrayed(true);
|
||||||
|
@ -1999,6 +2061,7 @@ class CHandlerItemMenuCheck : public IActionHandler
|
||||||
if(pCrisReload) pCrisReload->setGrayed(false);
|
if(pCrisReload) pCrisReload->setGrayed(false);
|
||||||
if(pTeleportUse) pTeleportUse->setGrayed(false);
|
if(pTeleportUse) pTeleportUse->setGrayed(false);
|
||||||
if(pItemConsume) pItemConsume->setGrayed(false);
|
if(pItemConsume) pItemConsume->setGrayed(false);
|
||||||
|
if(pItemExecute) pItemExecute->setGrayed(false);
|
||||||
if(pXpCatalyserUse) pXpCatalyserUse->setGrayed(false);
|
if(pXpCatalyserUse) pXpCatalyserUse->setGrayed(false);
|
||||||
if(pDrop) pDrop->setGrayed(false);
|
if(pDrop) pDrop->setGrayed(false);
|
||||||
if(pDestroy) pDestroy->setGrayed(false);
|
if(pDestroy) pDestroy->setGrayed(false);
|
||||||
|
@ -2179,6 +2242,24 @@ 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<CGroupHTML*>(
|
||||||
|
CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html")
|
||||||
|
);
|
||||||
|
if (pGH) pGH->browse(itemSheet->Scroll.WebCommand.c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
class CHandlerTeleportUse : public IActionHandler
|
class CHandlerTeleportUse : public IActionHandler
|
||||||
|
@ -2207,6 +2288,8 @@ class CHandlerTeleportUse : public IActionHandler
|
||||||
LoadingBackground = TeleportKaravanBackground;
|
LoadingBackground = TeleportKaravanBackground;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
if (pIS->Scroll.Label.empty())
|
||||||
|
checkItemCommand(pIS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -2221,12 +2304,28 @@ class CHandlerItemConsume : public IActionHandler
|
||||||
CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
|
CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
|
||||||
if (pCS == NULL) return;
|
if (pCS == NULL) return;
|
||||||
|
|
||||||
|
const CItemSheet *pIS = pCS->asItemSheet();
|
||||||
|
if (pIS && pIS->Scroll.Label.empty())
|
||||||
|
checkItemCommand(pIS);
|
||||||
|
|
||||||
// use the item
|
// use the item
|
||||||
sendMsgUseItem(uint16(pCS->getIndexInDB()));
|
sendMsgUseItem(uint16(pCS->getIndexInDB()));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
REGISTER_ACTION_HANDLER( CHandlerItemConsume, "item_consume" );
|
REGISTER_ACTION_HANDLER( CHandlerItemConsume, "item_consume" );
|
||||||
|
|
||||||
|
// ***************************************************************************
|
||||||
|
class CHandlerItemExecute : public IActionHandler
|
||||||
|
{
|
||||||
|
void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */)
|
||||||
|
{
|
||||||
|
CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
|
||||||
|
if (pCS)
|
||||||
|
checkItemCommand(pCS->asItemSheet());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
REGISTER_ACTION_HANDLER( CHandlerItemExecute, "item_execute" );
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
class CHandlerValidateItemTextEdition : public IActionHandler
|
class CHandlerValidateItemTextEdition : public IActionHandler
|
||||||
|
@ -2250,6 +2349,10 @@ class CHandlerItemTextDisplay : public IActionHandler
|
||||||
if (pCSItem == NULL || windowName.empty())
|
if (pCSItem == NULL || windowName.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
const CItemSheet *pIS = pCSItem->asItemSheet();
|
||||||
|
if (pIS && pIS->Scroll.Label.empty())
|
||||||
|
checkItemCommand(pIS);
|
||||||
|
|
||||||
CInterfaceItemEdition::getInstance()->setCurrWindow(pCSItem, windowName, false);
|
CInterfaceItemEdition::getInstance()->setCurrWindow(pCSItem, windowName, false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -2291,6 +2394,10 @@ class CHandlerXpCatalyserUse : public IActionHandler
|
||||||
CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
|
CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
|
||||||
if (pCS == NULL) return;
|
if (pCS == NULL) return;
|
||||||
|
|
||||||
|
const CItemSheet *pIS = pCS->asItemSheet();
|
||||||
|
if (pIS && pIS->Scroll.Label.empty())
|
||||||
|
checkItemCommand(pIS);
|
||||||
|
|
||||||
// use the item
|
// use the item
|
||||||
sendMsgUseItem(uint16(pCS->getIndexInDB()));
|
sendMsgUseItem(uint16(pCS->getIndexInDB()));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue