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/Kalimdor | |
| 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/Kalimdor')
9 files changed, 12 insertions, 12 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 9f6e4c19c17..713fb0c3ded 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -45,7 +45,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); @@ -70,7 +70,7 @@ class go_blackfathom_fire : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { me->SetGoState(GO_STATE_ACTIVE); me->AddFlag(GO_FLAG_NOT_SELECTABLE); 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 5f0730df796..a754e1a0a05 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -45,7 +45,7 @@ public: InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { if (instance->GetData(TYPE_BARREL_DIVERSION) == DONE) return false; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 6d1f4c70be9..c93b7c55cf7 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -381,7 +381,7 @@ public: InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { me->SendCustomAnim(0); instance->SetData(DATA_WAVE, IN_PROGRESS); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index bb6e986a71e..4dab5047481 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -290,7 +290,7 @@ class go_ossirian_crystal : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { Creature* ossirian = player->FindNearestCreature(NPC_OSSIRIAN, 30.0f); if (!ossirian || instance->GetBossState(DATA_OSSIRIAN) != IN_PROGRESS) diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 3589c70fbec..20caee55834 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -211,7 +211,7 @@ public: InstanceScript* instance; - bool GossipHello(Player* /*player*/, bool /*reportUse*/) override + bool GossipHello(Player* /*player*/) override { instance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN); //set bly & co to aggressive & start moving to top of stairs @@ -410,7 +410,7 @@ public: { 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 5fcf56a797e..d18a3f626d8 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 4bef27b450a..3137e1947c9 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -636,7 +636,7 @@ public: { 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) @@ -816,7 +816,7 @@ class go_bristlelimb_cage : public GameObjectScript { go_bristlelimb_cageAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player, bool /*reportUse*/) override + bool GossipHello(Player* player) override { me->SetGoState(GO_STATE_READY); if (player->GetQuestStatus(QUEST_THE_PROPHECY_OF_AKIDA) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 661eef0ad1f..23e2275b444 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -1239,7 +1239,7 @@ class go_wind_stone : public GameObjectScript } public: - 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 81b79d276cb..fda4714b5a3 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -616,7 +616,7 @@ public: { 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; |
