From 9ca8cf66e60c95ec3d20ed2c276623be2bb98713 Mon Sep 17 00:00:00 2001 From: Meji Date: Thu, 7 Jul 2022 16:08:04 +0200 Subject: Core/SAI: Allow using default npc_text from gossip_menu with SMART_ACTION_SEND_GOSSIP_MENU (#28097) --- src/server/game/AI/SmartScripts/SmartScript.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 5f1d187ad8d..63cd9e379dd 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1921,7 +1921,11 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u else player->PlayerTalkClass->ClearMenus(); - player->PlayerTalkClass->SendGossipMenu(e.action.sendGossipMenu.gossipNpcTextId, GetBaseObject()->GetGUID()); + uint32 gossipNpcTextId = e.action.sendGossipMenu.gossipNpcTextId; + if (!gossipNpcTextId) + gossipNpcTextId = player->GetGossipTextId(e.action.sendGossipMenu.gossipMenuId, GetBaseObject()); + + player->PlayerTalkClass->SendGossipMenu(gossipNpcTextId, GetBaseObject()->GetGUID()); } } break; -- cgit v1.2.3