diff --git a/CreatureHooks.cpp b/CreatureHooks.cpp index 7bc74c4..60540c3 100644 --- a/CreatureHooks.cpp +++ b/CreatureHooks.cpp @@ -62,13 +62,12 @@ bool Eluna::OnQuestReward(Player* pPlayer, Creature* pCreature, Quest const* pQu return CallAllFunctionsBool(CreatureEventBindings, CreatureUniqueBindings, entry_key, unique_key); } -uint32 Eluna::GetDialogStatus(const Player* pPlayer, const Creature* pCreature) +void Eluna::GetDialogStatus(const Player* pPlayer, const Creature* pCreature) { - START_HOOK_WITH_RETVAL(CREATURE_EVENT_ON_DIALOG_STATUS, pCreature, DIALOG_STATUS_SCRIPTED_NO_STATUS); + START_HOOK(CREATURE_EVENT_ON_DIALOG_STATUS, pCreature); Push(pPlayer); Push(pCreature); CallAllFunctions(CreatureEventBindings, CreatureUniqueBindings, entry_key, unique_key); - return DIALOG_STATUS_SCRIPTED_NO_STATUS; } void Eluna::OnAddToWorld(Creature* pCreature) diff --git a/ElunaIncludes.h b/ElunaIncludes.h index 2dd2497..231713e 100644 --- a/ElunaIncludes.h +++ b/ElunaIncludes.h @@ -121,7 +121,6 @@ typedef ThreatContainer::StorageType ThreatList; #define eObjectAccessor() sObjectAccessor. #define SERVER_MSG_STRING SERVER_MSG_CUSTOM #define TOTAL_LOCALES MAX_LOCALE -#define DIALOG_STATUS_SCRIPTED_NO_STATUS DIALOG_STATUS_UNDEFINED #define TARGETICONCOUNT TARGET_ICON_COUNT #define MAX_TALENT_SPECS MAX_TALENT_SPEC_COUNT #define TEAM_NEUTRAL TEAM_INDEX_NEUTRAL diff --git a/GameObjectHooks.cpp b/GameObjectHooks.cpp index 29b1da3..6562e2d 100644 --- a/GameObjectHooks.cpp +++ b/GameObjectHooks.cpp @@ -68,13 +68,12 @@ bool Eluna::OnQuestReward(Player* pPlayer, GameObject* pGameObject, Quest const* return CallAllFunctionsBool(GameObjectEventBindings, key); } -uint32 Eluna::GetDialogStatus(const Player* pPlayer, const GameObject* pGameObject) +void Eluna::GetDialogStatus(const Player* pPlayer, const GameObject* pGameObject) { - START_HOOK_WITH_RETVAL(GAMEOBJECT_EVENT_ON_DIALOG_STATUS, pGameObject->GetEntry(), false); + START_HOOK(GAMEOBJECT_EVENT_ON_DIALOG_STATUS, pGameObject->GetEntry()); Push(pPlayer); Push(pGameObject); CallAllFunctions(GameObjectEventBindings, key); - return DIALOG_STATUS_SCRIPTED_NO_STATUS; // DIALOG_STATUS_UNDEFINED } #ifndef CLASSIC diff --git a/LuaEngine.h b/LuaEngine.h index 38eccf9..fda782f 100644 --- a/LuaEngine.h +++ b/LuaEngine.h @@ -364,7 +364,7 @@ public: bool OnGossipSelectCode(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* code); bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest); bool OnQuestReward(Player* pPlayer, Creature* pCreature, Quest const* pQuest, uint32 opt); - uint32 GetDialogStatus(const Player* pPlayer, const Creature* pCreature); + void GetDialogStatus(const Player* pPlayer, const Creature* pCreature); bool OnSummoned(Creature* creature, Unit* summoner); bool UpdateAI(Creature* me, const uint32 diff); @@ -397,7 +397,7 @@ public: bool OnGossipSelectCode(Player* pPlayer, GameObject* pGameObject, uint32 sender, uint32 action, const char* code); bool OnQuestAccept(Player* pPlayer, GameObject* pGameObject, Quest const* pQuest); bool OnQuestReward(Player* pPlayer, GameObject* pGameObject, Quest const* pQuest, uint32 opt); - uint32 GetDialogStatus(const Player* pPlayer, const GameObject* pGameObject); + void GetDialogStatus(const Player* pPlayer, const GameObject* pGameObject); #ifndef CLASSIC #ifndef TBC void OnDestroyed(GameObject* pGameObject, Player* pPlayer);