diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-06-06 20:36:01 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2020-07-16 21:47:28 +0200 |
| commit | 5903a10a834b1198702b024182581799648540ff (patch) | |
| tree | bf13bff656fdae5ee6028b4db2ba32e0b6ddf6a5 /src/server/scripts/Northrend | |
| parent | f27b7ba2855f1d3a707dc0bdd15ca38546a4c321 (diff) | |
Core/AI: segregate GameObject ReportUse from normal Use (lock open/normal click)
Closes #19819
(cherry picked from commit 2335b9de1a46a409c714a1dc89cbd0565545e70e)
Diffstat (limited to 'src/server/scripts/Northrend')
10 files changed, 11 insertions, 11 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 9f432b27710..138b9e99356 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -393,7 +393,7 @@ class go_prince_taldaram_sphere : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { Creature* princeTaldaram = ObjectAccessor::GetCreature(*me, instance->GetGuidData(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 edd9982f0ef..309168ea52b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1373,7 +1373,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 224a6eb71d0..0a509af074b 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -359,7 +359,7 @@ class go_gundrak_altar : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { me->AddFlag(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 c9c25237ab2..e5988fe47b2 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -227,7 +227,7 @@ public: InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { Creature* keristrasza = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_KERISTRASZA)); if (keristrasza && keristrasza->IsAlive()) 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 201655985d1..f1ec20ef871 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 @@ -987,7 +987,7 @@ class go_celestial_planetarium_access : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { if (me->HasFlag(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 b23e296f0df..adaf0210e54 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1655,7 +1655,7 @@ class go_mimiron_hardmode_button : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (me->HasFlag(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 7be82bc4cf1..cc0facb9561 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -328,7 +328,7 @@ class go_razorscale_harpoon : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (instance->GetCreature(BOSS_RAZORSCALE)) me->AddFlag(GO_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 2eefd7e4b22..4664f201ab3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -567,7 +567,7 @@ public: InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(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 bd5e68d1fbb..4f533f1d7cb 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -1304,7 +1304,7 @@ class go_activation_crystal : public GameObjectScript { go_activation_crystalAI(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 4e1079eccc7..fc060ea7d08 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -312,7 +312,7 @@ public: { 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) @@ -597,7 +597,7 @@ public: { 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; |
