From 09568736134372ec1a79b936a248eec30f071c8d Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 12 Mar 2023 00:13:49 +0100 Subject: Core/Creatures: Allow overriding default gossip menu id --- src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp | 2 +- src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp | 2 +- src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 0c3e4a25620..c520cdd56d7 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -104,7 +104,7 @@ class npc_voljin_zulaman : public CreatureScript if (_instance->GetData(DATA_ZULAMAN_STATE) != NOT_STARTED) return true; - if (me->GetCreatureTemplate()->GossipMenuId == menuId && !gossipListId) + if (me->GetGossipMenuId() == menuId && !gossipListId) { _events.Reset(); me->SetMountDisplayId(0); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index 0700ce2ffbd..9258359eb16 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -336,7 +336,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript if (_instance->GetBossState(DATA_VAULT_OF_LIGHTS) == DONE) return true; - if (me->GetCreatureTemplate()->GossipMenuId == sender && !action) + if (me->GetGossipMenuId() == sender && !action) { _instance->SetBossState(DATA_VAULT_OF_LIGHTS, IN_PROGRESS); _currentPoint = 0; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index c0e2bd0262b..eadbf4252cb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -1193,7 +1193,7 @@ struct npc_tirion_fordring_tft : public ScriptedAI bool OnGossipSelect(Player* /*player*/, uint32 menuId, uint32 gossipListId) override { - if (me->GetCreatureTemplate()->GossipMenuId == menuId && !gossipListId) + if (me->GetGossipMenuId() == menuId && !gossipListId) { _events.SetPhase(PHASE_INTRO); me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); -- cgit v1.2.3