diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index 552e7f8f2..336733978 100644 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -26,7 +26,7 @@ // AggressorAI ///////////////// -int AggressorAI::Permissible(const Creature* creature) +int AggressorAI::Permissible(Creature const* creature) { // have some hostile factions, it will be selected by IsHostileTo check at MoveInLineOfSight if (!creature->IsCivilian() && !creature->IsNeutralToAll()) @@ -226,7 +226,7 @@ TurretAI::TurretAI(Creature* c) : CreatureAI(c) me->m_SightDistance = me->m_CombatDistance; } -bool TurretAI::CanAIAttack(const Unit* /*who*/) const +bool TurretAI::CanAIAttack(Unit const* /*who*/) const { // TODO: use one function to replace it if (!me->IsWithinCombatRange(me->GetVictim(), me->m_CombatDistance) diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h index 7459a1e26..39c016bc9 100644 --- a/src/server/game/AI/CoreAI/CombatAI.h +++ b/src/server/game/AI/CoreAI/CombatAI.h @@ -31,7 +31,7 @@ public: explicit AggressorAI(Creature* c) : CreatureAI(c) {} void UpdateAI(uint32) override; - static int Permissible(const Creature*); + static int Permissible(Creature const*); }; typedef std::vector SpellVct; @@ -83,7 +83,7 @@ struct TurretAI : public CreatureAI { public: explicit TurretAI(Creature* c); - bool CanAIAttack(const Unit* who) const override; + bool CanAIAttack(Unit const* who) const override; void AttackStart(Unit* who) override; void UpdateAI(uint32 diff) override; diff --git a/src/server/game/AI/CoreAI/GameObjectAI.cpp b/src/server/game/AI/CoreAI/GameObjectAI.cpp index c862042c6..4594ce83a 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.cpp +++ b/src/server/game/AI/CoreAI/GameObjectAI.cpp @@ -18,7 +18,7 @@ #include "GameObjectAI.h" //GameObjectAI::GameObjectAI(GameObject* g) : go(g) {} -int GameObjectAI::Permissible(const GameObject* go) +int GameObjectAI::Permissible(GameObject const* go) { if (go->GetAIName() == "GameObjectAI") return PERMIT_BASE_SPECIAL; diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 10a5fe8b2..1bf62bceb 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -63,7 +63,7 @@ public: virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) {} virtual void OnStateChanged(uint32 /*state*/, Unit* /*unit*/) {} virtual void EventInform(uint32 /*eventId*/) {} - virtual void SpellHit(Unit* /*unit*/, const SpellInfo* /*spellInfo*/) {} + virtual void SpellHit(Unit* /*unit*/, SpellInfo const* /*spellInfo*/) {} virtual bool CanBeSeen(Player const* /*seer*/) { return true; } virtual void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) { } diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h index 88a5a5086..5bb52196b 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.h +++ b/src/server/game/AI/CoreAI/PassiveAI.h @@ -30,7 +30,7 @@ public: void AttackStart(Unit*) override {} void UpdateAI(uint32) override; - static int Permissible(const Creature*) { return PERMIT_BASE_IDLE; } + static int Permissible(Creature const*) { return PERMIT_BASE_IDLE; } }; class PossessedAI : public CreatureAI @@ -46,7 +46,7 @@ public: void JustDied(Unit*) override; void KilledUnit(Unit* victim) override; - static int Permissible(const Creature*) { return PERMIT_BASE_IDLE; } + static int Permissible(Creature const*) { return PERMIT_BASE_IDLE; } }; class NullCreatureAI : public CreatureAI @@ -60,7 +60,7 @@ public: void EnterEvadeMode() override {} void OnCharmed(bool /*apply*/) override {} - static int Permissible(const Creature*) { return PERMIT_BASE_IDLE; } + static int Permissible(Creature const*) { return PERMIT_BASE_IDLE; } }; class CritterAI : public PassiveAI diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 370cfe5ff..e5b02841b 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -28,7 +28,7 @@ #include "SpellMgr.h" #include "Util.h" -int PetAI::Permissible(const Creature* creature) +int PetAI::Permissible(Creature const* creature) { if (creature->IsPet()) return PERMIT_BASE_SPECIAL; @@ -567,7 +567,7 @@ void PetAI::HandleReturnMovement() me->ClearInPetCombat(); } -void PetAI::SpellHit(Unit* caster, const SpellInfo* spellInfo) +void PetAI::SpellHit(Unit* caster, SpellInfo const* spellInfo) { // Xinef: taunt behavior code if (spellInfo->HasAura(SPELL_AURA_MOD_TAUNT) && !me->HasReactState(REACT_PASSIVE)) @@ -653,7 +653,7 @@ void PetAI::MovementInform(uint32 moveType, uint32 data) } } -bool PetAI::CanAttack(Unit* target, const SpellInfo* spellInfo) +bool PetAI::CanAttack(Unit* target, SpellInfo const* spellInfo) { // Evaluates wether a pet can attack a specific target based on CommandState, ReactState and other flags // IMPORTANT: The order in which things are checked is important, be careful if you add or remove checks diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h index 0e1235716..952e9843f 100644 --- a/src/server/game/AI/CoreAI/PetAI.h +++ b/src/server/game/AI/CoreAI/PetAI.h @@ -49,7 +49,7 @@ public: explicit PetAI(Creature* c); void UpdateAI(uint32) override; - static int Permissible(const Creature*); + static int Permissible(Creature const*); void KilledUnit(Unit* /*victim*/) override; void AttackStart(Unit* target) override; @@ -65,7 +65,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) override {} // CreatureAI interferes with returning pets void MoveInLineOfSight_Safe(Unit* /*who*/) {} // CreatureAI interferes with returning pets void EnterEvadeMode() override {} // For fleeing, pets don't use this type of Evade mechanic - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override; + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override; void PetStopAttack() override; @@ -86,7 +86,7 @@ private: Unit* SelectNextTarget(bool allowAutoSelect) const; void HandleReturnMovement(); void DoAttack(Unit* target, bool chase); - bool CanAttack(Unit* target, const SpellInfo* spellInfo = nullptr); + bool CanAttack(Unit* target, SpellInfo const* spellInfo = nullptr); void ClearCharmInfoFlags(); }; #endif diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp index a584b2d10..37165d7f1 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.cpp +++ b/src/server/game/AI/CoreAI/ReactorAI.cpp @@ -19,7 +19,7 @@ #include "CreatureAIImpl.h" #include "Errors.h" -int ReactorAI::Permissible(const Creature* creature) +int ReactorAI::Permissible(Creature const* creature) { if (creature->IsCivilian() || creature->IsNeutralToAll()) return PERMIT_BASE_REACTIVE; diff --git a/src/server/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h index 1446a226c..fb65eb0fc 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.h +++ b/src/server/game/AI/CoreAI/ReactorAI.h @@ -30,6 +30,6 @@ public: void MoveInLineOfSight(Unit*) override {} void UpdateAI(uint32 diff) override; - static int Permissible(const Creature*); + static int Permissible(Creature const*); }; #endif diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index 141d5dacb..60f7878db 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -38,7 +38,7 @@ TotemAI::TotemAI(Creature* c) : CreatureAI(c) ASSERT(c->IsTotem()); } -void TotemAI::SpellHit(Unit* /*caster*/, const SpellInfo* /*spellInfo*/) +void TotemAI::SpellHit(Unit* /*caster*/, SpellInfo const* /*spellInfo*/) { } diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h index 9b9f758cd..f8bb54587 100644 --- a/src/server/game/AI/CoreAI/TotemAI.h +++ b/src/server/game/AI/CoreAI/TotemAI.h @@ -32,7 +32,7 @@ public: void MoveInLineOfSight(Unit* who) override; void AttackStart(Unit* victim) override; void EnterEvadeMode() override; - void SpellHit(Unit* /*caster*/, const SpellInfo* /*spellInfo*/) override; + void SpellHit(Unit* /*caster*/, SpellInfo const* /*spellInfo*/) override; void DoAction(int32 param) override; void UpdateAI(uint32 diff) override; diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 5329f6a2b..42e9cbf46 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -149,7 +149,7 @@ void UnitAI::DoCast(uint32 spellId) break; case AITARGET_ENEMY: { - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(spellId); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); bool playerOnly = spellInfo->HasAttribute(SPELL_ATTR3_ONLY_ON_PLAYER); //float range = GetSpellMaxRange(spellInfo, false); target = SelectTarget(SelectTargetMethod::Random, 0, spellInfo->GetMaxRange(false), playerOnly); @@ -163,7 +163,7 @@ void UnitAI::DoCast(uint32 spellId) break; case AITARGET_DEBUFF: { - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(spellId); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); bool playerOnly = spellInfo->HasAttribute(SPELL_ATTR3_ONLY_ON_PLAYER); float range = spellInfo->GetMaxRange(false); @@ -225,7 +225,7 @@ void UnitAI::FillAISpellInfo() AISpellInfo = new AISpellInfoType[sSpellMgr->GetSpellInfoStoreSize()]; AISpellInfoType* AIInfo = AISpellInfo; - const SpellInfo* spellInfo; + SpellInfo const* spellInfo; for (uint32 i = 0; i < sSpellMgr->GetSpellInfoStoreSize(); ++i, ++AIInfo) { diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 4fa8f568e..5e7d98f61 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -41,7 +41,7 @@ enum class SelectTargetMethod // default predicate function to select target based on distance, player and/or aura criteria struct DefaultTargetSelector : public Acore::unary_function { - const Unit* me; + Unit const* me; float m_dist; bool m_playerOnly; int32 m_aura; @@ -167,7 +167,7 @@ struct FarthestTargetSelector : public Acore::unary_function } private: - const Unit* _me; + Unit const* _me; float _dist; bool _playerOnly; bool _inLos; diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h index c2b169aee..233d4c165 100644 --- a/src/server/game/AI/CreatureAIFactory.h +++ b/src/server/game/AI/CreatureAIFactory.h @@ -34,7 +34,7 @@ struct CreatureAIFactory : public SelectableAI CreatureAI* Create(void*) const; - int Permit(const Creature* c) const { return REAL_AI::Permissible(c); } + int Permit(Creature const* c) const { return REAL_AI::Permissible(c); } }; template @@ -61,7 +61,7 @@ struct GameObjectAIFactory : public SelectableGameObjectAI GameObjectAI* Create(void*) const; - int Permit(const GameObject* g) const { return REAL_GO_AI::Permissible(g); } + int Permit(GameObject const* g) const { return REAL_GO_AI::Permissible(g); } }; template diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 06c1b8c45..36314010b 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -698,7 +698,7 @@ void SmartAI::MoveInLineOfSight(Unit* who) } } -bool SmartAI::CanAIAttack(const Unit* /*who*/) const +bool SmartAI::CanAIAttack(Unit const* /*who*/) const { if (me->GetReactState() == REACT_PASSIVE) return false; @@ -754,7 +754,7 @@ void SmartAI::JustRespawned() mFollowArrivedAlive = true; } -int SmartAI::Permissible(const Creature* creature) +int SmartAI::Permissible(Creature const* creature) { if (creature->GetAIName() == "SmartAI") return PERMIT_BASE_SPECIAL; @@ -832,12 +832,12 @@ void SmartAI::AttackStart(Unit* who) } } -void SmartAI::SpellHit(Unit* unit, const SpellInfo* spellInfo) +void SmartAI::SpellHit(Unit* unit, SpellInfo const* spellInfo) { GetScript()->ProcessEventsFor(SMART_EVENT_SPELLHIT, unit, 0, 0, false, spellInfo); } -void SmartAI::SpellHitTarget(Unit* target, const SpellInfo* spellInfo) +void SmartAI::SpellHitTarget(Unit* target, SpellInfo const* spellInfo) { GetScript()->ProcessEventsFor(SMART_EVENT_SPELLHIT_TARGET, target, 0, 0, false, spellInfo); } @@ -1101,7 +1101,7 @@ void SmartGameObjectAI::SummonedCreatureDies(Creature* summon, Unit* /*killer*/) GetScript()->ProcessEventsFor(SMART_EVENT_SUMMONED_UNIT_DIES, summon); } -int SmartGameObjectAI::Permissible(const GameObject* g) +int SmartGameObjectAI::Permissible(GameObject const* g) { if (g->GetAIName() == "SmartGameObjectAI") return PERMIT_BASE_SPECIAL; @@ -1199,7 +1199,7 @@ void SmartGameObjectAI::EventInform(uint32 eventId) GetScript()->ProcessEventsFor(SMART_EVENT_GO_EVENT_INFORM, nullptr, eventId); } -void SmartGameObjectAI::SpellHit(Unit* unit, const SpellInfo* spellInfo) +void SmartGameObjectAI::SpellHit(Unit* unit, SpellInfo const* spellInfo) { GetScript()->ProcessEventsFor(SMART_EVENT_SPELLHIT, unit, 0, 0, false, spellInfo); } diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index b192a68fe..35ab05401 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -101,10 +101,10 @@ public: void MoveInLineOfSight(Unit* who) override; // Called when hit by a spell - void SpellHit(Unit* unit, const SpellInfo* spellInfo) override; + void SpellHit(Unit* unit, SpellInfo const* spellInfo) override; // Called when spell hits a target - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override; + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override; // Called at any Damage from any attacker (before damage apply) void DamageTaken(Unit* done_by, uint32& damage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask) override; @@ -146,7 +146,7 @@ public: void OnCharmed(bool apply) override; // Called when victim is in line of sight - bool CanAIAttack(const Unit* who) const override; + bool CanAIAttack(Unit const* who) const override; // Used in scripts to share variables void DoAction(int32 param = 0) override; @@ -164,7 +164,7 @@ public: ObjectGuid GetGUID(int32 id = 0) const override; //core related - static int32 Permissible(const Creature*); + static int32 Permissible(Creature const*); // Called at movepoint reached void MovepointReached(uint32 id); @@ -258,7 +258,7 @@ public: void InitializeAI() override; void Reset() override; SmartScript* GetScript() { return &mScript; } - static int32 Permissible(const GameObject* g); + static int32 Permissible(GameObject const* g); bool GossipHello(Player* player, bool reportUse) override; bool GossipSelect(Player* player, uint32 sender, uint32 action) override; @@ -271,7 +271,7 @@ public: void OnGameEvent(bool start, uint16 eventId) override; void OnStateChanged(uint32 state, Unit* unit) override; void EventInform(uint32 eventId) override; - void SpellHit(Unit* unit, const SpellInfo* spellInfo) override; + void SpellHit(Unit* unit, SpellInfo const* spellInfo) override; // Called when a summoned unit dies void SummonedCreatureDies(Creature* summon, Unit* killer) override; diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 18bac6250..4cfea9a4c 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -97,7 +97,7 @@ void SmartScript::OnReset() RestoreCasterMaxDist(); } -void SmartScript::ProcessEventsFor(SMART_EVENT e, Unit* unit, uint32 var0, uint32 var1, bool bvar, const SpellInfo* spell, GameObject* gob) +void SmartScript::ProcessEventsFor(SMART_EVENT e, Unit* unit, uint32 var0, uint32 var1, bool bvar, SpellInfo const* spell, GameObject* gob) { for (SmartAIEventList::iterator i = mEvents.begin(); i != mEvents.end(); ++i) { @@ -116,7 +116,7 @@ void SmartScript::ProcessEventsFor(SMART_EVENT e, Unit* unit, uint32 var0, uint3 } } -void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, uint32 var1, bool bvar, const SpellInfo* spell, GameObject* gob) +void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, uint32 var1, bool bvar, SpellInfo const* spell, GameObject* gob) { //calc random if (e.GetEventType() != SMART_EVENT_LINK && e.event.event_chance < 100 && e.event.event_chance) @@ -3410,7 +3410,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } } -void SmartScript::ProcessTimedAction(SmartScriptHolder& e, uint32 const& min, uint32 const& max, Unit* unit, uint32 var0, uint32 var1, bool bvar, const SpellInfo* spell, GameObject* gob) +void SmartScript::ProcessTimedAction(SmartScriptHolder& e, uint32 const& min, uint32 const& max, Unit* unit, uint32 var0, uint32 var1, bool bvar, SpellInfo const* spell, GameObject* gob) { // xinef: extended by selfs victim ConditionList const conds = sConditionMgr->GetConditionsForSmartEvent(e.entryOrGuid, e.event_id, e.source_type); @@ -4016,7 +4016,7 @@ ObjectList* SmartScript::GetWorldObjectsInDist(float dist) return targets; } -void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, uint32 var1, bool bvar, const SpellInfo* spell, GameObject* gob) +void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, uint32 var1, bool bvar, SpellInfo const* spell, GameObject* gob) { if (!e.active && e.GetEventType() != SMART_EVENT_LINK) return; @@ -4928,7 +4928,7 @@ void SmartScript::OnInitialize(WorldObject* obj, AreaTrigger const* at) // Xinef: if smartcast combat move flag is present if (i->GetActionType() == SMART_ACTION_CAST && (i->action.cast.flags & SMARTCAST_COMBAT_MOVE)) { - if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(i->action.cast.spell)) + if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(i->action.cast.spell)) { float maxRange = spellInfo->GetMaxRange(spellInfo->IsPositive()); float minRange = spellInfo->GetMinRange(spellInfo->IsPositive()); diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index f74b1cdfb..be075eb0b 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -36,14 +36,14 @@ public: void GetScript(); void FillScript(SmartAIEventList e, WorldObject* obj, AreaTrigger const* at); - void ProcessEventsFor(SMART_EVENT e, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = nullptr, GameObject* gob = nullptr); - void ProcessEvent(SmartScriptHolder& e, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = nullptr, GameObject* gob = nullptr); + void ProcessEventsFor(SMART_EVENT e, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, SpellInfo const* spell = nullptr, GameObject* gob = nullptr); + void ProcessEvent(SmartScriptHolder& e, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, SpellInfo const* spell = nullptr, GameObject* gob = nullptr); bool CheckTimer(SmartScriptHolder const& e) const; void RecalcTimer(SmartScriptHolder& e, uint32 min, uint32 max); void UpdateTimer(SmartScriptHolder& e, uint32 const diff); void InitTimer(SmartScriptHolder& e); - void ProcessAction(SmartScriptHolder& e, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = nullptr, GameObject* gob = nullptr); - void ProcessTimedAction(SmartScriptHolder& e, uint32 const& min, uint32 const& max, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, const SpellInfo* spell = nullptr, GameObject* gob = nullptr); + void ProcessAction(SmartScriptHolder& e, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, SpellInfo const* spell = nullptr, GameObject* gob = nullptr); + void ProcessTimedAction(SmartScriptHolder& e, uint32 const& min, uint32 const& max, Unit* unit = nullptr, uint32 var0 = 0, uint32 var1 = 0, bool bvar = false, SpellInfo const* spell = nullptr, GameObject* gob = nullptr); ObjectList* GetTargets(SmartScriptHolder const& e, Unit* invoker = nullptr); ObjectList* GetWorldObjectsInDist(float dist); void InstallTemplate(SmartScriptHolder const& e); diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index c3ecb80ac..35c719643 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -325,7 +325,7 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un return !target->HealthAbovePct(health.percent); case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_PLAYER_DEAD: if (target && !target->IsAlive()) - if (const Player* player = target->ToPlayer()) + if (Player const* player = target->ToPlayer()) if (player->GetDeathTimer() != 0) // flag set == must be same team, not set == different team return (player->GetTeamId() == source->GetTeamId()) == (player_dead.own_team_flag != 0); diff --git a/src/server/game/ArenaSpectator/ArenaSpectator.cpp b/src/server/game/ArenaSpectator/ArenaSpectator.cpp index 40f5a0084..cc31c7d8a 100644 --- a/src/server/game/ArenaSpectator/ArenaSpectator.cpp +++ b/src/server/game/ArenaSpectator/ArenaSpectator.cpp @@ -302,7 +302,7 @@ bool ArenaSpectator::ShouldSendAura(Aura* aura, uint8 effMask, ObjectGuid target } template<> -AC_GAME_API void ArenaSpectator::SendPacketTo(const Player* player, std::string&& message) +AC_GAME_API void ArenaSpectator::SendPacketTo(Player const* player, std::string&& message) { WorldPacket data; CreatePacket(data, message); diff --git a/src/server/game/ArenaSpectator/ArenaSpectator.h b/src/server/game/ArenaSpectator/ArenaSpectator.h index 99ac17462..7e050ab3c 100644 --- a/src/server/game/ArenaSpectator/ArenaSpectator.h +++ b/src/server/game/ArenaSpectator/ArenaSpectator.h @@ -91,7 +91,7 @@ namespace ArenaSpectator if (!targetGUID.IsPlayer()) return; - if (const SpellInfo* si = sSpellMgr->GetSpellInfo(id)) + if (SpellInfo const* si = sSpellMgr->GetSpellInfo(id)) if (si->SpellIconID == 1) return; diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index afed580ab..c1418457c 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -848,13 +848,13 @@ bool AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player if (propRefID < 0) { - const ItemRandomSuffixEntry* itemRandEntry = sItemRandomSuffixStore.LookupEntry(-item->GetItemRandomPropertyId()); + ItemRandomSuffixEntry const* itemRandEntry = sItemRandomSuffixStore.LookupEntry(-item->GetItemRandomPropertyId()); if (itemRandEntry) suffix = &itemRandEntry->Name; } else { - const ItemRandomPropertiesEntry* itemRandEntry = sItemRandomPropertiesStore.LookupEntry(item->GetItemRandomPropertyId()); + ItemRandomPropertiesEntry const* itemRandEntry = sItemRandomPropertiesStore.LookupEntry(item->GetItemRandomPropertyId()); if (itemRandEntry) suffix = &itemRandEntry->Name; } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 27adef4ac..eff8aa4b9 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2308,7 +2308,7 @@ void Creature::CallForHelp(float radius, Unit* target /*= nullptr*/) Cell::VisitGridObjects(this, worker, radius); } -bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /*= true*/) const +bool Creature::CanAssistTo(Unit const* u, Unit const* enemy, bool checkfaction /*= true*/) const { // is it true? if (!HasReactState(REACT_AGGRESSIVE)) @@ -2368,7 +2368,7 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction / // use this function to avoid having hostile creatures attack // friendlies and other mobs they shouldn't attack -bool Creature::_IsTargetAcceptable(const Unit* target) const +bool Creature::_IsTargetAcceptable(Unit const* target) const { ASSERT(target); @@ -2385,8 +2385,8 @@ bool Creature::_IsTargetAcceptable(const Unit* target) const return false; } - const Unit* myVictim = getAttackerForHelper(); - const Unit* targetVictim = target->getAttackerForHelper(); + Unit const* myVictim = getAttackerForHelper(); + Unit const* targetVictim = target->getAttackerForHelper(); // if I'm already fighting target, or I'm hostile towards the target, the target is acceptable if (myVictim == target || targetVictim == this || IsHostileTo(target)) diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 54e59a9bd..b78778497 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -256,8 +256,8 @@ public: void SetNoCallAssistance(bool val) { m_AlreadyCallAssistance = val; } void SetNoSearchAssistance(bool val) { m_AlreadySearchedAssistance = val; } bool HasSearchedAssistance() { return m_AlreadySearchedAssistance; } - bool CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction = true) const; - bool _IsTargetAcceptable(const Unit* target) const; + bool CanAssistTo(Unit const* u, Unit const* enemy, bool checkfaction = true) const; + bool _IsTargetAcceptable(Unit const* target) const; [[nodiscard]] bool CanIgnoreFeignDeath() const { return (GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_IGNORE_FEIGN_DEATH) != 0; } // pussywizard: updated at faction change, disable move in line of sight if actual faction is not hostile to anyone diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index b69a29c64..1d2e21a77 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -800,7 +800,7 @@ bool Item::CanBeTraded(bool mail, bool trade) const return true; } -bool Item::HasEnchantRequiredSkill(const Player* player) const +bool Item::HasEnchantRequiredSkill(Player const* player) const { // Check all enchants for required skill for (uint32 enchant_slot = PERM_ENCHANTMENT_SLOT; enchant_slot < MAX_ENCHANTMENT_SLOT; ++enchant_slot) diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index 8d42e5e45..6be9b0cfe 100644 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -253,7 +253,7 @@ public: void SetInTrade(bool b = true) { mb_in_trade = b; } [[nodiscard]] bool IsInTrade() const { return mb_in_trade; } - bool HasEnchantRequiredSkill(const Player* player) const; + bool HasEnchantRequiredSkill(Player const* player) const; [[nodiscard]] uint32 GetEnchantRequiredLevel() const; bool IsFitToSpellRequirements(SpellInfo const* spellInfo) const; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 9f822284d..fe7dc4acb 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1191,7 +1191,7 @@ InstanceScript* WorldObject::GetInstanceScript() const return map->IsDungeon() ? map->ToInstanceMap()->GetInstanceScript() : nullptr; } -float WorldObject::GetDistanceZ(const WorldObject* obj) const +float WorldObject::GetDistanceZ(WorldObject const* obj) const { float dz = std::fabs(GetPositionZ() - obj->GetPositionZ()); float sizefactor = GetObjectSize() + obj->GetObjectSize(); @@ -1238,7 +1238,7 @@ Position WorldObject::GetHitSpherePointFor(Position const& dest) const return Position(contactPoint.x, contactPoint.y, contactPoint.z, GetAngle(contactPoint.x, contactPoint.y)); } -float WorldObject::GetDistance(const WorldObject* obj) const +float WorldObject::GetDistance(WorldObject const* obj) const { float d = GetExactDist(obj) - GetObjectSize() - obj->GetObjectSize(); return d > 0.0f ? d : 0.0f; @@ -1256,7 +1256,7 @@ float WorldObject::GetDistance(const WorldObject* obj) const return d > 0.0f ? d : 0.0f; } -float WorldObject::GetDistance2d(const WorldObject* obj) const +float WorldObject::GetDistance2d(WorldObject const* obj) const { float d = GetExactDist2d(obj) - GetObjectSize() - obj->GetObjectSize(); return d > 0.0f ? d : 0.0f; @@ -1268,7 +1268,7 @@ float WorldObject::GetDistance2d(const WorldObject* obj) const return d > 0.0f ? d : 0.0f; } -bool WorldObject::IsSelfOrInSameMap(const WorldObject* obj) const +bool WorldObject::IsSelfOrInSameMap(WorldObject const* obj) const { if (this == obj) { @@ -1278,7 +1278,7 @@ bool WorldObject::IsSelfOrInSameMap(const WorldObject* obj) const return IsInMap(obj); } -bool WorldObject::IsInMap(const WorldObject* obj) const +bool WorldObject::IsInMap(WorldObject const* obj) const { if (obj) { @@ -1340,7 +1340,7 @@ bool WorldObject::IsWithinLOS(float ox, float oy, float oz, LineOfSightChecks ch return true; } -bool WorldObject::IsWithinLOSInMap(const WorldObject* obj, LineOfSightChecks checks) const +bool WorldObject::IsWithinLOSInMap(WorldObject const* obj, LineOfSightChecks checks) const { if (!IsInMap(obj)) return false; @@ -1463,7 +1463,7 @@ bool WorldObject::IsInRange3d(float x, float y, float z, float minRange, float m return distsq < maxdist * maxdist; } -bool WorldObject::IsInBetween(const WorldObject* obj1, const WorldObject* obj2, float size) const +bool WorldObject::IsInBetween(WorldObject const* obj1, WorldObject const* obj2, float size) const { if (!obj1 || !obj2) return false; @@ -1665,7 +1665,7 @@ float WorldObject::GetVisibilityRange() const return IsInWintergrasp() ? VISIBILITY_DIST_WINTERGRASP : GetMap()->GetVisibilityRange(); } -float WorldObject::GetSightRange(const WorldObject* target) const +float WorldObject::GetSightRange(WorldObject const* target) const { if (ToUnit()) { @@ -1756,7 +1756,7 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo // pussywizard: arena spectator if (obj->GetTypeId() == TYPEID_PLAYER) - if (((const Player*)obj)->IsSpectator() && ((const Player*)obj)->FindMap()->IsBattleArena()) + if (((Player const*)obj)->IsSpectator() && ((Player const*)obj)->FindMap()->IsBattleArena()) return false; bool corpseVisibility = false; @@ -1841,7 +1841,7 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo // pussywizard: arena spectator if (this->GetTypeId() == TYPEID_PLAYER) - if (((const Player*)this)->IsSpectator() && ((const Player*)this)->FindMap()->IsBattleArena() && (obj->m_invisibility.GetFlags() || obj->m_stealth.GetFlags())) + if (((Player const*)this)->IsSpectator() && ((Player const*)this)->FindMap()->IsBattleArena() && (obj->m_invisibility.GetFlags() || obj->m_stealth.GetFlags())) return false; if (!CanDetect(obj, ignoreStealth, !distanceCheck, checkAlert)) @@ -1859,10 +1859,10 @@ bool WorldObject::CanNeverSee(WorldObject const* obj) const bool WorldObject::CanDetect(WorldObject const* obj, bool ignoreStealth, bool checkClient, bool checkAlert) const { - const WorldObject* seer = this; + WorldObject const* seer = this; // Pets don't have detection, they use the detection of their masters - if (const Unit* thisUnit = ToUnit()) + if (Unit const* thisUnit = ToUnit()) if (Unit* controller = thisUnit->GetCharmerOrOwner()) seer = controller; @@ -2619,7 +2619,7 @@ void WorldObject::GetVoidClosePoint(float& x, float& y, float& z, float size, fl GetNearPoint(nullptr, x, y, z, size, distance2d, GetOrientation() + relAngle, controlZ); } -bool WorldObject::GetClosePoint(float& x, float& y, float& z, float size, float distance2d, float angle, const WorldObject* forWho, bool force) const +bool WorldObject::GetClosePoint(float& x, float& y, float& z, float size, float distance2d, float angle, WorldObject const* forWho, bool force) const { // angle calculated from current orientation GetNearPoint(forWho, x, y, z, size, distance2d, GetOrientation() + angle); @@ -2630,7 +2630,7 @@ bool WorldObject::GetClosePoint(float& x, float& y, float& z, float size, float y = this->GetPositionY(); z = this->GetPositionZ(); if (forWho) - if (const Unit* u = forWho->ToUnit()) + if (Unit const* u = forWho->ToUnit()) u->UpdateAllowedPositionZ(x, y, z); } float maxDist = GetObjectSize() + size + distance2d + 1.0f; @@ -2662,7 +2662,7 @@ Position WorldObject::GetRandomNearPosition(float radius) return pos; } -void WorldObject::GetContactPoint(const WorldObject* obj, float& x, float& y, float& z, float distance2d) const +void WorldObject::GetContactPoint(WorldObject const* obj, float& x, float& y, float& z, float distance2d) const { // angle to face `obj` to `this` using distance includes size of `obj` GetNearPoint(obj, x, y, z, obj->GetObjectSize(), distance2d, GetAngle(obj)); @@ -2677,7 +2677,7 @@ void WorldObject::GetContactPoint(const WorldObject* obj, float& x, float& y, fl } } -void WorldObject::GetChargeContactPoint(const WorldObject* obj, float& x, float& y, float& z, float distance2d) const +void WorldObject::GetChargeContactPoint(WorldObject const* obj, float& x, float& y, float& z, float distance2d) const { // angle to face `obj` to `this` using distance includes size of `obj` GetNearPoint(obj, x, y, z, obj->GetObjectSize(), distance2d, GetAngle(obj)); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index af45a7996..3d5e8c1eb 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -185,9 +185,9 @@ public: [[nodiscard]] Creature const* ToCreature() const { if (GetTypeId() == TYPEID_UNIT) return (Creature const*)((Creature*)this); else return nullptr; } Unit* ToUnit() { if (GetTypeId() == TYPEID_UNIT || GetTypeId() == TYPEID_PLAYER) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] Unit const* ToUnit() const { if (GetTypeId() == TYPEID_UNIT || GetTypeId() == TYPEID_PLAYER) return (const Unit*)((Unit*)this); else return nullptr; } + [[nodiscard]] Unit const* ToUnit() const { if (GetTypeId() == TYPEID_UNIT || GetTypeId() == TYPEID_PLAYER) return (Unit const*)((Unit*)this); else return nullptr; } GameObject* ToGameObject() { if (GetTypeId() == TYPEID_GAMEOBJECT) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] GameObject const* ToGameObject() const { if (GetTypeId() == TYPEID_GAMEOBJECT) return (const GameObject*)((GameObject*)this); else return nullptr; } + [[nodiscard]] GameObject const* ToGameObject() const { if (GetTypeId() == TYPEID_GAMEOBJECT) return (GameObject const*)((GameObject*)this); else return nullptr; } Corpse* ToCorpse() { if (GetTypeId() == TYPEID_CORPSE) return reinterpret_cast(this); else return nullptr; } [[nodiscard]] Corpse const* ToCorpse() const { if (GetTypeId() == TYPEID_CORPSE) return (const Corpse*)((Corpse*)this); else return nullptr; } @@ -392,7 +392,7 @@ public: void GetNearPoint2D(float& x, float& y, float distance, float absAngle, Position const* startPos = nullptr) const; void GetNearPoint(WorldObject const* searcher, float& x, float& y, float& z, float searcher_size, float distance2d, float absAngle, float controlZ = 0, Position const* startPos = nullptr) const; void GetVoidClosePoint(float& x, float& y, float& z, float size, float distance2d = 0, float relAngle = 0, float controlZ = 0) const; - bool GetClosePoint(float& x, float& y, float& z, float size, float distance2d = 0, float angle = 0, const WorldObject* forWho = nullptr, bool force = false) const; + bool GetClosePoint(float& x, float& y, float& z, float size, float distance2d = 0, float angle = 0, WorldObject const* forWho = nullptr, bool force = false) const; void MovePosition(Position& pos, float dist, float angle); Position GetNearPosition(float dist, float angle); void MovePositionToFirstCollision(Position& pos, float dist, float angle); @@ -401,8 +401,8 @@ public: Position GetFirstCollisionPosition(float dist, float angle); Position GetRandomNearPosition(float radius); - void GetContactPoint(const WorldObject* obj, float& x, float& y, float& z, float distance2d = CONTACT_DISTANCE) const; - void GetChargeContactPoint(const WorldObject* obj, float& x, float& y, float& z, float distance2d = CONTACT_DISTANCE) const; + void GetContactPoint(WorldObject const* obj, float& x, float& y, float& z, float distance2d = CONTACT_DISTANCE) const; + void GetChargeContactPoint(WorldObject const* obj, float& x, float& y, float& z, float distance2d = CONTACT_DISTANCE) const; [[nodiscard]] float GetObjectSize() const; @@ -433,15 +433,15 @@ public: [[nodiscard]] virtual std::string const& GetNameForLocaleIdx(LocaleConstant /*locale_idx*/) const { return m_name; } - float GetDistance(const WorldObject* obj) const; + float GetDistance(WorldObject const* obj) const; [[nodiscard]] float GetDistance(const Position& pos) const; [[nodiscard]] float GetDistance(float x, float y, float z) const; - float GetDistance2d(const WorldObject* obj) const; + float GetDistance2d(WorldObject const* obj) const; [[nodiscard]] float GetDistance2d(float x, float y) const; - float GetDistanceZ(const WorldObject* obj) const; + float GetDistanceZ(WorldObject const* obj) const; - bool IsSelfOrInSameMap(const WorldObject* obj) const; - bool IsInMap(const WorldObject* obj) const; + bool IsSelfOrInSameMap(WorldObject const* obj) const; + bool IsInMap(WorldObject const* obj) const; [[nodiscard]] bool IsWithinDist3d(float x, float y, float z, float dist) const; bool IsWithinDist3d(const Position* pos, float dist) const; [[nodiscard]] bool IsWithinDist2d(float x, float y, float dist) const; @@ -460,7 +460,7 @@ public: bool isInFront(WorldObject const* target, float arc = M_PI) const; bool isInBack(WorldObject const* target, float arc = M_PI) const; - bool IsInBetween(const WorldObject* obj1, const WorldObject* obj2, float size = 0) const; + bool IsInBetween(WorldObject const* obj1, WorldObject const* obj2, float size = 0) const; virtual void CleanupsBeforeDelete(bool finalCleanup = true); // used in destructor or explicitly before mass creature delete to remove cross-references to already deleted units @@ -481,7 +481,7 @@ public: [[nodiscard]] float GetGridActivationRange() const; [[nodiscard]] float GetVisibilityRange() const; - virtual float GetSightRange(const WorldObject* target = nullptr) const; + virtual float GetSightRange(WorldObject const* target = nullptr) const; //bool CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth = false, bool distanceCheck = false) const; bool CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth = false, bool distanceCheck = false, bool checkAlert = false) const; @@ -663,13 +663,13 @@ namespace Acore class ObjectDistanceOrderPred { public: - ObjectDistanceOrderPred(const WorldObject* pRefObj, bool ascending = true) : m_refObj(pRefObj), m_ascending(ascending) {} - bool operator()(const WorldObject* pLeft, const WorldObject* pRight) const + ObjectDistanceOrderPred(WorldObject const* pRefObj, bool ascending = true) : m_refObj(pRefObj), m_ascending(ascending) {} + bool operator()(WorldObject const* pLeft, WorldObject const* pRight) const { return m_ascending ? m_refObj->GetDistanceOrder(pLeft, pRight) : !m_refObj->GetDistanceOrder(pLeft, pRight); } private: - const WorldObject* m_refObj; + WorldObject const* m_refObj; const bool m_ascending; }; } diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index e5e272436..d87a7fd08 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -87,7 +87,7 @@ void Pet::AddToWorld() SpellAreaForAreaMapBounds saBounds = sSpellMgr->GetSpellAreaForAreaMapBounds(4812); for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) if ((itr->second->raceMask & plr->getRaceMask()) && !HasAura(itr->second->spellId)) - if (const SpellInfo* si = sSpellMgr->GetSpellInfo(itr->second->spellId)) + if (SpellInfo const* si = sSpellMgr->GetSpellInfo(itr->second->spellId)) if (si->HasAura(SPELL_AURA_MOD_INCREASE_HEALTH_PERCENT)) AddAura(itr->second->spellId, this); } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1bc0833cf..ed87817aa 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -3063,7 +3063,7 @@ bool Player::_addSpell(uint32 spellId, uint8 addSpecMask, bool temporary, bool l return false; //ABORT(); } - else if (const SpellInfo* learnSpell = sSpellMgr->GetSpellInfo(spellInfo->Effects[i].TriggerSpell)) + else if (SpellInfo const* learnSpell = sSpellMgr->GetSpellInfo(spellInfo->Effects[i].TriggerSpell)) _addSpell(learnSpell->Id, SPEC_MASK_ALL, true); } @@ -3679,7 +3679,7 @@ bool Player::resetTalents(bool noResetCost) // xinef: check if talent learns spell to spell book TalentEntry const* talentInfo = sTalentStore.LookupEntry(itr->second->talentID); - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(itr->first); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(itr->first); bool removed = false; if (talentInfo->addToSpellBook) @@ -7504,7 +7504,7 @@ void Player::_ApplyAmmoBonuses() UpdateDamagePhysical(RANGED_ATTACK); } -bool Player::CheckAmmoCompatibility(const ItemTemplate* ammo_proto) const +bool Player::CheckAmmoCompatibility(ItemTemplate const* ammo_proto) const { if (!ammo_proto) return false; @@ -9569,7 +9569,7 @@ class SpellModPred { public: SpellModPred() {} - bool operator() (const SpellModifier* a, const SpellModifier* b) const + bool operator() (SpellModifier const* a, SpellModifier const* b) const { if (a->type != b->type) return a->type == SPELLMOD_FLAT; @@ -9580,7 +9580,7 @@ class MageSpellModPred { public: MageSpellModPred() {} - bool operator() (const SpellModifier* a, const SpellModifier* b) const + bool operator() (SpellModifier const* a, SpellModifier const* b) const { if (a->type != b->type) return a->type == SPELLMOD_FLAT; @@ -9722,7 +9722,7 @@ void Player::RemoveSpellMods(Spell* spell) if (spell->m_appliedMods.empty()) return; - const SpellInfo* const spellInfo = spell->m_spellInfo; + SpellInfo const* const spellInfo = spell->m_spellInfo; for (uint8 i = 0; i < MAX_SPELLMOD; ++i) { @@ -9747,7 +9747,7 @@ void Player::RemoveSpellMods(Spell* spell) // MAGE T8P4 BONUS if( spellInfo->SpellFamilyName == SPELLFAMILY_MAGE ) { - const SpellInfo* sp = mod->ownerAura->GetSpellInfo(); + SpellInfo const* sp = mod->ownerAura->GetSpellInfo(); // Missile Barrage, Hot Streak, Brain Freeze (trigger spell - Fireball!) if( sp->SpellIconID == 3261 || sp->SpellIconID == 2999 || sp->SpellIconID == 2938 ) if( AuraEffect* aurEff = GetAuraEffectDummy(64869) ) @@ -11127,7 +11127,7 @@ bool Player::IsAlwaysDetectableFor(WorldObject const* seer) const return false; } - if (const Player* seerPlayer = seer->ToPlayer()) + if (Player const* seerPlayer = seer->ToPlayer()) { if (IsGroupVisibleFor(seerPlayer)) { @@ -12362,7 +12362,7 @@ bool Player::IsAtRecruitAFriendDistance(WorldObject const* pOther) const { if (!pOther) return false; - const WorldObject* player = GetCorpse(); + WorldObject const* player = GetCorpse(); if (!player || IsAlive()) player = this; @@ -13556,7 +13556,7 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank) if (spellId == 0) return; - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(spellId); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); if (!spellInfo) return; @@ -15815,7 +15815,7 @@ Optional Player::GetFarSightDistance() const return _farSightDistance; } -float Player::GetSightRange(const WorldObject* target) const +float Player::GetSightRange(WorldObject const* target) const { float sightRange = WorldObject::GetSightRange(target); if (_farSightDistance) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 055ca4505..04d33b183 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1250,7 +1250,7 @@ public: InventoryResult CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, Item* pItem, bool swap, bool not_loading = true) const; InventoryResult CanUseItem(Item* pItem, bool not_loading = true) const; [[nodiscard]] bool HasItemTotemCategory(uint32 TotemCategory) const; - bool IsTotemCategoryCompatiableWith(const ItemTemplate* pProto, uint32 requiredTotemCategoryId) const; + bool IsTotemCategoryCompatiableWith(ItemTemplate const* pProto, uint32 requiredTotemCategoryId) const; InventoryResult CanUseItem(ItemTemplate const* pItem) const; [[nodiscard]] InventoryResult CanUseAmmo(uint32 item) const; InventoryResult CanRollForItemInLFG(ItemTemplate const* item, WorldObject const* lootedObject) const; @@ -1277,7 +1277,7 @@ public: void SetAmmo(uint32 item); void RemoveAmmo(); [[nodiscard]] float GetAmmoDPS() const { return m_ammoDPS; } - bool CheckAmmoCompatibility(const ItemTemplate* ammo_proto) const; + bool CheckAmmoCompatibility(ItemTemplate const* ammo_proto) const; void QuickEquipItem(uint16 pos, Item* pItem); void VisualizeItem(uint8 slot, Item* pItem); void SetVisibleItemSlot(uint8 slot, Item* pItem); @@ -2448,7 +2448,7 @@ public: bool CanTeleport() { return m_canTeleport; } void SetCanTeleport(bool value) { m_canTeleport = value; } - bool isAllowedToLoot(const Creature* creature); + bool isAllowedToLoot(Creature const* creature); [[nodiscard]] DeclinedName const* GetDeclinedNames() const { return m_declinedname; } [[nodiscard]] uint8 GetRunesState() const { return m_runes->runeState; } @@ -2575,7 +2575,7 @@ public: void ResetFarSightDistance(); [[nodiscard]] Optional GetFarSightDistance() const; - float GetSightRange(const WorldObject* target = nullptr) const override; + float GetSightRange(WorldObject const* target = nullptr) const override; std::string GetPlayerName(); diff --git a/src/server/game/Entities/Player/PlayerMisc.cpp b/src/server/game/Entities/Player/PlayerMisc.cpp index e642ea61c..9153a2261 100644 --- a/src/server/game/Entities/Player/PlayerMisc.cpp +++ b/src/server/game/Entities/Player/PlayerMisc.cpp @@ -196,7 +196,7 @@ void Player::ResetInstances(ObjectGuid guid, uint8 method, bool isRaid) for (BoundInstancesMap::const_iterator itr = m_boundInstances.begin(); itr != m_boundInstances.end(); ++itr) { InstanceSave* instanceSave = itr->second.save; - const MapEntry* entry = sMapStore.LookupEntry(itr->first); + MapEntry const* entry = sMapStore.LookupEntry(itr->first); if (!entry || entry->IsRaid() || !instanceSave->CanReset()) continue; @@ -223,7 +223,7 @@ void Player::ResetInstances(ObjectGuid guid, uint8 method, bool isRaid) for (BoundInstancesMap::const_iterator itr = m_boundInstances.begin(); itr != m_boundInstances.end(); ++itr) { InstanceSave* instanceSave = itr->second.save; - const MapEntry* entry = sMapStore.LookupEntry(itr->first); + MapEntry const* entry = sMapStore.LookupEntry(itr->first); if (!entry || entry->IsRaid() != isRaid || !instanceSave->CanReset()) continue; diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index 81f44f50d..c6ab12d38 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -909,7 +909,7 @@ bool Player::HasItemTotemCategory(uint32 TotemCategory) const return false; } -bool Player::IsTotemCategoryCompatiableWith(const ItemTemplate* pProto, uint32 requiredTotemCategoryId) const +bool Player::IsTotemCategoryCompatiableWith(ItemTemplate const* pProto, uint32 requiredTotemCategoryId) const { if (requiredTotemCategoryId == 0) return true; @@ -2603,7 +2603,7 @@ Item* Player::StoreItem(ItemPosCountVec const& dest, Item* pItem, bool update) return nullptr; Item* lastItem = pItem; - const ItemTemplate* proto = pItem->GetTemplate(); + ItemTemplate const* proto = pItem->GetTemplate(); for (ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end();) { @@ -3072,7 +3072,7 @@ void Player::DestroyItem(uint8 bag, uint8 slot, bool update) pItem->ClearSoulboundTradeable(this); RemoveTradeableItem(pItem); - const ItemTemplate* proto = pItem->GetTemplate(); + ItemTemplate const* proto = pItem->GetTemplate(); for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) if (proto->Spells[i].SpellTrigger == ITEM_SPELLTRIGGER_ON_NO_DELAY_USE && proto->Spells[i].SpellId > 0) // On obtain trigger RemoveAurasDueToSpell(proto->Spells[i].SpellId); @@ -5644,7 +5644,7 @@ bool Player::LoadFromDB(ObjectGuid playerGuid, CharacterDatabaseQueryHolder cons return true; } -bool Player::isAllowedToLoot(const Creature* creature) +bool Player::isAllowedToLoot(Creature const* creature) { if (!creature->isDead() || !creature->IsDamageEnoughForLootingAndReward()) return false; @@ -5816,7 +5816,7 @@ void Player::_LoadGlyphAuras() { if (GlyphSlotEntry const* glyphSlotEntry = sGlyphSlotStore.LookupEntry(GetGlyphSlot(i))) { - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(glyphEntry->SpellId); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(glyphEntry->SpellId); if (glyphEntry->TypeFlags == glyphSlotEntry->TypeFlags) { if (!spellInfo->Stances) @@ -6740,7 +6740,7 @@ void Player::PrettyPrintRequirementsItemsList(const std::vectorGetSessionDbLocaleIndex(); for (const ProgressionRequirement* missingReq : missingItems) { - const ItemTemplate* itemTemplate = sObjectMgr->GetItemTemplate(missingReq->id); + ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(missingReq->id); if (!itemTemplate) { continue; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4cb7877f0..1f586c7c2 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -604,7 +604,7 @@ void Unit::resetAttackTimer(WeaponAttackType type) m_attackTimer[type] = std::min(m_attackTimer[type] + time, time); } -bool Unit::IsWithinCombatRange(const Unit* obj, float dist2compare) const +bool Unit::IsWithinCombatRange(Unit const* obj, float dist2compare) const { if (!obj || !IsInMap(obj) || !InSamePhase(obj)) return false; @@ -620,7 +620,7 @@ bool Unit::IsWithinCombatRange(const Unit* obj, float dist2compare) const return distsq < maxdist * maxdist; } -bool Unit::IsWithinMeleeRange(const Unit* obj, float dist) const +bool Unit::IsWithinMeleeRange(Unit const* obj, float dist) const { if (!obj || !IsInMap(obj) || !InSamePhase(obj)) return false; @@ -656,7 +656,7 @@ bool Unit::IsWithinRange(Unit const* obj, float dist) const return distsq <= dist * dist; } -bool Unit::GetRandomContactPoint(const Unit* obj, float& x, float& y, float& z, bool force) const +bool Unit::GetRandomContactPoint(Unit const* obj, float& x, float& y, float& z, bool force) const { float combat_reach = GetCombatReach(); if (combat_reach < 0.1f) // sometimes bugged for players @@ -665,7 +665,7 @@ bool Unit::GetRandomContactPoint(const Unit* obj, float& x, float& y, float& z, uint32 attacker_number = getAttackers().size(); if (attacker_number > 0) --attacker_number; - const Creature* c = obj->ToCreature(); + Creature const* c = obj->ToCreature(); if (c) if (c->isWorldBoss() || c->IsDungeonBoss() || (obj->IsPet() && const_cast(obj)->ToPet()->isControlled())) attacker_number = 0; // pussywizard: pets and bosses just come to target from their angle @@ -2167,7 +2167,7 @@ void Unit::CalcAbsorbResist(DamageInfo& dmgInfo, bool Splited) continue; // Xinef: Single Target splits require LoS - const SpellInfo* splitSpellInfo = (*itr)->GetSpellInfo(); + SpellInfo const* splitSpellInfo = (*itr)->GetSpellInfo(); if (!splitSpellInfo->Effects[(*itr)->GetEffIndex()].IsAreaAuraEffect() && !splitSpellInfo->HasAttribute(SPELL_ATTR2_IGNORE_LINE_OF_SIGHT)) if (!caster->IsWithinLOSInMap(victim) || !caster->IsWithinDist(victim, splitSpellInfo->GetMaxRange(splitSpellInfo->IsPositive(), caster))) continue; @@ -2465,7 +2465,7 @@ void Unit::HandleProcExtraAttackFor(Unit* victim) } } -MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackType attType) const +MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackType attType) const { // This is only wrapper @@ -2488,7 +2488,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy return RollMeleeOutcomeAgainst(victim, attType, int32(crit_chance * 100), int32(miss_chance * 100), int32(dodge_chance * 100), int32(parry_chance * 100), int32(block_chance * 100)); } -MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const +MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const { if (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsEvadingAttacks()) { @@ -2791,7 +2791,7 @@ bool Unit::isBlockCritical() return false; } -int32 Unit::GetMechanicResistChance(const SpellInfo* spell) +int32 Unit::GetMechanicResistChance(SpellInfo const* spell) { if (!spell) return 0; @@ -3285,7 +3285,7 @@ float Unit::GetUnitBlockChance() const } } -float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit* victim) const +float Unit::GetUnitCriticalChance(WeaponAttackType attackType, Unit const* victim) const { float crit; @@ -4052,7 +4052,7 @@ void Unit::_ApplyAura(AuraApplication* aurApp, uint8 effMask) Unit* caster = aura->GetCaster(); // Update target aura state flag - const SpellInfo* spellInfo = aura->GetSpellInfo(); + SpellInfo const* spellInfo = aura->GetSpellInfo(); if (AuraStateType aState = spellInfo->GetAuraState()) { if (aState != AURA_STATE_CONFLAGRATE) @@ -9504,7 +9504,7 @@ void Unit::setPowerType(Powers new_powertype) break; } - if (const Player* player = ToPlayer()) + if (Player const* player = ToPlayer()) if (player->NeedSendSpectatorData()) { ArenaSpectator::SendCommand_UInt32Value(FindMap(), GetGUID(), "PWT", new_powertype); @@ -12721,7 +12721,7 @@ void Unit::ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply, } } -void Unit::ApplySpellDispelImmunity(const SpellInfo* spellProto, DispelType type, bool apply) +void Unit::ApplySpellDispelImmunity(SpellInfo const* spellProto, DispelType type, bool apply) { ApplySpellImmune(spellProto->Id, IMMUNITY_DISPEL, type, apply); @@ -12756,7 +12756,7 @@ float Unit::GetWeaponProcChance() const return 0; } -float Unit::GetPPMProcChance(uint32 WeaponSpeed, float PPM, const SpellInfo* spellProto) const +float Unit::GetPPMProcChance(uint32 WeaponSpeed, float PPM, SpellInfo const* spellProto) const { // proc per minute chance calculation if (PPM <= 0) @@ -13216,7 +13216,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo repTargetToThis <= REP_NEUTRAL) { Player* owner = GetAffectingPlayer(); - const Unit* const thisUnit = owner ? owner : this; + Unit const* const thisUnit = owner ? owner : this; if (!(target->GetTypeId() == TYPEID_PLAYER && thisUnit->GetTypeId() == TYPEID_PLAYER) && !(target->GetTypeId() == TYPEID_UNIT && thisUnit->GetTypeId() == TYPEID_UNIT)) { @@ -13489,7 +13489,7 @@ bool Unit::IsAlwaysDetectableFor(WorldObject const* seer) const return true; if (Player* ownerPlayer = GetSpellModOwner()) - if (const Player* seerPlayer = seer->ToPlayer()) + if (Player const* seerPlayer = seer->ToPlayer()) { if (ownerPlayer->IsGroupVisibleFor(seerPlayer)) return true; @@ -15389,7 +15389,7 @@ bool InitTriggerAuraData() return true; } -void createProcFlags(const SpellInfo* spellInfo, WeaponAttackType attackType, bool positive, uint32& procAttacker, uint32& procVictim) +void createProcFlags(SpellInfo const* spellInfo, WeaponAttackType attackType, bool positive, uint32& procAttacker, uint32& procVictim) { if (spellInfo) { @@ -18132,8 +18132,8 @@ bool Unit::IsInPartyWith(Unit const* unit) const if (this == unit) return true; - const Unit* u1 = GetCharmerOrOwnerOrSelf(); - const Unit* u2 = unit->GetCharmerOrOwnerOrSelf(); + Unit const* u1 = GetCharmerOrOwnerOrSelf(); + Unit const* u2 = unit->GetCharmerOrOwnerOrSelf(); if (u1 == u2) return true; @@ -18155,8 +18155,8 @@ bool Unit::IsInRaidWith(Unit const* unit) const if (this == unit) return true; - const Unit* u1 = GetCharmerOrOwnerOrSelf(); - const Unit* u2 = unit->GetCharmerOrOwnerOrSelf(); + Unit const* u1 = GetCharmerOrOwnerOrSelf(); + Unit const* u2 = unit->GetCharmerOrOwnerOrSelf(); if (u1 == u2) return true; @@ -18341,7 +18341,7 @@ void Unit::ApplyResilience(Unit const* victim, float* crit, int32* damage, bool // Melee based spells can be miss, parry or dodge on this step // Crit or block - determined on damage calculation phase! (and can be both in some time) -float Unit::MeleeSpellMissChance(const Unit* victim, WeaponAttackType attType, int32 skillDiff, uint32 spellId) const +float Unit::MeleeSpellMissChance(Unit const* victim, WeaponAttackType attType, int32 skillDiff, uint32 spellId) const { SpellInfo const* spellInfo = spellId ? sSpellMgr->GetSpellInfo(spellId) : nullptr; if (spellInfo && spellInfo->HasAttribute(SPELL_ATTR7_NO_ATTACK_MISS)) @@ -19680,7 +19680,7 @@ bool CharmInfo::IsReturning() return _isReturning; } -void Unit::PetSpellFail(const SpellInfo* spellInfo, Unit* target, uint32 result) +void Unit::PetSpellFail(SpellInfo const* spellInfo, Unit* target, uint32 result) { CharmInfo* charmInfo = GetCharmInfo(); if (!charmInfo || GetTypeId() != TYPEID_UNIT) diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index fce3d96ae..69235c055 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -905,7 +905,7 @@ struct SpellPeriodicAuraLogInfo bool critical; }; -void createProcFlags(const SpellInfo* spellInfo, WeaponAttackType attackType, bool positive, uint32& procAttacker, uint32& procVictim); +void createProcFlags(SpellInfo const* spellInfo, WeaponAttackType attackType, bool positive, uint32& procAttacker, uint32& procVictim); uint32 createProcExtendMask(SpellNonMeleeDamage* damageInfo, SpellMissInfo missCondition); struct RedirectThreatInfo @@ -1308,10 +1308,10 @@ public: [[nodiscard]] float GetCombatReach() const override { return m_floatValues[UNIT_FIELD_COMBATREACH]; } [[nodiscard]] float GetMeleeReach() const { float reach = m_floatValues[UNIT_FIELD_COMBATREACH]; return reach > MIN_MELEE_REACH ? reach : MIN_MELEE_REACH; } [[nodiscard]] bool IsWithinRange(Unit const* obj, float dist) const; - bool IsWithinCombatRange(const Unit* obj, float dist2compare) const; - bool IsWithinMeleeRange(const Unit* obj, float dist = 0.f) const; + bool IsWithinCombatRange(Unit const* obj, float dist2compare) const; + bool IsWithinMeleeRange(Unit const* obj, float dist = 0.f) const; float GetMeleeRange(Unit const* target) const; - bool GetRandomContactPoint(const Unit* target, float& x, float& y, float& z, bool force = false) const; + bool GetRandomContactPoint(Unit const* target, float& x, float& y, float& z, bool force = false) const; uint32 m_extraAttacks; bool m_canDualWield; @@ -1524,9 +1524,9 @@ public: [[nodiscard]] uint32 GetRangedDamageReduction(uint32 damage) const { return GetCombatRatingDamageReduction(CR_CRIT_TAKEN_RANGED, 2.0f, 100.0f, damage); } [[nodiscard]] uint32 GetSpellDamageReduction(uint32 damage) const { return GetCombatRatingDamageReduction(CR_CRIT_TAKEN_SPELL, 2.0f, 100.0f, damage); } - static void ApplyResilience(const Unit* victim, float* crit, int32* damage, bool isCrit, CombatRating type); + static void ApplyResilience(Unit const* victim, float* crit, int32* damage, bool isCrit, CombatRating type); - float MeleeSpellMissChance(const Unit* victim, WeaponAttackType attType, int32 skillDiff, uint32 spellId) const; + float MeleeSpellMissChance(Unit const* victim, WeaponAttackType attType, int32 skillDiff, uint32 spellId) const; SpellMissInfo MeleeSpellHitResult(Unit* victim, SpellInfo const* spell); SpellMissInfo MagicSpellHitResult(Unit* victim, SpellInfo const* spell); SpellMissInfo SpellHitResult(Unit* victim, SpellInfo const* spell, bool canReflect = false); @@ -1535,8 +1535,8 @@ public: [[nodiscard]] float GetUnitParryChance() const; [[nodiscard]] float GetUnitBlockChance() const; [[nodiscard]] float GetUnitMissChance(WeaponAttackType attType) const; - float GetUnitCriticalChance(WeaponAttackType attackType, const Unit* victim) const; - int32 GetMechanicResistChance(const SpellInfo* spell); + float GetUnitCriticalChance(WeaponAttackType attackType, Unit const* victim) const; + int32 GetMechanicResistChance(SpellInfo const* spell); [[nodiscard]] bool CanUseAttackType(uint8 attacktype) const { switch (attacktype) @@ -1570,10 +1570,10 @@ public: uint32 GetDefenseSkillValue(Unit const* target = nullptr) const; uint32 GetWeaponSkillValue(WeaponAttackType attType, Unit const* target = nullptr) const; [[nodiscard]] float GetWeaponProcChance() const; - float GetPPMProcChance(uint32 WeaponSpeed, float PPM, const SpellInfo* spellProto) const; + float GetPPMProcChance(uint32 WeaponSpeed, float PPM, SpellInfo const* spellProto) const; - MeleeHitOutcome RollMeleeOutcomeAgainst (const Unit* victim, WeaponAttackType attType) const; - MeleeHitOutcome RollMeleeOutcomeAgainst (const Unit* victim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const; + MeleeHitOutcome RollMeleeOutcomeAgainst (Unit const* victim, WeaponAttackType attType) const; + MeleeHitOutcome RollMeleeOutcomeAgainst (Unit const* victim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const; [[nodiscard]] bool IsVendor() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_VENDOR); } [[nodiscard]] bool IsTrainer() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TRAINER); } @@ -2147,7 +2147,7 @@ public: void CastDelayedSpellWithPeriodicAmount(Unit* caster, uint32 spellId, AuraType auraType, int32 addAmount, uint8 effectIndex = 0); void ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply, SpellImmuneBlockType blockType = SPELL_BLOCK_TYPE_ALL); - void ApplySpellDispelImmunity(const SpellInfo* spellProto, DispelType type, bool apply); + void ApplySpellDispelImmunity(SpellInfo const* spellProto, DispelType type, bool apply); virtual bool IsImmunedToSpell(SpellInfo const* spellInfo); // redefined in Creature [[nodiscard]] bool IsImmunedToDamage(SpellSchoolMask meleeSchoolMask) const; @@ -2272,7 +2272,7 @@ public: void RemoveVehicleKit(); [[nodiscard]] Vehicle* GetVehicleKit()const { return m_vehicleKit; } [[nodiscard]] Vehicle* GetVehicle() const { return m_vehicle; } - bool IsOnVehicle(const Unit* vehicle) const { return m_vehicle && m_vehicle == vehicle->GetVehicleKit(); } + bool IsOnVehicle(Unit const* vehicle) const { return m_vehicle && m_vehicle == vehicle->GetVehicleKit(); } [[nodiscard]] Unit* GetVehicleBase() const; [[nodiscard]] Creature* GetVehicleCreatureBase() const; [[nodiscard]] ObjectGuid GetTransGUID() const override; @@ -2346,7 +2346,7 @@ public: [[nodiscard]] bool CanApplyResilience() const { return m_applyResilience; } - void PetSpellFail(const SpellInfo* spellInfo, Unit* target, uint32 result); + void PetSpellFail(SpellInfo const* spellInfo, Unit* target, uint32 result); int32 CalculateAOEDamageReduction(int32 damage, uint32 schoolMask, Unit* caster) const; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 8786336b4..ea230ac01 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1481,7 +1481,7 @@ void ObjectMgr::LoadEquipmentTemplates() if (!equipmentInfo.ItemEntry[i]) continue; - const ItemTemplate* item = GetItemTemplate(equipmentInfo.ItemEntry[i]); + ItemTemplate const* item = GetItemTemplate(equipmentInfo.ItemEntry[i]); if (!item) { @@ -1752,7 +1752,7 @@ void ObjectMgr::LoadLinkedRespawn() break; } - const MapEntry* const map = sMapStore.LookupEntry(master->mapid); + MapEntry const* const map = sMapStore.LookupEntry(master->mapid); if (!map || !map->Instanceable() || (master->mapid != slave->mapid)) { LOG_ERROR("sql.sql", "LinkedRespawn: Creature '{}' linking to Creature '{}' on an unpermitted map.", guidLow, linkedGuidLow); @@ -1789,7 +1789,7 @@ void ObjectMgr::LoadLinkedRespawn() break; } - const MapEntry* const map = sMapStore.LookupEntry(master->mapid); + MapEntry const* const map = sMapStore.LookupEntry(master->mapid); if (!map || !map->Instanceable() || (master->mapid != slave->mapid)) { LOG_ERROR("sql.sql", "LinkedRespawn: Creature '{}' linking to Gameobject '{}' on an unpermitted map.", guidLow, linkedGuidLow); @@ -1826,7 +1826,7 @@ void ObjectMgr::LoadLinkedRespawn() break; } - const MapEntry* const map = sMapStore.LookupEntry(master->mapid); + MapEntry const* const map = sMapStore.LookupEntry(master->mapid); if (!map || !map->Instanceable() || (master->mapid != slave->mapid)) { LOG_ERROR("sql.sql", "LinkedRespawn: Gameobject '{}' linking to Gameobject '{}' on an unpermitted map.", guidLow, linkedGuidLow); @@ -1863,7 +1863,7 @@ void ObjectMgr::LoadLinkedRespawn() break; } - const MapEntry* const map = sMapStore.LookupEntry(master->mapid); + MapEntry const* const map = sMapStore.LookupEntry(master->mapid); if (!map || !map->Instanceable() || (master->mapid != slave->mapid)) { LOG_ERROR("sql.sql", "LinkedRespawn: Gameobject '{}' linking to Creature '{}' on an unpermitted map.", guidLow, linkedGuidLow); @@ -6632,13 +6632,13 @@ AreaTriggerTeleport const* ObjectMgr::GetGoBackTrigger(uint32 Map) const { bool useParentDbValue = false; uint32 parentId = 0; - const MapEntry* mapEntry = sMapStore.LookupEntry(Map); + MapEntry const* mapEntry = sMapStore.LookupEntry(Map); if (!mapEntry || mapEntry->entrance_map < 0) return nullptr; if (mapEntry->IsDungeon()) { - const InstanceTemplate* iTemplate = sObjectMgr->GetInstanceTemplate(Map); + InstanceTemplate const* iTemplate = sObjectMgr->GetInstanceTemplate(Map); if (!iTemplate) return nullptr; diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index b4e4a461f..125ce99db 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -880,7 +880,7 @@ namespace Acore AnyUnfriendlyAttackableVisibleUnitInObjectRangeCheck(Unit const* funit, float range) : i_funit(funit), i_range(range) {} - bool operator()(const Unit* u) + bool operator()(Unit const* u) { return u->IsAlive() && i_funit->IsWithinDistInMap(u, i_range) @@ -1354,7 +1354,7 @@ namespace Acore class AllGameObjectsWithEntryInRange { public: - AllGameObjectsWithEntryInRange(const WorldObject* object, uint32 entry, float maxRange) : m_pObject(object), m_uiEntry(entry), m_fRange(maxRange) {} + AllGameObjectsWithEntryInRange(WorldObject const* object, uint32 entry, float maxRange) : m_pObject(object), m_uiEntry(entry), m_fRange(maxRange) {} bool operator() (GameObject* go) { if (go->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(go, m_fRange, false)) @@ -1363,7 +1363,7 @@ namespace Acore return false; } private: - const WorldObject* m_pObject; + WorldObject const* m_pObject; uint32 m_uiEntry; float m_fRange; }; @@ -1371,7 +1371,7 @@ namespace Acore class AllCreaturesOfEntryInRange { public: - AllCreaturesOfEntryInRange(const WorldObject* object, uint32 entry, float maxRange) : m_pObject(object), m_uiEntry(entry), m_fRange(maxRange) {} + AllCreaturesOfEntryInRange(WorldObject const* object, uint32 entry, float maxRange) : m_pObject(object), m_uiEntry(entry), m_fRange(maxRange) {} bool operator() (Unit* unit) { if (unit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(unit, m_fRange, false)) @@ -1381,7 +1381,7 @@ namespace Acore } private: - const WorldObject* m_pObject; + WorldObject const* m_pObject; uint32 m_uiEntry; float m_fRange; }; @@ -1496,13 +1496,13 @@ namespace Acore class AllWorldObjectsInRange { public: - AllWorldObjectsInRange(const WorldObject* object, float maxRange) : m_pObject(object), m_fRange(maxRange) {} + AllWorldObjectsInRange(WorldObject const* object, float maxRange) : m_pObject(object), m_fRange(maxRange) {} bool operator() (WorldObject* go) { return m_pObject->IsWithinDist(go, m_fRange, false) && m_pObject->InSamePhase(go); } private: - const WorldObject* m_pObject; + WorldObject const* m_pObject; float m_fRange; }; @@ -1557,14 +1557,14 @@ namespace Acore class AllWorldObjectsInExactRange { public: - AllWorldObjectsInExactRange(const WorldObject* object, float range, bool equals) : _object(object), _range(range), _equals(equals) { } + AllWorldObjectsInExactRange(WorldObject const* object, float range, bool equals) : _object(object), _range(range), _equals(equals) { } bool operator() (WorldObject const* object) { return (_object->GetExactDist2d(object) > _range) == _equals; } private: - const WorldObject* _object; + WorldObject const* _object; float _range; bool _equals; }; diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 9f18173c8..98466e33b 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -2029,7 +2029,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* leader) for (BoundInstancesMap::const_iterator itr = m_boundInstances.begin(); itr != m_boundInstances.end(); ++itr) { InstanceSave* instanceSave = itr->second.save; - const MapEntry* entry = sMapStore.LookupEntry(itr->first); + MapEntry const* entry = sMapStore.LookupEntry(itr->first); if (!entry || entry->IsRaid() || !instanceSave->CanReset()) continue; @@ -2053,7 +2053,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* leader) for (BoundInstancesMap::const_iterator itr = m_boundInstances.begin(); itr != m_boundInstances.end(); ++itr) { InstanceSave* instanceSave = itr->second.save; - const MapEntry* entry = sMapStore.LookupEntry(itr->first); + MapEntry const* entry = sMapStore.LookupEntry(itr->first); if (!entry || entry->IsRaid() != isRaid || !instanceSave->CanReset()) continue; diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 15455d789..5130565f6 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -793,7 +793,7 @@ void WorldSession::HandleSetSavedInstanceExtend(WorldPacket& recvData) uint8 toggleExtendOn; recvData >> mapId >> difficulty >> toggleExtendOn; - const MapEntry* entry = sMapStore.LookupEntry(mapId); + MapEntry const* entry = sMapStore.LookupEntry(mapId); if (!entry || !entry->IsRaid()) return; diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 3d85d6738..25366f52a 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -134,7 +134,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket& recvData) // pussywizard: exploit fix, can't share quests that give items to be sold if (object->GetTypeId() == TYPEID_PLAYER) if (uint32 itemId = quest->GetSrcItemId()) - if (const ItemTemplate* srcItem = sObjectMgr->GetItemTemplate(itemId)) + if (ItemTemplate const* srcItem = sObjectMgr->GetItemTemplate(itemId)) if (srcItem->SellPrice > 0) return; @@ -470,7 +470,7 @@ void WorldSession::HandleQuestConfirmAccept(WorldPacket& recvData) // pussywizard: exploit fix, can't share quests that give items to be sold if (uint32 itemId = quest->GetSrcItemId()) - if (const ItemTemplate* srcItem = sObjectMgr->GetItemTemplate(itemId)) + if (ItemTemplate const* srcItem = sObjectMgr->GetItemTemplate(itemId)) if (srcItem->SellPrice > 0) return; diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index c1268a7f3..4e3509708 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -67,7 +67,7 @@ InstanceSave* InstanceSaveMgr::AddInstanceSave(uint32 mapId, uint32 instanceId, { ASSERT(!GetInstanceSave(instanceId)); - const MapEntry* entry = sMapStore.LookupEntry(mapId); + MapEntry const* entry = sMapStore.LookupEntry(mapId); if (!entry) { LOG_ERROR("instance.save", "InstanceSaveMgr::AddInstanceSave: wrong mapid = {}, instanceid = {}!", mapId, instanceId); @@ -190,7 +190,7 @@ void InstanceSave::InsertToDB() time_t InstanceSave::GetResetTimeForDB() { // only save the reset time for normal instances - const MapEntry* entry = sMapStore.LookupEntry(GetMapId()); + MapEntry const* entry = sMapStore.LookupEntry(GetMapId()); if (!entry || entry->map_type == MAP_RAID || GetDifficulty() == DUNGEON_DIFFICULTY_HEROIC) return 0; else diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 8d342d000..f4529acfc 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3774,7 +3774,7 @@ void Map::DoForAllPlayers(std::function exec) * overloaded method with the start coords when you need to do a quick check on small segments * */ -bool Map::CanReachPositionAndGetValidCoords(const WorldObject* source, PathGenerator *path, float &destX, float &destY, float &destZ, bool failOnCollision, bool failOnSlopes) const +bool Map::CanReachPositionAndGetValidCoords(WorldObject const* source, PathGenerator *path, float &destX, float &destY, float &destZ, bool failOnCollision, bool failOnSlopes) const { G3D::Vector3 prevPath = path->GetStartPosition(); for (auto & vector : path->GetPath()) @@ -3814,19 +3814,19 @@ bool Map::CanReachPositionAndGetValidCoords(const WorldObject* source, PathGener * **/ -bool Map::CanReachPositionAndGetValidCoords(const WorldObject* source, float& destX, float& destY, float& destZ, bool failOnCollision, bool failOnSlopes) const +bool Map::CanReachPositionAndGetValidCoords(WorldObject const* source, float& destX, float& destY, float& destZ, bool failOnCollision, bool failOnSlopes) const { return CanReachPositionAndGetValidCoords(source, source->GetPositionX(), source->GetPositionY(), source->GetPositionZ(), destX, destY, destZ, failOnCollision, failOnSlopes); } -bool Map::CanReachPositionAndGetValidCoords(const WorldObject* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision, bool failOnSlopes) const +bool Map::CanReachPositionAndGetValidCoords(WorldObject const* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision, bool failOnSlopes) const { if (!CheckCollisionAndGetValidCoords(source, startX, startY, startZ, destX, destY, destZ, failOnCollision)) { return false; } - const Unit* unit = source->ToUnit(); + Unit const* unit = source->ToUnit(); // if it's not an unit (Object) then we do not have to continue // with walkable checks if (!unit) @@ -3838,7 +3838,7 @@ bool Map::CanReachPositionAndGetValidCoords(const WorldObject* source, float sta * Walkable checks */ bool isWaterNext = HasEnoughWater(unit, destX, destY, destZ); - const Creature* creature = unit->ToCreature(); + Creature const* creature = unit->ToCreature(); bool cannotEnterWater = isWaterNext && (creature && !creature->CanEnterWater()); bool cannotWalkOrFly = !isWaterNext && !source->ToPlayer() && !unit->CanFly() && (creature && !creature->CanWalk()); if (cannotEnterWater || cannotWalkOrFly || @@ -3857,7 +3857,7 @@ bool Map::CanReachPositionAndGetValidCoords(const WorldObject* source, float sta * @return true if the destination is valid, false otherwise * **/ -bool Map::CheckCollisionAndGetValidCoords(const WorldObject* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision) const +bool Map::CheckCollisionAndGetValidCoords(WorldObject const* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision) const { // Prevent invalid coordinates here, position is unchanged if (!Acore::IsValidMapCoord(startX, startY, startZ) || !Acore::IsValidMapCoord(destX, destY, destZ)) @@ -3874,7 +3874,7 @@ bool Map::CheckCollisionAndGetValidCoords(const WorldObject* source, float start path.SetUseRaycast(true); bool result = path.CalculatePath(startX, startY, startZ, destX, destY, destZ, false); - const Unit* unit = source->ToUnit(); + Unit const* unit = source->ToUnit(); bool notOnGround = path.GetPathType() & PATHFIND_NOT_USING_PATH || isWaterNext || (unit && unit->IsFlying()); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index deed2ccb5..ca0127439 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -529,21 +529,21 @@ public: } MapInstanced* ToMapInstanced() { if (Instanceable()) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] const MapInstanced* ToMapInstanced() const { if (Instanceable()) return (const MapInstanced*)((MapInstanced*)this); else return nullptr; } + [[nodiscard]] MapInstanced const* ToMapInstanced() const { if (Instanceable()) return (const MapInstanced*)((MapInstanced*)this); else return nullptr; } InstanceMap* ToInstanceMap() { if (IsDungeon()) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] const InstanceMap* ToInstanceMap() const { if (IsDungeon()) return (const InstanceMap*)((InstanceMap*)this); else return nullptr; } + [[nodiscard]] InstanceMap const* ToInstanceMap() const { if (IsDungeon()) return (const InstanceMap*)((InstanceMap*)this); else return nullptr; } BattlegroundMap* ToBattlegroundMap() { if (IsBattlegroundOrArena()) return reinterpret_cast(this); else return nullptr; } - [[nodiscard]] const BattlegroundMap* ToBattlegroundMap() const { if (IsBattlegroundOrArena()) return reinterpret_cast(this); return nullptr; } + [[nodiscard]] BattlegroundMap const* ToBattlegroundMap() const { if (IsBattlegroundOrArena()) return reinterpret_cast(this); return nullptr; } float GetWaterOrGroundLevel(uint32 phasemask, float x, float y, float z, float* ground = nullptr, bool swim = false, float collisionHeight = DEFAULT_COLLISION_HEIGHT) const; [[nodiscard]] float GetHeight(uint32 phasemask, float x, float y, float z, bool vmap = true, float maxSearchDist = DEFAULT_HEIGHT_SEARCH) const; [[nodiscard]] bool isInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask, LineOfSightChecks checks) const; - bool CanReachPositionAndGetValidCoords(const WorldObject* source, PathGenerator *path, float &destX, float &destY, float &destZ, bool failOnCollision = true, bool failOnSlopes = true) const; - bool CanReachPositionAndGetValidCoords(const WorldObject* source, float &destX, float &destY, float &destZ, bool failOnCollision = true, bool failOnSlopes = true) const; - bool CanReachPositionAndGetValidCoords(const WorldObject* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision = true, bool failOnSlopes = true) const; - bool CheckCollisionAndGetValidCoords(const WorldObject* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision = true) const; + bool CanReachPositionAndGetValidCoords(WorldObject const* source, PathGenerator *path, float &destX, float &destY, float &destZ, bool failOnCollision = true, bool failOnSlopes = true) const; + bool CanReachPositionAndGetValidCoords(WorldObject const* source, float &destX, float &destY, float &destZ, bool failOnCollision = true, bool failOnSlopes = true) const; + bool CanReachPositionAndGetValidCoords(WorldObject const* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision = true, bool failOnSlopes = true) const; + bool CheckCollisionAndGetValidCoords(WorldObject const* source, float startX, float startY, float startZ, float &destX, float &destY, float &destZ, bool failOnCollision = true) const; void Balance() { _dynamicTree.balance(); } void RemoveGameObjectModel(const GameObjectModel& model) { _dynamicTree.remove(model); } void InsertGameObjectModel(const GameObjectModel& model) { _dynamicTree.insert(model); } diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index 9e29fd79c..12c6acf6b 100644 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -185,13 +185,13 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave* save, std::lock_guard guard(Lock); // make sure we have a valid map id - const MapEntry* entry = sMapStore.LookupEntry(GetId()); + MapEntry const* entry = sMapStore.LookupEntry(GetId()); if (!entry) { LOG_ERROR("maps", "CreateInstance: no entry for map {}", GetId()); ABORT(); } - const InstanceTemplate* iTemplate = sObjectMgr->GetInstanceTemplate(GetId()); + InstanceTemplate const* iTemplate = sObjectMgr->GetInstanceTemplate(GetId()); if (!iTemplate) { LOG_ERROR("maps", "CreateInstance: no instance template for map {}", GetId()); diff --git a/src/server/game/Maps/MapMgr.h b/src/server/game/Maps/MapMgr.h index f1941a0e5..b397e1a2a 100644 --- a/src/server/game/Maps/MapMgr.h +++ b/src/server/game/Maps/MapMgr.h @@ -82,7 +82,7 @@ public: i_timer[3].Reset(); } - //void LoadGrid(int mapid, int instId, float x, float y, const WorldObject* obj, bool no_unload = false); + //void LoadGrid(int mapid, int instId, float x, float y, WorldObject const* obj, bool no_unload = false); void UnloadAll(); static bool ExistMapAndVMap(uint32 mapid, float x, float y); diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index 95ac5b010..3a6084e21 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -199,7 +199,7 @@ namespace Movement args.flags.flying = unit->m_movementInfo.HasMovementFlag((MovementFlags)(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_DISABLE_GRAVITY)); } - void MoveSplineInit::SetFacing(const Unit* target) + void MoveSplineInit::SetFacing(Unit const* target) { args.flags.EnableFacingTarget(); args.facing.target = target->GetGUID().GetRawValue(); diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h index 4f4429761..5d969e9f0 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.h +++ b/src/server/game/Movement/Spline/MoveSplineInit.h @@ -97,7 +97,7 @@ namespace Movement */ void SetFacing(float angle); void SetFacing(Vector3 const& point); - void SetFacing(const Unit* target); + void SetFacing(Unit const* target); /* Initializes movement by path * @param path - array of points, shouldn't be empty diff --git a/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp b/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp index 4cce6e9dc..c72d7eaa6 100644 --- a/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp @@ -30,7 +30,7 @@ void ScriptMgr::OnGlobalItemDelFromDB(CharacterDatabaseTransaction trans, Object }); } -void ScriptMgr::OnGlobalMirrorImageDisplayItem(const Item* item, uint32& display) +void ScriptMgr::OnGlobalMirrorImageDisplayItem(Item const* item, uint32& display) { ExecuteScript([&](GlobalScript* script) { diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp index 1aa5ca0bd..1f2bcd9b3 100644 --- a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp @@ -542,7 +542,7 @@ void ScriptMgr::OnPlayerJoinArena(Player* player) }); } -void ScriptMgr::GetCustomGetArenaTeamId(const Player* player, uint8 slot, uint32& teamID) const +void ScriptMgr::GetCustomGetArenaTeamId(Player const* player, uint8 slot, uint32& teamID) const { ExecuteScript([&](PlayerScript* script) { @@ -550,7 +550,7 @@ void ScriptMgr::GetCustomGetArenaTeamId(const Player* player, uint8 slot, uint32 }); } -void ScriptMgr::GetCustomArenaPersonalRating(const Player* player, uint8 slot, uint32& rating) const +void ScriptMgr::GetCustomArenaPersonalRating(Player const* player, uint8 slot, uint32& rating) const { ExecuteScript([&](PlayerScript* script) { @@ -558,7 +558,7 @@ void ScriptMgr::GetCustomArenaPersonalRating(const Player* player, uint8 slot, u }); } -void ScriptMgr::OnGetMaxPersonalArenaRatingRequirement(const Player* player, uint32 minSlot, uint32& maxArenaRating) const +void ScriptMgr::OnGetMaxPersonalArenaRatingRequirement(Player const* player, uint32 minSlot, uint32& maxArenaRating) const { ExecuteScript([&](PlayerScript* script) { diff --git a/src/server/game/Scripting/ScriptDefines/UnitScript.cpp b/src/server/game/Scripting/ScriptDefines/UnitScript.cpp index c2f26ac5d..7c7d755fd 100644 --- a/src/server/game/Scripting/ScriptDefines/UnitScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/UnitScript.cpp @@ -85,7 +85,7 @@ void ScriptMgr::ModifyHealRecieved(Unit* target, Unit* attacker, uint32& damage) }); } -void ScriptMgr::OnBeforeRollMeleeOutcomeAgainst(const Unit* attacker, const Unit* victim, WeaponAttackType attType, int32& attackerMaxSkillValueForLevel, int32& victimMaxSkillValueForLevel, int32& attackerWeaponSkill, int32& victimDefenseSkill, int32& crit_chance, int32& miss_chance, int32& dodge_chance, int32& parry_chance, int32& block_chance) +void ScriptMgr::OnBeforeRollMeleeOutcomeAgainst(Unit const* attacker, Unit const* victim, WeaponAttackType attType, int32& attackerMaxSkillValueForLevel, int32& victimMaxSkillValueForLevel, int32& attackerWeaponSkill, int32& victimDefenseSkill, int32& crit_chance, int32& miss_chance, int32& dodge_chance, int32& parry_chance, int32& block_chance) { ExecuteScript([&](UnitScript* script) { diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 2c0269685..95561b637 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -434,7 +434,7 @@ public: //Called when Damage is Dealt virtual uint32 DealDamage(Unit* /*AttackerUnit*/, Unit* /*pVictim*/, uint32 damage, DamageEffectType /*damagetype*/) { return damage; } - virtual void OnBeforeRollMeleeOutcomeAgainst(const Unit* /*attacker*/, const Unit* /*victim*/, WeaponAttackType /*attType*/, int32& /*attackerMaxSkillValueForLevel*/, int32& /*victimMaxSkillValueForLevel*/, int32& /*attackerWeaponSkill*/, int32& /*victimDefenseSkill*/, int32& /*crit_chance*/, int32& /*miss_chance*/, int32& /*dodge_chance*/, int32& /*parry_chance*/, int32& /*block_chance*/ ) { }; + virtual void OnBeforeRollMeleeOutcomeAgainst(Unit const* /*attacker*/, Unit const* /*victim*/, WeaponAttackType /*attType*/, int32& /*attackerMaxSkillValueForLevel*/, int32& /*victimMaxSkillValueForLevel*/, int32& /*attackerWeaponSkill*/, int32& /*victimDefenseSkill*/, int32& /*crit_chance*/, int32& /*miss_chance*/, int32& /*dodge_chance*/, int32& /*parry_chance*/, int32& /*block_chance*/ ) { }; virtual void OnAuraRemove(Unit* /*unit*/, AuraApplication* /*aurApp*/, AuraRemoveMode /*mode*/) { } @@ -1137,13 +1137,13 @@ public: virtual void OnPlayerJoinArena(Player* /*player*/) { } //Called when trying to get a team ID of a slot > 2 (This is for custom teams created by modules) - virtual void GetCustomGetArenaTeamId(const Player* /*player*/, uint8 /*slot*/, uint32& /*teamID*/) const { } + virtual void GetCustomGetArenaTeamId(Player const* /*player*/, uint8 /*slot*/, uint32& /*teamID*/) const { } //Called when trying to get players personal rating of an arena slot > 2 (This is for custom teams created by modules) - virtual void GetCustomArenaPersonalRating(const Player* /*player*/, uint8 /*slot*/, uint32& /*rating*/) const { } + virtual void GetCustomArenaPersonalRating(Player const* /*player*/, uint8 /*slot*/, uint32& /*rating*/) const { } //Called after the normal slots (0..2) for arena have been evaluated so that custom arena teams could modify it if nececasry - virtual void OnGetMaxPersonalArenaRatingRequirement(const Player* /*player*/, uint32 /*minSlot*/, uint32& /*maxArenaRating*/) const {} + virtual void OnGetMaxPersonalArenaRatingRequirement(Player const* /*player*/, uint32 /*minSlot*/, uint32& /*maxArenaRating*/) const {} //After looting item virtual void OnLootItem(Player* /*player*/, Item* /*item*/, uint32 /*count*/, ObjectGuid /*lootguid*/) { } @@ -1507,7 +1507,7 @@ protected: public: // items virtual void OnItemDelFromDB(CharacterDatabaseTransaction /*trans*/, ObjectGuid::LowType /*itemGuid*/) { } - virtual void OnMirrorImageDisplayItem(const Item* /*item*/, uint32& /*display*/) { } + virtual void OnMirrorImageDisplayItem(Item const* /*item*/, uint32& /*display*/) { } // loot virtual void OnAfterRefCount(Player const* /*player*/, LootStoreItem* /*LootStoreItem*/, Loot& /*loot*/, bool /*canRate*/, uint16 /*lootMode*/, uint32& /*maxcount*/, LootStore const& /*store*/) { } @@ -2213,9 +2213,9 @@ public: /* PlayerScript */ void OnEquip(Player* player, Item* it, uint8 bag, uint8 slot, bool update); void OnPlayerJoinBG(Player* player); void OnPlayerJoinArena(Player* player); - void GetCustomGetArenaTeamId(const Player* player, uint8 slot, uint32& teamID) const; - void GetCustomArenaPersonalRating(const Player* player, uint8 slot, uint32& rating) const; - void OnGetMaxPersonalArenaRatingRequirement(const Player* player, uint32 minSlot, uint32& maxArenaRating) const; + void GetCustomGetArenaTeamId(Player const* player, uint8 slot, uint32& teamID) const; + void GetCustomArenaPersonalRating(Player const* player, uint8 slot, uint32& rating) const; + void OnGetMaxPersonalArenaRatingRequirement(Player const* player, uint32 minSlot, uint32& maxArenaRating) const; void OnLootItem(Player* player, Item* item, uint32 count, ObjectGuid lootguid); void OnCreateItem(Player* player, Item* item, uint32 count); void OnQuestRewardItem(Player* player, Item* item, uint32 count); @@ -2341,7 +2341,7 @@ public: /* GroupScript */ public: /* GlobalScript */ void OnGlobalItemDelFromDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType itemGuid); - void OnGlobalMirrorImageDisplayItem(const Item* item, uint32& display); + void OnGlobalMirrorImageDisplayItem(Item const* item, uint32& display); void OnBeforeUpdateArenaPoints(ArenaTeam* at, std::map& ap); void OnAfterRefCount(Player const* player, Loot& loot, bool canRate, uint16 lootMode, LootStoreItem* LootStoreItem, uint32& maxcount, LootStore const& store); void OnBeforeDropAddItem(Player const* player, Loot& loot, bool canRate, uint16 lootMode, LootStoreItem* LootStoreItem, LootStore const& store); @@ -2369,7 +2369,7 @@ public: /* UnitScript */ void ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage); void ModifyHealRecieved(Unit* target, Unit* attacker, uint32& addHealth); uint32 DealDamage(Unit* AttackerUnit, Unit* pVictim, uint32 damage, DamageEffectType damagetype); - void OnBeforeRollMeleeOutcomeAgainst(const Unit* attacker, const Unit* victim, WeaponAttackType attType, int32& attackerMaxSkillValueForLevel, int32& victimMaxSkillValueForLevel, int32& attackerWeaponSkill, int32& victimDefenseSkill, int32& crit_chance, int32& miss_chance, int32& dodge_chance, int32& parry_chance, int32& block_chance); + void OnBeforeRollMeleeOutcomeAgainst(Unit const* attacker, Unit const* victim, WeaponAttackType attType, int32& attackerMaxSkillValueForLevel, int32& victimMaxSkillValueForLevel, int32& attackerWeaponSkill, int32& victimDefenseSkill, int32& crit_chance, int32& miss_chance, int32& dodge_chance, int32& parry_chance, int32& block_chance); void OnAuraRemove(Unit* unit, AuraApplication* aurApp, AuraRemoveMode mode); bool IfNormalReaction(Unit const* unit, Unit const* target, ReputationRank& repRank); bool IsNeedModSpellDamagePercent(Unit const* unit, AuraEffect* auraEff, float& doneTotalMod, SpellInfo const* spellProto); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index dbe2ab5a6..bc538e8ef 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2415,7 +2415,7 @@ void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, boo { if ((*iter)->GetCurrentSpell(i) && (*iter)->GetCurrentSpell(i)->m_targets.GetUnitTargetGUID() == target->GetGUID()) { - const SpellInfo* si = (*iter)->GetCurrentSpell(i)->GetSpellInfo(); + SpellInfo const* si = (*iter)->GetCurrentSpell(i)->GetSpellInfo(); if (si->HasAttribute(SPELL_ATTR6_IGNORE_PHASE_SHIFT) && (*iter)->GetTypeId() == TYPEID_UNIT) { Creature* c = (*iter)->ToCreature(); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 8f3cec23b..4d0f89c8d 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -287,7 +287,7 @@ void AuraApplication::ClientUpdate(bool remove) BuildUpdatePacket(data, remove); if (GetSlot() < MAX_AURAS) - if (const Player* plr = GetTarget()->ToPlayer()) + if (Player const* plr = GetTarget()->ToPlayer()) if (Aura* aura = GetBase()) if (plr->NeedSendSpectatorData() && ArenaSpectator::ShouldSendAura(aura, GetEffectMask(), GetTarget()->GetGUID(), remove)) ArenaSpectator::SendCommand_Aura(plr->FindMap(), plr->GetGUID(), "AUR", aura->GetCasterGUID(), aura->GetSpellInfo()->Id, aura->GetSpellInfo()->IsPositive(), aura->GetSpellInfo()->Dispel, aura->GetDuration(), aura->GetMaxDuration(), (aura->GetCharges() > 1 ? aura->GetCharges() : aura->GetStackAmount()), remove); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 525b71134..4bc58ebdc 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5334,7 +5334,7 @@ SpellCastResult Spell::CheckCast(bool strict) // Spectator check if (m_caster->GetTypeId() == TYPEID_PLAYER) - if (((const Player*)m_caster)->IsSpectator() && m_spellInfo->Id != SPECTATOR_SPELL_BINDSIGHT) + if (((Player const*)m_caster)->IsSpectator() && m_spellInfo->Id != SPECTATOR_SPELL_BINDSIGHT) return SPELL_FAILED_NOT_HERE; SpellCastResult res = SPELL_CAST_OK; diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 1880524c0..a76168571 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -839,13 +839,13 @@ typedef void(Spell::*pEffect)(SpellEffIndex effIndex); class ReflectEvent : public BasicEvent { public: - ReflectEvent(Unit* caster, ObjectGuid targetGUID, const SpellInfo* spellInfo) : _caster(caster), _targetGUID(targetGUID), _spellInfo(spellInfo) { } + ReflectEvent(Unit* caster, ObjectGuid targetGUID, SpellInfo const* spellInfo) : _caster(caster), _targetGUID(targetGUID), _spellInfo(spellInfo) { } bool Execute(uint64 e_time, uint32 p_time) override; protected: Unit* _caster; ObjectGuid _targetGUID; - const SpellInfo* _spellInfo; + SpellInfo const* _spellInfo; }; #endif diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index f6ac9a0d6..5556bade2 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4279,7 +4279,7 @@ void Spell::EffectSanctuary(SpellEffIndex /*effIndex*/) { if ((*iter)->GetCurrentSpell(i) && (*iter)->GetCurrentSpell(i)->m_targets.GetUnitTargetGUID() == unitTarget->GetGUID()) { - const SpellInfo* si = (*iter)->GetCurrentSpell(i)->GetSpellInfo(); + SpellInfo const* si = (*iter)->GetCurrentSpell(i)->GetSpellInfo(); if (si->HasAttribute(SPELL_ATTR6_IGNORE_PHASE_SHIFT) && (*iter)->GetTypeId() == TYPEID_UNIT) { Creature* c = (*iter)->ToCreature(); @@ -4968,7 +4968,7 @@ void Spell::EffectForceDeselect(SpellEffIndex /*effIndex*/) { if (spell->m_targets.GetUnitTargetGUID() == m_caster->GetGUID()) { - const SpellInfo* si = spell->GetSpellInfo(); + SpellInfo const* si = spell->GetSpellInfo(); if (si->HasAttribute(SPELL_ATTR6_IGNORE_PHASE_SHIFT) && (*iter)->GetTypeId() == TYPEID_UNIT) { Creature* c = (*iter)->ToCreature(); diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index e251e8207..898750db1 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1725,7 +1725,7 @@ bool SpellInfo::IsAuraEffectEqual(SpellInfo const* otherSpellInfo) const return matchCount * 2 == auraCount; } -bool SpellInfo::ValidateAttribute6SpellDamageMods(const Unit* caster, const AuraEffect* auraEffect, bool isDot) const +bool SpellInfo::ValidateAttribute6SpellDamageMods(Unit const* caster, const AuraEffect* auraEffect, bool isDot) const { // Xinef: no attribute if (!(AttributesEx6 & SPELL_ATTR6_IGNORE_CASTER_DAMAGE_MODIFIERS)) @@ -1735,7 +1735,7 @@ bool SpellInfo::ValidateAttribute6SpellDamageMods(const Unit* caster, const Aura // Xinef: Scourge Strike - Trigger if (Id == 70890 && auraEffect) { - const SpellInfo* auraInfo = auraEffect->GetSpellInfo(); + SpellInfo const* auraInfo = auraEffect->GetSpellInfo(); return auraInfo->SpellIconID == 3086 || (auraInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && (auraInfo->SpellFamilyFlags & flag96(8388608, 64, 16) || auraInfo->SpellIconID == 235 || auraInfo->SpellIconID == 154)); } diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 4dfcef8ac..133c7ce3c 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -481,7 +481,7 @@ public: // xinef: aura stacking bool IsStrongerAuraActive(Unit const* caster, Unit const* target) const; bool IsAuraEffectEqual(SpellInfo const* otherSpellInfo) const; - bool ValidateAttribute6SpellDamageMods(const Unit* caster, const AuraEffect* auraEffect, bool isDot) const; + bool ValidateAttribute6SpellDamageMods(Unit const* caster, const AuraEffect* auraEffect, bool isDot) const; SpellSchoolMask GetSchoolMask() const; uint32 GetAllEffectsMechanicMask() const; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index e7e08cc36..d22ebff47 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2853,10 +2853,10 @@ void SpellMgr::LoadSpellInfoCustomAttributes() for (uint8 j = 0; j < MAX_TALENT_RANK; j++) if (uint32 spellId = talentInfo->RankID[j]) - if (const SpellInfo* spellInfo = GetSpellInfo(spellId)) + if (SpellInfo const* spellInfo = GetSpellInfo(spellId)) for (uint8 k = 0; k < MAX_SPELL_EFFECTS; ++k) if (spellInfo->Effects[k].Effect == SPELL_EFFECT_LEARN_SPELL) - if (const SpellInfo* learnSpell = GetSpellInfo(spellInfo->Effects[k].TriggerSpell)) + if (SpellInfo const* learnSpell = GetSpellInfo(spellInfo->Effects[k].TriggerSpell)) if (learnSpell->IsRanked() && !learnSpell->HasAttribute(SpellAttr0(SPELL_ATTR0_PASSIVE | SPELL_ATTR0_DO_NOT_DISPLAY))) mTalentSpellAdditionalSet.insert(learnSpell->Id); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp index da4b1e2b5..914904e77 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -71,7 +71,7 @@ struct boss_quartermaster_zigris : public BossAI _JustDied(); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_STUNBOMB || spellInfo->Id == SPELL_HOOKEDNET) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index fbc5e6fe9..c71ec4eee 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -196,7 +196,7 @@ public: } } - bool CanAIAttack(const Unit* /*target*/) const override { return me->IsVisible(); } + bool CanAIAttack(Unit const* /*target*/) const override { return me->IsVisible(); } void JustReachedHome() override { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 1683eb641..a69d3367d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -237,7 +237,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Mechanic == MECHANIC_DISARM && _events.GetNextEventTime(EVENT_KILL_TALK) == 0) { @@ -250,7 +250,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_MOUNT_TARGET_MIDNIGHT) { @@ -355,7 +355,7 @@ public: Talk(SAY_ATTUMEN2_DEATH); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Mechanic == MECHANIC_DISARM && _events.GetNextEventTime(EVENT_KILL_TALK) == 0) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 980b6721f..49502e9c6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -139,7 +139,7 @@ public: creature->AI()->KilledUnit(who); } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) override + void SpellHit(Unit* /*who*/, SpellInfo const* spell) override { if (spell->Id == SPELL_INFERNAL_RELAY) { @@ -247,7 +247,7 @@ public: void EnfeebleHealthEffect() { - const SpellInfo* info = sSpellMgr->GetSpellInfo(SPELL_ENFEEBLE_EFFECT); + SpellInfo const* info = sSpellMgr->GetSpellInfo(SPELL_ENFEEBLE_EFFECT); if (!info) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 5e2e12270..3a2486971 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -526,7 +526,7 @@ public: DrinkInturrupted = true; } - void SpellHit(Unit* /*pAttacker*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*pAttacker*/, SpellInfo const* Spell) override { //We only care about interrupt effects and only if they are durring a spell currently being cast if ((Spell->Effects[0].Effect != SPELL_EFFECT_INTERRUPT_CAST && diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 732d1fc4f..abd16ad48 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -368,7 +368,7 @@ public: me->DespawnOrUnsummon(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* Spell) override { if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand() % 10))) { @@ -1127,7 +1127,7 @@ public: me->DespawnOrUnsummon(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* Spell) override { if (Spell->Id == SPELL_DRINK_POISON) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 78376bcfb..cb2f7d62e 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -74,7 +74,7 @@ public: SummonList summons; ObjectGuid CrystalGUID; - bool CanAIAttack(const Unit* who) const override + bool CanAIAttack(Unit const* who) const override { return who->GetPositionX() > 216.0f; } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index d0b1828cc..ccd1a49a7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -258,7 +258,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SWIMMING); } - void SpellHit(Unit* caster, const SpellInfo* pSpell) override + void SpellHit(Unit* caster, SpellInfo const* pSpell) override { if (!_duelInProgress && pSpell->Id == SPELL_DUEL) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 76f625612..4a5019f37 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -75,7 +75,7 @@ public: Talk(SAY_AGGRO); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->IsAlive() && !speechCounter) { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index f416f0928..747aead79 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -431,7 +431,7 @@ public: Talk(SAY_MO_KILL); } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) override + void SpellHit(Unit* /*who*/, SpellInfo const* spell) override { //When hit with resurrection say text if (spell->Id == SPELL_SCARLET_RESURRECTION) diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 3fcce4231..542cf2e0d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -293,7 +293,7 @@ public: } // used for shadow portal - void SpellHitTarget(Unit* target, const SpellInfo* spellinfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellinfo) override { uint32 room = 0; if (spellinfo && spellinfo->Id == SPELL_SHADOW_PORTAL && target && me->GetVictim()) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 5353ccfbc..f40ea198b 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -448,7 +448,7 @@ public: me->CastSpell(me, SPELL_DEMONIC_VAPOR_TRAIL_PERIODIC, true); } - void SpellHitTarget(Unit*, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit*, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_DEMONIC_VAPOR) me->CastSpell(me, SPELL_SUMMON_BLAZING_DEAD, true); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 1f6bdbab0..c144c9666 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -127,7 +127,7 @@ public: damage = 0; } - void SpellHit(Unit*, const SpellInfo* spell) override + void SpellHit(Unit*, SpellInfo const* spell) override { if (spell->Id == SPELL_TRANSFORM_SPLIT2) EnterPhase(PHASE_HUMAN); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index b5035fa98..ccd1a9018 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -447,7 +447,7 @@ public: void Reset() override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_FIRE_BOMB_THROW) DoCast(me, SPELL_FIRE_BOMB_DUMMY, true); @@ -668,7 +668,7 @@ public: void UpdateAI(uint32 /*diff*/) override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_HATCH_EGG) { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 20a0b1e5a..da73ddaff 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -582,7 +582,7 @@ public: void EnterCombat(Unit* /*target*/) override { } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_ZAP_INFORM) DoCast(caster, SPELL_ZAP_DAMAGE, true); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 1c1ab3a9e..11f7e20cc 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -633,7 +633,7 @@ public: } } - void SpellHit(Unit*, const SpellInfo* spell) override + void SpellHit(Unit*, SpellInfo const* spell) override { if (spell->Id == SPELL_COSMETIC_SPEAR_THROW) { diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index 83d9c06f9..c23348352 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -264,7 +264,7 @@ public: uint32 timer; ObjectGuid _targetGUID; - void SpellHit(Unit*, const SpellInfo* spellInfo) override + void SpellHit(Unit*, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_SHOOT && roll_chance_i(7)) me->CastSpell(me, SPELL_DEATHS_DOOR, true); diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index 0fa5bdb2b..314a0f131 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -61,7 +61,7 @@ public: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (bReset || spell->Id != 3607) return; diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index 5996eed01..0f41f2f28 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -70,7 +70,7 @@ struct npc_brewfest_keg_thrower : public ScriptedAI } } - bool CanBeSeen(const Player* player) override + bool CanBeSeen(Player const* player) override { if (player->GetMountID() == RAM_DISPLAY_ID) return true; @@ -343,7 +343,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI void MoveInLineOfSight(Unit* /*who*/) override {} void EnterCombat(Unit*) override {} - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_REPORT_DEATH) { @@ -733,7 +733,7 @@ struct npc_dark_iron_guzzler : public ScriptedAI who->CastSpell(who, SPELL_REPORT_DEATH, true); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (me->IsAlive() && spellInfo->Id == SPELL_PLAYER_MUG) { diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp index e2ec0221c..18687ee4e 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -494,7 +494,7 @@ struct npc_soh_fire_trigger : public NullCreatureAI me->SetDisableGravity(true); } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_START_FIRE) { @@ -882,7 +882,7 @@ struct npc_hallows_end_train_fire : public NullCreatureAI me->CastSpell(me, SPELL_FIRE_AURA_BASE, true); } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_WATER_SPLASH && caster->ToPlayer()) { @@ -998,7 +998,7 @@ struct boss_headless_horseman : public ScriptedAI health = param; } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_SUMMONING_RHYME_TARGET) { @@ -1007,7 +1007,7 @@ struct boss_headless_horseman : public ScriptedAI } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_THROW_HEAD_BACK) { @@ -1228,7 +1228,7 @@ struct boss_headless_horseman_head : public ScriptedAI uint32 timer; bool handled; - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_THROW_HEAD_BACK) { @@ -1239,7 +1239,7 @@ struct boss_headless_horseman_head : public ScriptedAI } } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { switch (spellInfo->Id) { @@ -1356,7 +1356,7 @@ struct boss_headless_horseman_pumpkin : public ScriptedAI me->CastSpell(me, SPELL_PUMPKIN_VISUAL, true); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_SPROUTING) { diff --git a/src/server/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp index c70659a17..a23e4af3c 100644 --- a/src/server/scripts/Events/pilgrims_bounty.cpp +++ b/src/server/scripts/Events/pilgrims_bounty.cpp @@ -201,7 +201,7 @@ struct npc_pilgrims_bounty_chair : public VehicleAI } } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { Unit* charm = target->GetCharm(); if (!charm || !charm->ToCreature()) @@ -210,7 +210,7 @@ struct npc_pilgrims_bounty_chair : public VehicleAI charm->ToCreature()->AI()->DoAction(spellInfo->Id); } - void SpellHit(Unit* /*target*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*target*/, SpellInfo const* spellInfo) override { switch (spellInfo->Id) { @@ -281,7 +281,7 @@ struct npc_pilgrims_bounty_plate : public NullCreatureAI { npc_pilgrims_bounty_plate(Creature* creature) : NullCreatureAI(creature) { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { switch (spellInfo->Id) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 8bc05bbab..9b9b98c01 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -319,7 +319,7 @@ public: void DoCastProtection() { // lets get spell info - const SpellInfo* info = sSpellMgr->GetSpellInfo(SPELL_PROTECTION_OF_ELUNE); + SpellInfo const* info = sSpellMgr->GetSpellInfo(SPELL_PROTECTION_OF_ELUNE); if (!info) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 0676e4c94..119b45769 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -85,7 +85,7 @@ public: events.ScheduleEvent(EVENT_SPELL_TIME_STOP, 20000); } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_TIME_STEP_H || spellInfo->Id == SPELL_TIME_STEP_N) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 357e34390..a36a5290f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1568,7 +1568,7 @@ public: changeTimer = time; } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_ARTHAS_CRUSADER_STRIKE) { diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 3236c2a82..b2d7144b5 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -510,7 +510,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (target->IsPlayer() && spell->DurationEntry && spell->DurationEntry->ID == 328 && spell->Effects[EFFECT_1].TargetA.GetTarget() == 1 && (spell->Effects[EFFECT_1].Amplitude == 50 || spell->Effects[EFFECT_1].Amplitude == 215)) // Deep Breath { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 56019cea9..f3ff86801 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -157,7 +157,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void SpellHit(Unit* caster, const SpellInfo* entry) override + void SpellHit(Unit* caster, SpellInfo const* entry) override { if (caster == me) return; diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index 1eb1c5e3c..4bf783dc1 100644 --- a/src/server/scripts/Kalimdor/zone_azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp @@ -69,7 +69,7 @@ public: void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* unit, const SpellInfo* spell) override + void SpellHit(Unit* unit, SpellInfo const* spell) override { if (spellhit) return; diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 4c7d110f9..64e848fe5 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -101,7 +101,7 @@ public: } } - void SpellHit(Unit* Caster, const SpellInfo* Spell) override + void SpellHit(Unit* Caster, SpellInfo const* Spell) override { if (Spell->SpellFamilyFlags[2] & 0x080000000) { diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp index f8bffbea1..025943bb8 100644 --- a/src/server/scripts/Kalimdor/zone_darkshore.cpp +++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp @@ -218,7 +218,7 @@ public: } } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) override + void SpellHit(Unit* /*pCaster*/, SpellInfo const* pSpell) override { if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_AWAKEN) ClearSleeping(); diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 71b6062d6..762b42c48 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -615,7 +615,7 @@ public: DoCast(SPELL_OMEN_SUMMON_SPOTLIGHT); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_ELUNE_CANDLE) { diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 52e669ea4..dc3a89f92 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -188,7 +188,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp index 10d8c8a0f..84d6f1d00 100644 --- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp @@ -230,7 +230,7 @@ public: } } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) override + void SpellHit(Unit* /*pCaster*/, SpellInfo const* pSpell) override { if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_REVIVE_RINGO) ClearFaint(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 2d0826e55..a171aa5ac 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -144,7 +144,7 @@ class boss_anub_arak : public CreatureScript void SummonHelpers(float x, float y, float z, uint32 spellId) { - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(spellId); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); me->SummonCreature(spellInfo->Effects[EFFECT_0].MiscValue, x, y, z); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index edd681e44..5e42eaed2 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -328,7 +328,7 @@ struct boss_taldaram : public BossAI me->InterruptNonMeleeSpells(true); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo *spellInfo) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_CONJURE_FLAME_SPHERE) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index e38ed0c29..7ec29a135 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -257,7 +257,7 @@ public: } } - bool CanAIAttack(const Unit* who) const override + bool CanAIAttack(Unit const* who) const override { return me->GetHomePosition().GetExactDist2d(who) < 52.0f; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 76dab6217..4b3f838bc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -137,7 +137,7 @@ public: pInstance->SetData(BOSS_ARGENT_CHALLENGE, IN_PROGRESS); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == 66905 && me->GetHealth() == 1) // hammer throw back damage (15k) me->CastSpell(me, 68197, true); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 3e1ef1601..e98f871a0 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -187,7 +187,7 @@ public: } } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { switch( spell->Id ) { @@ -410,7 +410,7 @@ public: events.RescheduleEvent(2, urand(3000, 4000)); // claw } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_BK_GHOUL_EXPLODE) { @@ -419,7 +419,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { switch(spell->Id) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index ad04bfb48..d93ffd9fc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -642,7 +642,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { switch( spell->Id ) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 4c67ff21e..06ab0b128 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -416,7 +416,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return target->GetEntry() != NPC_FROST_SPHERE; } @@ -505,7 +505,7 @@ public: me->m_Events.AddEvent(new HideNpcEvent(*me), me->m_Events.CalculateTime(5000)); } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return target->GetEntry() != NPC_FROST_SPHERE && !me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } @@ -569,7 +569,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if( spell->Id == SPELL_SPIKE_FAIL ) { @@ -640,7 +640,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if( !target || !spell ) return; @@ -713,7 +713,7 @@ public: me->m_Events.AddEvent(new HideNpcEvent(*me), me->m_Events.CalculateTime(5000)); } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return target->GetEntry() != NPC_FROST_SPHERE; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index b35f72251..ba59f1159 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -145,7 +145,7 @@ public: pInstance->SetData(TYPE_JARAXXUS, IN_PROGRESS); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { switch( spell->Id ) { @@ -392,7 +392,7 @@ public: events.RescheduleEvent(EVENT_SPELL_MISTRESS_KISS, urand(10000, 15000)); } - void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) override + void SpellHit(Unit* /*caster*/, SpellInfo const* /*spell*/) override { //if (caster && spell && spell->Id == 66287 /*control vehicle*/) // caster->ClearUnitState(UNIT_STATE_ONVEHICLE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 171acf0d4..d08b617dc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -747,7 +747,7 @@ public: if( !count || !GetOwner() ) return; - if( const SpellInfo* se = GetAura()->GetSpellInfo() ) + if( SpellInfo const* se = GetAura()->GetSpellInfo() ) if( Unit* owner = GetOwner()->ToUnit() ) { uint32 auraId = 0; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index e5463f1f9..ccfca3a3b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -107,7 +107,7 @@ public: } } - bool IsValidDedicatedInsanityItem(const ItemTemplate* item) + bool IsValidDedicatedInsanityItem(ItemTemplate const* item) { if (!item) // should not happen, but checked in GetAverageItemLevel() return true; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 682406ccf..3a0efc1b2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -118,7 +118,7 @@ public: } } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == SPELL_TELEPORT) { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index b74f7c153..15b4d08da 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -144,7 +144,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_PHANTOM_BLAST_H) bAchiev = false; @@ -165,7 +165,7 @@ public: } } - bool CanAIAttack(const Unit* target) const override { return target->GetPositionZ() > 706.5f; } + bool CanAIAttack(Unit const* target) const override { return target->GetPositionZ() > 706.5f; } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index fbe67c550..e2ca3e5e5 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1460,7 +1460,7 @@ public: summons.Despawn(s); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (target && target->IsAlive() && spell->Id == SPELL_LICH_KING_ZAP_PLAYER) Unit::DealDamage(me, target, 10000); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index b212fc0d3..940319efe 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -169,7 +169,7 @@ public: } } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == uint32(SPELL_SARONITE_TRIGGERED)) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 3ceb527eb..fe70a24f3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -93,7 +93,7 @@ public: pInstance->SetData(DATA_ICK, NOT_STARTED); } - bool CanAIAttack(const Unit* /*who*/) const override + bool CanAIAttack(Unit const* /*who*/) const override { return pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) >= INSTANCE_PROGRESS_FINISHED_INTRO; } @@ -113,7 +113,7 @@ public: pInstance->SetData(DATA_ICK, IN_PROGRESS); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (!target || !spell) return; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 5fc78a345..5b54f8b35 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -214,7 +214,7 @@ public: Talk(RAND(SAY_SLAY_1, SAY_SLAY_2)); } - bool CanAIAttack(const Unit* who) const override + bool CanAIAttack(Unit const* who) const override { switch (who->GetEntry()) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 0bee1beea..78a499832 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -877,7 +877,7 @@ public: uint16 timer1; uint16 timer2; - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (target && spell && target->GetTypeId() == TYPEID_PLAYER && spell->Id == 70827 && pInstance) pInstance->SetData(DATA_ACHIEV_DONT_LOOK_UP, 0); @@ -1112,7 +1112,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_ID, 70827, true); } - bool CanAIAttack(const Unit* who) const override + bool CanAIAttack(Unit const* who) const override { return who->GetEntry() == NPC_FALLEN_WARRIOR; } @@ -1181,7 +1181,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if ((spell->Id == SPELL_TELEPORT_JAINA || spell->Id == SPELL_TELEPORT_SYLVANAS) && target && target->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 2f03559d4..b639e814d 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -93,7 +93,7 @@ public: events.ScheduleEvent(EVENT_TRANSFORMATION, 12000); } - void SpellHitTarget(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_TRANSFORMATION) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 2a0d0084c..9fa3c6719 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -573,7 +573,7 @@ public: BossAI::EnterEvadeMode(); } - bool CanAIAttack(const Unit* /*target*/) const override + bool CanAIAttack(Unit const* /*target*/) const override { return me->IsVisible(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 26d4471fb..1149280e2 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -316,7 +316,7 @@ public: creature->AI()->DoAction(ACTION_START_OUTRO); } - bool CanAIAttack(const Unit* /*target*/) const override + bool CanAIAttack(Unit const* /*target*/) const override { return _introDone; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index f427a448d..69784292b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1047,7 +1047,7 @@ public: } } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { if (_instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != IN_PROGRESS) return false; @@ -1386,7 +1386,7 @@ public: } } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { if (_instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != IN_PROGRESS) return false; @@ -1445,7 +1445,7 @@ public: { npc_igb_ship_crewAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) {} - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return _instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) == IN_PROGRESS && target->GetTransport() == me->GetTransport() && target->GetPositionZ() < 478.0f && (me->GetEntry() == NPC_SKYBREAKER_DECKHAND ? (target->GetPositionY() > 2042.0f) : (target->GetPositionY() < 2431.0f)); } @@ -1627,7 +1627,7 @@ struct npc_gunship_boarding_addAI : public ScriptedAI checkTimer -= diff; } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return Instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) == IN_PROGRESS && target->GetTransport() && target->GetTransport() != me->GetTransport() && target->GetPositionZ() < 478.0f && (me->GetEntry() == NPC_SKYBREAKER_SERGEANT || me->GetEntry() == NPC_SKYBREAKER_MARINE ? (target->GetPositionY() < 2431.0f) : (target->GetPositionY() > 2042.0f)); } @@ -1806,7 +1806,7 @@ public: gunship_npc_AI::UpdateAI(diff); } - bool CanAIAttack(const Unit* /*target*/) const override + bool CanAIAttack(Unit const* /*target*/) const override { return Instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) == IN_PROGRESS; } @@ -1880,7 +1880,7 @@ public: DoSpellAttackIfReady(me->GetEntry() == NPC_SKYBREAKER_RIFLEMAN ? SPELL_SHOOT : SPELL_HURL_AXE); } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return Instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) == IN_PROGRESS && target->GetTransport() && target->GetTransport() != me->GetTransport(); } @@ -1935,7 +1935,7 @@ public: me->_AddCreatureSpellCooldown(spellId, 0, 9000); } - bool CanAIAttack(const Unit* /*target*/) const override + bool CanAIAttack(Unit const* /*target*/) const override { return Instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) == IN_PROGRESS; } @@ -2426,7 +2426,7 @@ public: void CalculateDamage(SpellEffIndex /*effIndex*/) { PreventHitEffect(EFFECT_0); - const SpellInfo* si = sSpellMgr->GetSpellInfo(GetSpellInfo()->Effects[0].TriggerSpell); + SpellInfo const* si = sSpellMgr->GetSpellInfo(GetSpellInfo()->Effects[0].TriggerSpell); if (!si) return; SpellCastTargets targets; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 4be347d94..0fb505436 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -135,7 +135,7 @@ public: instance->SetBossState(DATA_LORD_MARROWGAR, IN_PROGRESS); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (target && (spell->Id == 69055 || spell->Id == 70814)) // Bone Slice (Saber Lash) for (uint8 i = 0; i < 3; ++i) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 82e7f42e2..63a196b63 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -217,7 +217,7 @@ public: return me->IsValidAttackTarget(target); } private: - const Unit* me; + Unit const* me; }; class boss_professor_putricide : public CreatureScript @@ -283,7 +283,7 @@ public: BossAI::AttackStart(who); } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return me->IsVisible() && target->GetPositionZ() > 388.0f && target->GetPositionZ() < 410.0f && target->GetPositionY() > 3157.1f && target->GetExactDist2dSq(4356.0f, 3211.0f) < 80.0f * 80.0f; } @@ -895,8 +895,8 @@ public: // big hax to unlock Abomination Eat Ooze ability, requires caster aura spell from difficulty X, but unlocks clientside when got base aura void HandleScript(SpellEffIndex /*effIndex*/) { - const SpellInfo* s1 = sSpellMgr->GetSpellInfo(70346); - const SpellInfo* s2 = sSpellMgr->GetSpellInfo(72456); + SpellInfo const* s1 = sSpellMgr->GetSpellInfo(70346); + SpellInfo const* s2 = sSpellMgr->GetSpellInfo(72456); if (s1 && s2) if (Unit* target = GetHitUnit()) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index e0f7bf2bd..40dc41f1e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -354,7 +354,7 @@ public: Talk(SAY_AGGRO); } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return me->IsVisible() && target->GetEntry() != NPC_CROK_SCOURGEBANE; } @@ -947,7 +947,7 @@ public: bool CheckProc(ProcEventInfo& eventInfo) { - const SpellInfo* spellInfo = eventInfo.GetSpellInfo(); + SpellInfo const* spellInfo = eventInfo.GetSpellInfo(); if (!spellInfo) return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 5ebe9dc2a..6dd0dcd89 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1766,7 +1766,7 @@ public: DoMeleeAttackIfReady(); } - void SpellHitTarget(Unit* c, const SpellInfo* spell) override + void SpellHitTarget(Unit* c, SpellInfo const* spell) override { if (spell->Id == 71306 && c->GetTypeId() == TYPEID_UNIT) // Twisted Winds { @@ -2856,7 +2856,7 @@ public: return target->GetExactDist(4357.0f, 2769.0f, 356.0f) < 170.0f; } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == 71906 || spell->Id == 71942) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 3c532ceaa..af6414c24 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -251,7 +251,7 @@ public: SpellAreaForAreaMapBounds saBounds = sSpellMgr->GetSpellAreaForAreaMapBounds(4812); for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) if ((itr->second->raceMask & plr->getRaceMask()) && !creature->HasAura(itr->second->spellId)) - if (const SpellInfo* si = sSpellMgr->GetSpellInfo(itr->second->spellId)) + if (SpellInfo const* si = sSpellMgr->GetSpellInfo(itr->second->spellId)) if (si->HasAura(SPELL_AURA_MOD_INCREASE_HEALTH_PERCENT)) creature->AddAura(itr->second->spellId, creature); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 660d9bc96..913ba2a53 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -226,7 +226,7 @@ public: DoMeleeAttackIfReady(); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == RAID_MODE(SPELL_WIDOWS_EMBRACE, SPELL_MINION_WIDOWS_EMBRACE)) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index ac41d9476..f907d4c32 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -178,7 +178,7 @@ struct NotOnSameSide public: explicit NotOnSameSide(Unit* pSource) : m_inLiveSide(IN_LIVE_SIDE(pSource)) { } - bool operator() (const Unit* pTarget) + bool operator() (Unit const* pTarget) { return (m_inLiveSide != IN_LIVE_SIDE(pTarget)); } @@ -384,7 +384,7 @@ public: return false; } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { uint8 pos = urand(0, 4); switch (spellInfo->Id) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 2974ece3f..8a2a6b27e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -107,7 +107,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, RAID_MODE(720000, 540000)); } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == RAID_MODE(SPELL_SLIME_SPRAY_10, SPELL_SLIME_SPRAY_25) && target->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 3d62e3621..6f3d978bb 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -194,7 +194,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_ICEBOLT_CAST) { diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 0a7f1bdbb..6ffa0cdc2 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -310,7 +310,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_POWER_SPARK_MALYGOS_BUFF) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 1f9624163..30a336c2f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -149,7 +149,7 @@ public: summon->SetInCombatWithZone(); } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (spellInfo->Id >= SPELL_FIRE_MAGUS_DEATH && spellInfo->Id <= SPELL_ARCANE_MAGUS_DEATH && caster->ToCreature()) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 80a0f8ba1..be6ce9a9d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -232,7 +232,7 @@ public: Talk(SAY_PLAYER_KILL); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { switch( spell->Id ) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index a8f695548..7b76822a9 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -141,7 +141,7 @@ public: Talk(SAY_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_DISPERSE) Split(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 93ca510f2..972f7b3ff 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -246,7 +246,7 @@ public: events.ScheduleEvent(EVENT_MOVE_TO_ANVIL, 0, 0, 2); } - void SpellHitTarget(Unit* /*who*/, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* /*who*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_TEMPER) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 42909f6d6..13c420021 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -283,7 +283,7 @@ public: bool _fedOnTears; bool _heraldOfTheTitans; - bool IsValidHeraldItem(const ItemTemplate* item) + bool IsValidHeraldItem(ItemTemplate const* item) { if (!item) // should not happen, but checked in GetAverageItemLevel() return true; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 22520d368..901fbcbf6 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -322,7 +322,7 @@ public: me->CastSpell(me, SPELL_ELECTRICAL_CHARGE, true); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_SUPERCHARGE) UpdatePhase(); @@ -491,7 +491,7 @@ public: Talk(SAY_MOLGEIM_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_SUPERCHARGE) UpdatePhase(); @@ -711,13 +711,13 @@ public: Talk(SAY_BRUNDIR_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_SUPERCHARGE) UpdatePhase(); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_CHAIN_LIGHTNING || spellInfo->Id == uint32(RAID_MODE(61916, 63482))) // Lightning Whirl triggered _stunnedAchievement = false; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index a26a85881..e82875208 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -240,7 +240,7 @@ public: } void SummonedCreatureDespawn(Creature* cr) override { summons.Despawn(cr); } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override; + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override; void JustDied(Unit*) override; void KilledUnit(Unit* who) override; void SpellHitTarget(Unit* target, SpellInfo const* spell) override; @@ -608,7 +608,7 @@ void boss_flame_leviathan::boss_flame_leviathanAI::ScheduleEvents() events.RescheduleEvent(EVENT_PURSUE, 0); } -void boss_flame_leviathan::boss_flame_leviathanAI::SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) +void boss_flame_leviathan::boss_flame_leviathanAI::SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) { if (spellInfo->Id == SPELL_SYSTEMS_SHUTDOWN) { @@ -1183,7 +1183,7 @@ public: damage = 0; } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->SchoolMask & SPELL_SCHOOL_MASK_FIRE && !me->HasAura(SPELL_BLAZE)) me->CastSpell(me, SPELL_BLAZE, true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 54ba7abe4..917ca584e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -560,7 +560,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_NATURE_BOMB_FLIGHT) me->SummonCreature(NPC_NATURE_BOMB, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index a6d17e817..784bd8362 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -200,7 +200,7 @@ public: return 0; } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (target && spell && target->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_VEZAX_SHADOW_CRASH_DMG) bAchievShadowdodger = false; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 336165d91..e384ce1af 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -314,7 +314,7 @@ public: me->RemoveAura(SPELL_ICICLE_BOSS_AURA); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { switch( spell->Id ) { @@ -552,7 +552,7 @@ public: summons.Despawn(s); } - bool CanAIAttack(const Unit* t) const override + bool CanAIAttack(Unit const* t) const override { if (t->GetTypeId() == TYPEID_PLAYER) return !t->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER); @@ -730,7 +730,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { switch( spell->Id ) { @@ -777,7 +777,7 @@ public: events.ScheduleEvent(EVENT_PRIEST_SMITE, 2100); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if(spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) { @@ -829,7 +829,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) override {} void EnterEvadeMode() override {} - bool CanAIAttack(const Unit* t) const override { return t->GetEntry() == NPC_HODIR; } + bool CanAIAttack(Unit const* t) const override { return t->GetEntry() == NPC_HODIR; } void JustDied(Unit* /*killer*/) override { @@ -873,7 +873,7 @@ public: events.ScheduleEvent(EVENT_DRUID_STARLIGHT, 10000); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if(spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) { @@ -926,7 +926,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) override {} void EnterEvadeMode() override {} - bool CanAIAttack(const Unit* t) const override { return t->GetEntry() == NPC_HODIR; } + bool CanAIAttack(Unit const* t) const override { return t->GetEntry() == NPC_HODIR; } void JustDied(Unit* /*killer*/) override { @@ -970,7 +970,7 @@ public: events.ScheduleEvent(EVENT_SHAMAN_STORM_CLOUD, 10000); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if(spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) { @@ -979,7 +979,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (target && spell->Id == SPELL_SHAMAN_STORM_CLOUD) if (Aura* a = target->GetAura(SPELL_SHAMAN_STORM_CLOUD, me->GetGUID())) @@ -1026,7 +1026,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) override {} void EnterEvadeMode() override {} - bool CanAIAttack(const Unit* t) const override { return t->GetEntry() == NPC_HODIR; } + bool CanAIAttack(Unit const* t) const override { return t->GetEntry() == NPC_HODIR; } void JustDied(Unit* /*killer*/) override { @@ -1071,7 +1071,7 @@ public: events.ScheduleEvent(EVENT_MAGE_MELT_ICE, 1000); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if(spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) { @@ -1141,7 +1141,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) override {} void EnterEvadeMode() override {} - bool CanAIAttack(const Unit* t) const override { return t->GetEntry() == NPC_HODIR; } + bool CanAIAttack(Unit const* t) const override { return t->GetEntry() == NPC_HODIR; } void JustDied(Unit* /*killer*/) override { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 6aa0a1fb8..bd81bca5c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -121,7 +121,7 @@ public: me->CastSpell(me, 38757, true); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_ACTIVATE_CONSTRUCT) { @@ -325,7 +325,7 @@ public: Unit::Kill(*itr, *itr); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (caster && spell->Id == SPELL_GRAB_CONTROL_2) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 249d0a767..9bc1c38b3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1255,7 +1255,7 @@ public: return 0; } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if( spell->Id == SPELL_SELF_REPAIR ) { @@ -1597,7 +1597,7 @@ public: p->ToCreature()->DespawnOrUnsummon(8000); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if( spell->Id == SPELL_SELF_REPAIR ) { @@ -1926,7 +1926,7 @@ public: summons.Despawn(s); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if( spell->Id == SPELL_SELF_REPAIR ) { @@ -1962,9 +1962,9 @@ public: void AttackStart(Unit* /*who*/) override {} void MoveInLineOfSight(Unit* /*who*/) override {} - bool CanAIAttack(const Unit* /*target*/) const override { return false; } + bool CanAIAttack(Unit const* /*target*/) const override { return false; } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (target && spell && target->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_MINE_EXPLOSION) if (InstanceScript* pInstance = me->GetInstanceScript()) @@ -2404,7 +2404,7 @@ public: { npc_ulduar_flames_spreadAI(Creature* pCreature) : NullCreatureAI(pCreature) {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { switch( spell->Id ) { @@ -2503,7 +2503,7 @@ public: { npc_ulduar_rocket_strike_triggerAI(Creature* pCreature) : NullCreatureAI(pCreature) {} - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (!target || !spell) return; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 8e1d0d12d..cf714d63f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -213,7 +213,7 @@ public: pInstance->SetData(TYPE_RAZORSCALE, DONE); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (!caster || !pInstance) return; @@ -973,7 +973,7 @@ public: timer2 = 6000; } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return target && target->GetEntry() != NPC_RAZORSCALE; } @@ -1022,7 +1022,7 @@ public: timer2 = 2000; } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return target && target->GetEntry() != NPC_RAZORSCALE; } @@ -1078,7 +1078,7 @@ public: timer2 = 6000; } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return target && target->GetEntry() != NPC_RAZORSCALE; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index ab1d2cb31..106023b6b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -622,7 +622,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_LIGHTNING_ORB_CHARGER) { @@ -633,7 +633,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_LIGHTNING_CHARGE_DAMAGE && target->GetTypeId() == TYPEID_PLAYER) _hitByLightning = true; @@ -1093,7 +1093,7 @@ public: me->SetDisableGravity(true); } - void SpellHit(Unit*, const SpellInfo* spellInfo) override + void SpellHit(Unit*, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_CHARGE_ORB) me->CastSpell(me, SPELL_LIGHTNING_PILLAR_P1, true); @@ -1432,7 +1432,7 @@ public: _checkTarget = true; } - void SpellHit(Unit*, const SpellInfo* spellInfo) override + void SpellHit(Unit*, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_RUNIC_SMASH_LEFT || spellInfo->Id == SPELL_RUNIC_SMASH_RIGHT) { @@ -1645,7 +1645,7 @@ public: } } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return target->GetPositionX() < 2180 && target->GetPositionZ() < 425; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 8c813e62c..f04c584c8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -498,7 +498,7 @@ public: me->CastSpell(pile, SPELL_ENERGY_ORB, true); } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { // spawn not-so-random robots if (spellInfo->Id == SPELL_ENERGY_ORB_TRIGGER && target->GetEntry() == NPC_PILE_TRIGGER) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index cde45b848..c41227b69 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -611,7 +611,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_SANITY) if (Aura* aur = target->GetAura(SPELL_SANITY)) @@ -1163,7 +1163,7 @@ public: return 0; } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_IN_THE_MAWS_OF_THE_OLD_GOD) me->AddLootMode(32); @@ -1827,7 +1827,7 @@ public: damage = me->GetHealth() - 1; } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_SHADOW_BEACON) caster->GetAI()->DoAction(ACTION_YOGG_SARON_SHADOW_BEACON); @@ -2247,7 +2247,7 @@ public: me->CastSpell(me, SPELL_INSANE_PERIODIC, true); } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_INSANE1) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 307308b05..4fe68716c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -321,7 +321,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == 47593) // SPELL_FLAME_VISUAL trigger target->CastSpell(target, me->GetMap()->IsHeroic() ? SPELL_FLAME_BREATH_H : SPELL_FLAME_BREATH_N, true); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 452b6bfe8..2e9a1ca3b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -196,7 +196,7 @@ public: } } - void SpellHitTarget(Unit*, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit*, SpellInfo const* spellInfo) override { if (spellInfo->Id == 59302 && pInstance) // Bane trigger pInstance->SetData(DATA_YMIRON_ACHIEVEMENT, false); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index e1163d22d..4a36a0f4f 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -125,7 +125,7 @@ public: events.ScheduleEvent(EVENT_SUMMON_NEXT_MINION, 4000); } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { // restore minions health if (spellInfo->Id == SPELL_OVERCHARGE) diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index a41dae1c4..1816a2476 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -95,7 +95,7 @@ public: events.RescheduleEvent(EVENT_SPELL_MANA_DESTRUCTION, 20000); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (!target || !spell) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 65379c32b..6920d03a7 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -320,7 +320,7 @@ public: InstanceScript* pInstance; uint32 uiRangeCheck_Timer; - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_CREATE_GLOBULE_VISUAL) me->CastSpell(me, SPELL_WATER_GLOBULE, true); diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index f54b1e8be..9fd0dc20c 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -132,7 +132,7 @@ public: casterGuid.Clear(); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (phase || spell->Id != SPELL_SET_CART) return; @@ -551,7 +551,7 @@ struct npc_beryl_sorcererAI : public CreatureAI _events.ScheduleEvent(EVENT_FROSTBOLT, 3000, 4000); } - void SpellHit(Unit* unit, const SpellInfo* spell) override + void SpellHit(Unit* unit, SpellInfo const* spell) override { if (spell->Id == SPELL_ARCANE_CHAINS && !_chainsCast) { @@ -774,7 +774,7 @@ public: { } - void SpellHit(Unit* unit, const SpellInfo* spell) override + void SpellHit(Unit* unit, SpellInfo const* spell) override { if (spell->Id == SPELL_NEURAL_NEEDLE && unit->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 3aa4a630b..a10d3c7d1 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -533,7 +533,7 @@ public: me->SetCorpseDelay(1); } - bool CanAIAttack(const Unit* who) const override + bool CanAIAttack(Unit const* who) const override { return who->GetEntry() == NPC_INJURED_7TH_LEGION_SOLDER; } @@ -1145,7 +1145,7 @@ public: ScriptedAI::AttackStart(who); } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE) || target->HasUnitState(UNIT_STATE_STUNNED) || me->GetDisplayId() == 11686) return false; @@ -1893,7 +1893,7 @@ public: Talk (SAY_AGGRO, player); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id != SPELL_HIGH_EXECUTORS_BRANDING_IRON) return; diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 184cac66a..9266a7ea8 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -354,7 +354,7 @@ public: _gender = Data; } - void SpellHit(Unit* Caster, const SpellInfo* Spell) override + void SpellHit(Unit* Caster, SpellInfo const* Spell) override { if (Spell->Id == SPELL_OUTHOUSE_GROANS) { @@ -534,7 +534,7 @@ public: me->DespawnOrUnsummon(_despawnTimer); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_RENEW_SKIRMISHER && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(QUEST_OVERWHELMED) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 802193cf5..96c282517 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -65,7 +65,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (caster && spellInfo->Id == 44454) me->GetMotionMaster()->MovePoint(0, *caster); diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 1fe71ad6e..5995b63a5 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -398,7 +398,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override // for banana(51932), orange(51931), papaya(51933) + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override // for banana(51932), orange(51931), papaya(51933) { if (running) { diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index dc05aedb0..a38425216 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -147,7 +147,7 @@ public: me->SetControlled(true, UNIT_STATE_STUNNED); } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_STORM_HAMMER) { @@ -413,7 +413,7 @@ public: setCharm = true; } - void SpellHit(Unit* caster, const SpellInfo* spellInfo) override + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (!playerGUID && spellInfo->Id == SPELL_SPEAR_OF_HODIR) { @@ -789,7 +789,7 @@ public: me->DespawnOrUnsummon(); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id != SPELL_ICE_LANCE) return; diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 9d84ebf4d..457ab1528 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -477,14 +477,14 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_THROW_PORTAL_CRYSTAL) if (Aura* aura = target->AddAura(SPELL_ARTHAS_PORTAL, target)) aura->SetDuration(48000); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spellInfo) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_TOUCH_OF_DEATH) { @@ -673,7 +673,7 @@ public: me->DespawnOrUnsummon(1); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_UNLOCK_SHACKLE) { @@ -728,7 +728,7 @@ public: DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_FREE_RAGECLAW) { @@ -927,7 +927,7 @@ public: Reset(); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id != GYMERS_GRAB) return; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 3c6126f1b..3cd4dc72e 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -91,7 +91,7 @@ public: summon->CastSpell(summon, SPELL_FOCUS_FIRE_VISUAL, true); } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_FOCUS_CAST) target->CastSpell(target, DUNGEON_MODE(SPELL_FIERY_BLAST_N, SPELL_FIERY_BLAST_H), false); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 6404323d5..153fb4299 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -240,7 +240,7 @@ public: akama->AI()->EnterEvadeMode(); } - bool CanAIAttack(const Unit* target) const override + bool CanAIAttack(Unit const* target) const override { return target->GetEntry() != NPC_AKAMA && target->GetEntry() != NPC_MAIEV_SHADOWSONG; } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index f65a23c4e..b11cedae7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -316,7 +316,7 @@ public: damage = 0; } - bool CanAIAttack(const Unit* who) const override + bool CanAIAttack(Unit const* who) const override { return who->GetGUID() == ownerGUID; } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 35d686c5b..c956428d8 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -331,7 +331,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TYPEID_PLAYER) { @@ -975,7 +975,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { // Cast SPELL_BAD_PRESS_DAMAGE with scaled basepoints when the visual hits the target. // Need Fix: When SPELL_BAD_PRESS_TRIGGER hits target it triggers spell SPELL_BAD_PRESS_DAMAGE by itself diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index ddd369721..2823e440c 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -163,7 +163,7 @@ public: summoned->AI()->AttackStart(me); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == SPELL_CHAIN_LIGHTNING) { @@ -512,7 +512,7 @@ public: summoned->AI()->AttackStart(me); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == SPELL_KUR_CHAIN_LIGHTNING) { diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index b462602d9..49f3237d1 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -1728,7 +1728,7 @@ public: PlayerGUID = who->GetGUID(); } - //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) + //void SpellHit(Unit* /*caster*/, SpellInfo const* /*spell*/) //{ // DoCast(me, SPELL_DE_MATERIALIZE); //} diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 9025ae70b..22f70b085 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -251,7 +251,7 @@ public: caster->AI()->SetData(TYPE_INFERNAL, DATA_DIED); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_SUMMON_INFERNAL) { @@ -469,7 +469,7 @@ public: me->SetVisible(true); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (!caster) return; @@ -612,7 +612,7 @@ public: events.ScheduleEvent(EVENT_SUNDER, urand(5000, 10000)); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (!caster) return; @@ -1761,7 +1761,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (!tapped && spell->Id == SPELL_WHISTLE) { diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 4245c2663..497541d95 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -60,7 +60,7 @@ struct npc_pet_gen_soul_trader_beacon : public ScriptedAI Player* GetOwner() const { return ObjectAccessor::GetPlayer(*me, ownerGUID); } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_STEAL_ESSENCE_VISUAL && target == me) { @@ -740,7 +740,7 @@ struct npc_pet_gen_fetch_ball : public NullCreatureAI me->CastSpell(me, 48649 /*SPELL_PET_TOY_FETCH_BALL_COME_HERE*/, true); } - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override + void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { if (spellInfo->Id == 48649 /*SPELL_PET_TOY_FETCH_BALL_COME_HERE*/) { diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 84b19ebe8..88ed7bec2 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -461,7 +461,7 @@ class spell_dk_wandering_plague_aura : public AuraScript bool CheckProc(ProcEventInfo& eventInfo) { - const SpellInfo* spellInfo = eventInfo.GetSpellInfo(); + SpellInfo const* spellInfo = eventInfo.GetSpellInfo(); if (!spellInfo || !eventInfo.GetActionTarget() || !eventInfo.GetDamageInfo() || !eventInfo.GetActor()) return false; @@ -591,7 +591,7 @@ class spell_dk_dancing_rune_weapon : public AuraScript if (!eventInfo.GetActor() || !eventInfo.GetActionTarget() || !eventInfo.GetActionTarget()->IsAlive() || eventInfo.GetActor()->GetTypeId() != TYPEID_PLAYER) return false; - const SpellInfo* spellInfo = eventInfo.GetSpellInfo(); + SpellInfo const* spellInfo = eventInfo.GetSpellInfo(); if (!spellInfo) return true; @@ -636,7 +636,7 @@ class spell_dk_dancing_rune_weapon : public AuraScript return; dancingRuneWeapon->SetOrientation(dancingRuneWeapon->GetAngle(target)); - if (const SpellInfo* procSpell = eventInfo.GetSpellInfo()) + if (SpellInfo const* procSpell = eventInfo.GetSpellInfo()) { // xinef: ugly hack if (!procSpell->IsAffectingArea()) @@ -1338,7 +1338,7 @@ class spell_dk_death_grip : public SpellScript else { caster->CastSpell(target, 49560, true); - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(1766); // Rogue kick + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(1766); // Rogue kick if (!target->IsImmunedToSpellEffect(spellInfo, EFFECT_0)) target->InterruptNonMeleeSpells(true); } @@ -1356,7 +1356,7 @@ class spell_dk_death_grip : public SpellScript { if (target != GetCaster()) { - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(1766); // Rogue kick + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(1766); // Rogue kick if (!target->IsImmunedToSpellEffect(spellInfo, EFFECT_0)) target->InterruptNonMeleeSpells(false, 0, false); } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 3417526b8..3237cfc78 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -565,7 +565,7 @@ class spell_dru_lifebloom : public AuraScript // final heal int32 stack = GetStackAmount(); int32 healAmount = aurEff->GetAmount(); - const SpellInfo* finalHeal = sSpellMgr->GetSpellInfo(SPELL_DRUID_LIFEBLOOM_FINAL_HEAL); + SpellInfo const* finalHeal = sSpellMgr->GetSpellInfo(SPELL_DRUID_LIFEBLOOM_FINAL_HEAL); if (Unit* caster = GetCaster()) { @@ -586,7 +586,7 @@ class spell_dru_lifebloom : public AuraScript { Unit* caster = GetCaster(); int32 healAmount = GetSpellInfo()->Effects[EFFECT_1].CalcValue(caster ? caster : target, 0, target) * dispelInfo->GetRemovedCharges(); - const SpellInfo* finalHeal = sSpellMgr->GetSpellInfo(SPELL_DRUID_LIFEBLOOM_FINAL_HEAL); + SpellInfo const* finalHeal = sSpellMgr->GetSpellInfo(SPELL_DRUID_LIFEBLOOM_FINAL_HEAL); if (caster) { // healing with bonus diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index b8cbc6928..cc052f3ba 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -959,7 +959,7 @@ class spell_item_blade_ward_enchant : public AuraScript return; } - if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(64442 /*SPELL_BLADE_WARDING*/)) + if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(64442 /*SPELL_BLADE_WARDING*/)) { int32 basepoints = spellInfo->Effects[EFFECT_0].CalcValue() * this->GetStackAmount(); eventInfo.GetActionTarget()->CastCustomSpell(spellInfo->Id, SPELLVALUE_BASE_POINT0, basepoints, eventInfo.GetActor(), true); @@ -984,14 +984,14 @@ class spell_item_blood_draining_enchant : public AuraScript return; } - if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(64569 /*SPELL_BLOOD_RESERVE*/)) + if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(64569 /*SPELL_BLOOD_RESERVE*/)) { int32 basepoints = spellInfo->Effects[EFFECT_0].CalcValue() * this->GetStackAmount(); eventInfo.GetActionTarget()->CastCustomSpell(spellInfo->Id, SPELLVALUE_BASE_POINT0, basepoints, eventInfo.GetActionTarget(), true); eventInfo.GetActionTarget()->RemoveAurasDueToSpell(GetSpellInfo()->Id); // Remove rest auras } - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(64569 /*SPELL_BLOOD_RESERVE*/); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(64569 /*SPELL_BLOOD_RESERVE*/); int32 basepoints = spellInfo->Effects[EFFECT_0].CalcValue() * this->GetStackAmount(); eventInfo.GetActionTarget()->CastCustomSpell(spellInfo->Id, SPELLVALUE_BASE_POINT0, basepoints, eventInfo.GetActionTarget(), true); eventInfo.GetActionTarget()->RemoveAurasDueToSpell(GetSpellInfo()->Id); // Remove rest auras @@ -2226,7 +2226,7 @@ class spell_item_shadowmourne : public AuraScript /*if (!GetTarget()->FindMap() || GetTarget()->FindMap()->IsBattlegroundOrArena()) return false;*/ - if (const SpellInfo* procSpell = eventInfo.GetSpellInfo()) + if (SpellInfo const* procSpell = eventInfo.GetSpellInfo()) { if (eventInfo.GetDamageInfo() && !eventInfo.GetDamageInfo()->GetDamage()) { diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 73b657ae8..c00f88157 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -133,7 +133,7 @@ class spell_mage_molten_armor : public AuraScript bool CheckProc(ProcEventInfo& eventInfo) { - const SpellInfo* spellInfo = eventInfo.GetSpellInfo(); + SpellInfo const* spellInfo = eventInfo.GetSpellInfo(); if (!spellInfo || (eventInfo.GetTypeMask() & PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK)) return true; @@ -345,7 +345,7 @@ class spell_mage_brain_freeze : public AuraScript bool CheckProc(ProcEventInfo& eventInfo) { - const SpellInfo* spellInfo = eventInfo.GetSpellInfo(); + SpellInfo const* spellInfo = eventInfo.GetSpellInfo(); if (!spellInfo) return false; @@ -591,7 +591,7 @@ class spell_mage_ice_barrier_aura : public spell_mage_incanters_absorbtion_base_ PrepareAuraScript(spell_mage_ice_barrier_aura); // TODO: Rework - static int32 CalculateSpellAmount(Unit* caster, int32 amount, const SpellInfo* spellInfo, const AuraEffect* aurEff) + static int32 CalculateSpellAmount(Unit* caster, int32 amount, SpellInfo const* spellInfo, const AuraEffect* aurEff) { // +80.68% from sp bonus float bonus = 0.8068f; @@ -627,7 +627,7 @@ class spell_mage_ice_barrier : public SpellScript PrepareSpellScript(spell_mage_ice_barrier); // TODO: Rework - static int32 CalculateSpellAmount(Unit* caster, int32 amount, const SpellInfo* spellInfo, const AuraEffect* aurEff) + static int32 CalculateSpellAmount(Unit* caster, int32 amount, SpellInfo const* spellInfo, const AuraEffect* aurEff) { // +80.68% from sp bonus float bonus = 0.8068f; @@ -919,7 +919,7 @@ class spell_mage_summon_water_elemental : public SpellScript if (pet->GetCharmInfo() && caster->ToPlayer()) { pet->m_CreatureSpellCooldowns.clear(); - const SpellInfo* spellEntry = sSpellMgr->GetSpellInfo(31707); + SpellInfo const* spellEntry = sSpellMgr->GetSpellInfo(31707); pet->GetCharmInfo()->ToggleCreatureAutocast(spellEntry, true); pet->GetCharmInfo()->SetSpellAutocast(spellEntry, true); caster->ToPlayer()->CharmSpellInitialize(); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 3335edd8b..50510a854 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -100,7 +100,7 @@ class spell_pal_seal_of_command_aura : public AuraScript return false; } - if (const SpellInfo* procSpell = eventInfo.GetSpellInfo()) + if (SpellInfo const* procSpell = eventInfo.GetSpellInfo()) { if (procSpell->SpellIconID == 3025) // Righteous Vengeance, should not proc SoC { @@ -115,7 +115,7 @@ class spell_pal_seal_of_command_aura : public AuraScript { PreventDefaultAction(); int32 targets = 3; - if (const SpellInfo* procSpell = eventInfo.GetSpellInfo()) + if (SpellInfo const* procSpell = eventInfo.GetSpellInfo()) { if (procSpell->IsAffectingArea()) { @@ -146,7 +146,7 @@ class spell_pal_seal_of_command : public SpellScript void FilterTargets(std::list& targets) { - if (const SpellValue* spellValue = GetSpellValue()) + if (SpellValue const* spellValue = GetSpellValue()) if (spellValue->MaxAffectedTargets == 1) targets.clear(); } @@ -198,7 +198,7 @@ class spell_pal_sacred_shield_base : public AuraScript { if (Unit* caster = GetCaster()) { - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell); amount = spellInfo->Effects[EFFECT_0].CalcValue(); // +75.00% from sp bonus @@ -238,7 +238,7 @@ class spell_pal_sacred_shield_base : public AuraScript return; } - const SpellInfo* procSpell = damageInfo->GetSpellInfo(); + SpellInfo const* procSpell = damageInfo->GetSpellInfo(); if (!procSpell) { return; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 4d7ff591e..d2fa4932f 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -546,7 +546,7 @@ class spell_pri_penance : public SpellScript }; // -17 - Power Word: Shield -static int32 CalculateSpellAmount(Unit* caster, int32 amount, const SpellInfo* spellInfo, const AuraEffect* aurEff) +static int32 CalculateSpellAmount(Unit* caster, int32 amount, SpellInfo const* spellInfo, const AuraEffect* aurEff) { // +80.68% from sp bonus float bonus = 0.8068f; diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 95bc32635..202331f59 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -65,7 +65,7 @@ public: disabled = true; break; case 34475: - if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(SPELL_ARCANE_CHARGES)) + if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_ARCANE_CHARGES)) Spell::SendCastResult(player, spellInfo, 1, SPELL_FAILED_NOT_ON_GROUND); break; } @@ -209,7 +209,7 @@ public: { player->SendEquipError(EQUIP_ERR_NONE, item, nullptr); - if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(SPELL_PETROV_BOMB)) + if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_PETROV_BOMB)) Spell::SendCastResult(player, spellInfo, 1, SPELL_FAILED_NOT_HERE); return true; diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index a0078e520..335c9c5f9 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -183,7 +183,7 @@ public: } uint32 timer, interval; - const SpellInfo* spell; + SpellInfo const* spell; void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/World/npc_stave_of_ancients.cpp b/src/server/scripts/World/npc_stave_of_ancients.cpp index 3d781258c..fd7aba9d9 100644 --- a/src/server/scripts/World/npc_stave_of_ancients.cpp +++ b/src/server/scripts/World/npc_stave_of_ancients.cpp @@ -393,7 +393,7 @@ public: DoMeleeAttackIfReady(); } - void SpellHit(Unit* /*Caster*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*Caster*/, SpellInfo const* Spell) override { uint32 serpentStings[12] = { 1978, 13549, 13550, 13551, 13552, 13553, 13554, 13555, 25295, 27016, 49000, 49001 }; @@ -774,7 +774,7 @@ public: DoMeleeAttackIfReady(); } - void SpellHit(Unit* /*Caster*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*Caster*/, SpellInfo const* Spell) override { if (!InNormalForm()) { @@ -984,7 +984,7 @@ public: DoMeleeAttackIfReady(); } - void SpellHit(Unit* /*Caster*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*Caster*/, SpellInfo const* Spell) override { if (InNormalForm()) { @@ -1155,7 +1155,7 @@ public: DoMeleeAttackIfReady(); } - void SpellHit(Unit* /*Caster*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*Caster*/, SpellInfo const* Spell) override { if (InNormalForm()) { diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 7df7d5c79..c92dc888a 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2245,7 +2245,7 @@ public: break; } - const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(spellId); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); if (spellInfo && spellInfo->Effects[0].Effect == SPELL_EFFECT_SUMMON_OBJECT_WILD) return spellInfo->Effects[0].MiscValue;