Core/SAI: Allow using default npc_text from gossip_menu with SMART_ACTION_SEND_GOSSIP_MENU
Port From (https://github.com/TrinityCore/TrinityCore/commit/9ca8cf66e60c95ec3d20ed2c276623be2bb98713)
This commit is contained in:
@@ -1902,7 +1902,11 @@ namespace Game.AI
|
|||||||
else
|
else
|
||||||
player.PlayerTalkClass.ClearMenus();
|
player.PlayerTalkClass.ClearMenus();
|
||||||
|
|
||||||
player.PlayerTalkClass.SendGossipMenu(e.Action.sendGossipMenu.gossipNpcTextId, GetBaseObject().GetGUID());
|
uint gossipNpcTextId = e.Action.sendGossipMenu.gossipNpcTextId;
|
||||||
|
if (gossipNpcTextId == 0)
|
||||||
|
gossipNpcTextId = player.GetGossipTextId(e.Action.sendGossipMenu.gossipMenuId, GetBaseObject());
|
||||||
|
|
||||||
|
player.PlayerTalkClass.SendGossipMenu(gossipNpcTextId, GetBaseObject().GetGUID());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -2581,6 +2581,7 @@ namespace Game.Entities
|
|||||||
|
|
||||||
ModifyMoney(-cost);
|
ModifyMoney(-cost);
|
||||||
}
|
}
|
||||||
|
|
||||||
public uint GetGossipTextId(WorldObject source)
|
public uint GetGossipTextId(WorldObject source)
|
||||||
{
|
{
|
||||||
if (source == null)
|
if (source == null)
|
||||||
@@ -2588,7 +2589,8 @@ namespace Game.Entities
|
|||||||
|
|
||||||
return GetGossipTextId(GetDefaultGossipMenuForSource(source), source);
|
return GetGossipTextId(GetDefaultGossipMenuForSource(source), source);
|
||||||
}
|
}
|
||||||
uint GetGossipTextId(uint menuId, WorldObject source)
|
|
||||||
|
public uint GetGossipTextId(uint menuId, WorldObject source)
|
||||||
{
|
{
|
||||||
uint textId = SharedConst.DefaultGossipMessage;
|
uint textId = SharedConst.DefaultGossipMessage;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user