diff options
Diffstat (limited to 'src')
33 files changed, 61 insertions, 70 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 39657dc78bd..06b2bd04fd8 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -1089,7 +1089,7 @@ class SmartTrigger : public AreaTriggerScript SmartTrigger() : AreaTriggerScript("SmartTrigger") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override { if (!player->IsAlive()) return false; diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index b1022b43967..c154345a755 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1723,7 +1723,7 @@ bool ScriptMgr::OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger, b ASSERT(trigger); GET_SCRIPT_RET(AreaTriggerScript, sObjectMgr->GetAreaTriggerScriptId(trigger->ID), tmpscript, false); - return tmpscript->OnTrigger(player, trigger, entered); + return entered ? tmpscript->OnTrigger(player, trigger) : tmpscript->OnExit(player, trigger); } Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId /*typeId*/) @@ -2428,7 +2428,7 @@ AreaTriggerScript::AreaTriggerScript(char const* name) ScriptRegistry<AreaTriggerScript>::Instance()->AddScript(this); } -bool OnlyOnceAreaTriggerScript::OnTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered) +bool OnlyOnceAreaTriggerScript::OnTrigger(Player* player, AreaTriggerEntry const* trigger) { uint32 const triggerId = trigger->ID; if (InstanceScript* instance = player->GetInstanceScript()) @@ -2438,7 +2438,7 @@ bool OnlyOnceAreaTriggerScript::OnTrigger(Player* player, AreaTriggerEntry const else instance->MarkAreaTriggerDone(triggerId); } - return _OnTrigger(player, trigger, entered); + return _OnTrigger(player, trigger); } void OnlyOnceAreaTriggerScript::ResetAreaTriggerDone(InstanceScript* script, uint32 triggerId) { script->ResetAreaTriggerDone(triggerId); } void OnlyOnceAreaTriggerScript::ResetAreaTriggerDone(Player const* player, AreaTriggerEntry const* trigger) { if (InstanceScript* instance = player->GetInstanceScript()) ResetAreaTriggerDone(instance, trigger->ID); } diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 863661022af..1ab7fc54478 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -445,7 +445,10 @@ class TC_GAME_API AreaTriggerScript : public ScriptObject public: // Called when the area trigger is activated by a player. - virtual bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/, bool /*entered*/) { return false; } + virtual bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) { return false; } + + // Called when the area trigger is left by a player. + virtual bool OnExit(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) { return false; } }; class TC_GAME_API OnlyOnceAreaTriggerScript : public AreaTriggerScript @@ -453,10 +456,10 @@ class TC_GAME_API OnlyOnceAreaTriggerScript : public AreaTriggerScript using AreaTriggerScript::AreaTriggerScript; public: - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered) final override; + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) final; protected: - virtual bool _OnTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered) = 0; + virtual bool _OnTrigger(Player* player, AreaTriggerEntry const* trigger) = 0; void ResetAreaTriggerDone(InstanceScript* instance, uint32 triggerId); void ResetAreaTriggerDone(Player const* player, AreaTriggerEntry const* trigger); }; diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp index 23f32002eaf..9040aee9a35 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp @@ -67,7 +67,7 @@ class at_alizabal_intro : public AreaTriggerScript public: at_alizabal_intro() : AreaTriggerScript("at_alizabal_intro") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* alizabal = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_ALIZABAL))) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index a44ed51b6c2..1fc0428e524 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -97,7 +97,7 @@ class at_ring_of_law : public AreaTriggerScript public: at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index ef297887136..0fddea26788 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -537,7 +537,7 @@ class at_dragonspire_hall : public AreaTriggerScript public: at_dragonspire_hall() : AreaTriggerScript("at_dragonspire_hall") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player && player->IsAlive()) { @@ -561,7 +561,7 @@ class at_blackrock_stadium : public AreaTriggerScript public: at_blackrock_stadium() : AreaTriggerScript("at_blackrock_stadium") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player && player->IsAlive()) { @@ -585,7 +585,7 @@ class at_nearby_scarshield_infiltrator : public AreaTriggerScript public: at_nearby_scarshield_infiltrator() : AreaTriggerScript("at_nearby_scarshield_infiltrator") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/) override { if (player->IsAlive()) { diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 5e0a2fc0a29..f16542dd53a 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -43,7 +43,7 @@ class at_malfurion_stormrage : public AreaTriggerScript public: at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->GetInstanceScript() && !player->FindNearestCreature(15362, 15)) player->SummonCreature(15362, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 900155c70e3..21dd0c3e8ce 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -152,7 +152,7 @@ class AreaTrigger_at_map_chamber : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->GetQuestStatus(QUEST_HIDDEN_CHAMBER) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_HIDDEN_CHAMBER); diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 5e037b2e9ea..579cd1a7dc4 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -146,7 +146,7 @@ class at_twilight_grove : public AreaTriggerScript public: at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->GetQuestStatus(QUEST_NIGHTMARES_CORRUPTION) == QUEST_STATUS_INCOMPLETE) if (!player->FindNearestCreature(NPC_TWILIGHT_CORRUPTER, 500.0f, true)) diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index f718e3c2d67..afc0e21bbc0 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -939,7 +939,7 @@ class at_bring_your_orphan_to : public AreaTriggerScript public: at_bring_your_orphan_to() : AreaTriggerScript("at_bring_your_orphan_to") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override { if (player->isDead() || !player->HasAura(SPELL_ORPHAN_OUT)) return false; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index b2a6593382f..8c4becc0050 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -318,11 +318,8 @@ class at_aq_battleguard_sartura : public AreaTriggerScript public: at_aq_battleguard_sartura() : AreaTriggerScript("at_aq_battleguard_sartura") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool entered) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { - if (!entered) - return false; - if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* sartura = instance->GetCreature(DATA_SARTURA)) sartura->AI()->AttackStart(player); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 4f013ba98d2..23d7a4ef3f6 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -447,7 +447,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index e4cef0e8a00..ed93062f560 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -402,7 +402,7 @@ class at_sc_corborus_intro : public AreaTriggerScript public: at_sc_corborus_intro() : AreaTriggerScript("at_sc_corborus_intro") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* corborus = instance->GetCreature(DATA_CORBORUS)) @@ -416,7 +416,7 @@ class at_sc_slabhide_intro : public AreaTriggerScript public: at_sc_slabhide_intro() : AreaTriggerScript("at_sc_slabhide_intro") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* slabhide = instance->GetCreature(DATA_SLABHIDE)) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 3f63f63accd..3ff20da4e1b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -159,7 +159,7 @@ class at_baltharus_plateau : public OnlyOnceAreaTriggerScript public: at_baltharus_plateau() : OnlyOnceAreaTriggerScript("at_baltharus_plateau") { } - bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { // Only trigger once if (InstanceScript* instance = player->GetInstanceScript()) 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 12af81aeeed..0158caf9936 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -2038,7 +2038,7 @@ class at_hor_intro_start : public AreaTriggerScript public: at_hor_intro_start() : AreaTriggerScript("at_hor_intro_start") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->IsGameMaster()) return true; @@ -2064,7 +2064,7 @@ class at_hor_waves_restarter : public AreaTriggerScript public: at_hor_waves_restarter() : AreaTriggerScript("at_hor_waves_restarter") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->IsGameMaster()) return true; @@ -2099,7 +2099,7 @@ class at_hor_impenetrable_door : public AreaTriggerScript public: at_hor_impenetrable_door() : AreaTriggerScript("at_hor_impenetrable_door") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->IsGameMaster()) return true; @@ -2119,7 +2119,7 @@ class at_hor_shadow_throne : public AreaTriggerScript public: at_hor_shadow_throne() : AreaTriggerScript("at_hor_shadow_throne") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->IsGameMaster()) return true; @@ -2736,7 +2736,7 @@ class at_hor_uther_quel_delar_start : public AreaTriggerScript public: at_hor_uther_quel_delar_start() : AreaTriggerScript("at_hor_uther_quel_delar_start") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->IsGameMaster()) return true; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 5e1d283ef11..97c78e8f356 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -545,7 +545,7 @@ class at_tyrannus_event_starter : public AreaTriggerScript public: at_tyrannus_event_starter() : AreaTriggerScript("at_tyrannus_event_starter") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/) override { InstanceScript* instance = player->GetInstanceScript(); if (player->IsGameMaster() || !instance) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 1820c2d9e43..e723d921a44 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -318,11 +318,8 @@ class at_pit_cavern_entrance : public AreaTriggerScript public: at_pit_cavern_entrance() : AreaTriggerScript("at_pit_cavern_entrance") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool entered) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { - if (!entered) - return true; - if (InstanceScript* instance = player->GetInstanceScript()) { if (instance->GetData(DATA_CAVERN_ACTIVE)) @@ -342,11 +339,8 @@ class at_pit_cavern_end : public AreaTriggerScript public: at_pit_cavern_end() : AreaTriggerScript("at_pit_cavern_end") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool entered) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { - if (!entered) - return true; - if (InstanceScript* instance = player->GetInstanceScript()) { instance->SetData(DATA_CAVERN_ACTIVE, 0); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index f84e7b72b39..b4352659170 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -1522,7 +1522,7 @@ class at_blood_prince_council_start_intro : public AreaTriggerScript public: at_blood_prince_council_start_intro() : AreaTriggerScript("at_blood_prince_council_start_intro") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* controller = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_BLOOD_PRINCES_CONTROL))) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index c11552b97e0..124054ffd47 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -1031,7 +1031,7 @@ class at_lady_deathwhisper_entrance : public OnlyOnceAreaTriggerScript public: at_lady_deathwhisper_entrance() : OnlyOnceAreaTriggerScript("at_lady_deathwhisper_entrance") { } - bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (instance->GetBossState(DATA_LADY_DEATHWHISPER) != DONE) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index a68f4c970d4..a4a31898935 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -767,7 +767,7 @@ class at_lord_marrowgar_entrance : public OnlyOnceAreaTriggerScript public: at_lord_marrowgar_entrance() : OnlyOnceAreaTriggerScript("at_lord_marrowgar_entrance") { } - bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* lordMarrowgar = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_LORD_MARROWGAR))) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index e6a0ba715bd..6dbe50b9f60 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1658,7 +1658,7 @@ class at_sindragosa_lair : public AreaTriggerScript public: at_sindragosa_lair() : AreaTriggerScript("at_sindragosa_lair") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 3554ee8b274..43920148097 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -2175,7 +2175,7 @@ class at_icc_saurfang_portal : public AreaTriggerScript public: at_icc_saurfang_portal() : AreaTriggerScript("at_icc_saurfang_portal") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance || instance->GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE) @@ -2209,7 +2209,7 @@ class at_icc_shutdown_traps : public AreaTriggerScript public: at_icc_shutdown_traps() : AreaTriggerScript("at_icc_shutdown_traps") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) instance->SetData(DATA_UPPERSPIRE_TELE_ACT, DONE); @@ -2223,7 +2223,7 @@ class at_icc_start_blood_quickening : public AreaTriggerScript public: at_icc_start_blood_quickening() : AreaTriggerScript("at_icc_start_blood_quickening") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (instance->GetData(DATA_BLOOD_QUICKENING_STATE) == NOT_STARTED) @@ -2237,7 +2237,7 @@ class at_icc_start_frostwing_gauntlet : public AreaTriggerScript public: at_icc_start_frostwing_gauntlet() : AreaTriggerScript("at_icc_start_frostwing_gauntlet") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* crok = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_CROK_SCOURGEBANE))) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index 3f73afebd60..97d4696ca68 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -84,7 +84,7 @@ class at_frozen_throne_teleport : public AreaTriggerScript public: at_frozen_throne_teleport() : AreaTriggerScript("at_frozen_throne_teleport") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->IsInCombat()) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index e723a49b9a2..df55ec33299 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -245,7 +245,7 @@ class at_anubrekhan_entrance : public OnlyOnceAreaTriggerScript public: at_anubrekhan_entrance() : OnlyOnceAreaTriggerScript("at_anubrekhan_entrance") { } - bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance || instance->GetBossState(BOSS_ANUBREKHAN) != NOT_STARTED) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 6a7cfb08a04..38a8b0e76ea 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -265,7 +265,7 @@ class at_faerlina_entrance : public OnlyOnceAreaTriggerScript public: at_faerlina_entrance() : OnlyOnceAreaTriggerScript("at_faerlina_entrance") { } - bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance || instance->GetBossState(BOSS_FAERLINA) != NOT_STARTED) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 8ee6948d5c4..2e6c332192d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -980,10 +980,10 @@ class at_kelthuzad_center : public AreaTriggerScript public: at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/, bool entered) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/) override { InstanceScript* instance = player->GetInstanceScript(); - if (!instance || instance->GetBossState(BOSS_KELTHUZAD) != NOT_STARTED || !entered) + if (!instance || instance->GetBossState(BOSS_KELTHUZAD) != NOT_STARTED) return true; if (player->IsGameMaster()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index c5cdf881675..c5089af75fc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -1246,7 +1246,7 @@ class at_thaddius_entrance : public OnlyOnceAreaTriggerScript public: at_thaddius_entrance() : OnlyOnceAreaTriggerScript("at_thaddius_entrance") { } - bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance || instance->GetBossState(BOSS_THADDIUS) == DONE) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 1505be8eca0..54ab59570c5 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -932,15 +932,12 @@ class at_skadi_gaunlet : public AreaTriggerScript public: at_skadi_gaunlet() : AreaTriggerScript("at_skadi_gaunlet") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool entered) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance || player->IsGameMaster()) return true; - if (!entered) - return true; - if (instance->GetBossState(DATA_SKADI_THE_RUTHLESS) == NOT_STARTED) if (Creature* skadi = instance->GetCreature(DATA_SKADI_THE_RUTHLESS)) { diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 67a92a10ebc..e65ad2a0ef7 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -715,9 +715,9 @@ class at_nearby_messenger_torvus : public AreaTriggerScript public: at_nearby_messenger_torvus() : AreaTriggerScript("at_nearby_messenger_torvus") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/, bool entered) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/) override { - if (player->IsAlive() && entered) + if (player->IsAlive()) if (Quest const* quest = sObjectMgr->GetQuestTemplate(QUEST_MESSAGE_FROM_THE_WEST)) if (player->CanTakeQuest(quest, false)) if (Creature* creature = player->FindNearestCreature(NPC_MESSENGER_TORVUS, 50.0f, true)) diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index be818237539..6d249b5ba77 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -432,7 +432,7 @@ class at_teron_gorefiend_entrance : public OnlyOnceAreaTriggerScript public: at_teron_gorefiend_entrance() : OnlyOnceAreaTriggerScript("at_teron_gorefiend_entrance") { } - bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool _OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* teron = instance->GetCreature(DATA_TERON_GOREFIEND)) diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp index e5ba669aa7d..383091325f2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -30,7 +30,7 @@ class at_nethekurse_exit : public AreaTriggerScript public: at_nethekurse_exit() : AreaTriggerScript("at_nethekurse_exit") { }; - bool OnTrigger(Player* player, AreaTriggerEntry const*, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const*) override { if (InstanceScript* is = player->GetInstanceScript()) { diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 1c4c9e2ddb8..fc21a287b74 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -317,7 +317,7 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { //if player lost aura or not have at all, we should not try start event. if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index dcde8ef2c7c..7fc6360b3de 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -60,7 +60,7 @@ class AreaTrigger_at_coilfang_waterfall : public AreaTriggerScript public: AreaTrigger_at_coilfang_waterfall() : AreaTriggerScript("at_coilfang_waterfall") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (GameObject* go = GetClosestGameObjectWithEntry(player, GO_COILFANG_WATERFALL, 35.0f)) if (go->getLootState() == GO_READY) @@ -88,7 +88,7 @@ class AreaTrigger_at_legion_teleporter : public AreaTriggerScript public: AreaTrigger_at_legion_teleporter() : AreaTriggerScript("at_legion_teleporter") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->IsAlive() && !player->IsInCombat()) { @@ -126,7 +126,7 @@ class AreaTrigger_at_stormwright_shelf : public AreaTriggerScript public: AreaTrigger_at_stormwright_shelf() : AreaTriggerScript("at_stormwright_shelf") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (!player->isDead() && player->GetQuestStatus(QUEST_STRENGTH_OF_THE_TEMPEST) == QUEST_STATUS_INCOMPLETE) player->CastSpell(player, SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST, false); @@ -150,7 +150,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript public: AreaTrigger_at_scent_larkorwi() : AreaTriggerScript("at_scent_larkorwi") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE) { @@ -184,7 +184,7 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript public: AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override { if (!player->isDead() && (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) != QUEST_STATUS_NONE || (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED))) @@ -221,7 +221,7 @@ class AreaTrigger_at_nats_landing : public AreaTriggerScript public: AreaTrigger_at_nats_landing() : AreaTriggerScript("at_nats_landing") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (!player->IsAlive() || !player->HasAura(SPELL_FISH_PASTE)) return false; @@ -266,7 +266,7 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript _triggerTimes[AT_BREWFEST_DUROTAR] = _triggerTimes[AT_BREWFEST_DUN_MOROGH] = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override { uint32 triggerId = areaTrigger->ID; // Second trigger happened too early after first, skip for now @@ -319,7 +319,7 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript _triggerTimes[AT_AREA_52_SOUTH] = _triggerTimes[AT_AREA_52_NORTH] = _triggerTimes[AT_AREA_52_WEST] = _triggerTimes[AT_AREA_52_EAST] = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override { float x = 0.0f, y = 0.0f, z = 0.0f; @@ -390,7 +390,7 @@ public: stormforgedEradictorGUID.Clear(); } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->GetQuestStatus(QUEST_THE_LONESOME_WATCHER) != QUEST_STATUS_INCOMPLETE) return false; |