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

Remove unused dialog status from hook

Browse Source
This commit is contained in:
Rochet2
2018-01-03 16:06:25 +02:00
parent 28e2497afa
commit d9415332bb
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CreatureHooks.cpp
View File

@@ -62,13 +62,12 @@ bool Eluna::OnQuestReward(Player* pPlayer, Creature* pCreature, Quest const* pQu
return CallAllFunctionsBool(CreatureEventBindings, CreatureUniqueBindings, entry_key, unique_key); 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(pPlayer);
Push(pCreature); Push(pCreature);
CallAllFunctions(CreatureEventBindings, CreatureUniqueBindings, entry_key, unique_key); CallAllFunctions(CreatureEventBindings, CreatureUniqueBindings, entry_key, unique_key);
return DIALOG_STATUS_SCRIPTED_NO_STATUS;
} }
void Eluna::OnAddToWorld(Creature* pCreature) void Eluna::OnAddToWorld(Creature* pCreature)

1
ElunaIncludes.h
View File

@@ -121,7 +121,6 @@ typedef ThreatContainer::StorageType ThreatList;
#define eObjectAccessor() sObjectAccessor. #define eObjectAccessor() sObjectAccessor.
#define SERVER_MSG_STRING SERVER_MSG_CUSTOM #define SERVER_MSG_STRING SERVER_MSG_CUSTOM
#define TOTAL_LOCALES MAX_LOCALE #define TOTAL_LOCALES MAX_LOCALE
#define DIALOG_STATUS_SCRIPTED_NO_STATUS DIALOG_STATUS_UNDEFINED
#define TARGETICONCOUNT TARGET_ICON_COUNT #define TARGETICONCOUNT TARGET_ICON_COUNT
#define MAX_TALENT_SPECS MAX_TALENT_SPEC_COUNT #define MAX_TALENT_SPECS MAX_TALENT_SPEC_COUNT
#define TEAM_NEUTRAL TEAM_INDEX_NEUTRAL #define TEAM_NEUTRAL TEAM_INDEX_NEUTRAL

5
GameObjectHooks.cpp
View File

@@ -68,13 +68,12 @@ bool Eluna::OnQuestReward(Player* pPlayer, GameObject* pGameObject, Quest const*
return CallAllFunctionsBool(GameObjectEventBindings, key); 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(pPlayer);
Push(pGameObject); Push(pGameObject);
CallAllFunctions(GameObjectEventBindings, key); CallAllFunctions(GameObjectEventBindings, key);
return DIALOG_STATUS_SCRIPTED_NO_STATUS; // DIALOG_STATUS_UNDEFINED
} }
#ifndef CLASSIC #ifndef CLASSIC

4
LuaEngine.h
View File

@@ -364,7 +364,7 @@ public:
bool OnGossipSelectCode(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* code); bool OnGossipSelectCode(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* code);
bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest); bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest);
bool OnQuestReward(Player* pPlayer, Creature* pCreature, Quest const* pQuest, uint32 opt); 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 OnSummoned(Creature* creature, Unit* summoner);
bool UpdateAI(Creature* me, const uint32 diff); 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 OnGossipSelectCode(Player* pPlayer, GameObject* pGameObject, uint32 sender, uint32 action, const char* code);
bool OnQuestAccept(Player* pPlayer, GameObject* pGameObject, Quest const* pQuest); bool OnQuestAccept(Player* pPlayer, GameObject* pGameObject, Quest const* pQuest);
bool OnQuestReward(Player* pPlayer, GameObject* pGameObject, Quest const* pQuest, uint32 opt); 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 CLASSIC
#ifndef TBC #ifndef TBC
void OnDestroyed(GameObject* pGameObject, Player* pPlayer); void OnDestroyed(GameObject* pGameObject, Player* pPlayer);