diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 8c18469c0b2..4de8a0dd2c5 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -13972,35 +13972,13 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId, bool showQues case GossipOptionNpc::CemeterySelect: canTalk = false; // Deprecated break; - case GossipOptionNpc::GuildBanker: - case GossipOptionNpc::Spellclick: - case GossipOptionNpc::WorldPvPQueue: - case GossipOptionNpc::LFGDungeon: - case GossipOptionNpc::ArtifactRespec: - case GossipOptionNpc::QueueScenario: - case GossipOptionNpc::GarrisonArchitect: - case GossipOptionNpc::GarrisonMissionNpc: - case GossipOptionNpc::ShipmentCrafter: - case GossipOptionNpc::GarrisonTradeskillNpc: - case GossipOptionNpc::GarrisonRecruitment: - case GossipOptionNpc::AdventureMap: - case GossipOptionNpc::GarrisonTalent: - case GossipOptionNpc::ContributionCollector: - case GossipOptionNpc::IslandsMissionNpc: - case GossipOptionNpc::UIItemInteraction: - case GossipOptionNpc::WorldMap: - case GossipOptionNpc::Soulbind: - case GossipOptionNpc::ChromieTimeNpc: - case GossipOptionNpc::CovenantPreviewNpc: - case GossipOptionNpc::RuneforgeLegendaryCrafting: - case GossipOptionNpc::NewPlayerGuide: - case GossipOptionNpc::RuneforgeLegendaryUpgrade: - case GossipOptionNpc::CovenantRenownNpc: - break; // NYI default: - TC_LOG_ERROR("sql.sql", "Creature entry {} has an unknown gossip option icon {} for menu {}.", creature->GetEntry(), AsUnderlyingType(gossipMenuItem.OptionNpc), gossipMenuItem.MenuID); - canTalk = false; - break; + if (gossipMenuItem.OptionNpc >= GossipOptionNpc::Count) + { + TC_LOG_ERROR("sql.sql", "Creature entry {} has an unknown gossip option icon {} for menu {}.", creature->GetEntry(), AsUnderlyingType(gossipMenuItem.OptionNpc), gossipMenuItem.MenuID); + canTalk = false; + } + break; // NYI } } else if (GameObject* go = source->ToGameObject()) |