Skip to content

Commit

Permalink
[z1511] Use equal_range instead of lower_bound/upper_bound pairs
Browse files Browse the repository at this point in the history
(based on zergtmn's repo commit 0499169)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>

(based on master commit 4540e7f)

Re-apply for aura part

(based on commit fdae910)
  • Loading branch information
technoir42 authored and VladimirMangos committed Apr 21, 2011
1 parent 5955057 commit f85ab71
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 0 additions & 3 deletions src/game/ObjectMgr.h
Expand Up @@ -713,9 +713,6 @@ class ObjectMgr
return "There is no info for this item";
}

typedef std::multimap<int32, uint32> ExclusiveQuestGroups;
ExclusiveQuestGroups mExclusiveQuestGroups;

WeatherZoneChances const* GetWeatherChances(uint32 zone_id) const
{
WeatherZoneMap::const_iterator itr = mWeatherZoneMap.find(zone_id);
Expand Down
4 changes: 2 additions & 2 deletions src/game/Unit.h
Expand Up @@ -1226,11 +1226,11 @@ class MANGOS_DLL_SPEC Unit : public WorldObject

SpellAuraHolderBounds GetSpellAuraHolderBounds(uint32 spell_id)
{
return SpellAuraHolderBounds(m_spellAuraHolders.lower_bound(spell_id), m_spellAuraHolders.upper_bound(spell_id));
return m_spellAuraHolders.equal_range(spell_id);
}
SpellAuraHolderConstBounds GetSpellAuraHolderBounds(uint32 spell_id) const
{
return SpellAuraHolderConstBounds(m_spellAuraHolders.lower_bound(spell_id), m_spellAuraHolders.upper_bound(spell_id));
return m_spellAuraHolders.equal_range(spell_id);
}

bool HasAuraType(AuraType auraType) const;
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "1510"
#define REVISION_NR "1511"
#endif // __REVISION_NR_H__

0 comments on commit f85ab71

Please sign in to comment.