diff options
| author | Maks Szokalski <42069493+illunix@users.noreply.github.com> | 2020-09-10 16:57:11 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-05 22:18:19 +0100 |
| commit | bc04acb72652882290cef49b2055d3cf1ab12f36 (patch) | |
| tree | b430b10375254570eb8c4c9ed802066ba0c14b96 /src/server/game/AI/SmartScripts | |
| parent | 013c9b2cb7404a6d03443eb39f49622dcc99a7fa (diff) | |
Add "On" to some gossip methods in AI (#25415)
* Add "On" to some methods
* Update npc_innkeeper.cpp
* Update zone_borean_tundra.cpp
(cherry picked from commit 41188eb535e445b73909659980257da2939e4be4)
Diffstat (limited to 'src/server/game/AI/SmartScripts')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 34 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.h | 20 |
2 files changed, 27 insertions, 27 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 9ae1c3fcd22..fd5720d2eb1 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -746,31 +746,31 @@ void SmartAI::SetEvadeDisabled(bool disable) _evadeDisabled = disable; } -bool SmartAI::GossipHello(Player* player) +bool SmartAI::OnGossipHello(Player* player) { _gossipReturn = false; GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player); return _gossipReturn; } -bool SmartAI::GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) +bool SmartAI::OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) { _gossipReturn = false; GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, menuId, gossipListId); return _gossipReturn; } -bool SmartAI::GossipSelectCode(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/, char const* /*code*/) +bool SmartAI::OnGossipSelectCode(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/, char const* /*code*/) { return false; } -void SmartAI::QuestAccept(Player* player, Quest const* quest) +void SmartAI::OnQuestAccept(Player* player, Quest const* quest) { GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId()); } -void SmartAI::QuestReward(Player* player, Quest const* quest, LootItemType /*type*/, uint32 opt) +void SmartAI::OnQuestReward(Player* player, Quest const* quest, LootItemType /*type*/, uint32 opt) { GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId(), opt); } @@ -1014,22 +1014,15 @@ void SmartGameObjectAI::Reset() } // Called when a player opens a gossip dialog with the gameobject. -bool SmartGameObjectAI::GossipHello(Player* player) +bool SmartGameObjectAI::OnGossipHello(Player* player) { _gossipReturn = false; 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; -} - // Called when a player selects a gossip item in the gameobject's gossip menu. -bool SmartGameObjectAI::GossipSelect(Player* player, uint32 sender, uint32 action) +bool SmartGameObjectAI::OnGossipSelect(Player* player, uint32 sender, uint32 action) { _gossipReturn = false; GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, sender, action, false, nullptr, me); @@ -1037,23 +1030,30 @@ bool SmartGameObjectAI::GossipSelect(Player* player, uint32 sender, uint32 actio } // Called when a player selects a gossip with a code in the gameobject's gossip menu. -bool SmartGameObjectAI::GossipSelectCode(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/, char const* /*code*/) +bool SmartGameObjectAI::OnGossipSelectCode(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/, char const* /*code*/) { return false; } // Called when a player accepts a quest from the gameobject. -void SmartGameObjectAI::QuestAccept(Player* player, Quest const* quest) +void SmartGameObjectAI::OnQuestAccept(Player* player, Quest const* quest) { GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId(), 0, false, nullptr, me); } // Called when a player selects a quest reward. -void SmartGameObjectAI::QuestReward(Player* player, Quest const* quest, LootItemType /*type*/, uint32 opt) +void SmartGameObjectAI::OnQuestReward(Player* player, Quest const* quest, LootItemType /*type*/, uint32 opt) { GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId(), opt, false, nullptr, me); } +bool SmartGameObjectAI::OnReportUse(Player* player) +{ + _gossipReturn = false; + GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 1, 0, false, nullptr, me); + return _gossipReturn; +} + // Called when the gameobject is destroyed (destructible buildings only). void SmartGameObjectAI::Destroyed(WorldObject* attacker, uint32 eventId) { diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index d8949aa6e3e..ae4a47cc3fc 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -174,11 +174,11 @@ class TC_GAME_API SmartAI : public CreatureAI void SetInvincibilityHpLevel(uint32 level) { _invincibilityHPLevel = level; } - bool GossipHello(Player* player) override; - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override; - bool GossipSelectCode(Player* player, uint32 menuId, uint32 gossipListId, char const* code) override; - void QuestAccept(Player* player, Quest const* quest) override; - void QuestReward(Player* player, Quest const* quest, LootItemType type, uint32 opt) override; + bool OnGossipHello(Player* player) override; + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override; + bool OnGossipSelectCode(Player* player, uint32 menuId, uint32 gossipListId, char const* code) override; + void OnQuestAccept(Player* player, Quest const* quest) override; + void OnQuestReward(Player* player, Quest const* quest, LootItemType type, uint32 opt) override; void OnGameEvent(bool start, uint16 eventId) override; void SetDespawnTime (uint32 t) @@ -257,12 +257,12 @@ class TC_GAME_API SmartGameObjectAI : public GameObjectAI SmartScript* GetScript() { return &_script; } static int32 Permissible(GameObject const* /*go*/) { return PERMIT_BASE_NO; } - bool GossipHello(Player* player) override; + bool OnGossipHello(Player* player) override; + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override; + bool OnGossipSelectCode(Player* player, uint32 menuId, uint32 gossipListId, char const* code) override; + void OnQuestAccept(Player* player, Quest const* quest) override; + void OnQuestReward(Player* player, Quest const* quest, LootItemType type, uint32 opt) override; bool OnReportUse(Player* player) override; - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override; - bool GossipSelectCode(Player* player, uint32 menuId, uint32 gossipListId, char const* code) override; - void QuestAccept(Player* player, Quest const* quest) override; - void QuestReward(Player* player, Quest const* quest, LootItemType type, uint32 opt) override; void Destroyed(WorldObject* attacker, uint32 eventId) override; void SetData(uint32 id, uint32 value, Unit* invoker); void SetData(uint32 id, uint32 value) override { SetData(id, value, nullptr); } |
