aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-06-06 15:36:01 -0300
committerariel- <ariel-@users.noreply.github.com>2017-06-06 17:57:04 -0300
commit2335b9de1a46a409c714a1dc89cbd0565545e70e (patch)
treed711b7cf6206e5dde3432dd4d0accae5b8243135 /src/server/scripts/Kalimdor
parent47d54bf5e20617d04055e1102e7688fb93e9f985 (diff)
Core/AI: segregate GameObject ReportUse from normal Use (lock open/normal click)
Closes #19819
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp2
-rw-r--r--src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp2
-rw-r--r--src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp2
-rw-r--r--src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp4
-rw-r--r--src/server/scripts/Kalimdor/zone_ashenvale.cpp2
-rw-r--r--src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp4
-rw-r--r--src/server/scripts/Kalimdor/zone_desolace.cpp2
-rw-r--r--src/server/scripts/Kalimdor/zone_silithus.cpp2
-rw-r--r--src/server/scripts/Kalimdor/zone_thousand_needles.cpp2
-rw-r--r--src/server/scripts/Kalimdor/zone_winterspring.cpp2
11 files changed, 14 insertions, 14 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index 0313a58f8d5..b2d7f9cc166 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);
@@ -68,7 +68,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->SetFlag(GAMEOBJECT_FLAGS, 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 380971d6aa5..34072f03975 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
@@ -44,7 +44,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 02b395eb3b3..3771a6bfbc7 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 66a6c3b42e6..6d0001bac73 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -285,7 +285,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 87e4f8ba095..6539decdd56 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -207,7 +207,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
@@ -406,7 +406,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 738e647bad0..35fb7d4f418 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 ac0311b6dcd..2cd1176bbc0 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -637,7 +637,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)
@@ -817,7 +817,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_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index f32de9fef7b..0b0264439ff 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -146,7 +146,7 @@ class go_iruxos : public GameObjectScript
{
go_iruxosAI(GameObject* go) : GameObjectAI(go) { }
- bool GossipHello(Player* player, bool /*reportUse*/) override
+ bool GossipHello(Player* player) override
{
if (player->GetQuestStatus(QUEST_HAND_IRUXOS) == QUEST_STATUS_INCOMPLETE && !me->FindNearestCreature(NPC_DEMON_SPIRIT, 25.0f, true))
player->SummonCreature(NPC_DEMON_SPIRIT, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index 5fca1e46ee7..436e75ccffa 100644
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -1236,7 +1236,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_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp
index dcbf970594c..d8d48f566bc 100644
--- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp
+++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp
@@ -279,7 +279,7 @@ public:
{
go_panther_cageAI(GameObject* go) : GameObjectAI(go) { }
- bool GossipHello(Player* player, bool /*reportUse*/) override
+ bool GossipHello(Player* player) override
{
me->UseDoorOrButton();
if (player->GetQuestStatus(QUEST_HYPERCAPACITOR_GIZMO) == QUEST_STATUS_INCOMPLETE)
diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index 4b166bbde01..40e2dc6e6fd 100644
--- a/src/server/scripts/Kalimdor/zone_winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
@@ -614,7 +614,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;