mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7023] Remove not used useCharges for IsImmunedToSpell/IsImmunedToDamage

Browse source 
Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
DiSlord 2009-01-04 23:15:24 +03:00
parent a865eb6010
commit 4b9af01d42
10 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Creature.cpp
View file

@ -1536,7 +1536,7 @@ void Creature::Respawn()
} }
} }
bool Creature::IsImmunedToSpell(SpellEntry const* spellInfo, bool useCharges) bool Creature::IsImmunedToSpell(SpellEntry const* spellInfo)
{ {
if (!spellInfo) if (!spellInfo)
return false; return false;
@ -1544,7 +1544,7 @@ bool Creature::IsImmunedToSpell(SpellEntry const* spellInfo, bool useCharges)
if (GetCreatureInfo()->MechanicImmuneMask & (1 << (spellInfo->Mechanic - 1))) if (GetCreatureInfo()->MechanicImmuneMask & (1 << (spellInfo->Mechanic - 1)))
return true; return true;
return Unit::IsImmunedToSpell(spellInfo, useCharges); return Unit::IsImmunedToSpell(spellInfo);
} }
bool Creature::IsImmunedToSpellEffect(uint32 effect, uint32 mechanic) const bool Creature::IsImmunedToSpellEffect(uint32 effect, uint32 mechanic) const

2
src/game/Creature.h
View file

@ -425,7 +425,7 @@ class MANGOS_DLL_SPEC Creature : public Unit
bool isCanIneractWithBattleMaster(Player* player, bool msg) const; bool isCanIneractWithBattleMaster(Player* player, bool msg) const;
bool isCanTrainingAndResetTalentsOf(Player* pPlayer) const; bool isCanTrainingAndResetTalentsOf(Player* pPlayer) const;
bool IsOutOfThreatArea(Unit* pVictim) const; bool IsOutOfThreatArea(Unit* pVictim) const;
bool IsImmunedToSpell(SpellEntry const* spellInfo, bool useCharges = false); bool IsImmunedToSpell(SpellEntry const* spellInfo);
// redefine Unit::IsImmunedToSpell // redefine Unit::IsImmunedToSpell
bool IsImmunedToSpellEffect(uint32 effect, uint32 mechanic) const; bool IsImmunedToSpellEffect(uint32 effect, uint32 mechanic) const;
// redefine Unit::IsImmunedToSpellEffect // redefine Unit::IsImmunedToSpellEffect

2
src/game/MovementHandler.cpp
View file

@ -248,7 +248,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
// 14.57 can be calculated by resolving damageperc formular below to 0 // 14.57 can be calculated by resolving damageperc formular below to 0
if (z_diff >= 14.57f && !target->isDead() && !target->isGameMaster() && if (z_diff >= 14.57f && !target->isDead() && !target->isGameMaster() &&
!target->HasAuraType(SPELL_AURA_HOVER) && !target->HasAuraType(SPELL_AURA_FEATHER_FALL) && !target->HasAuraType(SPELL_AURA_HOVER) && !target->HasAuraType(SPELL_AURA_FEATHER_FALL) &&
!target->HasAuraType(SPELL_AURA_FLY) && !target->IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL,true) ) !target->HasAuraType(SPELL_AURA_FLY) && !target->IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL) )
{ {
//Safe fall, fall height reduction //Safe fall, fall height reduction
int32 safe_fall = target->GetTotalAuraModifier(SPELL_AURA_SAFE_FALL); int32 safe_fall = target->GetTotalAuraModifier(SPELL_AURA_SAFE_FALL);

6
src/game/Spell.cpp
View file

@ -1045,8 +1045,8 @@ void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask)
// Recheck immune (only for delayed spells) // Recheck immune (only for delayed spells)
if( m_spellInfo->speed && ( if( m_spellInfo->speed && (
unit->IsImmunedToDamage(GetSpellSchoolMask(m_spellInfo),true) || unit->IsImmunedToDamage(GetSpellSchoolMask(m_spellInfo)) ||
unit->IsImmunedToSpell(m_spellInfo,true) )) unit->IsImmunedToSpell(m_spellInfo)))
{ {
m_caster->SendSpellMiss(unit, m_spellInfo->Id, SPELL_MISS_IMMUNE); m_caster->SendSpellMiss(unit, m_spellInfo->Id, SPELL_MISS_IMMUNE);
return; return;
@ -3621,7 +3621,7 @@ uint8 Spell::CanCast(bool strict)
if(IsPositiveSpell(m_spellInfo->Id)) if(IsPositiveSpell(m_spellInfo->Id))
{ {
if(target->IsImmunedToSpell(m_spellInfo,false)) if(target->IsImmunedToSpell(m_spellInfo))
return SPELL_FAILED_TARGET_AURASTATE; return SPELL_FAILED_TARGET_AURASTATE;
} }

2
src/game/ThreatManager.cpp
View file

@ -278,7 +278,7 @@ HostilReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostilRe
assert(target); // if the ref has status online the target must be there ! assert(target); // if the ref has status online the target must be there !
// some units are prefered in comparison to others // some units are prefered in comparison to others
if(!noPriorityTargetFound && (target->IsImmunedToDamage(pAttacker->GetMeleeDamageSchoolMask(), false) || target->hasNegativeAuraWithInterruptFlag(AURA_INTERRUPT_FLAG_DAMAGE)) ) if(!noPriorityTargetFound && (target->IsImmunedToDamage(pAttacker->GetMeleeDamageSchoolMask()) || target->hasNegativeAuraWithInterruptFlag(AURA_INTERRUPT_FLAG_DAMAGE)) )
{ {
if(iter != lastRef) if(iter != lastRef)
{ {

4
src/game/Totem.cpp
View file

@ -159,7 +159,7 @@ void Totem::SetTypeBySummonSpell(SpellEntry const * spellProto)
m_type = TOTEM_STATUE; //Jewelery statue m_type = TOTEM_STATUE; //Jewelery statue
} }
bool Totem::IsImmunedToSpell(SpellEntry const* spellInfo, bool useCharges) bool Totem::IsImmunedToSpell(SpellEntry const* spellInfo)
{ {
for (int i=0;i<3;i++) for (int i=0;i<3;i++)
{ {
@ -172,5 +172,5 @@ bool Totem::IsImmunedToSpell(SpellEntry const* spellInfo, bool useCharges)
continue; continue;
} }
} }
return Creature::IsImmunedToSpell(spellInfo, useCharges); return Creature::IsImmunedToSpell(spellInfo);
} }

2
src/game/Totem.h
View file

@ -53,7 +53,7 @@ class Totem : public Creature
void UpdateAttackPowerAndDamage(bool /*ranged*/ ) {} void UpdateAttackPowerAndDamage(bool /*ranged*/ ) {}
void UpdateDamagePhysical(WeaponAttackType /*attType*/) {} void UpdateDamagePhysical(WeaponAttackType /*attType*/) {}
bool IsImmunedToSpell(SpellEntry const* spellInfo, bool useCharges = false); bool IsImmunedToSpell(SpellEntry const* spellInfo);
protected: protected:
TotemType m_type; TotemType m_type;

10
src/game/Unit.cpp
View file

@ -1189,7 +1189,7 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
} }
// Physical Immune check // Physical Immune check
if(damageInfo->target->IsImmunedToDamage(SpellSchoolMask(damageInfo->damageSchoolMask),true)) if(damageInfo->target->IsImmunedToDamage(SpellSchoolMask(damageInfo->damageSchoolMask)))
{ {
damageInfo->HitInfo |= HITINFO_NORMALSWING; damageInfo->HitInfo |= HITINFO_NORMALSWING;
damageInfo->TargetState = VICTIMSTATE_IS_IMMUNE; damageInfo->TargetState = VICTIMSTATE_IS_IMMUNE;
@ -2391,7 +2391,7 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
return SPELL_MISS_EVADE; return SPELL_MISS_EVADE;
// Check for immune (use charges) // Check for immune (use charges)
if (pVictim->IsImmunedToSpell(spell,true)) if (pVictim->IsImmunedToSpell(spell))
return SPELL_MISS_IMMUNE; return SPELL_MISS_IMMUNE;
// All positive spells can`t miss // All positive spells can`t miss
@ -2400,7 +2400,7 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
return SPELL_MISS_NONE; return SPELL_MISS_NONE;
// Check for immune (use charges) // Check for immune (use charges)
if (pVictim->IsImmunedToDamage(GetSpellSchoolMask(spell),true)) if (pVictim->IsImmunedToDamage(GetSpellSchoolMask(spell)))
return SPELL_MISS_IMMUNE; return SPELL_MISS_IMMUNE;
// Try victim reflect spell // Try victim reflect spell
@ -7548,7 +7548,7 @@ int32 Unit::SpellBaseHealingBonusForVictim(SpellSchoolMask schoolMask, Unit *pVi
return AdvertisedBenefit; return AdvertisedBenefit;
} }
bool Unit::IsImmunedToDamage(SpellSchoolMask shoolMask, bool useCharges) bool Unit::IsImmunedToDamage(SpellSchoolMask shoolMask)
{ {
//If m_immuneToSchool type contain this school type, IMMUNE damage. //If m_immuneToSchool type contain this school type, IMMUNE damage.
SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL]; SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL];
@ -7565,7 +7565,7 @@ bool Unit::IsImmunedToDamage(SpellSchoolMask shoolMask, bool useCharges)
return false; return false;
} }
bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo, bool useCharges) bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo)
{ {
if (!spellInfo) if (!spellInfo)
return false; return false;

4
src/game/Unit.h
View file

@ -1313,9 +1313,9 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
void ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply); void ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply);
void ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType type, bool apply); void ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType type, bool apply);
virtual bool IsImmunedToSpell(SpellEntry const* spellInfo, bool useCharges = false); virtual bool IsImmunedToSpell(SpellEntry const* spellInfo);
// redefined in Creature // redefined in Creature
bool IsImmunedToDamage(SpellSchoolMask meleeSchoolMask, bool useCharges = false); bool IsImmunedToDamage(SpellSchoolMask meleeSchoolMask);
virtual bool IsImmunedToSpellEffect(uint32 effect, uint32 mechanic) const; virtual bool IsImmunedToSpellEffect(uint32 effect, uint32 mechanic) const;
// redefined in Creature // redefined in Creature

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7022" #define REVISION_NR "7023"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__