Remove reportUse parameter on GameObjectAI::GossipHello and give it its own event.
Ported from 3.3.5
This commit is contained in:
1 parent
843c21048a
commit
c8aeadc949
48 files changed
+99
-87
No files matched your search
@@ -385,7 +385,7 @@ class go_prince_taldaram_sphere : public GameObjectScript
|
||||
{
|
||||
go_prince_taldaram_sphereAI(GameObject* go) : GameObjectAI(go) { }
|
||||
|
||||
bool GossipHello(Player* /*player*/, bool /*reportUse*/) override
|
||||
bool GossipHello(Player* /*player*/) override
|
||||
{
|
||||
InstanceScript* instance = me->GetInstanceScript();
|
||||
if (!instance)
|
||||
|
||||
@@ -1364,7 +1364,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);
|
||||
|
||||
@@ -355,7 +355,7 @@ class go_gundrak_altar : public GameObjectScript
|
||||
{
|
||||
go_gundrak_altarAI(GameObject* go) : GameObjectAI(go) { }
|
||||
|
||||
bool GossipHello(Player* /*player*/, bool /*reportUse*/) override
|
||||
bool GossipHello(Player* /*player*/) override
|
||||
{
|
||||
me->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
|
||||
me->SetGoState(GO_STATE_ACTIVE);
|
||||
|
||||
@@ -229,7 +229,7 @@ public:
|
||||
{
|
||||
containment_sphereAI(GameObject* go) : GameObjectAI(go) { }
|
||||
|
||||
bool GossipHello(Player* /*player*/, bool /*reportUse*/) override
|
||||
bool GossipHello(Player* /*player*/) override
|
||||
{
|
||||
InstanceScript* instance = me->GetInstanceScript();
|
||||
|
||||
|
||||
@@ -979,7 +979,7 @@ class go_celestial_planetarium_access : public GameObjectScript
|
||||
{
|
||||
}
|
||||
|
||||
bool GossipHello(Player* player, bool /*reportUse*/) override
|
||||
bool GossipHello(Player* player) override
|
||||
{
|
||||
if (me->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE))
|
||||
return true;
|
||||
|
||||
@@ -1650,7 +1650,7 @@ class go_mimiron_hardmode_button : public GameObjectScript
|
||||
{
|
||||
go_mimiron_hardmode_buttonAI(GameObject* go) : GameObjectAI(go) { }
|
||||
|
||||
bool GossipHello(Player* /*player*/, bool /*reportUse*/) override
|
||||
bool GossipHello(Player* /*player*/) override
|
||||
{
|
||||
if (me->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE))
|
||||
return true;
|
||||
|
||||
@@ -321,7 +321,7 @@ class go_razorscale_harpoon : public GameObjectScript
|
||||
{
|
||||
go_razorscale_harpoonAI(GameObject* go) : GameObjectAI(go) { }
|
||||
|
||||
bool GossipHello(Player* /*player*/, bool /*reportUse*/) override
|
||||
bool GossipHello(Player* /*player*/) override
|
||||
{
|
||||
if (InstanceScript* instance = me->GetInstanceScript())
|
||||
if (instance->GetCreature(BOSS_RAZORSCALE))
|
||||
|
||||
@@ -560,7 +560,7 @@ public:
|
||||
{
|
||||
go_palehoof_sphereAI(GameObject* go) : GameObjectAI(go) { }
|
||||
|
||||
bool GossipHello(Player* /*player*/, bool /*reportUse*/) override
|
||||
bool GossipHello(Player* /*player*/) override
|
||||
{
|
||||
if (InstanceScript* instance = me->GetInstanceScript())
|
||||
{
|
||||
|
||||
@@ -1315,7 +1315,7 @@ class go_activation_crystal : public GameObjectScript
|
||||
{
|
||||
go_blackfathom_altarAI(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;
|
||||
|
||||
@@ -309,7 +309,7 @@ class go_scourge_enclosure : public GameObjectScript
|
||||
{
|
||||
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)
|
||||
@@ -595,7 +595,7 @@ class go_finklesteins_cauldron : public GameObjectScript
|
||||
{
|
||||
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;
|
||||
|
||||
Reference in new issue
Block a user