diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-10-09 18:43:35 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-10-09 18:43:35 +0200 |
| commit | 49709e427360006186744ca52116f9ee35092b83 (patch) | |
| tree | 5bc7daeab68564c94d7d8eb151ebc13e3ceb8a23 /src/server/game/Globals/ObjectMgr.h | |
| parent | fcf2c5c803a9d1b13f6b4cb18c03685aa66be764 (diff) | |
Core/Gossip: Remove gossip menu option fallback code, all menus are now required to have options defined instead of trying to get them from menuid = 0
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index d90701a8c31..91499ba7e40 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -774,8 +774,6 @@ typedef std::multimap<uint32, GossipMenus> GossipMenusContainer; typedef std::pair<GossipMenusContainer::const_iterator, GossipMenusContainer::const_iterator> GossipMenusMapBounds; typedef std::pair<GossipMenusContainer::iterator, GossipMenusContainer::iterator> GossipMenusMapBoundsNonConst; typedef std::multimap<uint32, GossipMenuItems> GossipMenuItemsContainer; -typedef std::pair<GossipMenuItemsContainer::const_iterator, GossipMenuItemsContainer::const_iterator> GossipMenuItemsMapBounds; -typedef std::pair<GossipMenuItemsContainer::iterator, GossipMenuItemsContainer::iterator> GossipMenuItemsMapBoundsNonConst; typedef std::unordered_map<uint32, GossipMenuAddon> GossipMenuAddonContainer; struct QuestPOIBlobPoint @@ -1685,13 +1683,13 @@ class TC_GAME_API ObjectMgr return _gossipMenusStore.equal_range(uiMenuId); } - GossipMenuItemsMapBounds GetGossipMenuItemsMapBounds(uint32 uiMenuId) const + Trinity::IteratorPair<GossipMenuItemsContainer::const_iterator> GetGossipMenuItemsMapBounds(uint32 uiMenuId) const { - return _gossipMenuItemsStore.equal_range(uiMenuId); + return Trinity::Containers::MapEqualRange(_gossipMenuItemsStore, uiMenuId); } - GossipMenuItemsMapBoundsNonConst GetGossipMenuItemsMapBoundsNonConst(uint32 uiMenuId) + Trinity::IteratorPair<GossipMenuItemsContainer::iterator> GetGossipMenuItemsMapBoundsNonConst(uint32 uiMenuId) { - return _gossipMenuItemsStore.equal_range(uiMenuId); + return Trinity::Containers::MapEqualRange(_gossipMenuItemsStore, uiMenuId); } GossipMenuAddon const* GetGossipMenuAddon(uint32 menuId) const { |