Jump to content

[Patch] Rename some methods


Recommended Posts

Posted

What bug does the patch fix? What features does the patch add?

It just renames some methods.

For which repository revision was the patch created?

8052

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

No. There is no Thread.

Who has been writing this patch? Please include either forum user names or email addresses.

I did.

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 3de02a9..d2fbc73 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -594,7 +594,7 @@ bool Creature::Create (uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry,
    return bResult;
}

-bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const
+bool Creature::IsTrainerOf(Player* pPlayer, bool msg) const
{
    if(!isTrainer())
        return false;
@@ -680,7 +680,7 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const
    return true;
}

-bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const
+bool Creature::CanInteractWithBattleMaster(Player* pPlayer, bool msg) const
{
    if(!isBattleMaster())
        return false;
@@ -712,7 +712,7 @@ bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const
    return true;
}

-bool Creature::isCanTrainingAndResetTalentsOf(Player* pPlayer) const
+bool Creature::IsTrainerAndCanResetTalentsOf(Player* pPlayer) const
{
    return pPlayer->getLevel() >= 10
        && GetCreatureInfo()->trainer_type == TRAINER_TYPE_CLASS
@@ -769,11 +769,11 @@ void Creature::PrepareGossipMenu( Player *pPlayer,uint32 gossipid )
                        break;
                    }
                    case GOSSIP_OPTION_TRAINER:
-                        if(!isCanTrainingOf(pPlayer,false))
+                        if(!IsTrainerOf(pPlayer,false))
                            cantalking=false;
                        break;
                    case GOSSIP_OPTION_UNLEARNTALENTS:
-                        if(!isCanTrainingAndResetTalentsOf(pPlayer))
+                        if (!IsTrainerAndCanResetTalentsOf(pPlayer))
                            cantalking=false;
                        break;
                    case GOSSIP_OPTION_UNLEARNPETSKILLS:
@@ -785,7 +785,7 @@ void Creature::PrepareGossipMenu( Player *pPlayer,uint32 gossipid )
                            return;
                        break;
                    case GOSSIP_OPTION_BATTLEFIELD:
-                        if(!isCanInteractWithBattleMaster(pPlayer,false))
+                        if (!CanInteractWithBattleMaster(pPlayer, false))
                            cantalking=false;
                        break;
                    case GOSSIP_OPTION_SPIRITGUIDE:
@@ -829,11 +829,11 @@ void Creature::PrepareGossipMenu( Player *pPlayer,uint32 gossipid )
    {
        if(HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_TRAINER))
        {
-            isCanTrainingOf(pPlayer,true);                  // output error message if need
+            IsTrainerOf(pPlayer, true);                     // output error message if need
        }
        if(HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_BATTLEMASTER))
        {
-            isCanInteractWithBattleMaster(pPlayer,true);     // output error message if need
+            CanInteractWithBattleMaster(pPlayer, true);     // output error message if need
        }
    }
}
@@ -1587,7 +1587,7 @@ void Creature::ForcedDespawn()
    SetHealth(0);                                           // just for nice GM-mode view
}

-bool Creature::IsImmunedToSpell(SpellEntry const* spellInfo)
+bool Creature::IsImmuneToSpell(SpellEntry const* spellInfo)
{
    if (!spellInfo)
        return false;
@@ -1595,10 +1595,10 @@ bool Creature::IsImmunedToSpell(SpellEntry const* spellInfo)
    if (GetCreatureInfo()->MechanicImmuneMask & (1 << (spellInfo->Mechanic - 1)))
        return true;

-    return Unit::IsImmunedToSpell(spellInfo);
+    return Unit::IsImmuneToSpell(spellInfo);
}

-bool Creature::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
+bool Creature::IsImmuneToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
{
    if (GetCreatureInfo()->MechanicImmuneMask & (1 << (spellInfo->EffectMechanic[index] - 1)))
        return true;
@@ -1617,7 +1617,7 @@ bool Creature::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index)
            return true;
    }

-    return Unit::IsImmunedToSpellEffect(spellInfo, index);
+    return Unit::IsImmuneToSpellEffect(spellInfo, index);
}

SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim)
diff --git a/src/game/Creature.h b/src/game/Creature.h
index 834dec4..3885685 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -485,14 +485,14 @@ class MANGOS_DLL_SPEC Creature : public Unit
        bool canWalk() const { return GetCreatureInfo()->InhabitType & INHABIT_GROUND; }
        bool canSwim() const { return GetCreatureInfo()->InhabitType & INHABIT_WATER; }
        bool canFly()  const { return GetCreatureInfo()->InhabitType & INHABIT_AIR; }
-        ///// TODO RENAME THIS!!!!!
-        bool isCanTrainingOf(Player* player, bool msg) const;
-        bool isCanInteractWithBattleMaster(Player* player, bool msg) const;
-        bool isCanTrainingAndResetTalentsOf(Player* pPlayer) const;
+
+        bool IsTrainerOf(Player* player, bool msg) const;
+        bool CanInteractWithBattleMaster(Player* player, bool msg) const;
+        bool IsTrainerAndCanResetTalentsOf(Player* pPlayer) const;
        bool IsOutOfThreatArea(Unit* pVictim) const;
-        bool IsImmunedToSpell(SpellEntry const* spellInfo);
+        bool IsImmuneToSpell(SpellEntry const* spellInfo);
                                                            // redefine Unit::IsImmunedToSpell
-        bool IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const;
+        bool IsImmuneToSpellEffect(SpellEntry const* spellInfo, uint32 index) const;
                                                            // redefine Unit::IsImmunedToSpellEffect
        bool isElite() const
        {
diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h
index 583732a..4279dd7 100644
--- a/src/game/GridNotifiersImpl.h
+++ b/src/game/GridNotifiersImpl.h
@@ -170,7 +170,7 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
    SpellEntry const *spellInfo = sSpellStore.LookupEntry(i_dynobject.GetSpellId());
    uint32 eff_index  = i_dynobject.GetEffIndex();
    // Check target immune to spell or aura
-    if (target->IsImmunedToSpell(spellInfo) || target->IsImmunedToSpellEffect(spellInfo, eff_index))
+    if (target->IsImmuneToSpell(spellInfo) || target->IsImmuneToSpellEffect(spellInfo, eff_index))
        return;
    // Apply PersistentAreaAura on target
    PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, NULL, target, i_dynobject.GetCaster());
diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index f36fa96..405bc43 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -127,7 +127,7 @@ void WorldSession::SendTrainerList( uint64 guid, const std::string& strTitle )
        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);

    // trainer list loaded at check;
-    if(!unit->isCanTrainingOf(_player,true))
+    if (!unit->IsTrainerOf(_player, true))
        return;

    CreatureInfo const *ci = unit->GetCreatureInfo();
@@ -213,7 +213,7 @@ void WorldSession::HandleTrainerBuySpellOpcode( WorldPacket & recv_data )
    if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);

-    if(!unit->isCanTrainingOf(_player,true))
+    if (!unit->IsTrainerOf(_player, true))
        return;

    // check present spell in trainer spell list
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 4a42414..65ec1b5 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -883,7 +883,7 @@ void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex)
        return;

    // Check for effect immune skip if immuned
-    bool immuned = pVictim->IsImmunedToSpellEffect(m_spellInfo, effIndex);
+    bool immuned = pVictim->IsImmuneToSpellEffect(m_spellInfo, effIndex);

    uint64 targetGUID = pVictim->GetGUID();

@@ -1152,7 +1152,7 @@ void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask)
    // Recheck immune (only for delayed spells)
    if( m_spellInfo->speed && (
        unit->IsImmunedToDamage(GetSpellSchoolMask(m_spellInfo)) ||
-        unit->IsImmunedToSpell(m_spellInfo)))
+        unit->IsImmuneToSpell(m_spellInfo)))
    {
        m_caster->SendSpellMiss(unit, m_spellInfo->Id, SPELL_MISS_IMMUNE);
        return;
@@ -3763,7 +3763,7 @@ SpellCastResult Spell::CheckCast(bool strict)
        }

        if(IsPositiveSpell(m_spellInfo->Id))
-            if(target->IsImmunedToSpell(m_spellInfo))
+            if(target->IsImmuneToSpell(m_spellInfo))
                return SPELL_FAILED_TARGET_AURASTATE;

        //Must be behind the target.
diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp
index 98a5b7e..e278c2f 100644
--- a/src/game/Totem.cpp
+++ b/src/game/Totem.cpp
@@ -159,7 +159,7 @@ void Totem::SetTypeBySummonSpell(SpellEntry const * spellProto)
        m_type = TOTEM_STATUE;                              //Jewelery statue
}

-bool Totem::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
+bool Totem::IsImmuneToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
{
    // TODO: possibly all negative auras immuned?
    switch(spellInfo->EffectApplyAuraName[index])
@@ -172,5 +172,5 @@ bool Totem::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) co
        default:
            break;
    }
-    return Creature::IsImmunedToSpellEffect(spellInfo, index);
+    return Creature::IsImmuneToSpellEffect(spellInfo, index);
}
diff --git a/src/game/Totem.h b/src/game/Totem.h
index 98f071b..c84956e 100644
--- a/src/game/Totem.h
+++ b/src/game/Totem.h
@@ -53,7 +53,7 @@ class Totem : public Creature
        void UpdateAttackPowerAndDamage(bool /*ranged*/ ) {}
        void UpdateDamagePhysical(WeaponAttackType /*attType*/) {}

-        bool IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const;
+        bool IsImmuneToSpellEffect(SpellEntry const* spellInfo, uint32 index) const;

    protected:
        TotemType m_type;
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 4c1f8bd..daeafff 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -2645,7 +2645,7 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
        return SPELL_MISS_EVADE;

    // Check for immune
-    if (pVictim->IsImmunedToSpell(spell))
+    if (pVictim->IsImmuneToSpell(spell))
        return SPELL_MISS_IMMUNE;

    // All positive spells can`t miss
@@ -8505,7 +8505,7 @@ bool Unit::IsImmunedToDamage(SpellSchoolMask shoolMask)
    return false;
}

-bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo)
+bool Unit::IsImmuneToSpell(SpellEntry const* spellInfo)
{
    if (!spellInfo)
        return false;
@@ -8540,7 +8540,7 @@ bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo)
    return false;
}

-bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
+bool Unit::IsImmuneToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
{
    //If m_immuneToEffect type contain this effect type, IMMUNE effect.
    uint32 effect = spellInfo->Effect[index];
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 8e5e8be..bfbf52c 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -1441,10 +1441,10 @@ class MANGOS_DLL_SPEC Unit : public WorldObject

        void ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply);
        void ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType type, bool apply);
-        virtual bool IsImmunedToSpell(SpellEntry const* spellInfo);
+        virtual bool IsImmuneToSpell(SpellEntry const* spellInfo);
                                                            // redefined in Creature
        bool IsImmunedToDamage(SpellSchoolMask meleeSchoolMask);
-        virtual bool IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const;
+        virtual bool IsImmuneToSpellEffect(SpellEntry const* spellInfo, uint32 index) const;
                                                            // redefined in Creature

        uint32 CalcArmorReducedDamage(Unit* pVictim, const uint32 damage);

  • 1 year later...
  • 1 month later...
×
×
  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use