josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Gossip: Fixed remaining issues with gossip menu items

Browse Source
This commit is contained in:
Shauren
2011-05-27 14:22:36 +02:00
parent bc2cca0733
commit 889cdda614
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+4 -7
View File
@@ -14115,16 +14115,13 @@ void Player::SendPreparedGossip(WorldObject* source)
void Player::OnGossipSelect(WorldObject* source, uint32 gossipListId, uint32 menuId)
{
GossipMenu& gossipmenu = PlayerTalkClass->GetGossipMenu();
if (gossipListId >= gossipmenu.GetMenuItemCount())
return;
GossipMenu& gossipMenu = PlayerTalkClass->GetGossipMenu();
// if not same, then something funky is going on
if (menuId != gossipmenu.GetMenuId())
if (menuId != gossipMenu.GetMenuId())
return;
GossipMenuItem const* item = gossipmenu.GetItem(gossipListId);
GossipMenuItem const* item = gossipMenu.GetItem(gossipListId);
if (!item)
return;
@@ -14140,7 +14137,7 @@ void Player::OnGossipSelect(WorldObject* source, uint32 gossipListId, uint32 men
}
}
GossipMenuItemData const* menuItemData = gossipmenu.GetItemData(gossipListId);
GossipMenuItemData const* menuItemData = gossipMenu.GetItemData(gossipListId);
if (!menuItemData)
return;