diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-06-06 15:36:01 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-06-06 17:57:04 -0300 |
| commit | 2335b9de1a46a409c714a1dc89cbd0565545e70e (patch) | |
| tree | d711b7cf6206e5dde3432dd4d0accae5b8243135 /src/server/game/AI/SmartScripts | |
| parent | 47d54bf5e20617d04055e1102e7688fb93e9f985 (diff) | |
Core/AI: segregate GameObject ReportUse from normal Use (lock open/normal click)
Closes #19819
Diffstat (limited to 'src/server/game/AI/SmartScripts')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 11 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.h | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 14689b93839..df5fe1d6b7b 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -982,10 +982,17 @@ void SmartGameObjectAI::Reset() } // Called when a player opens a gossip dialog with the gameobject. -bool SmartGameObjectAI::GossipHello(Player* player, bool reportUse) +bool SmartGameObjectAI::GossipHello(Player* player) { _gossipReturn = false; - GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, uint32(reportUse), 0, false, nullptr, me); + GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 0, 0, false, nullptr, me); + return _gossipReturn; +} + +bool SmartGameObjectAI::OnReportUse(Player* player) +{ + _gossipReturn = false; + GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 1, 0, false, nullptr, me); return _gossipReturn; } diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 886bc94c3dd..e295f1bc7c4 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -259,7 +259,8 @@ class TC_GAME_API SmartGameObjectAI : public GameObjectAI SmartScript* GetScript() { return &mScript; } static int32 Permissible(GameObject const* /*go*/) { return PERMIT_BASE_NO; } - bool GossipHello(Player* player, bool reportUse) override; + bool GossipHello(Player* player) override; + bool OnReportUse(Player* player) override; bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override; bool GossipSelectCode(Player* player, uint32 menuId, uint32 gossipListId, const char* code) override; void QuestAccept(Player* player, Quest const* quest) override; |
