josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*use ASSERT macro instead of regular assert for better output.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2010-07-30 20:04:28 +02:00
parent 3dc29732b7
commit 48b360097c
50 changed files with 261 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+4 -4
View File
@@ -878,7 +878,7 @@ void AuraEffect::CalculateSpellMod()
{
m_spellmod = new SpellModifier(GetBase());
m_spellmod->op = SpellModOp(GetMiscValue());
assert(m_spellmod->op < MAX_SPELLMOD);
ASSERT(m_spellmod->op < MAX_SPELLMOD);
m_spellmod->type = SpellModType(GetAuraType()); // SpellModType value == spell aura types
m_spellmod->spellId = GetId();
@@ -917,7 +917,7 @@ void AuraEffect::ChangeAmount(int32 newAmount, bool mark)
void AuraEffect::HandleEffect(AuraApplication const * aurApp, uint8 mode, bool apply)
{
// check if call is correct
assert(!mode
ASSERT(!mode
|| mode == AURA_EFFECT_HANDLE_REAL
|| mode == AURA_EFFECT_HANDLE_SEND_FOR_CLIENT
|| mode == AURA_EFFECT_HANDLE_CHANGE_AMOUNT
@@ -933,7 +933,7 @@ void AuraEffect::HandleEffect(AuraApplication const * aurApp, uint8 mode, bool a
void AuraEffect::HandleEffect(Unit * target, uint8 mode, bool apply)
{
AuraApplication const * aurApp = GetBase()->GetApplicationOfTarget(target->GetGUID());
assert(aurApp);
ASSERT(aurApp);
HandleEffect(aurApp, mode, apply);
}
@@ -1169,7 +1169,7 @@ void AuraEffect::UpdatePeriodic(Unit * caster)
bool AuraEffect::IsPeriodicTickCrit(Unit * target, Unit const * caster) const
{
assert(caster);
ASSERT(caster);
Unit::AuraEffectList const& mPeriodicCritAuras= caster->GetAuraEffectsByType(SPELL_AURA_ABILITY_PERIODIC_CRIT);
for (Unit::AuraEffectList::const_iterator itr = mPeriodicCritAuras.begin(); itr != mPeriodicCritAuras.end(); ++itr)
{
src/server/game/Spells/Auras/SpellAuras.cpp
+36 -36
View File
@@ -39,7 +39,7 @@ AuraApplication::AuraApplication(Unit * target, Unit * caster, Aura * aura, uint
: m_target(target), m_base(aura), m_slot(MAX_AURAS), m_flags(AFLAG_NONE), m_needClientUpdate(false)
, m_removeMode(AURA_REMOVE_NONE), m_effectsToApply(effMask)
{
assert(GetTarget() && GetBase());
ASSERT(GetTarget() && GetBase());
if (GetBase()->IsVisible())
{
@@ -137,9 +137,9 @@ bool AuraApplication::_CheckPositive(Unit * /*caster*/) const
void AuraApplication::_HandleEffect(uint8 effIndex, bool apply)
{
AuraEffect * aurEff = GetBase()->GetEffect(effIndex);
assert(aurEff);
assert(HasEffect(effIndex) == (!apply));
assert((1<<effIndex) & m_effectsToApply);
ASSERT(aurEff);
ASSERT(HasEffect(effIndex) == (!apply));
ASSERT((1<<effIndex) & m_effectsToApply);
sLog.outDebug("AuraApplication::_HandleEffect: %u, apply: %u: amount: %u", aurEff->GetAuraType(), apply, aurEff->GetAmount());
Unit * caster = GetBase()->GetCaster();
@@ -177,13 +177,13 @@ void AuraApplication::ClientUpdate(bool remove)
if (remove)
{
assert(!m_target->GetVisibleAura(m_slot));
ASSERT(!m_target->GetVisibleAura(m_slot));
data << uint32(0);
sLog.outDebug("Aura %u removed slot %u",GetBase()->GetId(), m_slot);
m_target->SendMessageToSet(&data, true);
return;
}
assert(m_target->GetVisibleAura(m_slot));
ASSERT(m_target->GetVisibleAura(m_slot));
Aura const * aura = GetBase();
data << uint32(aura->GetId());
@@ -208,10 +208,10 @@ void AuraApplication::ClientUpdate(bool remove)
Aura * Aura::TryCreate(SpellEntry const* spellproto, uint8 tryEffMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID)
{
assert(spellproto);
assert(owner);
assert(caster || casterGUID);
assert(tryEffMask <= MAX_EFFECT_MASK);
ASSERT(spellproto);
ASSERT(owner);
ASSERT(caster || casterGUID);
ASSERT(tryEffMask <= MAX_EFFECT_MASK);
uint8 effMask = 0;
switch(owner->GetTypeId())
{
@@ -238,9 +238,9 @@ Aura * Aura::TryCreate(SpellEntry const* spellproto, uint8 tryEffMask, WorldObje
Aura * Aura::TryCreate(SpellEntry const* spellproto, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID)
{
assert(spellproto);
assert(owner);
assert(caster || casterGUID);
ASSERT(spellproto);
ASSERT(owner);
ASSERT(caster || casterGUID);
uint8 effMask = 0;
switch(owner->GetTypeId())
{
@@ -267,11 +267,11 @@ Aura * Aura::TryCreate(SpellEntry const* spellproto, WorldObject * owner, Unit *
Aura * Aura::Create(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID)
{
assert(effMask);
assert(spellproto);
assert(owner);
assert(caster || casterGUID);
assert(effMask <= MAX_EFFECT_MASK);
ASSERT(effMask);
ASSERT(spellproto);
ASSERT(owner);
ASSERT(caster || casterGUID);
ASSERT(effMask <= MAX_EFFECT_MASK);
// try to get caster of aura
if (casterGUID)
{
@@ -291,7 +291,7 @@ Aura * Aura::Create(SpellEntry const* spellproto, uint8 effMask, WorldObject * o
aura = new DynObjAura(spellproto,effMask,owner,caster,baseAmount,castItem, casterGUID);
break;
default:
assert(false);
ASSERT(false);
return NULL;
}
// aura can be removed in Unit::_AddAura call
@@ -345,7 +345,7 @@ Aura::~Aura()
for (uint8 i = 0 ; i < MAX_SPELL_EFFECTS; ++i)
delete m_effects[i];
assert(m_applications.empty());
ASSERT(m_applications.empty());
_DeleteRemovedApplications();
}
@@ -366,10 +366,10 @@ AuraObjectType Aura::GetType() const
void Aura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * auraApp)
{
assert(target);
assert(auraApp);
ASSERT(target);
ASSERT(auraApp);
// aura mustn't be already applied
assert (m_applications.find(target->GetGUID()) == m_applications.end());
ASSERT (m_applications.find(target->GetGUID()) == m_applications.end());
m_applications[target->GetGUID()] = auraApp;
@@ -386,9 +386,9 @@ void Aura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * auraA
void Aura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * auraApp)
{
assert(target);
assert(auraApp->GetRemoveMode());
assert(auraApp);
ASSERT(target);
ASSERT(auraApp->GetRemoveMode());
ASSERT(auraApp);
ApplicationMap::iterator itr = m_applications.find(target->GetGUID());
// TODO: Figure out why this happens.
@@ -401,7 +401,7 @@ void Aura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * aur
m_applications.erase(itr);
// aura has to be already applied
//assert(itr->second == auraApp);
//ASSERT(itr->second == auraApp);
m_removedApplications.push_back(auraApp);
// reset cooldown state for spells
@@ -417,7 +417,7 @@ void Aura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * aur
// and marks aura as removed
void Aura::_Remove(AuraRemoveMode removeMode)
{
assert (!m_isRemoved);
ASSERT (!m_isRemoved);
m_isRemoved = true;
ApplicationMap::iterator appItr = m_applications.begin();
for (appItr = m_applications.begin(); appItr != m_applications.end();)
@@ -506,7 +506,7 @@ void Aura::UpdateTargetMap(Unit * caster, bool apply)
else
{
// owner has to be in world, or effect has to be applied to self
assert((!GetOwner()->IsInWorld() && GetOwner() == itr->first) || GetOwner()->IsInMap(itr->first));
ASSERT((!GetOwner()->IsInWorld() && GetOwner() == itr->first) || GetOwner()->IsInMap(itr->first));
itr->first->_CreateAuraApplication(this, itr->second);
++itr;
}
@@ -528,7 +528,7 @@ void Aura::UpdateTargetMap(Unit * caster, bool apply)
if (AuraApplication * aurApp = GetApplicationOfTarget(itr->first->GetGUID()))
{
// owner has to be in world, or effect has to be applied to self
assert((!GetOwner()->IsInWorld() && GetOwner() == itr->first) || GetOwner()->IsInMap(itr->first));
ASSERT((!GetOwner()->IsInWorld() && GetOwner() == itr->first) || GetOwner()->IsInMap(itr->first));
itr->first->_ApplyAura(aurApp, itr->second);
}
}
@@ -552,14 +552,14 @@ void Aura::_ApplyEffectForTargets(uint8 effIndex)
if (GetApplicationOfTarget((*itr)->GetGUID()))
{
// owner has to be in world, or effect has to be applied to self
assert((!GetOwner()->IsInWorld() && GetOwner() == *itr) || GetOwner()->IsInMap(*itr));
ASSERT((!GetOwner()->IsInWorld() && GetOwner() == *itr) || GetOwner()->IsInMap(*itr));
(*itr)->_ApplyAuraEffect(this, effIndex);
}
}
}
void Aura::UpdateOwner(uint32 diff, WorldObject * owner)
{
assert(owner == m_owner);
ASSERT(owner == m_owner);
Unit * caster = GetCaster();
// Apply spellmods for channeled auras
@@ -759,7 +759,7 @@ bool Aura::IsVisible() const
void Aura::UnregisterSingleTarget()
{
assert(m_isSingleTarget);
ASSERT(m_isSingleTarget);
Unit * caster = GetCaster();
caster->GetSingleCastAuras().remove(this);
SetIsSingleTarget(false);
@@ -795,7 +795,7 @@ bool Aura::HasEffectType(AuraType type) const
void Aura::RecalculateAmountOfEffects()
{
assert (!IsRemoved());
ASSERT (!IsRemoved());
Unit * caster = GetCaster();
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
if (m_effects[i])
@@ -804,7 +804,7 @@ void Aura::RecalculateAmountOfEffects()
void Aura::HandleAllEffects(AuraApplication const * aurApp, uint8 mode, bool apply)
{
assert (!IsRemoved());
ASSERT (!IsRemoved());
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
if (m_effects[i] && !IsRemoved())
m_effects[i]->HandleEffect(aurApp, mode, apply);
@@ -1492,7 +1492,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
bool Aura::CheckAreaTarget(Unit *target)
{
// for owner check use Spell::CheckTarget
assert(GetOwner() != target);
ASSERT(GetOwner() != target);
// some special cases
switch(GetId())
src/server/game/Spells/Auras/SpellAuras.h
+4 -4
View File
@@ -65,7 +65,7 @@ class AuraApplication
uint8 GetSlot() const { return m_slot; }
uint8 GetFlags() const { return m_flags; }
uint8 GetEffectMask() const { return m_flags & (AFLAG_EFF_INDEX_0 | AFLAG_EFF_INDEX_1 | AFLAG_EFF_INDEX_2); }
bool HasEffect(uint8 effect) const { assert(effect < MAX_SPELL_EFFECTS); return m_flags & (1<<effect); }
bool HasEffect(uint8 effect) const { ASSERT(effect < MAX_SPELL_EFFECTS); return m_flags & (1<<effect); }
bool IsPositive() const { return m_flags & AFLAG_POSITIVE; }
uint8 GetEffectsToApply() const { return m_effectsToApply; }
@@ -95,8 +95,8 @@ class Aura
uint64 const& GetCasterGUID() const { return m_casterGuid; }
Unit* GetCaster() const;
WorldObject * GetOwner() const { return m_owner; }
Unit * GetUnitOwner() const { assert(GetType() == UNIT_AURA_TYPE); return (Unit*)m_owner; }
DynamicObject * GetDynobjOwner() const { assert(GetType() == DYNOBJ_AURA_TYPE); return (DynamicObject*)m_owner; }
Unit * GetUnitOwner() const { ASSERT(GetType() == UNIT_AURA_TYPE); return (Unit*)m_owner; }
DynamicObject * GetDynobjOwner() const { ASSERT(GetType() == DYNOBJ_AURA_TYPE); return (DynamicObject*)m_owner; }
AuraObjectType GetType() const;
@@ -150,7 +150,7 @@ class Aura
// helpers for aura effects
bool HasEffect(uint8 effIndex) const { return bool(GetEffect(effIndex)); }
bool HasEffectType(AuraType type) const;
AuraEffect * GetEffect (uint8 effIndex) const { assert (effIndex < MAX_SPELL_EFFECTS); return m_effects[effIndex]; }
AuraEffect * GetEffect (uint8 effIndex) const { ASSERT (effIndex < MAX_SPELL_EFFECTS); return m_effects[effIndex]; }
uint8 GetEffectMask() const { uint8 effMask = 0; for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (m_effects[i]) effMask |= 1<<i; return effMask; }
void RecalculateAmountOfEffects();
void HandleAllEffects(AuraApplication const * aurApp, uint8 mode, bool apply);
src/server/game/Spells/Spell.cpp
+3 -3
View File
@@ -467,13 +467,13 @@ Spell::~Spell()
if (m_referencedFromCurrentSpell && m_selfContainer && *m_selfContainer == this)
{
// Clean the reference to avoid later crash.
// If this error is repeating, we may have to add an assert to better track down how we get into this case.
// If this error is repeating, we may have to add an ASSERT to better track down how we get into this case.
sLog.outError("SPELL: deleting spell for spell ID %u. However, spell still referenced.", m_spellInfo->Id);
*m_selfContainer = NULL;
}
if (m_caster && m_caster->GetTypeId() == TYPEID_PLAYER)
assert(m_caster->ToPlayer()->m_spellModTakingSpell != this);
ASSERT(m_caster->ToPlayer()->m_spellModTakingSpell != this);
delete m_spellValue;
}
@@ -1402,7 +1402,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
if (scaleAura)
{
aurSpellInfo = spellmgr.SelectAuraRankForPlayerLevel(m_spellInfo,unitTarget->getLevel());
assert (aurSpellInfo);
ASSERT (aurSpellInfo);
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
{
basePoints[i] = aurSpellInfo->EffectBasePoints[i];
src/server/game/Spells/Spell.h
+1 -1
View File
@@ -716,7 +716,7 @@ namespace Trinity
: i_source(source), i_data(&data), i_radius(radius), i_push_type(type)
, i_TargetType(TargetType), i_pos(pos), i_entry(entry)
{
assert(i_source);
ASSERT(i_source);
}
template<class T> inline void Visit(GridRefManager<T> &m)
src/server/game/Spells/SpellEffects.cpp
+5 -5
View File
@@ -2540,7 +2540,7 @@ void Spell::EffectApplyAura(uint32 i)
{
if (!m_spellAura || !unitTarget)
return;
assert(unitTarget == m_spellAura->GetOwner());
ASSERT(unitTarget == m_spellAura->GetOwner());
m_spellAura->_ApplyEffectForTargets(i);
}
@@ -2548,7 +2548,7 @@ void Spell::EffectApplyAreaAura(uint32 i)
{
if (!m_spellAura || !unitTarget)
return;
assert (unitTarget == m_spellAura->GetOwner());
ASSERT (unitTarget == m_spellAura->GetOwner());
m_spellAura->_ApplyEffectForTargets(i);
}
@@ -3067,12 +3067,12 @@ void Spell::EffectPersistentAA(uint32 i)
m_spellAura = aura;
else
{
assert(false);
ASSERT(false);
return;
}
m_spellAura->_RegisterForTargets();
}
assert(m_spellAura->GetDynobjOwner());
ASSERT(m_spellAura->GetDynobjOwner());
m_spellAura->_ApplyEffectForTargets(i);
}
@@ -4265,7 +4265,7 @@ void Spell::EffectSummonPet(uint32 i)
if (OldSummon->isDead())
return;
assert(OldSummon->GetMap() == owner->GetMap());
ASSERT(OldSummon->GetMap() == owner->GetMap());
//OldSummon->GetMap()->Remove(OldSummon->ToCreature(),false);