diff options
| -rwxr-xr-x | src/server/game/Entities/Creature/GossipDef.h | 4 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h index 8b8c7940e7f..07ac9423732 100755 --- a/src/server/game/Entities/Creature/GossipDef.h +++ b/src/server/game/Entities/Creature/GossipDef.h @@ -180,7 +180,7 @@ class GossipMenu return _menuItems.empty(); } - GossipMenuItem const* GetItem(unsigned int id) const + GossipMenuItem const* GetItem(uint32 id) const { GossipMenuItemContainer::const_iterator itr = _menuItems.find(id); if (itr != _menuItems.end()) @@ -189,7 +189,7 @@ class GossipMenu return NULL; } - GossipMenuItemData const* GetItemData(unsigned int indexId) const + GossipMenuItemData const* GetItemData(uint32 indexId) const { GossipMenuItemDataContainer::const_iterator itr = _menuItemData.find(indexId); if (itr != _menuItemData.end()) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index e83819c8df1..49648235e37 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -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; |