aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-06-06 20:36:01 +0200
committerCarbenium <carbenium@outlook.com>2020-07-16 21:47:28 +0200
commit5903a10a834b1198702b024182581799648540ff (patch)
treebf13bff656fdae5ee6028b4db2ba32e0b6ddf6a5 /src/server/scripts/Outland
parentf27b7ba2855f1d3a707dc0bdd15ca38546a4c321 (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/Outland')
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp2
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp2
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp2
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp2
-rw-r--r--src/server/scripts/Outland/zone_blades_edge_mountains.cpp6
-rw-r--r--src/server/scripts/Outland/zone_nagrand.cpp4
-rw-r--r--src/server/scripts/Outland/zone_netherstorm.cpp2
-rw-r--r--src/server/scripts/Outland/zone_terokkar_forest.cpp2
10 files changed, 13 insertions, 13 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index 35ff1fd862c..f37cc338f65 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -182,7 +182,7 @@ public:
InstanceScript* instance;
- bool GossipHello(Player* player, bool /*reportUse*/) override
+ bool GossipHello(Player* player) override
{
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 f4d74f49f83..75713f960a3 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -444,7 +444,7 @@ class go_strange_pool : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* player, bool /*reportUse*/) override
+ bool GossipHello(Player* player) override
{
// 25%
if (!urand(0, 3))
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 7a60b41ecec..590ec8ad523 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -73,7 +73,7 @@ class go_bridge_console : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* /*player*/, bool /*reportUse*/) override
+ bool GossipHello(Player* /*player*/) override
{
if (instance)
instance->SetData(DATA_CONTROL_CONSOLE, DONE);
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 3569426d8d1..17f089c50c6 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -34,7 +34,7 @@ class go_main_chambers_access_panel : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* /*player*/, bool /*reportUse*/) override
+ bool GossipHello(Player* /*player*/) override
{
if (me->GetEntry() == GO_ACCESS_PANEL_HYDRO && (instance->GetBossState(DATA_HYDROMANCER_THESPIA) == DONE || instance->GetBossState(DATA_HYDROMANCER_THESPIA) == SPECIAL))
instance->SetBossState(DATA_HYDROMANCER_THESPIA, SPECIAL);
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index 789472f2a29..b58011d0494 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -138,7 +138,7 @@ class go_broggok_lever : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* /*player*/, bool /*reportUse*/) override
+ bool GossipHello(Player* /*player*/) override
{
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 e61d5186fbf..1af69e9bd94 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -472,7 +472,7 @@ public:
{
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 97e7e8e9460..2d36c3e246c 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -303,7 +303,7 @@ public:
{
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)
{
@@ -890,7 +890,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);
@@ -926,7 +926,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 55e129504e6..67098547d0e 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -295,7 +295,7 @@ public:
{
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)
@@ -613,7 +613,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 9ef66707d03..6b74490e9dd 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -687,7 +687,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 7d519c434a4..cb3666e6261 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -550,7 +550,7 @@ public:
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))
{