diff options
| author | QAston <none@none> | 2010-01-18 20:15:23 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2010-01-18 20:15:23 +0100 |
| commit | f03a2a60e7c40a5ac1bac2ddb576b3c4d0ed9027 (patch) | |
| tree | dcb8cf1ea841c5374a563c4920c4bff81245d3a8 | |
| parent | 17d407f347ff67736a79612c81fced98cb4fc114 (diff) | |
*Use std::map instead of UNORDERED_MAP for storing aura applications of an aura.
--HG--
branch : trunk
| -rw-r--r-- | src/game/SpellAuras.h | 2 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 2 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index 1d0900c437e..8d0a11c4877 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -78,7 +78,7 @@ class AuraApplication class TRINITY_DLL_SPEC Aura { public: - typedef UNORDERED_MAP<uint64, AuraApplication *> ApplicationMap; + typedef std::map<uint64, AuraApplication *> ApplicationMap; static Aura * TryCreate(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount = NULL, Item * castItem = NULL, uint64 casterGUID = 0); static Aura * TryCreate(SpellEntry const* spellproto, WorldObject * owner, Unit * caster, int32 *baseAmount = NULL, Item * castItem = NULL, uint64 casterGUID = 0); diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index d0255983de7..da9adc00d2c 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -899,7 +899,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con // part of positive spell if casted at self if(spellproto->EffectImplicitTargetA[effIndex] != TARGET_UNIT_CASTER) return false; - // but not this if this first effect (didn't find batter check) + // but not this if this first effect (didn't find better check) if(spellproto->Attributes & 0x4000000 && effIndex==0) return false; break; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e52faf0e875..232438ebf40 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -3755,6 +3755,7 @@ void Unit::_UnapplyAura(AuraApplication * aurApp, AuraRemoveMode removeMode) else ++iter; } + assert(false); } void Unit::_RemoveNoStackAuraApplicationsDueToAura(Aura * aura) |