diff options
| author | Maks Szokalski <42069493+illunix@users.noreply.github.com> | 2020-09-10 16:57:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 16:57:11 +0200 |
| commit | 41188eb535e445b73909659980257da2939e4be4 (patch) | |
| tree | 7c4efaa1a9d2478447624ab13c2e101dbbc4e4a4 /src/server/scripts/Northrend | |
| parent | feaaa595cae735bb6093b24a88562c27b2723cfe (diff) | |
Add "On" to some gossip methods in AI (#25415)
* Add "On" to some methods
* Update npc_innkeeper.cpp
* Update zone_borean_tundra.cpp
Diffstat (limited to 'src/server/scripts/Northrend')
30 files changed, 65 insertions, 65 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 69db2055e4c..cb8d8c1690b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -409,7 +409,7 @@ class go_prince_taldaram_sphere : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { Creature* princeTaldaram = instance->GetCreature(DATA_PRINCE_TALDARAM); if (princeTaldaram && princeTaldaram->IsAlive()) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 4bd3b8e8c63..69a9462501b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1367,7 +1367,7 @@ class go_twilight_portal : public GameObjectScript } } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (_spellId != 0) player->CastSpell(player, _spellId, true); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 968576194c3..44f12375539 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -450,7 +450,7 @@ public: } } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (((instance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && instance->GetData(BOSS_BLACK_KNIGHT) == DONE && @@ -470,7 +470,7 @@ public: return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); ClearGossipMenuFor(player); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 892aaaca667..94619dd179c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -545,7 +545,7 @@ class npc_essence_of_twin : public CreatureScript return spellReturned; } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { player->RemoveAurasDueToSpell(GetData(ESSENCE_REMOVE)); player->CastSpell(player, GetData(ESSENCE_APPLY), true); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 030a5c090dc..af5e59a7184 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -237,7 +237,7 @@ struct npc_barrett_toc : public ScriptedAI me->GetMotionMaster()->MoveAlongSplineChain(POINT_BARRETT_DESPAWN, SPLINE_INITIAL_MOVEMENT, false); } - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { switch (menuId) { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 0cf9c7e2a9f..9529a97744c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -106,7 +106,7 @@ public: Initialize(); } - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { if (menuId == MENU_ID_SYLVANAS && gossipListId == GOSSIP_OPTION_ID) { @@ -204,7 +204,7 @@ public: Initialize(); } - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { if (menuId == MENU_ID_JAINA && gossipListId == GOSSIP_OPTION_ID) { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 85e73c40f70..f8999552fd9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -360,7 +360,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript _instance = me->GetInstanceScript(); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { // override default gossip if (_instance->GetData(DATA_QUEL_DELAR_EVENT) == IN_PROGRESS || _instance->GetData(DATA_QUEL_DELAR_EVENT) == SPECIAL) @@ -373,7 +373,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript return false; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { ClearGossipMenuFor(player); @@ -880,7 +880,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript } } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { // override default gossip if (_instance->GetBossState(DATA_THE_LICH_KING_ESCAPE) == DONE) @@ -894,7 +894,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript return false; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { ClearGossipMenuFor(player); diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 1fc237c7880..9ec726968fa 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -360,7 +360,7 @@ class go_gundrak_altar : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { me->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); me->SetGoState(GO_STATE_ACTIVE); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 8a8e60e804d..472b9651d3e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -642,7 +642,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript _events.Reset(); } - bool GossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override { if (menuId == GOSSIP_MENU_HIGH_OVERLORD_SAURFANG) { @@ -853,7 +853,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript _events.Reset(); } - bool GossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override { if (menuId == GOSSIP_MENU_MURADIN_BRONZEBEARD) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index a0d0150c39b..ec1b1646998 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -958,7 +958,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript } } - bool GossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) override { me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->GetTransport()->EnableMovement(true); @@ -1222,7 +1222,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript } } - bool GossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) override { me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->GetTransport()->EnableMovement(true); @@ -1388,7 +1388,7 @@ class npc_zafod_boombox : public CreatureScript me->SetReactState(REACT_PASSIVE); } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { player->AddItem(ITEM_GOBLIN_ROCKET_PACK, 1); player->PlayerTalkClass->SendCloseGossip(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 9a586cd2ba8..f7a49f7a0e7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -1212,7 +1212,7 @@ struct npc_tirion_fordring_tft : public ScriptedAI me->LoadEquipment(1); // remove glow on ashbringer } - bool GossipSelect(Player* /*player*/, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* /*player*/, uint32 menuId, uint32 gossipListId) override { if (me->GetCreatureTemplate()->GossipMenuId == menuId && !gossipListId) { @@ -2895,4 +2895,4 @@ void AddSC_boss_the_lich_king() // Achievements new achievement_been_waiting_long_time(); new achievement_neck_deep_in_vile(); -} +}
\ No newline at end of file diff --git a/src/server/scripts/Northrend/IcecrownCitadel/go_icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/go_icecrown_citadel_teleport.cpp index 3e88e65b96c..cf01e8c9c45 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/go_icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/go_icecrown_citadel_teleport.cpp @@ -50,7 +50,7 @@ class icecrown_citadel_teleport : public GameObjectScript { } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { if (gossipListId >= TeleportSpells.size()) return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index fb09eb3c0a9..7adcd67d553 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -586,7 +586,7 @@ class npc_alchemist_adrianna : public CreatureScript { npc_alchemist_adriannaAI(Creature* creature) : ScriptedAI(creature) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (!me->FindCurrentSpellBySpellId(sSpellMgr->GetSpellIdForDifficulty(SPELL_HARVEST_BLIGHT_SPECIMEN, me))) if (player->HasAura(SPELL_ORANGE_BLIGHT_RESIDUE) && player->HasAura(SPELL_GREEN_BLIGHT_RESIDUE)) @@ -655,7 +655,7 @@ struct npc_entrance_faction_leader : public ScriptedAI { npc_entrance_faction_leader(Creature* creature) : ScriptedAI(creature) { } - bool GossipSelect(Player* /*player*/, uint32 menuId, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* /*player*/, uint32 menuId, uint32 /*gossipListId*/) override { if (menuId == GOSSIP_MENUID_ALLY || menuId == GOSSIP_MENUID_HORDE) if (InstanceScript* instance = me->GetInstanceScript()) @@ -1167,7 +1167,7 @@ struct go_empowering_blood_orb : public GameObjectAI _triggerGuid = trigger->GetGUID(); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { me->CastSpell(player, SPELL_EMPOWERED_BLOOD, true); HandleObjectUse(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index daa26f648ab..23c3c62abb8 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -234,7 +234,7 @@ public: InstanceScript* instance; - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { Creature* keristrasza = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_KERISTRASZA)); if (keristrasza && keristrasza->IsAlive()) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index c57a43ffa06..10b207e8798 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -144,7 +144,7 @@ class npc_verdisa_beglaristrasz_eternos : public CreatureScript player->DestroyItemCount(itemId, 1, true, false); } - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { switch (menuId) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 4b97ff9b80b..0d2a0bf9e76 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -685,7 +685,7 @@ public: DoMeleeAttackIfReady(); } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); ClearGossipMenuFor(player); @@ -698,7 +698,7 @@ public: return true; } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index d91204d350c..abec67d21de 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1210,7 +1210,7 @@ class npc_brann_bronzebeard_ulduar_intro : public CreatureScript _instance = creature->GetInstanceScript(); } - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { if (menuId == GOSSIP_MENU_BRANN_BRONZEBEARD && gossipListId == GOSSIP_OPTION_BRANN_BRONZEBEARD) { @@ -1264,7 +1264,7 @@ class npc_lorekeeper : public CreatureScript } } - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { if (menuId == GOSSIP_MENU_LORE_KEEPER && gossipListId == GOSSIP_OPTION_LORE_KEEPER) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index fe978184105..f279fcd2ae7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1680,7 +1680,7 @@ class go_mimiron_hardmode_button : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { if (me->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE)) return true; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index ffd89337a14..2346846bb95 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -681,7 +681,7 @@ struct npc_expedition_commander : public ScriptedAI BuildBrokenHarpoons(); } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { if (gossipListId == GOSSIP_START_ENCOUNTER) { @@ -1513,7 +1513,7 @@ public: } } - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { me->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); if (Creature* controller = me->FindNearestCreature(NPC_RAZORSCALE_CONTROLLER, 5.0f)) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index fed1556590d..11a4a52b33a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -1548,7 +1548,7 @@ class npc_observation_ring_keeper : public CreatureScript DoCast(SPELL_KEEPER_ACTIVE); } - bool GossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override { if (menuId != 10333) return false; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 178ee94a1ce..083c39708fc 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -566,7 +566,7 @@ public: InstanceScript* instance; - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { if (Creature* palehoof = instance->GetCreature(DATA_GORTOK_PALEHOOF)) { diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 355be6925a0..ec8b7f87dba 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -344,7 +344,7 @@ class npc_sinclari_vh : public CreatureScript } } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { // override default gossip switch (_instance->GetData(DATA_MAIN_EVENT_STATE)) @@ -365,7 +365,7 @@ class npc_sinclari_vh : public CreatureScript return false; } - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { if (menuId == GOSSIP_MENU_START_ENCOUNTER && gossipListId == 0) { @@ -1307,7 +1307,7 @@ class go_activation_crystal : public GameObjectScript { go_activation_crystalAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { player->CastSpell(player, SPELL_CRYSTAL_ACTIVATION, true); return false; diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index bd62a7d5a3c..21230347e80 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -62,7 +62,7 @@ public: { npc_corastraszaAI(Creature* creature) : ScriptedAI(creature) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); @@ -82,7 +82,7 @@ public: return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); ClearGossipMenuFor(player); @@ -718,7 +718,7 @@ public: arthas->RemoveFromWorld(); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); @@ -730,7 +730,7 @@ public: return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); ClearGossipMenuFor(player); @@ -1602,7 +1602,7 @@ public: DoMeleeAttackIfReady(); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { uint32 uiGossipText = 0; char const* charGossipItem; @@ -1636,7 +1636,7 @@ public: return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); ClearGossipMenuFor(player); diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 3addeaf4ac7..5a1f80233a8 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -561,7 +561,7 @@ class npc_wyrmrest_defender : public CreatureScript } } - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { if (menuId == MENU_ID && gossipListId == GOSSIP_OPTION_ID) { diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 3ee199c8481..ec4d7df9690 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -184,7 +184,7 @@ public: _RavenousworgGUID.Clear(); } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_PERILOUS_ADVENTURE) { @@ -775,7 +775,7 @@ public: } } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { DoCast(player, SPELL_SUMMON_ASHWOOD_BRAND); return false; diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 86f2c054221..d61b10aa404 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -236,7 +236,7 @@ public: } } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TRAIL_OF_FIRE) StartEscort(player); @@ -372,7 +372,7 @@ struct npc_daegarn : public ScriptedAI SummonGladiator(entry); } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_DEFEAT_AT_RING) { diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 664ceb30100..e9dc5ad568d 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -137,7 +137,7 @@ public: } } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_DISASTER) { diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index cba0f0f9ec5..5d3ff55ec80 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -88,7 +88,7 @@ public: DoMeleeAttackIfReady(); } - bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { if (menuId == GOSSIP_ID && gossipListId == GOSSIP_OPTION_ID) { @@ -99,7 +99,7 @@ public: return false; } - void QuestAccept(Player* /*player*/, Quest const* quest) override + void OnQuestAccept(Player* /*player*/, Quest const* quest) override { if (quest->GetQuestId() == QUEST_BITTER_DEPARTURE) Talk(SAY_QUEST_ACCEPT); @@ -131,7 +131,7 @@ public: { npc_roxi_ramrocketAI(Creature* creature) : ScriptedAI(creature) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { //Quest Menu if (me->IsQuestGiver()) @@ -150,7 +150,7 @@ public: return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); ClearGossipMenuFor(player); @@ -493,7 +493,7 @@ public: objectCounter = 0; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { CloseGossipMenuFor(player); playerGUID = player->GetGUID(); diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 0430d69aa5a..5cd579ea6fb 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -126,7 +126,7 @@ class npc_wg_demolisher_engineer : public CreatureScript { npc_wg_demolisher_engineerAI(Creature* creature) : ScriptedAI(creature) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); @@ -149,7 +149,7 @@ class npc_wg_demolisher_engineer : public CreatureScript return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); CloseGossipMenuFor(player); @@ -214,7 +214,7 @@ class npc_wg_spirit_guide : public CreatureScript DoCast(me, SPELL_CHANNEL_SPIRIT_HEAL); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); @@ -232,7 +232,7 @@ class npc_wg_spirit_guide : public CreatureScript return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); CloseGossipMenuFor(player); @@ -294,7 +294,7 @@ class npc_wg_queue : public CreatureScript DoMeleeAttackIfReady(); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); @@ -323,7 +323,7 @@ class npc_wg_queue : public CreatureScript return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { CloseGossipMenuFor(player); diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 4e7e012bba0..7469dbccb1b 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -268,7 +268,7 @@ public: return; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { _events.ScheduleEvent(EVENT_RECRUIT_1, 100ms); CloseGossipMenuFor(player); @@ -309,7 +309,7 @@ public: { go_scourge_enclosureAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { me->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_OUR_ONLY_HOPE) == QUEST_STATUS_INCOMPLETE) @@ -563,7 +563,7 @@ public: } } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { CloseGossipMenuFor(player); DoCast(player, SPELL_ALCHEMIST_APPRENTICE_INVISBUFF); @@ -594,7 +594,7 @@ public: { go_finklesteins_cauldronAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { player->CastSpell(player, SPELL_POT_CHECK); return true; |
