*Use std::map instead of UNORDERED_MAP for storing aura applications of an aura.

--HG--
branch : trunk
This commit is contained in:
QAston
2010-01-18 20:15:23 +01:00
parent 17d407f347
commit f03a2a60e7
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -78,7 +78,7 @@ class AuraApplication
class TRINITY_DLL_SPEC Aura class TRINITY_DLL_SPEC Aura
{ {
public: 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, 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); static Aura * TryCreate(SpellEntry const* spellproto, WorldObject * owner, Unit * caster, int32 *baseAmount = NULL, Item * castItem = NULL, uint64 casterGUID = 0);
+1 -1
View File
@@ -899,7 +899,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
// part of positive spell if casted at self // part of positive spell if casted at self
if(spellproto->EffectImplicitTargetA[effIndex] != TARGET_UNIT_CASTER) if(spellproto->EffectImplicitTargetA[effIndex] != TARGET_UNIT_CASTER)
return false; 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) if(spellproto->Attributes & 0x4000000 && effIndex==0)
return false; return false;
break; break;
+1
View File
@@ -3755,6 +3755,7 @@ void Unit::_UnapplyAura(AuraApplication * aurApp, AuraRemoveMode removeMode)
else else
++iter; ++iter;
} }
assert(false);
} }
void Unit::_RemoveNoStackAuraApplicationsDueToAura(Aura * aura) void Unit::_RemoveNoStackAuraApplicationsDueToAura(Aura * aura)