From c8aeadc9498e23ce0cf032d6d2239cfc414cc209 Mon Sep 17 00:00:00 2001 From: Krudor Date: Sun, 10 Dec 2017 13:59:13 +0100 Subject: [PATCH] Remove reportUse parameter on GameObjectAI::GossipHello and give it its own event. Ported from 3.3.5 --- src/server/game/AI/CoreAI/GameObjectAI.h | 6 +- src/server/game/AI/SmartScripts/SmartAI.cpp | 11 +++- src/server/game/AI/SmartScripts/SmartAI.h | 3 +- .../game/Entities/GameObject/GameObject.cpp | 2 +- src/server/game/Handlers/SpellHandler.cpp | 2 +- src/server/game/Spells/SpellEffects.cpp | 2 +- .../BlackrockDepths/blackrock_depths.cpp | 2 +- .../BlackwingLair/boss_razorgore.cpp | 2 +- .../Karazhan/boss_nightbane.cpp | 2 +- .../ScarletEnclave/chapter1.cpp | 2 +- .../boss_headless_horseman.cpp | 2 +- .../Scholomance/boss_kirtonos_the_herald.cpp | 2 +- .../EasternKingdoms/Stratholme/stratholme.cpp | 2 +- .../SunkenTemple/sunken_temple.cpp | 2 +- .../SunwellPlateau/boss_kalecgos.cpp | 2 +- .../SunwellPlateau/boss_kiljaeden.cpp | 2 +- .../Uldaman/boss_archaedas.cpp | 2 +- .../EasternKingdoms/Uldaman/uldaman.cpp | 2 +- .../BlackfathomDeeps/blackfathom_deeps.cpp | 4 +- .../boss_leutenant_drake.cpp | 2 +- .../Kalimdor/RazorfenDowns/razorfen_downs.cpp | 2 +- .../RuinsOfAhnQiraj/boss_ossirian.cpp | 2 +- .../scripts/Kalimdor/ZulFarrak/zulfarrak.cpp | 4 +- .../scripts/Kalimdor/zone_ashenvale.cpp | 2 +- .../scripts/Kalimdor/zone_azuremyst_isle.cpp | 2 +- src/server/scripts/Kalimdor/zone_silithus.cpp | 2 +- .../scripts/Kalimdor/zone_winterspring.cpp | 2 +- .../Ahnkahet/boss_prince_taldaram.cpp | 2 +- .../RubySanctum/boss_halion.cpp | 2 +- .../Northrend/Gundrak/instance_gundrak.cpp | 2 +- .../Nexus/Nexus/boss_keristrasza.cpp | 2 +- .../Ulduar/boss_algalon_the_observer.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_mimiron.cpp | 2 +- .../Ulduar/Ulduar/boss_razorscale.cpp | 2 +- .../UtgardePinnacle/boss_palehoof.cpp | 2 +- .../Northrend/VioletHold/violet_hold.cpp | 2 +- src/server/scripts/Northrend/zone_zuldrak.cpp | 4 +- .../BlackTemple/boss_warlord_najentus.cpp | 2 +- .../SerpentShrine/boss_lurker_below.cpp | 2 +- .../SerpentShrine/instance_serpent_shrine.cpp | 2 +- .../SteamVault/instance_steam_vault.cpp | 2 +- .../BloodFurnace/boss_broggok.cpp | 2 +- .../MagtheridonsLair/boss_magtheridon.cpp | 2 +- .../Outland/zone_blades_edge_mountains.cpp | 6 +- src/server/scripts/Outland/zone_nagrand.cpp | 4 +- .../scripts/Outland/zone_netherstorm.cpp | 2 +- .../scripts/Outland/zone_terokkar_forest.cpp | 2 +- src/server/scripts/World/go_scripts.cpp | 66 +++++++++---------- 48 files changed, 99 insertions(+), 87 deletions(-) diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 1d938be7b1a..84ead51cc91 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -48,7 +48,7 @@ class TC_GAME_API GameObjectAI static int32 Permissible(GameObject const* /*go*/) { return PERMIT_BASE_NO; } // Called when a player opens a gossip dialog with the gameobject. - virtual bool GossipHello(Player* /*player*/, bool /*reportUse*/) { return false; } + virtual bool GossipHello(Player* /*player*/) { return false; } // Called when a player selects a gossip item in the gameobject's gossip menu. virtual bool GossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) { return false; } @@ -65,6 +65,10 @@ class TC_GAME_API GameObjectAI // Called when the dialog status between a player and the gameobject is requested. virtual uint32 GetDialogStatus(Player* /*player*/) { return DIALOG_STATUS_SCRIPTED_NO_STATUS; } + // Called when a Player clicks a GameObject, before GossipHello + // prevents achievement tracking if returning true + virtual bool OnReportUse(Player* /*player*/) { return false; } + virtual void Destroyed(Player* /*player*/, uint32 /*eventId*/) { } virtual void Damaged(Player* /*player*/, uint32 /*eventId*/) { } diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 8df12baec6f..970b5718cd1 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -973,10 +973,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) { TC_LOG_DEBUG("scripts.ai", "SmartGameObjectAI::GossipHello"); - 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 false; +} + +bool SmartGameObjectAI::OnReportUse(Player* player) +{ + TC_LOG_DEBUG("scripts.ai", "SmartGameObjectAI::OnReportUse"); + GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 1, 0, false, nullptr, me); return false; } diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 1b5c733a8f7..d8aa4164d03 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -254,7 +254,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; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 2f9cdf6b3d0..7f31215a4d2 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1240,7 +1240,7 @@ void GameObject::Use(Unit* user) if (Player* playerUser = user->ToPlayer()) { playerUser->PlayerTalkClass->ClearMenus(); - if (AI()->GossipHello(playerUser, false)) + if (AI()->GossipHello(playerUser)) return; } diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index a19bb478eb1..fcfce3ee5a1 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -337,7 +337,7 @@ void WorldSession::HandleGameobjectReportUse(WorldPacket& recvPacket) if (GameObject* go = GetPlayer()->GetGameObjectIfCanInteractWith(guid)) { - if (go->AI()->GossipHello(_player, true)) + if (go->AI()->OnReportUse(_player)) return; _player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT, go->GetEntry()); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 5e81a416877..5b23bfbc9ae 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1676,7 +1676,7 @@ void Spell::SendLoot(ObjectGuid guid, LootType loottype) } player->PlayerTalkClass->ClearMenus(); - if (gameObjTarget->AI()->GossipHello(player, false)) + if (gameObjTarget->AI()->GossipHello(player)) return; switch (gameObjTarget->GetGoType()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index d06b3e399ae..0e685770ce2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -34,7 +34,7 @@ public: { go_shadowforge_brazierAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (InstanceScript* instance = me->GetInstanceScript()) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp index 3d535e65312..cbedc69d001 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -182,7 +182,7 @@ class go_orb_of_domination : public GameObjectScript { go_orb_of_dominationAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (InstanceScript* instance = me->GetInstanceScript()) if (instance->GetData(DATA_EGG_EVENT) != DONE) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 2af70d84b29..7926f2ab05e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -423,7 +423,7 @@ class go_blackened_urn : public GameObjectScript { go_blackened_urnAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (me->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE)) return false; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 093e575e950..67330fe9648 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -327,7 +327,7 @@ public: { go_acherus_soul_prisonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (Creature* anchor = me->FindNearestCreature(29521, 15)) if (ObjectGuid prisonerGUID = anchor->AI()->GetGUID()) diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 3ef55054cd0..4d377bc075f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -884,7 +884,7 @@ class go_loosely_turned_soil : public GameObjectScript { go_loosely_turned_soilAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (InstanceScript* instance = player->GetInstanceScript()) if (instance->GetBossState(DATA_HORSEMAN_EVENT) == IN_PROGRESS || player->GetQuestStatus(QUEST_CALL_THE_HEADLESS_HORSEMAN) != QUEST_STATUS_COMPLETE) diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index fd26fb7579b..51228f1a193 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -284,7 +284,7 @@ class go_brazier_of_the_herald : public GameObjectScript { go_brazier_of_the_heraldAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); me->PlayDirectSound(SOUND_SCREECH, 0); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 71b396795ba..2275956daa0 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -51,7 +51,7 @@ public: { go_gauntlet_gateAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { InstanceScript* instance = me->GetInstanceScript(); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index fd971fa7c4d..466270d618e 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -71,7 +71,7 @@ class go_atalai_statue : public GameObjectScript { go_atalai_statueAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (InstanceScript* instance = player->GetInstanceScript()) instance->SetData(EVENT_STATE, me->GetEntry()); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 983baed4362..70cdfa85c19 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -541,7 +541,7 @@ public: { kalecgos_teleporterAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { #if MAX_PLAYERS_IN_SPECTRAL_REALM > 0 uint8 SpectralPlayers = 0; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 381a4220c25..0d52fcbe25d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -367,7 +367,7 @@ class go_orb_of_the_blue_flight : public GameObjectScript { go_orb_of_the_blue_flightAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (me->GetFaction() == 35) { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 4d30a186ad2..ec1208f035f 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -401,7 +401,7 @@ class go_altar_of_archaedas : public GameObjectScript { go_altar_of_archaedasAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 4f0c263576b..9f229bafa79 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -124,7 +124,7 @@ class go_keystone_chamber : public GameObjectScript { go_keystone_chamberAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (InstanceScript* instance = me->GetInstanceScript()) instance->SetData(DATA_IRONAYA_SEAL, IN_PROGRESS); //door animation and save state. diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 64c2473e76d..a99f749d944 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -43,7 +43,7 @@ class go_blackfathom_altar : public GameObjectScript { go_blackfathom_altarAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (!player->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player); @@ -66,7 +66,7 @@ class go_blackfathom_fire : public GameObjectScript { go_blackfathom_fireAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (InstanceScript* instance = me->GetInstanceScript()) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 7bb18e3e09e..d5a7af487a9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -42,7 +42,7 @@ public: { go_barrel_old_hillsbradAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (InstanceScript* instance = me->GetInstanceScript()) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 9d92be6c145..c7c10335276 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -379,7 +379,7 @@ class go_gong : public GameObjectScript { go_gongAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { InstanceScript* instance = me->GetInstanceScript(); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index d56a205fa0b..569f3a9105a 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -283,7 +283,7 @@ class go_ossirian_crystal : public GameObjectScript { go_ossirian_crystalAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { InstanceScript* Instance = player->GetInstanceScript(); if (!Instance) diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index ee4c2f982ad..176f9da054e 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -210,7 +210,7 @@ public: { go_troll_cageAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (InstanceScript* instance = me->GetInstanceScript()) { @@ -417,7 +417,7 @@ class go_shallow_grave : public GameObjectScript { go_shallow_graveAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { // randomly summon a zombie or dead hero the first time a grave is used if (me->GetUseCount() == 0) diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 2c906550acd..748442a3796 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -332,7 +332,7 @@ class go_naga_brazier : public GameObjectScript { go_naga_brazierAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (Creature* creature = GetClosestCreatureWithEntry(me, NPC_MUGLASH, INTERACTION_DISTANCE * 2)) { diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 3229936cce7..739e74e875f 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -636,7 +636,7 @@ class go_ravager_cage : public GameObjectScript { go_ravager_cageAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_STRENGTH_ONE) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 7275a00abea..14712535843 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -1130,7 +1130,7 @@ class go_wind_stone : public GameObjectScript { go_wind_stoneAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { uint8 rank = GetPlayerRank(player); diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index c05db28ee69..b2b3e291dd1 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -569,7 +569,7 @@ class go_elune_fire : public GameObjectScript { go_elune_fireAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { // Check if we are using the torches or the altar bool isAltar = false; 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 a2f8d768e44..7e7a7d09b5e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -385,7 +385,7 @@ class go_prince_taldaram_sphere : public GameObjectScript { go_prince_taldaram_sphereAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { InstanceScript* instance = me->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 38bfb9f220a..46a74d84114 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1364,7 +1364,7 @@ class go_twilight_portal : public GameObjectScript } } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (_spellId != 0) player->CastSpell(player, _spellId, true); diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index fa9ce4d1151..244d5aa9181 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -355,7 +355,7 @@ class go_gundrak_altar : public GameObjectScript { go_gundrak_altarAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { me->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); me->SetGoState(GO_STATE_ACTIVE); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 40052a51250..6f02f9abf19 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -229,7 +229,7 @@ public: { containment_sphereAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { InstanceScript* instance = me->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index a9989c111c9..f62f7ec51f9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -979,7 +979,7 @@ class go_celestial_planetarium_access : public GameObjectScript { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (me->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE)) return true; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index d01c9ff4b4a..0a1131e713c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1650,7 +1650,7 @@ class go_mimiron_hardmode_button : public GameObjectScript { go_mimiron_hardmode_buttonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(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 31e63bdab2b..bbdb223a0d3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -321,7 +321,7 @@ class go_razorscale_harpoon : public GameObjectScript { go_razorscale_harpoonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (InstanceScript* instance = me->GetInstanceScript()) if (instance->GetCreature(BOSS_RAZORSCALE)) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index d102f1085d2..dead19a90a2 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -560,7 +560,7 @@ public: { go_palehoof_sphereAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (InstanceScript* instance = me->GetInstanceScript()) { diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index eedf29c1c49..f5e962117e1 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -1315,7 +1315,7 @@ class go_activation_crystal : public GameObjectScript { go_blackfathom_altarAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { player->CastSpell(player, SPELL_CRYSTAL_ACTIVATION, true); return false; diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index da5f0e864d2..21983384ab6 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -309,7 +309,7 @@ class go_scourge_enclosure : public GameObjectScript { go_scourge_enclosureAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_OUR_ONLY_HOPE) == QUEST_STATUS_INCOMPLETE) @@ -595,7 +595,7 @@ class go_finklesteins_cauldron : public GameObjectScript { go_finklesteins_cauldronAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { player->CastSpell(player, SPELL_POT_CHECK); return true; diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index b58a2e50379..3805b0d1f18 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -177,7 +177,7 @@ class go_najentus_spine : public GameObjectScript { go_najentus_spineAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (InstanceScript* instance = me->GetInstanceScript()) if (Creature* najentus = instance->GetCreature(DATA_HIGH_WARLORD_NAJENTUS)) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 1c6c6f25623..f7a09e9b578 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -439,7 +439,7 @@ class go_strange_pool : public GameObjectScript { go_strange_poolAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { // 25% if (InstanceScript* instanceScript = me->GetInstanceScript()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 42f30ec5920..160bf15faa9 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -69,7 +69,7 @@ class go_bridge_console : public GameObjectScript { go_bridge_consoleAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { InstanceScript* instance = me->GetInstanceScript(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 1be6cd5cdfa..08298b15eac 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -29,7 +29,7 @@ class go_main_chambers_access_panel : public GameObjectScript { go_main_chambers_access_panelAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { InstanceScript* instance = me->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 89998cb9feb..f99c85a4c5c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -132,7 +132,7 @@ class go_broggok_lever : public GameObjectScript { go_broggok_leverAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (InstanceScript* instance = me->GetInstanceScript()) if (instance->GetBossState(DATA_BROGGOK) != DONE && instance->GetBossState(DATA_BROGGOK) != IN_PROGRESS) diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index eed9490fbb6..1c20e4c41be 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -468,7 +468,7 @@ class go_manticron_cube : public GameObjectScript { go_manticron_cubeAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->HasAura(SPELL_MIND_EXHAUSTION) || player->HasAura(SPELL_SHADOW_GRASP)) return true; diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 00d6182489f..42d5a806e9f 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -305,7 +305,7 @@ class go_legion_obelisk : public GameObjectScript { go_legion_obeliskAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->GetQuestStatus(QUEST_YOURE_FIRED) == QUEST_STATUS_INCOMPLETE) { @@ -892,7 +892,7 @@ class go_simon_cluster : public GameObjectScript { go_simon_clusterAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (Creature* bunny = me->FindNearestCreature(NPC_SIMON_BUNNY, 12.0f, true)) bunny->AI()->SetData(me->GetEntry(), 0); @@ -928,7 +928,7 @@ class go_apexis_relic : public GameObjectScript { go_apexis_relicAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { player->PrepareGossipMenu(me, me->GetGOInfo()->questgiver.gossipID); player->SendPreparedGossip(me); diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index d6f8fe1033f..d63081c71b8 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -291,7 +291,7 @@ class go_corkis_prison : public GameObjectScript { go_corkis_prisonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->SetGoState(GO_STATE_READY); if (me->GetEntry() == GO_CORKIS_PRISON) @@ -609,7 +609,7 @@ class go_warmaul_prison : public GameObjectScript { go_warmaul_prisonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_FINDING_THE_SURVIVORS) != QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 6eec0a3508c..fd7c47b5c5b 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -685,7 +685,7 @@ class go_captain_tyralius_prison : public GameObjectScript { go_captain_tyralius_prisonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); if (Creature* tyralius = me->FindNearestCreature(NPC_CAPTAIN_TYRALIUS, 1.0f)) diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index e6e3267e2ad..9b4c738c78a 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -551,7 +551,7 @@ class go_skull_pile : public GameObjectScript return true; } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if ((player->GetQuestStatus(ADVERSARIAL_BLOOD) == QUEST_STATUS_INCOMPLETE) || player->GetQuestRewardStatus(ADVERSARIAL_BLOOD)) { diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index ec22dddab74..78f2c468991 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -72,7 +72,7 @@ class go_cat_figurine : public GameObjectScript { go_cat_figurineAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { player->CastSpell(player, SPELL_SUMMON_GHOST_SABER, true); return false; @@ -98,7 +98,7 @@ class go_barov_journal : public GameObjectScript { go_barov_journalAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !player->HasSpell(26086)) player->CastSpell(player, 26095, false); @@ -132,7 +132,7 @@ class go_gilded_brazier : public GameObjectScript { go_gilded_brazierAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (me->GetGoType() == GAMEOBJECT_TYPE_GOOBER) { @@ -165,7 +165,7 @@ class go_orb_of_command : public GameObjectScript { go_orb_of_commandAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->GetQuestRewardStatus(7761)) player->CastSpell(player, 23460, true); @@ -193,7 +193,7 @@ class go_tablet_of_madness : public GameObjectScript { go_tablet_of_madnessAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->HasSkill(SKILL_ALCHEMY) && player->GetSkillValue(SKILL_ALCHEMY) >= 300 && !player->HasSpell(24266)) player->CastSpell(player, 24267, false); @@ -222,7 +222,7 @@ class go_tablet_of_the_seven : public GameObjectScript go_tablet_of_the_sevenAI(GameObject* go) : GameObjectAI(go) { } /// @todo use gossip option ("Transcript the Tablet") instead, if Trinity adds support. - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (me->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) return true; @@ -253,7 +253,7 @@ class go_jump_a_tron : public GameObjectScript { go_jump_a_tronAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) player->CastSpell(player, 33382, true); @@ -297,7 +297,7 @@ class go_ethereum_prison : public GameObjectScript { go_ethereum_prisonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); int Random = rand32() % (sizeof(NpcPrisonEntry) / sizeof(uint32)); @@ -357,7 +357,7 @@ class go_ethereum_stasis : public GameObjectScript { go_ethereum_stasisAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); int Random = rand32() % (sizeof(NpcStasisEntry) / sizeof(uint32)); @@ -393,7 +393,7 @@ class go_resonite_cask : public GameObjectScript { go_resonite_caskAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (me->GetGoType() == GAMEOBJECT_TYPE_GOOBER) me->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000); @@ -426,7 +426,7 @@ class go_sacred_fire_of_life : public GameObjectScript { go_sacred_fire_of_lifeAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (me->GetGoType() == GAMEOBJECT_TYPE_GOOBER) player->SummonCreature(NPC_ARIKARA, -5008.338f, -2118.894f, 83.657f, 0.874f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -464,7 +464,7 @@ class go_shrine_of_the_birds : public GameObjectScript { go_shrine_of_the_birdsAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { uint32 BirdEntry = 0; @@ -517,7 +517,7 @@ class go_southfury_moonstone : public GameObjectScript { go_southfury_moonstoneAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose //player->CastSpell(player, SPELL_SUMMON_RIZZLE, false); @@ -556,7 +556,7 @@ class go_tele_to_dalaran_crystal : public GameObjectScript { go_tele_to_dalaran_crystalAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) return false; @@ -586,7 +586,7 @@ class go_tele_to_violet_stand : public GameObjectScript { go_tele_to_violet_standAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || player->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; @@ -626,7 +626,7 @@ class go_fel_crystalforge : public GameObjectScript { go_fel_crystalforgeAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (me->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ player->PrepareQuestMenu(me->GetGUID()); /* return true*/ @@ -696,7 +696,7 @@ class go_bashir_crystalforge : public GameObjectScript { go_bashir_crystalforgeAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (me->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ player->PrepareQuestMenu(me->GetGUID()); /* return true*/ @@ -771,7 +771,7 @@ class go_matrix_punchograph : public GameObjectScript { go_matrix_punchographAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { switch (me->GetEntry()) { @@ -834,7 +834,7 @@ class go_scourge_cage : public GameObjectScript { go_scourge_cageAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); if (Creature* pNearestPrisoner = me->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true)) @@ -872,7 +872,7 @@ class go_arcane_prison : public GameObjectScript { go_arcane_prisonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE) { @@ -909,7 +909,7 @@ class go_blood_filled_orb : public GameObjectScript { go_blood_filled_orbAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (me->GetGoType() == GAMEOBJECT_TYPE_GOOBER) player->SummonCreature(NPC_ZELEMAR, -369.746f, 166.759f, -21.50f, 5.235f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -950,7 +950,7 @@ class go_jotunheim_cage : public GameObjectScript { go_jotunheim_cageAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); Creature* pPrisoner = me->FindNearestCreature(NPC_EBON_BLADE_PRISONER_HUMAN, 5.0f, true); @@ -1010,7 +1010,7 @@ class go_table_theka : public GameObjectScript { go_table_thekaAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->GetQuestStatus(QUEST_SPIDER_GOLD) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_SPIDER_GOLD); @@ -1046,7 +1046,7 @@ class go_inconspicuous_landmark : public GameObjectScript { go_inconspicuous_landmarkAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (player->HasItemCount(ITEM_CUERGOS_KEY)) return false; @@ -1082,7 +1082,7 @@ class go_soulwell : public GameObjectScript /// _and_ CMSG_GAMEOBJECT_REPORT_USE, this GossipHello hook is called /// twice. The script's handling is fine as it won't remove two charges /// on the well. We have to find how to segregate REPORT_USE and USE. - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { Unit* owner = me->GetOwner(); if (!owner || owner->GetTypeId() != TYPEID_PLAYER || !player->IsInSameRaidWith(owner->ToPlayer())) @@ -1120,7 +1120,7 @@ class go_dragonflayer_cage : public GameObjectScript { go_dragonflayer_cageAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_PRISONERS_OF_WYRMSKULL) != QUEST_STATUS_INCOMPLETE) @@ -1186,7 +1186,7 @@ class go_amberpine_outhouse : public GameObjectScript { go_amberpine_outhouseAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { QuestStatus status = player->GetQuestStatus(QUEST_DOING_YOUR_DUTY); if (status == QUEST_STATUS_INCOMPLETE || status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) @@ -1253,7 +1253,7 @@ class go_hive_pod : public GameObjectScript { go_hive_podAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { player->SendLoot(me->GetGUID(), LOOT_CORPSE); me->SummonCreature(NPC_HIVE_AMBUSHER, me->GetPositionX() + 1, me->GetPositionY(), me->GetPositionZ(), me->GetAngle(player), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); @@ -1277,7 +1277,7 @@ class go_massive_seaforium_charge : public GameObjectScript { go_massive_seaforium_chargeAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { me->SetLootState(GO_JUST_DEACTIVATED); return true; @@ -1310,7 +1310,7 @@ class go_veil_skith_cage : public GameObjectScript { go_veil_skith_cageAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_MISSING_FRIENDS) == QUEST_STATUS_INCOMPLETE) @@ -1357,7 +1357,7 @@ class go_frostblade_shrine : public GameObjectScript { go_frostblade_shrineAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->UseDoorOrButton(10); if (!player->HasAura(SPELL_RECENT_MEDITATION)) @@ -1394,7 +1394,7 @@ class go_midsummer_bonfire : public GameObjectScript { go_midsummer_bonfireAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { player->CastSpell(player, STAMP_OUT_BONFIRE_QUEST_COMPLETE, true); CloseGossipMenuFor(player); @@ -1425,7 +1425,7 @@ class go_midsummer_ribbon_pole : public GameObjectScript { go_midsummer_ribbon_poleAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (Creature* creature = me->FindNearestCreature(NPC_POLE_RIBBON_BUNNY, 10.0f)) {