yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: restore gossip menu after lua script

Browse Source 
Cherry pick from https://github.com/ElunaLuaEngine/Eluna/pull/405
Co-authored by https://github.com/Rochet2
This commit is contained in:
55Honey
2022-03-24 20:26:38 +01:00
parent 6fb5300b4e
commit b12768eb2f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
GossipHooks.cpp
View File

@@ -116,22 +116,32 @@ bool Eluna::OnGossipHello(Player* pPlayer, Creature* pCreature)
bool Eluna::OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) bool Eluna::OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
{ {
START_HOOK_WITH_RETVAL(CreatureGossipBindings, GOSSIP_EVENT_ON_SELECT, pCreature->GetEntry(), false); START_HOOK_WITH_RETVAL(CreatureGossipBindings, GOSSIP_EVENT_ON_SELECT, pCreature->GetEntry(), false);
auto original_menu = *pPlayer->PlayerTalkClass;
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
Push(pPlayer); Push(pPlayer);
Push(pCreature); Push(pCreature);
Push(sender); Push(sender);
Push(action); Push(action);
return CallAllFunctionsBool(CreatureGossipBindings, key, true); auto preventDefault = CallAllFunctionsBool(CreatureGossipBindings, key, true);
if (!preventDefault) {
*pPlayer->PlayerTalkClass = original_menu;
}
return preventDefault;
} }
bool Eluna::OnGossipSelectCode(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* code) bool Eluna::OnGossipSelectCode(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* code)
{ {
START_HOOK_WITH_RETVAL(CreatureGossipBindings, GOSSIP_EVENT_ON_SELECT, pCreature->GetEntry(), false); START_HOOK_WITH_RETVAL(CreatureGossipBindings, GOSSIP_EVENT_ON_SELECT, pCreature->GetEntry(), false);
auto original_menu = *pPlayer->PlayerTalkClass;
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
Push(pPlayer); Push(pPlayer);
Push(pCreature); Push(pCreature);
Push(sender); Push(sender);
Push(action); Push(action);
Push(code); Push(code);
return CallAllFunctionsBool(CreatureGossipBindings, key, true); auto preventDefault = CallAllFunctionsBool(CreatureGossipBindings, key, true);
if (!preventDefault) {
*pPlayer->PlayerTalkClass = original_menu;
}
return preventDefault;
} }