diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-02-24 15:52:09 -0300 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-08-08 21:21:34 +0200 |
| commit | a1a00f823e7e47e8cb652b71a839c1d0875a8f84 (patch) | |
| tree | ddffcb6efbfed6d4d27d8dd9320e552365a34545 /src/server/game/Globals/ObjectMgr.h | |
| parent | 30f8adda86f0c4376595866607a2e03cc88406eb (diff) | |
Core/Entities: kill unused return value from Unit::HandleSpellClick
- AI hook will now receive the result by copy, as modifying it had no effect
- Some renaming: result->spellClickHandled, clickPair is actually clickBounds, the clickPair is the pair <creatureID, SpellClickInfo>
(cherry picked from commit 98d6258efdc07b53808ba6177e5427c65163bc0d)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index abd56dd76b1..85ac73d7cf3 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -454,7 +454,6 @@ struct TC_GAME_API SpellClickInfo }; typedef std::multimap<uint32, SpellClickInfo> SpellClickInfoContainer; -typedef std::pair<SpellClickInfoContainer::const_iterator, SpellClickInfoContainer::const_iterator> SpellClickInfoMapBounds; struct AreaTriggerStruct { @@ -1580,9 +1579,9 @@ class TC_GAME_API ObjectMgr std::string const& GetScriptName(uint32 id) const; uint32 GetScriptId(std::string const& name); - SpellClickInfoMapBounds GetSpellClickInfoMapBounds(uint32 creature_id) const + Trinity::IteratorPair<SpellClickInfoContainer::const_iterator> GetSpellClickInfoMapBounds(uint32 creature_id) const { - return _spellClickInfoStore.equal_range(creature_id); + return Trinity::Containers::MapEqualRange(_spellClickInfoStore, creature_id); } GossipMenusMapBounds GetGossipMenusMapBounds(uint32 uiMenuId) const |