diff options
| author | click <clickvd@gonnamakeyou.com> | 2011-06-11 22:35:29 +0200 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2011-06-11 22:35:29 +0200 |
| commit | 158966dc793f47dd4ada264da775f647601298aa (patch) | |
| tree | 8fa1dc1cc36d07123662c32eb5981cfac01e91b6 | |
| parent | 9ef8bd307200445f448a67d1bb26c3afee9b7051 (diff) | |
Core: Codestyle cleanup
410 files changed, 1790 insertions, 1790 deletions
diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index 14bf90eb8a2..c37fa7b08d3 100755 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -39,22 +39,22 @@ void AggressorAI::UpdateAI(const uint32 /*diff*/) } // some day we will delete these useless things -int CombatAI::Permissible(const Creature * /*creature*/) +int CombatAI::Permissible(const Creature* /*creature*/) { return PERMIT_BASE_NO; } -int ArcherAI::Permissible(const Creature * /*creature*/) +int ArcherAI::Permissible(const Creature* /*creature*/) { return PERMIT_BASE_NO; } -int TurretAI::Permissible(const Creature * /*creature*/) +int TurretAI::Permissible(const Creature* /*creature*/) { return PERMIT_BASE_NO; } -int VehicleAI::Permissible(const Creature * /*creature*/) +int VehicleAI::Permissible(const Creature* /*creature*/) { return PERMIT_BASE_NO; } @@ -229,7 +229,7 @@ TurretAI::TurretAI(Creature *c) : CreatureAI(c) me->m_SightDistance = me->m_CombatDistance; } -bool TurretAI::CanAIAttack(const Unit * /*who*/) const +bool TurretAI::CanAIAttack(const Unit* /*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 4aa28c934e7..b3d7b580697 100755 --- a/src/server/game/AI/CoreAI/CombatAI.h +++ b/src/server/game/AI/CoreAI/CombatAI.h @@ -57,9 +57,9 @@ class CasterAI : public CombatAI public: explicit CasterAI(Creature *c) : CombatAI(c) { m_attackDist = MELEE_RANGE; } void InitializeAI(); - void AttackStart(Unit * victim) { AttackStartCaster(victim, m_attackDist); } + void AttackStart(Unit* victim) { AttackStartCaster(victim, m_attackDist); } void UpdateAI(const uint32 diff); - void EnterCombat(Unit * /*who*/); + void EnterCombat(Unit* /*who*/); private: float m_attackDist; }; diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 8cf9ca8ee13..ed3a5b47e76 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -28,7 +28,7 @@ class GameObjectAI { protected: - GameObject * const go; + GameObject* const go; public: explicit GameObjectAI(GameObject *g) : go(g) {} virtual ~GameObjectAI() {} diff --git a/src/server/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp index 1bad2545d27..1bff5a3a80c 100755 --- a/src/server/game/AI/CoreAI/PassiveAI.cpp +++ b/src/server/game/AI/CoreAI/PassiveAI.cpp @@ -46,7 +46,7 @@ void PossessedAI::UpdateAI(const uint32 /*diff*/) } } -void PossessedAI::JustDied(Unit * /*u*/) +void PossessedAI::JustDied(Unit* /*u*/) { // We died while possessed, disable our loot me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); @@ -59,7 +59,7 @@ void PossessedAI::KilledUnit(Unit* victim) victim->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } -void CritterAI::DamageTaken(Unit * /*done_by*/, uint32 &) +void CritterAI::DamageTaken(Unit* /*done_by*/, uint32 &) { if (!me->HasUnitState(UNIT_STAT_FLEEING)) me->SetControlled(true, UNIT_STAT_FLEEING); diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h index fd64aa39688..05841dbfa5e 100755 --- a/src/server/game/AI/CoreAI/PetAI.h +++ b/src/server/game/AI/CoreAI/PetAI.h @@ -32,12 +32,12 @@ class PetAI : public CreatureAI explicit PetAI(Creature *c); void EnterEvadeMode(); - void JustDied(Unit * /*who*/) { _stopAttack(); } + void JustDied(Unit* /*who*/) { _stopAttack(); } void UpdateAI(const uint32); static int Permissible(const Creature *); - void KilledUnit(Unit * /*victim*/); + void KilledUnit(Unit* /*victim*/); void AttackStart(Unit *target); void MovementInform(uint32 moveType, uint32 data); diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 71034d4c333..6bd9c98bd64 100755 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -100,7 +100,7 @@ struct DefaultTargetSelector : public std::unary_function<Unit* , bool> class UnitAI { protected: - Unit * const me; + Unit* const me; public: explicit UnitAI(Unit* unit) : me(unit) {} virtual ~UnitAI() {} diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index 2dd99904ddf..f49df99554f 100755 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -294,7 +294,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction { //Note: checked only aura for effect 0, if need check aura for effect 1/2 then // possible way: pack in event.buffed.amount 2 uint16 (ammount+effectIdx) - Aura const * aura = me->GetAura(event.buffed.spellId); + Aura const* aura = me->GetAura(event.buffed.spellId); if (!aura || aura->GetStackAmount() < event.buffed.amount) return false; @@ -310,7 +310,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction //Note: checked only aura for effect 0, if need check aura for effect 1/2 then // possible way: pack in event.buffed.amount 2 uint16 (ammount+effectIdx) - Aura const * aura = pActionInvoker->GetAura(event.buffed.spellId); + Aura const* aura = pActionInvoker->GetAura(event.buffed.spellId); if (!aura || aura->GetStackAmount() < event.buffed.amount) return false; diff --git a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h index c448b9ba4da..f50372027af 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h @@ -27,9 +27,9 @@ struct SimpleAI : public ScriptedAI void Reset(); - void EnterCombat(Unit * /*who*/); + void EnterCombat(Unit* /*who*/); - void KilledUnit(Unit * /*victim*/); + void KilledUnit(Unit* /*victim*/); void DamageTaken(Unit *killer, uint32 &damage); diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 1ba4d597108..32562e26869 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -124,7 +124,7 @@ class SmartAI : public CreatureAI void IsSummonedBy(Unit* summoner); // Called at any Damage to any victim (before damage apply) - void DamageDealt(Unit * done_to, uint32 & damage, DamageEffectType /*damagetype*/); + void DamageDealt(Unit* done_to, uint32 & damage, DamageEffectType /*damagetype*/); // Called when a summoned creature dissapears (UnSommoned) void SummonedCreatureDespawn(Creature* unit); @@ -251,7 +251,7 @@ public: void SetScript9(SmartScriptHolder &e, uint32 entry, Unit* invoker); protected: - GameObject * const go; + GameObject* const go; SmartScript mScript; }; #endif diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index e1d8a6056db..bfbc618dc1a 100755 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -1373,7 +1373,7 @@ bool Battleground::AddObject(uint32 type, uint32 entry, float x, float y, float // Must be created this way, adding to godatamap would add it to the base map of the instance // and when loading it (in go::LoadFromDB()), a new guid would be assigned to the object, and a new object would be created // So we must create it specific for this instance - GameObject * go = new GameObject; + GameObject* go = new GameObject; if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), entry, GetBgMap(), PHASEMASK_NORMAL, x, y, z, o, rotation0, rotation1, rotation2, rotation3, 100, GO_STATE_READY)) { diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 086efb0f59d..a765a1c239b 100755 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -557,7 +557,7 @@ class Battleground //to be removed const char* GetTrinityString(int32 entry); - virtual bool HandlePlayerUnderMap(Player * /*plr*/) { return false; } + virtual bool HandlePlayerUnderMap(Player* /*plr*/) { return false; } // since arenas can be AvA or Hvh, we have to get the "temporary" team of a player uint32 GetPlayerTeam(const uint64& guid) const; @@ -591,7 +591,7 @@ class Battleground // Scorekeeping BattlegroundScoreMap m_PlayerScores; // Player scores // must be implemented in BG subclass - virtual void RemovePlayer(Player * /*player*/, uint64 /*guid*/) {} + virtual void RemovePlayer(Player* /*player*/, uint64 /*guid*/) {} // Player lists, those need to be accessible by inherited classes BattlegroundPlayerMap m_Players; diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 97e1f93f370..1799c502271 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -70,7 +70,7 @@ void BattlegroundMgr::DeleteAllBattlegrounds() { for (BattlegroundSet::iterator itr = m_Battlegrounds[i].begin(); itr != m_Battlegrounds[i].end();) { - Battleground * bg = itr->second; + Battleground* bg = itr->second; m_Battlegrounds[i].erase(itr++); if (!m_ClientBattlegroundIds[i][bg->GetBracketId()].empty()) m_ClientBattlegroundIds[i][bg->GetBracketId()].erase(bg->GetClientInstanceID()); @@ -106,7 +106,7 @@ void BattlegroundMgr::Update(uint32 diff) // direct deletion caused crashes if (itr->second->m_SetDeleteThis) { - Battleground * bg = itr->second; + Battleground* bg = itr->second; m_Battlegrounds[i].erase(itr); if (!m_ClientBattlegroundIds[i][bg->GetBracketId()].empty()) m_ClientBattlegroundIds[i][bg->GetBracketId()].erase(bg->GetClientInstanceID()); @@ -429,7 +429,7 @@ void BattlegroundMgr::BuildPlayerJoinedBattlegroundPacket(WorldPacket *data, Pla *data << uint64(plr->GetGUID()); } -Battleground * BattlegroundMgr::GetBattlegroundThroughClientInstance(uint32 instanceId, BattlegroundTypeId bgTypeId) +Battleground* BattlegroundMgr::GetBattlegroundThroughClientInstance(uint32 instanceId, BattlegroundTypeId bgTypeId) { //cause at HandleBattlegroundJoinOpcode the clients sends the instanceid he gets from //SMSG_BATTLEFIELD_LIST we need to find the battleground with this clientinstance-id @@ -448,7 +448,7 @@ Battleground * BattlegroundMgr::GetBattlegroundThroughClientInstance(uint32 inst return NULL; } -Battleground * BattlegroundMgr::GetBattleground(uint32 InstanceID, BattlegroundTypeId bgTypeId) +Battleground* BattlegroundMgr::GetBattleground(uint32 InstanceID, BattlegroundTypeId bgTypeId) { if (!InstanceID) return NULL; @@ -468,7 +468,7 @@ Battleground * BattlegroundMgr::GetBattleground(uint32 InstanceID, BattlegroundT return ((itr != m_Battlegrounds[bgTypeId].end()) ? itr->second : NULL); } -Battleground * BattlegroundMgr::GetBattlegroundTemplate(BattlegroundTypeId bgTypeId) +Battleground* BattlegroundMgr::GetBattlegroundTemplate(BattlegroundTypeId bgTypeId) { //map is sorted and we can be sure that lowest instance id has only BG template return m_Battlegrounds[bgTypeId].empty() ? NULL : m_Battlegrounds[bgTypeId].begin()->second; @@ -497,7 +497,7 @@ uint32 BattlegroundMgr::CreateClientVisibleInstanceId(BattlegroundTypeId bgTypeI } // create a new battleground that will really be used to play -Battleground * BattlegroundMgr::CreateNewBattleground(BattlegroundTypeId bgTypeId, PvPDifficultyEntry const* bracketEntry, uint8 arenaType, bool isRated) +Battleground* BattlegroundMgr::CreateNewBattleground(BattlegroundTypeId bgTypeId, PvPDifficultyEntry const* bracketEntry, uint8 arenaType, bool isRated) { // get the template BG Battleground *bg_template = GetBattlegroundTemplate(bgTypeId); @@ -1026,7 +1026,7 @@ void BattlegroundMgr::SetHolidayWeekends(uint32 mask) { for (uint32 bgtype = 1; bgtype < MAX_BATTLEGROUND_TYPE_ID; ++bgtype) { - if (Battleground * bg = GetBattlegroundTemplate(BattlegroundTypeId(bgtype))) + if (Battleground* bg = GetBattlegroundTemplate(BattlegroundTypeId(bgtype))) { bg->SetHoliday(mask & (1 << bgtype)); } diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 9975cbe29e1..4b1bbed4bf6 100755 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -390,7 +390,7 @@ void BattlegroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCou // first send removal information if (Player *plr2 = sObjectMgr->GetPlayer(group->Players.begin()->first)) { - Battleground * bg = sBattlegroundMgr->GetBattlegroundTemplate(group->BgTypeId); + Battleground* bg = sBattlegroundMgr->GetBattlegroundTemplate(group->BgTypeId); BattlegroundQueueTypeId bgQueueTypeId = BattlegroundMgr::BGQueueTypeId(group->BgTypeId, group->ArenaType); uint32 queueSlot = plr2->GetBattlegroundQueueIndex(bgQueueTypeId); plr2->RemoveBattlegroundQueueId(bgQueueTypeId); // must be called this way, because if you move this call to @@ -422,7 +422,7 @@ bool BattlegroundQueue::GetPlayerGroupInfoData(const uint64& guid, GroupQueueInf return true; } -bool BattlegroundQueue::InviteGroupToBG(GroupQueueInfo * ginfo, Battleground * bg, uint32 side) +bool BattlegroundQueue::InviteGroupToBG(GroupQueueInfo * ginfo, Battleground* bg, uint32 side) { // set side if needed if (side) @@ -777,7 +777,7 @@ void BattlegroundQueue::Update(BattlegroundTypeId bgTypeId, BattlegroundBracketI // finished iterating through the bgs with free slots, maybe we need to create a new bg - Battleground * bg_template = sBattlegroundMgr->GetBattlegroundTemplate(bgTypeId); + Battleground* bg_template = sBattlegroundMgr->GetBattlegroundTemplate(bgTypeId); if (!bg_template) { sLog->outError("Battleground: Update: bg template not found for %u", bgTypeId); @@ -835,7 +835,7 @@ void BattlegroundQueue::Update(BattlegroundTypeId bgTypeId, BattlegroundBracketI if (CheckPremadeMatch(bracket_id, MinPlayersPerTeam, MaxPlayersPerTeam)) { //create new battleground - Battleground * bg2 = sBattlegroundMgr->CreateNewBattleground(bgTypeId, bracketEntry, 0, false); + Battleground* bg2 = sBattlegroundMgr->CreateNewBattleground(bgTypeId, bracketEntry, 0, false); if (!bg2) { sLog->outError("BattlegroundQueue::Update - Cannot create battleground: %u", bgTypeId); @@ -861,7 +861,7 @@ void BattlegroundQueue::Update(BattlegroundTypeId bgTypeId, BattlegroundBracketI || (bg_template->isArena() && CheckSkirmishForSameFaction(bracket_id, MinPlayersPerTeam))) { // we successfully created a pool - Battleground * bg2 = sBattlegroundMgr->CreateNewBattleground(bgTypeId, bracketEntry, arenaType, false); + Battleground* bg2 = sBattlegroundMgr->CreateNewBattleground(bgTypeId, bracketEntry, arenaType, false); if (!bg2) { sLog->outError("BattlegroundQueue::Update - Cannot create battleground: %u", bgTypeId); diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h index 38b58476b85..bcf366bd85c 100755 --- a/src/server/game/Battlegrounds/BattlegroundQueue.h +++ b/src/server/game/Battlegrounds/BattlegroundQueue.h @@ -118,7 +118,7 @@ class BattlegroundQueue private: - bool InviteGroupToBG(GroupQueueInfo * ginfo, Battleground * bg, uint32 side); + bool InviteGroupToBG(GroupQueueInfo * ginfo, Battleground* bg, uint32 side); uint32 m_WaitTimes[BG_TEAMS_COUNT][MAX_BATTLEGROUND_BRACKETS][COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME]; uint32 m_WaitTimeLastPlayer[BG_TEAMS_COUNT][MAX_BATTLEGROUND_BRACKETS]; uint32 m_SumOfWaitTimes[BG_TEAMS_COUNT][MAX_BATTLEGROUND_BRACKETS]; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAA.cpp index c21c8164431..922e26556ee 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAA.cpp @@ -62,7 +62,7 @@ void BattlegroundAA::AddPlayer(Player *plr) m_PlayerScores[plr->GetGUID()] = sc; } -void BattlegroundAA::RemovePlayer(Player * /*plr*/, uint64 /*guid*/) +void BattlegroundAA::RemovePlayer(Player* /*plr*/, uint64 /*guid*/) { } @@ -71,7 +71,7 @@ void BattlegroundAA::HandleKillPlayer(Player* player, Player* killer) Battleground::HandleKillPlayer(player, killer); } -void BattlegroundAA::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/) +void BattlegroundAA::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/) { } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index 6b56f2a14a6..307c7df51d7 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -215,7 +215,7 @@ void BattlegroundAB::AddPlayer(Player *plr) m_PlayerScores[plr->GetGUID()] = sc; } -void BattlegroundAB::RemovePlayer(Player * /*plr*/, uint64 /*guid*/) +void BattlegroundAB::RemovePlayer(Player* /*plr*/, uint64 /*guid*/) { } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.h b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h index c34ad73b571..4756b9aa45a 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundBE.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h @@ -68,7 +68,7 @@ class BattlegroundBE : public Battleground virtual void Reset(); virtual void FillInitialWorldStates(WorldPacket &d); void HandleKillPlayer(Player* player, Player *killer); - bool HandlePlayerUnderMap(Player * plr); + bool HandlePlayerUnderMap(Player* plr); /* Scorekeeping */ void UpdatePlayerScore(Player *Source, uint32 type, uint32 value, bool doAddHonor = true); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp index 7ad258449d3..a1b2bcd400d 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp @@ -110,7 +110,7 @@ void BattlegroundDS::AddPlayer(Player *plr) UpdateArenaWorldState(); } -void BattlegroundDS::RemovePlayer(Player * /*plr*/, uint64 /*guid*/) +void BattlegroundDS::RemovePlayer(Player* /*plr*/, uint64 /*guid*/) { if (GetStatus() == STATUS_WAIT_LEAVE) return; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h index 0071a386e2a..4a44a375049 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h @@ -77,7 +77,7 @@ class BattlegroundDS : public Battleground virtual void Reset(); virtual void FillInitialWorldStates(WorldPacket &d); void HandleKillPlayer(Player* player, Player *killer); - bool HandlePlayerUnderMap(Player * plr); + bool HandlePlayerUnderMap(Player* plr); private: uint32 m_waterTimer; bool m_waterfallActive; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 5a86767f286..91d3534b4cd 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -370,7 +370,7 @@ class BattlegroundEY : public Battleground bool IsAllNodesConrolledByTeam(uint32 team) const; private: void EventPlayerCapturedFlag(Player *Source, uint32 BgObjectType); - void EventPlayerCapturedFlag(Player * /*Source*/) {} + void EventPlayerCapturedFlag(Player* /*Source*/) {} void EventTeamCapturedPoint(Player *Source, uint32 Point); void EventTeamLostPoint(Player *Source, uint32 Point); void UpdatePointsCount(uint32 Team); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index c66679c0e7d..58c17988756 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -316,7 +316,7 @@ void BattlegroundIC::RemovePlayer(Player* plr, uint64 /*guid*/) plr->RemoveAura(SPELL_OIL_REFINERY); } -void BattlegroundIC::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/) +void BattlegroundIC::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/) { // this is wrong way to implement these things. On official it done by gameobject spell cast. if (GetStatus() != STATUS_IN_PROGRESS) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.h b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h index aee06ae7bdb..ba0011bba30 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundNA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h @@ -69,6 +69,6 @@ class BattlegroundNA : public Battleground virtual void Reset(); virtual void FillInitialWorldStates(WorldPacket &d); void HandleKillPlayer(Player* player, Player *killer); - bool HandlePlayerUnderMap(Player * plr); + bool HandlePlayerUnderMap(Player* plr); }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRB.cpp index 5adc117a1be..9b88dff5352 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRB.cpp @@ -61,7 +61,7 @@ void BattlegroundRB::RemovePlayer(Player* /*plr*/, uint64 /*guid*/) { } -void BattlegroundRB::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/) +void BattlegroundRB::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/) { // this is wrong way to implement these things. On official it done by gameobject spell cast. if (GetStatus() != STATUS_IN_PROGRESS) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.h b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h index 5c6e161e79b..a58e09431dd 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRL.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h @@ -65,6 +65,6 @@ class BattlegroundRL : public Battleground void HandleAreaTrigger(Player *Source, uint32 Trigger); bool SetupBattleground(); void HandleKillPlayer(Player* player, Player *killer); - bool HandlePlayerUnderMap(Player * plr); + bool HandlePlayerUnderMap(Player* plr); }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp index 0a74cec74a9..aa7aef9a451 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp @@ -131,7 +131,7 @@ void BattlegroundRV::AddPlayer(Player *plr) UpdateWorldState(BG_RV_WORLD_STATE_H, GetAlivePlayersCountByTeam(HORDE)); } -void BattlegroundRV::RemovePlayer(Player * /*plr*/, uint64 /*guid*/) +void BattlegroundRV::RemovePlayer(Player* /*plr*/, uint64 /*guid*/) { if (GetStatus() == STATUS_WAIT_LEAVE) return; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h index 3fea2dac889..a87fb7e3f3d 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h @@ -122,7 +122,7 @@ class BattlegroundRV : public Battleground void HandleAreaTrigger(Player *Source, uint32 Trigger); bool SetupBattleground(); void HandleKillPlayer(Player* player, Player *killer); - bool HandlePlayerUnderMap(Player * plr); + bool HandlePlayerUnderMap(Player* plr); private: uint32 Timer; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index 9a1e4a8c0b2..7a0aa5b9357 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -469,7 +469,7 @@ void BattlegroundSA::RemovePlayer(Player* /*plr*/, uint64 /*guid*/) { } -void BattlegroundSA::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/) +void BattlegroundSA::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/) { // this is wrong way to implement these things. On official it done by gameobject spell cast. if (GetStatus() != STATUS_IN_PROGRESS) @@ -912,7 +912,7 @@ void BattlegroundSA::SendTransportInit(Player *player) } } -void BattlegroundSA::SendTransportsRemove(Player * player) +void BattlegroundSA::SendTransportsRemove(Player* player) { if (m_BgObjects[BG_SA_BOAT_ONE] || m_BgObjects[BG_SA_BOAT_TWO]) { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index a481194402a..2a972f5a7d0 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -538,7 +538,7 @@ class BattlegroundSA : public Battleground /// Send packet to player for create boats (client part) void SendTransportInit(Player *player); /// Send packet to player for destroy boats (client part) - void SendTransportsRemove(Player * player); + void SendTransportsRemove(Player* player); /// Id of attacker team TeamId Attackers; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index 927b8fc81ed..ace65bc3e3c 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -142,20 +142,20 @@ void BattlegroundWS::Update(uint32 diff) m_FlagSpellForceTimer += diff; if (m_FlagDebuffState == 0 && m_FlagSpellForceTimer >= 600000) //10 minutes { - if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[0])) + if (Player* plr = sObjectMgr->GetPlayer(m_FlagKeepers[0])) plr->CastSpell(plr, WS_SPELL_FOCUSED_ASSAULT, true); - if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[1])) + if (Player* plr = sObjectMgr->GetPlayer(m_FlagKeepers[1])) plr->CastSpell(plr, WS_SPELL_FOCUSED_ASSAULT, true); m_FlagDebuffState = 1; } else if (m_FlagDebuffState == 1 && m_FlagSpellForceTimer >= 900000) //15 minutes { - if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[0])) + if (Player* plr = sObjectMgr->GetPlayer(m_FlagKeepers[0])) { plr->RemoveAurasDueToSpell(WS_SPELL_FOCUSED_ASSAULT); plr->CastSpell(plr, WS_SPELL_BRUTAL_ASSAULT, true); } - if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[1])) + if (Player* plr = sObjectMgr->GetPlayer(m_FlagKeepers[1])) { plr->RemoveAurasDueToSpell(WS_SPELL_FOCUSED_ASSAULT); plr->CastSpell(plr, WS_SPELL_BRUTAL_ASSAULT, true); diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index ff6c16ec554..6142f52855e 100755 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -1056,7 +1056,7 @@ void ChatHandler::FillMessageData(WorldPacket *data, WorldSession* session, uint *data << uint8(0); } -Player * ChatHandler::getSelectedPlayer() +Player* ChatHandler::getSelectedPlayer() { if (!m_session) return NULL; diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index 1babb5980ab..428146bbf28 100755 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -103,7 +103,7 @@ bool ChatHandler::HandleSetSkillCommand(const char *args) int32 level = atol (level_p); - Player * target = getSelectedPlayer(); + Player* target = getSelectedPlayer(); if (!target) { SendSysMessage(LANG_NO_CHAR_SELECTED); @@ -614,7 +614,7 @@ bool ChatHandler::HandleListObjectCommand(const char *args) return false; } - GameObjectTemplate const * gInfo = sObjectMgr->GetGameObjectTemplate(go_id); + GameObjectTemplate const* gInfo = sObjectMgr->GetGameObjectTemplate(go_id); if (!gInfo) { PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, go_id); @@ -2405,8 +2405,8 @@ bool ChatHandler::HandleListAurasCommand (const char * /*args*/) { bool talent = GetTalentSpellCost(itr->second->GetBase()->GetId()) > 0; - AuraApplication const * aurApp = itr->second; - Aura const * aura = aurApp->GetBase(); + AuraApplication const* aurApp = itr->second; + Aura const* aura = aurApp->GetBase(); char const* name = aura->GetSpellProto()->SpellName[GetSessionDbcLocale()]; if (m_session) diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 84212075013..ae0cf87bcec 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -29,7 +29,7 @@ // Checks if player meets the condition // Can have CONDITION_SOURCE_TYPE_NONE && !mReferenceId if called from a special event (ie: eventAI) -bool Condition::Meets(Player * player, Unit* invoker) +bool Condition::Meets(Player* player, Unit* invoker) { if (!player) { @@ -1289,7 +1289,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) } case CONDITION_MAPID: { - MapEntry const * me = sMapStore.LookupEntry(cond->mConditionValue1); + MapEntry const* me = sMapStore.LookupEntry(cond->mConditionValue1); if (!me) { sLog->outErrorDb("Map condition has non existing map (%u), skipped", cond->mConditionValue1); diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 8c58f21be86..daa20e585ff 100755 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -127,7 +127,7 @@ struct Condition mScriptId = 0; } - bool Meets(Player * player, Unit* invoker = NULL); + bool Meets(Player* player, Unit* invoker = NULL); bool isLoaded() const { return mConditionType > CONDITION_NONE || mReferenceId; } }; diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 3fd61553811..6eddf396d45 100755 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -300,7 +300,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales, bad_dbc_files, sFactionStore, dbcPath, "Faction.dbc"); for (uint32 i=0; i<sFactionStore.GetNumRows(); ++i) { - FactionEntry const * faction = sFactionStore.LookupEntry(i); + FactionEntry const* faction = sFactionStore.LookupEntry(i); if (faction && faction->team) { SimpleFactionsList &flist = sFactionTeamMap[faction->team]; @@ -312,7 +312,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales, bad_dbc_files, sGameObjectDisplayInfoStore, dbcPath, "GameObjectDisplayInfo.dbc"); for (uint32 i = 0; i < sGameObjectDisplayInfoStore.GetNumRows(); ++i) { - if (GameObjectDisplayInfoEntry const * info = sGameObjectDisplayInfoStore.LookupEntry(i)) + if (GameObjectDisplayInfoEntry const* info = sGameObjectDisplayInfoStore.LookupEntry(i)) { if (info->maxX < info->minX) std::swap(*(float*)(&info->maxX), *(float*)(&info->minX)); @@ -386,7 +386,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales, bad_dbc_files, sSpellStore, dbcPath, "Spell.dbc", &CustomSpellEntryfmt, &CustomSpellEntryIndex); for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) { - SpellEntry const * spell = sSpellStore.LookupEntry(i); + SpellEntry const* spell = sSpellStore.LookupEntry(i); if (spell && spell->Category) sSpellCategoryStore[spell->Category].insert(i); } diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h index 82f63d887ab..67a94ecd591 100755 --- a/src/server/game/Entities/Creature/TemporarySummon.h +++ b/src/server/game/Entities/Creature/TemporarySummon.h @@ -57,7 +57,7 @@ class Minion : public TempSummon bool IsPetGhoul() const {return GetEntry() == 26125;} // Ghoul may be guardian or pet bool IsGuardianPet() const; protected: - Unit * const m_owner; + Unit* const m_owner; float m_followAngle; }; diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp index 444b4170104..d6eb5ac3516 100755 --- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp +++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp @@ -196,7 +196,7 @@ void DynamicObject::SetCasterViewpoint() void DynamicObject::RemoveCasterViewpoint() { - if (Player * caster = _caster->ToPlayer()) + if (Player* caster = _caster->ToPlayer()) { caster->SetViewpoint(this, false); _isViewpoint = false; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index f79b2ddbb23..dae77ac300e 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -144,7 +144,7 @@ void GameObject::RemoveFromWorld() // Possible crash at access to deleted GO in Unit::m_gameobj if (uint64 owner_guid = GetOwnerGUID()) { - if (Unit * owner = GetOwner()) + if (Unit* owner = GetOwner()) owner->RemoveGameObject(this, false); else sLog->outError("Delete GameObject (GUID: %u Entry: %u) that have references in not found creature %u GO list. Crash possible later.", GetGUIDLow(), GetGOInfo()->entry, GUID_LOPART(owner_guid)); @@ -609,7 +609,7 @@ void GameObject::Delete() { SetLootState(GO_NOT_READY); if (GetOwnerGUID()) - if (Unit * owner = GetOwner()) + if (Unit* owner = GetOwner()) owner->RemoveGameObject(this, false); ASSERT (!GetOwnerGUID()); @@ -817,7 +817,7 @@ bool GameObject::hasInvolvedQuest(uint32 quest_id) const bool GameObject::IsTransport() const { // If something is marked as a transport, don't transmit an out of range packet for it. - GameObjectTemplate const * gInfo = GetGOInfo(); + GameObjectTemplate const* gInfo = GetGOInfo(); if (!gInfo) return false; return gInfo->type == GAMEOBJECT_TYPE_TRANSPORT || gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT; } @@ -826,7 +826,7 @@ bool GameObject::IsTransport() const bool GameObject::IsDynTransport() const { // If something is marked as a transport, don't transmit an out of range packet for it. - GameObjectTemplate const * gInfo = GetGOInfo(); + GameObjectTemplate const* gInfo = GetGOInfo(); if (!gInfo) return false; return gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT || (gInfo->type == GAMEOBJECT_TYPE_TRANSPORT && !gInfo->transport.pause); } @@ -929,7 +929,7 @@ void GameObject::TriggeringLinkedGameObject(uint32 trapEntry, Unit* target) return; float range; - SpellRangeEntry const * srentry = sSpellRangeStore.LookupEntry(trapSpell->rangeIndex); + SpellRangeEntry const* srentry = sSpellRangeStore.LookupEntry(trapSpell->rangeIndex); if (GetSpellMaxRangeForHostile(srentry) == GetSpellMaxRangeForFriend(srentry)) range = GetSpellMaxRangeForHostile(srentry); else @@ -1657,7 +1657,7 @@ void GameObject::SendCustomAnim(uint32 anim) bool GameObject::IsInRange(float x, float y, float z, float radius) const { - GameObjectDisplayInfoEntry const * info = sGameObjectDisplayInfoStore.LookupEntry(GetUInt32Value(GAMEOBJECT_DISPLAYID)); + GameObjectDisplayInfoEntry const* info = sGameObjectDisplayInfoStore.LookupEntry(GetUInt32Value(GAMEOBJECT_DISPLAYID)); if (!info) return IsWithinDist3d(x, y, z, radius); diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp index 4d2ebf1b466..007e22d5dfa 100755 --- a/src/server/game/Entities/Item/Container/Bag.cpp +++ b/src/server/game/Entities/Item/Container/Bag.cpp @@ -70,7 +70,7 @@ void Bag::RemoveFromWorld() bool Bag::Create(uint32 guidlow, uint32 itemid, Player const* owner) { - ItemTemplate const * itemProto = sObjectMgr->GetItemTemplate(itemid); + ItemTemplate const* itemProto = sObjectMgr->GetItemTemplate(itemid); if (!itemProto || itemProto->ContainerSlots > MAX_BAG_SIZE) return false; diff --git a/src/server/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h index c8421346082..df6253caf9e 100755 --- a/src/server/game/Entities/Item/Container/Bag.h +++ b/src/server/game/Entities/Item/Container/Bag.h @@ -66,7 +66,7 @@ class Bag : public Item Item* m_bagslot[MAX_BAG_SIZE]; }; -inline Item* NewItemOrBag(ItemTemplate const * proto) +inline Item* NewItemOrBag(ItemTemplate const* proto) { return (proto->InventoryType == INVTYPE_BAG) ? new Bag : new Item; } diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index ce937cdedfd..877621af69f 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1147,7 +1147,7 @@ bool Object::PrintIndexError(uint32 index, bool set) const return false; } -bool Position::HasInLine(const Unit * const target, float distance, float width) const +bool Position::HasInLine(const Unit* const target, float distance, float width) const { if (!HasInArc(M_PI, target) || !target->IsWithinDist3d(m_positionX, m_positionY, m_positionZ, distance)) return false; diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index b4e95cc8f4c..dc925c9f451 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -762,7 +762,7 @@ bool Pet::CreateBaseAtCreature(Creature* creature) return true; } -bool Pet::CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit * owner) +bool Pet::CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit* owner) { if (!CreateBaseAtTamed(cinfo, owner->GetMap(), owner->GetPhaseMask())) return false; @@ -775,7 +775,7 @@ bool Pet::CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit * owner) return true; } -bool Pet::CreateBaseAtTamed(CreatureTemplate const * cinfo, Map * map, uint32 phaseMask) +bool Pet::CreateBaseAtTamed(CreatureTemplate const* cinfo, Map * map, uint32 phaseMask) { sLog->outDebug(LOG_FILTER_PETS, "Pet::CreateBaseForTamed"); uint32 guid=sObjectMgr->GenerateLowGuid(HIGHGUID_PET); @@ -1564,7 +1564,7 @@ bool Pet::resetTalents() if (owner->ToPlayer()->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS)) owner->ToPlayer()->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS, true); - CreatureTemplate const * ci = GetCreatureInfo(); + CreatureTemplate const* ci = GetCreatureInfo(); if (!ci) return false; // Check pet talent type diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index 52d2e4401f1..172151ac85a 100755 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -136,8 +136,8 @@ class Pet : public Guardian bool Create (uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 pet_number); bool CreateBaseAtCreature(Creature* creature); - bool CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit * owner); - bool CreateBaseAtTamed(CreatureTemplate const * cinfo, Map * map, uint32 phaseMask); + bool CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit* owner); + bool CreateBaseAtTamed(CreatureTemplate const* cinfo, Map * map, uint32 phaseMask); bool LoadPetFromDB(Player* owner, uint32 petentry = 0, uint32 petnumber = 0, bool current = false); bool isBeingLoaded() const { return m_loading;} void SavePetToDB(PetSaveMode mode); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6215c043586..19202a6d882 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4202,7 +4202,7 @@ void Player::RemoveArenaSpellCooldowns(bool removeActivePetCooldowns) { next = itr; ++next; - SpellEntry const * entry = sSpellStore.LookupEntry(itr->first); + SpellEntry const* entry = sSpellStore.LookupEntry(itr->first); // check if spellentry is present and if the cooldown is less or equal to 10 min if (entry && entry->RecoveryTime <= 10 * MINUTE * IN_MILLISECONDS && @@ -6897,7 +6897,7 @@ int32 Player::CalculateReputationGain(uint32 creatureOrQuestLevel, int32 rep, in float percent = 100.0f; // Get the generic rate first - if (RepRewardRate const * repData = sObjectMgr->GetRepRewardRate(faction)) + if (RepRewardRate const* repData = sObjectMgr->GetRepRewardRate(faction)) { float repRate = for_quest ? repData->quest_rate : repData->creature_rate; percent *= repRate; @@ -7582,7 +7582,7 @@ void Player::DuelComplete(DuelCompleteType type) AuraApplicationMap &itsAuras = duel->opponent->GetAppliedAuras(); for (AuraApplicationMap::iterator i = itsAuras.begin(); i != itsAuras.end();) { - Aura const * aura = i->second->GetBase(); + Aura const* aura = i->second->GetBase(); if (!i->second->IsPositive() && aura->GetCasterGUID() == GetGUID() && aura->GetApplyTime() >= duel->startTime) duel->opponent->RemoveAura(i); else @@ -7592,7 +7592,7 @@ void Player::DuelComplete(DuelCompleteType type) AuraApplicationMap &myAuras = GetAppliedAuras(); for (AuraApplicationMap::iterator i = myAuras.begin(); i != myAuras.end();) { - Aura const * aura = i->second->GetBase(); + Aura const* aura = i->second->GetBase(); if (!i->second->IsPositive() && aura->GetCasterGUID() == duel->opponent->GetGUID() && aura->GetApplyTime() >= duel->startTime) RemoveAura(i); else @@ -8183,7 +8183,7 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) { // If usable, try to cast item spell - if (Item * item = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) + if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) if (!item->IsBroken() && CanUseAttackType(attType)) if (ItemTemplate const *proto = item->GetTemplate()) { @@ -8211,7 +8211,7 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 } } -void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item *item, ItemTemplate const * proto) +void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item *item, ItemTemplate const* proto) { // Can do effect if any damage done to target if (procVictim & PROC_FLAG_TAKEN_DAMAGE) @@ -9611,7 +9611,7 @@ void Player::SendBGWeekendWorldStates() { for (uint32 i = 1; i < sBattlemasterListStore.GetNumRows(); ++i) { - BattlemasterListEntry const * bl = sBattlemasterListStore.LookupEntry(i); + BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(i); if (bl && bl->HolidayWorldStateId) { if (BattlegroundMgr::IsBGWeekend((BattlegroundTypeId)bl->id)) @@ -14481,7 +14481,7 @@ bool Player::IsActiveQuest(uint32 quest_id) const return m_QuestStatus.find(quest_id) != m_QuestStatus.end(); } -Quest const * Player::GetNextQuest(uint64 guid, Quest const *pQuest) +Quest const* Player::GetNextQuest(uint64 guid, Quest const *pQuest) { QuestRelationBounds pObjectQR; @@ -15435,7 +15435,7 @@ bool Player::GiveQuestSourceItem(Quest const *pQuest) InventoryResult msg = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, srcitem, count); if (msg == EQUIP_ERR_OK) { - Item * item = StoreNewItem(dest, srcitem, true); + Item* item = StoreNewItem(dest, srcitem, true); SendNewItem(item, count, true, false); return true; } @@ -16548,7 +16548,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) _LoadInstanceTimeRestrictions(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADINSTANCELOCKTIMES)); _LoadBGData(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADBGDATA)); - MapEntry const * mapEntry = sMapStore.LookupEntry(mapId); + MapEntry const* mapEntry = sMapStore.LookupEntry(mapId); if (!mapEntry || !IsPositionValid()) { sLog->outError("Player (guidlow %d) have invalid coordinates (MapId: %u X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.", guid, mapId, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); @@ -17316,7 +17316,7 @@ Item* Player::_LoadItem(SQLTransaction& trans, uint32 zoneId, uint32 timeDiff, F Item* item = NULL; uint32 itemGuid = fields[13].GetUInt32(); uint32 itemEntry = fields[14].GetUInt32(); - if (ItemTemplate const * proto = sObjectMgr->GetItemTemplate(itemEntry)) + if (ItemTemplate const* proto = sObjectMgr->GetItemTemplate(itemEntry)) { bool remove = false; item = NewItemOrBag(proto); @@ -19543,7 +19543,7 @@ void Player::SendRemoveControlBar() GetSession()->SendPacket(&data); } -bool Player::IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mod, Spell * spell) +bool Player::IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mod, Spell* spell) { if (!mod || !spellInfo) return false; @@ -19645,7 +19645,7 @@ void Player::RestoreSpellMods(Spell *spell, uint32 ownerAuraId) } } -void Player::RemoveSpellMods(Spell * spell) +void Player::RemoveSpellMods(Spell* spell) { if (!spell) return; @@ -19678,7 +19678,7 @@ void Player::RemoveSpellMods(Spell * spell) } } -void Player::DropModCharge(SpellModifier * mod, Spell * spell) +void Player::DropModCharge(SpellModifier* mod, Spell* spell) { // don't handle spells with proc_event entry defined // this is a temporary workaround, because all spellmods should be handled like that @@ -19695,7 +19695,7 @@ void Player::DropModCharge(SpellModifier * mod, Spell * spell) } } -void Player::SetSpellModTakingSpell(Spell * spell, bool apply) +void Player::SetSpellModTakingSpell(Spell* spell, bool apply) { if (!spell || (m_spellModTakingSpell && m_spellModTakingSpell != spell)) return; @@ -21195,14 +21195,14 @@ void Player::ModifyMoney(int32 d) } } -Unit * Player::GetSelectedUnit() const +Unit* Player::GetSelectedUnit() const { if (m_curSelection) return ObjectAccessor::GetUnit(*this, m_curSelection); return NULL; } -Player * Player::GetSelectedPlayer() const +Player* Player::GetSelectedPlayer() const { if (m_curSelection) return ObjectAccessor::GetPlayer(*this, m_curSelection); @@ -21228,7 +21228,7 @@ void Player::SendComboPoints() } } -void Player::AddComboPoints(Unit* target, int8 count, Spell * spell) +void Player::AddComboPoints(Unit* target, int8 count, Spell* spell) { if (!count) return; @@ -21481,7 +21481,7 @@ void Player::SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint3 GetSession()->SendPacket(&data); } -void Player::ApplyEquipCooldown(Item * pItem) +void Player::ApplyEquipCooldown(Item* pItem) { if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_PROTO_FLAG_NO_EQUIP_COOLDOWN)) return; @@ -22074,7 +22074,7 @@ bool Player::CanNoReagentCast(SpellEntry const* spellInfo) const return false; } -void Player::RemoveItemDependentAurasAndCasts(Item * pItem) +void Player::RemoveItemDependentAurasAndCasts(Item* pItem) { for (AuraMap::iterator itr = m_ownedAuras.begin(); itr != m_ownedAuras.end();) { @@ -22765,7 +22765,7 @@ uint32 Player::GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 n void Player::InitGlyphsForLevel() { for (uint32 i = 0; i < sGlyphSlotStore.GetNumRows(); ++i) - if (GlyphSlotEntry const * gs = sGlyphSlotStore.LookupEntry(i)) + if (GlyphSlotEntry const* gs = sGlyphSlotStore.LookupEntry(i)) if (gs->Order) SetGlyphSlot(gs->Order - 1, gs->Id); @@ -22946,7 +22946,7 @@ uint32 Player::GetRuneBaseCooldown(uint8 index) return cooldown; } -void Player::RemoveRunesByAuraEffect(AuraEffect const * aura) +void Player::RemoveRunesByAuraEffect(AuraEffect const* aura) { for (uint8 i = 0; i < MAX_RUNES; ++i) { @@ -22960,7 +22960,7 @@ void Player::RemoveRunesByAuraEffect(AuraEffect const * aura) void Player::RestoreBaseRune(uint8 index) { - AuraEffect const * aura = m_runes->runes[index].ConvertAura; + AuraEffect const* aura = m_runes->runes[index].ConvertAura; ConvertRune(index, GetBaseRune(index)); SetRuneConvertAura(index, NULL); // Don't drop passive talents providing rune convertion @@ -23097,7 +23097,7 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot) if (msg == EQUIP_ERR_OK) { AllowedLooterSet* looters = item->GetAllowedLooters(); - Item * newitem = StoreNewItem(dest, item->itemid, true, item->randomPropertyId, (looters->size() > 1) ? looters : NULL); + Item* newitem = StoreNewItem(dest, item->itemid, true, item->randomPropertyId, (looters->size() > 1) ? looters : NULL); if (qitem) { diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 081948d7b9d..84f7e1edd86 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -310,7 +310,7 @@ struct RuneInfo uint8 BaseRune; uint8 CurrentRune; uint32 Cooldown; - AuraEffect const * ConvertAura; + AuraEffect const* ConvertAura; }; struct Runes @@ -331,10 +331,10 @@ struct Runes struct EnchantDuration { EnchantDuration() : item(NULL), slot(MAX_ENCHANTMENT_SLOT), leftduration(0) {}; - EnchantDuration(Item * _item, EnchantmentSlot _slot, uint32 _leftduration) : item(_item), slot(_slot), + EnchantDuration(Item* _item, EnchantmentSlot _slot, uint32 _leftduration) : item(_item), slot(_slot), leftduration(_leftduration){ ASSERT(item); }; - Item * item; + Item* item; EnchantmentSlot slot; uint32 leftduration; }; @@ -1250,7 +1250,7 @@ class Player : public Unit, public GridObject<Player> void AddRefundReference(uint32 it); void DeleteRefundReference(uint32 it); - void ApplyEquipCooldown(Item * pItem); + void ApplyEquipCooldown(Item* pItem); void SetAmmo(uint32 item); void RemoveAmmo(); float GetAmmoDPS() const { return m_ammoDPS; } @@ -1268,7 +1268,7 @@ class Player : public Unit, public GridObject<Player> // in trade, auction, guild bank, mail.... void MoveItemToInventory(ItemPosCountVec const& dest, Item* pItem, bool update, bool in_characterInventoryDB = false); // in trade, guild bank, mail.... - void RemoveItemDependentAurasAndCasts(Item * pItem); + void RemoveItemDependentAurasAndCasts(Item* pItem); void DestroyItem(uint8 bag, uint8 slot, bool update); void DestroyItemCount(uint32 item, uint32 count, bool update, bool unequip_check = false); void DestroyItemCount(Item* item, uint32& count, bool update); @@ -1536,7 +1536,7 @@ class Player : public Unit, public GridObject<Player> uint8 GetComboPoints() { return m_comboPoints; } const uint64& GetComboTarget() const { return m_comboTarget; } - void AddComboPoints(Unit* target, int8 count, Spell * spell = NULL); + void AddComboPoints(Unit* target, int8 count, Spell* spell = NULL); void GainSpellComboPoints(int8 count); void ClearComboPoints(); void SendComboPoints(); @@ -1655,11 +1655,11 @@ class Player : public Unit, public GridObject<Player> SpellCooldowns const& GetSpellCooldownMap() const { return m_spellCooldowns; } void AddSpellMod(SpellModifier* mod, bool apply); - bool IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mod, Spell * spell = NULL); - template <class T> T ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell * spell = NULL); - void RemoveSpellMods(Spell * spell); + bool IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mod, Spell* spell = NULL); + template <class T> T ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell* spell = NULL); + void RemoveSpellMods(Spell* spell); void RestoreSpellMods(Spell *spell, uint32 ownerAuraId=0); - void DropModCharge(SpellModifier * mod, Spell * spell); + void DropModCharge(SpellModifier* mod, Spell* spell); void SetSpellModTakingSpell(Spell* spell, bool apply); static uint32 const infinityCooldownDelay = MONTH; // used for set "infinity cooldowns" for spells and check @@ -2042,8 +2042,8 @@ class Player : public Unit, public GridObject<Player> void ResetAllPowers(); void _ApplyWeaponDependentAuraMods(Item *item, WeaponAttackType attackType, bool apply); - void _ApplyWeaponDependentAuraCritMod(Item *item, WeaponAttackType attackType, AuraEffect const * aura, bool apply); - void _ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType attackType, AuraEffect const * aura, bool apply); + void _ApplyWeaponDependentAuraCritMod(Item *item, WeaponAttackType attackType, AuraEffect const* aura, bool apply); + void _ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType attackType, AuraEffect const* aura, bool apply); void _ApplyItemMods(Item *item, uint8 slot, bool apply); void _RemoveAllItemMods(); @@ -2062,7 +2062,7 @@ class Player : public Unit, public GridObject<Player> void UpdateEquipSpellsAtFormChange(); void CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx); void CastItemUseSpell(Item *item, SpellCastTargets const& targets, uint8 cast_count, uint32 glyphIndex); - void CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item *item, ItemTemplate const * proto); + void CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item *item, ItemTemplate const* proto); void SendEquipmentSetList(); void SetEquipmentSet(uint32 index, EquipmentSet eqset); @@ -2407,9 +2407,9 @@ class Player : public Unit, public GridObject<Player> void SetBaseRune(uint8 index, RuneType baseRune) { m_runes->runes[index].BaseRune = baseRune; } void SetCurrentRune(uint8 index, RuneType currentRune) { m_runes->runes[index].CurrentRune = currentRune; } void SetRuneCooldown(uint8 index, uint32 cooldown) { m_runes->runes[index].Cooldown = cooldown; m_runes->SetRuneState(index, (cooldown == 0) ? true : false); } - void SetRuneConvertAura(uint8 index, AuraEffect const * aura) { m_runes->runes[index].ConvertAura = aura; } - void AddRuneByAuraEffect(uint8 index, RuneType newType, AuraEffect const * aura) { SetRuneConvertAura(index, aura); ConvertRune(index, newType); } - void RemoveRunesByAuraEffect(AuraEffect const * aura); + void SetRuneConvertAura(uint8 index, AuraEffect const* aura) { m_runes->runes[index].ConvertAura = aura; } + void AddRuneByAuraEffect(uint8 index, RuneType newType, AuraEffect const* aura) { SetRuneConvertAura(index, aura); ConvertRune(index, newType); } + void RemoveRunesByAuraEffect(AuraEffect const* aura); void RestoreBaseRune(uint8 index); void ConvertRune(uint8 index, RuneType newType); void ResyncRunes(uint8 count); @@ -2430,7 +2430,7 @@ class Player : public Unit, public GridObject<Player> uint32 GetChampioningFaction() const { return m_ChampioningFaction; } void SetChampioningFaction(uint32 faction) { m_ChampioningFaction = faction; } - Spell * m_spellModTakingSpell; + Spell* m_spellModTakingSpell; float GetAverageItemLevel(); bool isDebugAreaTriggers; @@ -2597,7 +2597,7 @@ class Player : public Unit, public GridObject<Player> SpellModList m_spellMods[MAX_SPELLMOD]; //uint32 m_pad; -// Spell * m_spellModTakingSpell; // Spell for which charges are dropped in spell::finish +// Spell* m_spellModTakingSpell; // Spell for which charges are dropped in spell::finish EnchantDurationList m_enchantDuration; ItemDurationList m_itemDuration; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 414791b73c6..ef2a117b517 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -600,10 +600,10 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa if (((*i)->GetMiscValue() & damageSchoolMask) == 0) continue; - Unit * shareDamageTarget = (*i)->GetCaster(); + Unit* shareDamageTarget = (*i)->GetCaster(); if (!shareDamageTarget) continue; - SpellEntry const * spell = (*i)->GetSpellProto(); + SpellEntry const* spell = (*i)->GetSpellProto(); uint32 share = CalculatePctN(damage, (*i)->GetAmount()); @@ -819,7 +819,7 @@ void Unit::CastStop(uint32 except_spellid) InterruptSpell(CurrentSpellTypes(i), false); } -void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, AuraEffect const * triggeredByAura, uint64 originalCaster) +void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, AuraEffect const* triggeredByAura, uint64 originalCaster) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); @@ -832,7 +832,7 @@ void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castIte CastSpell(Victim, spellInfo, triggered, castItem, triggeredByAura, originalCaster); } -void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, Item *castItem, AuraEffect const * triggeredByAura, uint64 originalCaster) +void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, Item *castItem, AuraEffect const* triggeredByAura, uint64 originalCaster) { if (!spellInfo) { @@ -841,7 +841,7 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, } if (!originalCaster && GetTypeId() == TYPEID_UNIT && this->ToCreature()->isTotem() && IsControlledByPlayer()) - if (Unit * owner = GetOwner()) + if (Unit* owner = GetOwner()) originalCaster=owner->GetGUID(); SpellCastTargets targets; @@ -859,7 +859,7 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, spell->prepare(&targets, triggeredByAura); } -void Unit::CastCustomSpell(Unit* target, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, AuraEffect const * triggeredByAura, uint64 originalCaster) +void Unit::CastCustomSpell(Unit* target, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, AuraEffect const* triggeredByAura, uint64 originalCaster) { CustomSpellValues values; if (bp0) @@ -871,14 +871,14 @@ void Unit::CastCustomSpell(Unit* target, uint32 spellId, int32 const* bp0, int32 CastCustomSpell(spellId, values, target, triggered, castItem, triggeredByAura, originalCaster); } -void Unit::CastCustomSpell(uint32 spellId, SpellValueMod mod, int32 value, Unit* target, bool triggered, Item *castItem, AuraEffect const * triggeredByAura, uint64 originalCaster) +void Unit::CastCustomSpell(uint32 spellId, SpellValueMod mod, int32 value, Unit* target, bool triggered, Item *castItem, AuraEffect const* triggeredByAura, uint64 originalCaster) { CustomSpellValues values; values.AddSpellMod(mod, value); CastCustomSpell(spellId, values, target, triggered, castItem, triggeredByAura, originalCaster); } -void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* Victim, bool triggered, Item *castItem, AuraEffect const * triggeredByAura, uint64 originalCaster) +void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* Victim, bool triggered, Item *castItem, AuraEffect const* triggeredByAura, uint64 originalCaster) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); if (!spellInfo) @@ -908,7 +908,7 @@ void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* } // used for scripting -void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem, AuraEffect const * triggeredByAura, uint64 originalCaster, Unit* OriginalVictim) +void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem, AuraEffect const* triggeredByAura, uint64 originalCaster, Unit* OriginalVictim) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); @@ -1660,7 +1660,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff { AuraEffect * absorbAurEff = (*itr); // Check if aura was removed during iteration - we don't need to work on such auras - AuraApplication const * aurApp = absorbAurEff->GetBase()->GetApplicationOfTarget(pVictim->GetGUID()); + AuraApplication const* aurApp = absorbAurEff->GetBase()->GetApplicationOfTarget(pVictim->GetGUID()); if (!aurApp) continue; if (!(absorbAurEff->GetMiscValue() & schoolMask)) @@ -1710,7 +1710,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff { AuraEffect * absorbAurEff = (*itr); // Check if aura was removed during iteration - we don't need to work on such auras - AuraApplication const * aurApp = absorbAurEff->GetBase()->GetApplicationOfTarget(pVictim->GetGUID()); + AuraApplication const* aurApp = absorbAurEff->GetBase()->GetApplicationOfTarget(pVictim->GetGUID()); if (!aurApp) continue; // check damage school mask @@ -1779,7 +1779,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff continue; // Damage can be splitted only if aura has an alive caster - Unit * caster = (*itr)->GetCaster(); + Unit* caster = (*itr)->GetCaster(); if (!caster || (caster == pVictim) || !caster->IsInWorld() || !caster->isAlive()) continue; @@ -1813,7 +1813,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff continue; // Damage can be splitted only if aura has an alive caster - Unit * caster = (*itr)->GetCaster(); + Unit* caster = (*itr)->GetCaster(); if (!caster || (caster == pVictim) || !caster->IsInWorld() || !caster->isAlive()) continue; @@ -2222,7 +2222,7 @@ void Unit::SendMeleeAttackStop(Unit* victim) sLog->outDetail("%s %u stopped attacking %s %u", (GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), GetGUIDLow(), (victim->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), victim->GetGUIDLow()); } -bool Unit::isSpellBlocked(Unit* victim, SpellEntry const * spellProto, WeaponAttackType attackType) +bool Unit::isSpellBlocked(Unit* victim, SpellEntry const* spellProto, WeaponAttackType attackType) { // These spells can't be blocked if (spellProto && spellProto->Attributes & SPELL_ATTR0_IMPOSSIBLE_DODGE_PARRY_BLOCK) @@ -2895,7 +2895,7 @@ void Unit::_UpdateAutoRepeatSpell() } } -void Unit::SetCurrentCastedSpell(Spell * pSpell) +void Unit::SetCurrentCastedSpell(Spell* pSpell) { ASSERT(pSpell); // NULL may be never passed here, use InterruptSpell or InterruptNonMeleeSpells @@ -3063,7 +3063,7 @@ Spell* Unit::FindCurrentSpellBySpellId(uint32 spell_id) const int32 Unit::GetCurrentSpellCastTime(uint32 spell_id) const { - if (Spell const * spell = FindCurrentSpellBySpellId(spell_id)) + if (Spell const* spell = FindCurrentSpellBySpellId(spell_id)) return spell->GetCastTime(); return 0; } @@ -3167,7 +3167,7 @@ Aura* Unit::_TryStackingOrRefreshingExistingAura(SpellEntry const* newAura, uint return NULL; } -void Unit::_AddAura(UnitAura * aura, Unit * caster) +void Unit::_AddAura(UnitAura* aura, Unit* caster) { ASSERT(!m_cleanupDone); m_ownedAuras.insert(AuraMap::value_type(aura->GetId(), aura)); @@ -3219,7 +3219,7 @@ AuraApplication * Unit::_CreateAuraApplication(Aura * aura, uint8 effMask) (GetTypeId() != TYPEID_PLAYER || !this->ToPlayer()->GetSession()->PlayerLoading())) return NULL; - Unit * caster = aura->GetCaster(); + Unit* caster = aura->GetCaster(); AuraApplication * aurApp = new AuraApplication(this, caster, aura, effMask); m_appliedAuras.insert(AuraApplicationMap::value_type(aurId, aurApp)); @@ -3271,7 +3271,7 @@ void Unit::_ApplyAura(AuraApplication * aurApp, uint8 effMask) if (aura->GetSpellProto()->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED && !IsSitState()) SetStandState(UNIT_STAND_STATE_SIT); - Unit * caster = aura->GetCaster(); + Unit* caster = aura->GetCaster(); if (aurApp->GetRemoveMode()) return; @@ -3303,7 +3303,7 @@ void Unit::_UnapplyAura(AuraApplicationMap::iterator &i, AuraRemoveMode removeMo ++m_removedAurasCount; - Unit * caster = aura->GetCaster(); + Unit* caster = aura->GetCaster(); // Remove all pointers from lists here to prevent possible pointer invalidation on spellcast/auraapply/auraremove m_appliedAuras.erase(i); @@ -3576,7 +3576,7 @@ void Unit::RemoveAura(uint32 spellId, uint64 caster, uint8 reqEffMask, AuraRemov { for (AuraApplicationMap::iterator iter = m_appliedAuras.lower_bound(spellId); iter != m_appliedAuras.upper_bound(spellId);) { - Aura const * aura = iter->second->GetBase(); + Aura const* aura = iter->second->GetBase(); if (((aura->GetEffectMask() & reqEffMask) == reqEffMask) && (!caster || aura->GetCasterGUID() == caster)) { @@ -3632,7 +3632,7 @@ void Unit::RemoveAurasDueToSpell(uint32 spellId, uint64 caster, uint8 reqEffMask { for (AuraApplicationMap::iterator iter = m_appliedAuras.lower_bound(spellId); iter != m_appliedAuras.upper_bound(spellId);) { - Aura const * aura = iter->second->GetBase(); + Aura const* aura = iter->second->GetBase(); if (((aura->GetEffectMask() & reqEffMask) == reqEffMask) && (!caster || aura->GetCasterGUID() == caster)) { @@ -3764,7 +3764,7 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit int32 baseDamage[MAX_SPELL_EFFECTS]; uint8 effMask = 0; uint8 recalculateMask = 0; - Unit * caster = aura->GetCaster(); + Unit* caster = aura->GetCaster(); for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if (aura->GetEffect(i)) @@ -3876,8 +3876,8 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase) // single target auras from other casters for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();) { - AuraApplication const * aurApp = iter->second; - Aura const * aura = aurApp->GetBase(); + AuraApplication const* aurApp = iter->second; + Aura const* aura = aurApp->GetBase(); if (aura->GetCasterGUID() != GetGUID() && IsSingleTargetSpell(aura->GetSpellProto())) { @@ -3944,7 +3944,7 @@ void Unit::RemoveAurasWithFamily(SpellFamilyNames family, uint32 familyFlag1, ui { for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();) { - Aura const * aura = iter->second->GetBase(); + Aura const* aura = iter->second->GetBase(); if (!casterGUID || aura->GetCasterGUID() == casterGUID) { SpellEntry const *spell = aura->GetSpellProto(); @@ -3967,7 +3967,7 @@ void Unit::RemoveAurasWithMechanic(uint32 mechanic_mask, AuraRemoveMode removemo { for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();) { - Aura const * aura = iter->second->GetBase(); + Aura const* aura = iter->second->GetBase(); if (!except || aura->GetId() != except) { if (GetAllSpellMechanicMask(aura->GetSpellProto()) & mechanic_mask) @@ -3992,7 +3992,7 @@ void Unit::RemoveAreaAurasDueToLeaveWorld() { AuraApplication * aurApp = itr->second; ++itr; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target == this) continue; target->RemoveAura(aurApp); @@ -4035,8 +4035,8 @@ void Unit::RemoveArenaAuras(bool onleave) // used to remove positive visible auras in arenas for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();) { - AuraApplication const * aurApp = iter->second; - Aura const * aura = aurApp->GetBase(); + AuraApplication const* aurApp = iter->second; + Aura const* aura = aurApp->GetBase(); if (!(aura->GetSpellProto()->AttributesEx4 & SPELL_ATTR4_UNK21) // don't remove stances, shadowform, pally/hunter auras && !aura->IsPassive() // don't remove passive auras && !(aura->GetSpellProto()->AttributesEx3 & SPELL_ATTR3_DEATH_PERSISTENT) // not death persistent auras @@ -4053,7 +4053,7 @@ void Unit::RemoveAllAurasOnDeath() // and disable the mods for the passive ones for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();) { - Aura const * aura = iter->second->GetBase(); + Aura const* aura = iter->second->GetBase(); if (!aura->IsPassive() && !aura->IsDeathPersistent()) _UnapplyAura(iter, AURA_REMOVE_BY_DEATH); else @@ -4074,7 +4074,7 @@ void Unit::RemoveAllAurasRequiringDeadTarget() { for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();) { - Aura const * aura = iter->second->GetBase(); + Aura const* aura = iter->second->GetBase(); if (!aura->IsPassive() && IsRequiringDeadTargetSpell(aura->GetSpellProto())) _UnapplyAura(iter, AURA_REMOVE_BY_DEFAULT); else @@ -4158,7 +4158,7 @@ AuraEffect * Unit::GetAuraEffectOfRankedSpell(uint32 spellId, uint8 effIndex, ui { if (AuraEffect * aurEff = GetAuraEffect(rankSpell, effIndex, caster)) return aurEff; - SpellChainNode const * chainNode = sSpellMgr->GetSpellChainNode(rankSpell); + SpellChainNode const* chainNode = sSpellMgr->GetSpellChainNode(rankSpell); if (!chainNode) break; else @@ -4174,7 +4174,7 @@ AuraEffect* Unit::GetAuraEffect(AuraType type, SpellFamilyNames name, uint32 ico { if (effIndex != (*itr)->GetEffIndex()) continue; - SpellEntry const * spell = (*itr)->GetSpellProto(); + SpellEntry const* spell = (*itr)->GetSpellProto(); if (spell->SpellIconID == iconId && spell->SpellFamilyName == uint32(name) && !spell->SpellFamilyFlags) return *itr; } @@ -4201,7 +4201,7 @@ AuraApplication * Unit::GetAuraApplication(uint32 spellId, uint64 casterGUID, ui { for (AuraApplicationMap::const_iterator itr = m_appliedAuras.lower_bound(spellId); itr != m_appliedAuras.upper_bound(spellId); ++itr) { - Aura const * aura = itr->second->GetBase(); + Aura const* aura = itr->second->GetBase(); if (((aura->GetEffectMask() & reqEffMask) == reqEffMask) && (!casterGUID || aura->GetCasterGUID() == casterGUID) && (!itemCasterGUID || aura->GetCastItemGUID() == itemCasterGUID) && (!except || except != itr->second)) return itr->second; } @@ -4221,7 +4221,7 @@ AuraApplication * Unit::GetAuraApplicationOfRankedSpell(uint32 spellId, uint64 c { if (AuraApplication * aurApp = GetAuraApplication(rankSpell, casterGUID, itemCasterGUID, reqEffMask, except)) return aurApp; - SpellChainNode const * chainNode = sSpellMgr->GetSpellChainNode(rankSpell); + SpellChainNode const* chainNode = sSpellMgr->GetSpellChainNode(rankSpell); if (!chainNode) break; else @@ -4287,7 +4287,7 @@ bool Unit::HasAuraTypeWithMiscvalue(AuraType auratype, int32 miscvalue) const return false; } -bool Unit::HasAuraTypeWithAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const +bool Unit::HasAuraTypeWithAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const { AuraEffectList const& mTotalAuraList = GetAuraEffectsByType(auratype); for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) @@ -4345,7 +4345,7 @@ bool Unit::HasAuraWithMechanic(uint32 mechanicMask) return false; } -AuraEffect * Unit::IsScriptOverriden(SpellEntry const * spell, int32 script) const +AuraEffect * Unit::IsScriptOverriden(SpellEntry const* spell, int32 script) const { AuraEffectList const& auras = GetAuraEffectsByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); for (AuraEffectList::const_iterator i = auras.begin(); i != auras.end(); ++i) @@ -4569,7 +4569,7 @@ int32 Unit::GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_ return modifier; } -int32 Unit::GetTotalAuraModifierByAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const +int32 Unit::GetTotalAuraModifierByAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const { int32 modifier = 0; @@ -4582,7 +4582,7 @@ int32 Unit::GetTotalAuraModifierByAffectMask(AuraType auratype, SpellEntry const return modifier; } -float Unit::GetTotalAuraMultiplierByAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const +float Unit::GetTotalAuraMultiplierByAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const { float multiplier = 1.0f; @@ -4595,7 +4595,7 @@ float Unit::GetTotalAuraMultiplierByAffectMask(AuraType auratype, SpellEntry con return multiplier; } -int32 Unit::GetMaxPositiveAuraModifierByAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const +int32 Unit::GetMaxPositiveAuraModifierByAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const { int32 modifier = 0; @@ -4609,7 +4609,7 @@ int32 Unit::GetMaxPositiveAuraModifierByAffectMask(AuraType auratype, SpellEntry return modifier; } -int32 Unit::GetMaxNegativeAuraModifierByAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const +int32 Unit::GetMaxNegativeAuraModifierByAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const { int32 modifier = 0; @@ -4803,7 +4803,7 @@ void Unit::SendSpellNonMeleeDamageLog(Unit *target, uint32 SpellID, uint32 Damag SendSpellNonMeleeDamageLog(&log); } -void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procExtra, uint32 amount, WeaponAttackType attType, SpellEntry const *procSpell, SpellEntry const * procAura) +void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procExtra, uint32 amount, WeaponAttackType attType, SpellEntry const *procSpell, SpellEntry const* procAura) { // Not much to do if no flags are set. if (procAttacker) @@ -4816,7 +4816,7 @@ void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVic void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo *pInfo) { - AuraEffect const * aura = pInfo->auraEff; + AuraEffect const* aura = pInfo->auraEff; WorldPacket data(SMSG_PERIODICAURALOG, 30); data.append(GetPackGUID()); @@ -4874,7 +4874,7 @@ void Unit::SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo) SendMessageToSet(&data, true); } -void Unit::SendSpellDamageImmune(Unit * target, uint32 spellId) +void Unit::SendSpellDamageImmune(Unit* target, uint32 spellId) { WorldPacket data(SMSG_SPELLORDAMAGE_IMMUNE, 8+8+4+1); data << uint64(GetGUID()); @@ -4962,7 +4962,7 @@ void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 /*SwingType SendAttackStateUpdate(&dmgInfo); } -bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) +bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) { SpellEntry const *hasteSpell = triggeredByAura->GetSpellProto(); @@ -5025,7 +5025,7 @@ bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger return true; } -bool Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) +bool Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) { SpellEntry const *triggeredByAuraSpell = triggeredByAura->GetSpellProto(); @@ -5087,7 +5087,7 @@ bool Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*damage*/, AuraE return true; } -bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown) +bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const* procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown) { SpellEntry const *dummySpell = triggeredByAura->GetSpellProto(); uint32 effIndex = triggeredByAura->GetEffIndex(); @@ -6038,7 +6038,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger // regen mana for caster CastCustomSpell(this, 59117, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); // Get second aura of spell for replenishment effect on party - if (AuraEffect const * aurEff = (*i)->GetBase()->GetEffect(1)) + if (AuraEffect const* aurEff = (*i)->GetBase()->GetEffect(1)) { // Replenishment - roll chance if (roll_chance_i(aurEff->GetAmount())) @@ -6547,7 +6547,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (!procSpell) return false; - Spell * spell = ToPlayer()->m_spellModTakingSpell; + Spell* spell = ToPlayer()->m_spellModTakingSpell; // Disable charge drop because of Lock and Load ToPlayer()->SetSpellModTakingSpell(spell, false); @@ -6644,7 +6644,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (dummySpell->Id == 53651) { // Get target of beacon of light - if (Unit * beaconTarget = triggeredByAura->GetBase()->GetCaster()) + if (Unit* beaconTarget = triggeredByAura->GetBase()->GetCaster()) { // do not proc when target of beacon of light is healed if (beaconTarget == this) @@ -7382,7 +7382,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger return false; // Water Shield - if (AuraEffect const * aurEff = GetAuraEffect(SPELL_AURA_PROC_TRIGGER_SPELL, SPELLFAMILY_SHAMAN, 0, 0x00000020, 0)) + if (AuraEffect const* aurEff = GetAuraEffect(SPELL_AURA_PROC_TRIGGER_SPELL, SPELLFAMILY_SHAMAN, 0, 0x00000020, 0)) { uint32 spell = aurEff->GetSpellProto()->EffectTriggerSpell[aurEff->GetEffIndex()]; CastSpell(this, spell, true, castItem, triggeredByAura); @@ -7458,7 +7458,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (dummySpell->SpellIconID == 3059) { // Lightning Shield - if (AuraEffect const * aurEff = GetAuraEffect(SPELL_AURA_PROC_TRIGGER_SPELL, SPELLFAMILY_SHAMAN, 0x400, 0, 0)) + if (AuraEffect const* aurEff = GetAuraEffect(SPELL_AURA_PROC_TRIGGER_SPELL, SPELLFAMILY_SHAMAN, 0x400, 0, 0)) { uint32 spell = sSpellMgr->GetSpellWithRank(26364, sSpellMgr->GetSpellRank(aurEff->GetId())); @@ -7774,7 +7774,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger return true; } -bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) +bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) { SpellEntry const *dummySpell = triggeredByAura->GetSpellProto (); //uint32 effIndex = triggeredByAura->GetEffIndex(); @@ -7831,7 +7831,7 @@ bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffe this->ToPlayer()->AddSpellCooldown(triggered_spell_id, 0, time(NULL) + cooldown); return true; } -bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) +bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) { SpellEntry const *dummySpell = triggeredByAura->GetSpellProto (); //uint32 effIndex = triggeredByAura->GetEffIndex(); @@ -7893,7 +7893,7 @@ bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 /*damage*/, Aur // Used in case when access to whole aura is needed // All procs should be handled like this... -bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 procEx, uint32 cooldown, bool * handled) +bool Unit::HandleAuraProc(Unit* pVictim, uint32 damage, Aura * triggeredByAura, SpellEntry const* procSpell, uint32 /*procFlag*/, uint32 procEx, uint32 cooldown, bool * handled) { SpellEntry const *dummySpell = triggeredByAura->GetSpellProto(); @@ -8839,7 +8839,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig { // Get talent aura from owner if (isPet()) - if (Unit * owner = GetOwner()) + if (Unit* owner = GetOwner()) { if (AuraEffect * aurEff = owner->GetDummyAuraEffect(SPELLFAMILY_WARLOCK, 3220, 0)) { @@ -9663,7 +9663,7 @@ void Unit::ModifyAuraState(AuraState flag, bool apply) } } -uint32 Unit::BuildAuraStateUpdateForTarget(Unit * target) const +uint32 Unit::BuildAuraStateUpdateForTarget(Unit* target) const { uint32 auraStates = GetUInt32Value(UNIT_FIELD_AURASTATE) &~(PER_CASTER_AURA_STATE_MASK); for (AuraStateAurasMap::const_iterator itr = m_auraStateAuras.begin(); itr != m_auraStateAuras.end(); ++itr) @@ -9674,7 +9674,7 @@ uint32 Unit::BuildAuraStateUpdateForTarget(Unit * target) const return auraStates; } -bool Unit::HasAuraState(AuraState flag, SpellEntry const *spellProto, Unit const * Caster) const +bool Unit::HasAuraState(AuraState flag, SpellEntry const *spellProto, Unit const* Caster) const { if (Caster) { @@ -10150,7 +10150,7 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) // We are pet now, return owner if (player != this) return IsWithinDistInMap(player, radius) ? player : NULL; - Unit * pet = GetGuardianPet(); + Unit* pet = GetGuardianPet(); //No pet, no group, nothing to return if (!pet) return NULL; @@ -10246,7 +10246,7 @@ void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 SendMessageToSet(&data, true); } -int32 Unit::HealBySpell(Unit * pVictim, SpellEntry const * spellInfo, uint32 addHealth, bool critical) +int32 Unit::HealBySpell(Unit* pVictim, SpellEntry const* spellInfo, uint32 addHealth, bool critical) { uint32 absorb = 0; // calculate heal absorb and reduce healing @@ -10333,7 +10333,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 AddPctN(DoneTotalMod, (*i)->GetAmount()); // done scripted mod (take it from owner) - Unit * owner = GetOwner() ? GetOwner() : this; + Unit* owner = GetOwner() ? GetOwner() : this; AuraEffectList const &mOverrideClassScript= owner->GetAuraEffectsByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); for (AuraEffectList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i) { @@ -10365,7 +10365,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 AuraApplicationMap const &victimAuras = pVictim->GetAppliedAuras(); for (AuraApplicationMap::const_iterator itr = victimAuras.begin(); itr != victimAuras.end(); ++itr) { - Aura const * aura = itr->second->GetBase(); + Aura const* aura = itr->second->GetBase(); SpellEntry const *m_spell = aura->GetSpellProto(); if (m_spell->SpellFamilyName != SPELLFAMILY_WARLOCK || !(m_spell->SpellFamilyFlags[1] & 0x0004071B || m_spell->SpellFamilyFlags[0] & 0x8044C402)) continue; @@ -10930,7 +10930,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM case SPELLFAMILY_DRUID: // Improved Faerie Fire if (pVictim->HasAuraState(AURA_STATE_FAERIE_FIRE)) - if (AuraEffect const * aurEff = GetDummyAuraEffect(SPELLFAMILY_DRUID, 109, 0)) + if (AuraEffect const* aurEff = GetDummyAuraEffect(SPELLFAMILY_DRUID, 109, 0)) crit_chance+=aurEff->GetAmount(); // cumulative effect - don't break @@ -10939,7 +10939,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM if (spellProto->SpellFamilyFlags[0] & 0x4 && spellProto->SpellIconID == 1485) { // Improved Insect Swarm - if (AuraEffect const * aurEff = GetDummyAuraEffect(SPELLFAMILY_DRUID, 1771, 0)) + if (AuraEffect const* aurEff = GetDummyAuraEffect(SPELLFAMILY_DRUID, 1771, 0)) if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, 0x00000002, 0, 0)) crit_chance+=aurEff->GetAmount(); break; @@ -11157,7 +11157,7 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint AuraApplicationMap const& victimAuras = pVictim->GetAppliedAuras(); for (AuraApplicationMap::const_iterator itr = victimAuras.begin(); itr != victimAuras.end(); ++itr) { - Aura const * aura = itr->second->GetBase(); + Aura const* aura = itr->second->GetBase(); if (aura->GetCasterGUID() != GetGUID()) continue; SpellEntry const* m_spell = aura->GetSpellProto(); @@ -11535,7 +11535,7 @@ bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) con return false; } -bool Unit::IsDamageToThreatSpell(SpellEntry const * spellInfo) const +bool Unit::IsDamageToThreatSpell(SpellEntry const* spellInfo) const { if (!spellInfo) return false; @@ -11670,7 +11670,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att default: return; } - Item * item = ToPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, slot); + Item* item = ToPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, slot); if (item && !item->IsBroken() && item->IsFitToSpellRequirements((*i)->GetSpellProto())) AddPctN(DoneTotalMod, (*i)->GetAmount()); @@ -11691,7 +11691,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att AddPctN(DoneTotalMod, (*i)->GetAmount()); // done scripted mod (take it from owner) - Unit * owner = GetOwner() ? GetOwner() : this; + Unit* owner = GetOwner() ? GetOwner() : this; AuraEffectList const &mOverrideClassScript= owner->GetAuraEffectsByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); for (AuraEffectList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i) { @@ -12223,7 +12223,7 @@ bool Unit::canAttack(Unit const* target, bool force) const return true; } -bool Unit::isAttackableByAOE(SpellEntry const * spellProto) const +bool Unit::isAttackableByAOE(SpellEntry const* spellProto) const { bool targetMustBeDead = spellProto ? bool(spellProto->AttributesEx3 & SPELL_ATTR3_REQUIRE_DEAD_TARGET) : false; bool targetCanBeDead = spellProto ? bool(spellProto->AttributesEx2 & SPELL_ATTR2_ALLOW_DEAD_TARGET) : false; @@ -12413,7 +12413,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) // for some spells this mod is applied on vehicle owner int32 owner_speed_mod = 0; - if (Unit * owner = GetCharmer()) + if (Unit* owner = GetCharmer()) owner_speed_mod = owner->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); main_speed_mod = std::max(main_speed_mod, owner_speed_mod); @@ -12844,7 +12844,7 @@ Unit* Creature::SelectVictim() target = getAttackerForHelper(); if (!target && isSummon()) { - if (Unit * owner = this->ToTempSummon()->GetOwner()) + if (Unit* owner = this->ToTempSummon()->GetOwner()) { if (owner->isInCombat()) target = owner->getAttackerForHelper(); @@ -13064,7 +13064,7 @@ int32 Unit::ModSpellDuration(SpellEntry const* spellProto, Unit const* target, i return std::max(duration, 0); } -void Unit::ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spell * spell) +void Unit::ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spell* spell) { if (!spellProto || castTime < 0) return; @@ -14111,7 +14111,7 @@ uint32 createProcExtendMask(SpellNonMeleeDamage *damageInfo, SpellMissInfo missC return procEx; } -void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage, SpellEntry const * procAura) +void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellEntry const* procSpell, uint32 damage, SpellEntry const* procAura) { // Player is loaded now - do not allow passive spell casts to proc if (GetTypeId() == TYPEID_PLAYER && this->ToPlayer()->GetSession()->PlayerLoading()) @@ -14601,7 +14601,7 @@ void Unit::RestoreDisplayId() // iterate over already applied transform auras - from newest to oldest for (Unit::AuraEffectList::const_reverse_iterator i = transforms.rbegin(); i != transforms.rend(); ++i) { - if (AuraApplication const * aurApp = (*i)->GetBase()->GetApplicationOfTarget(GetGUID())) + if (AuraApplication const* aurApp = (*i)->GetBase()->GetApplicationOfTarget(GetGUID())) { if (!handledAura) handledAura = (*i); @@ -15129,9 +15129,9 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue(AuraEffect *triggeredByAura) else radius = (float)GetSpellMaxRangeForTarget(triggeredByAura->GetCaster(), sSpellRangeStore.LookupEntry(spellProto->rangeIndex)); - if (Unit * caster = triggeredByAura->GetCaster()) + if (Unit* caster = triggeredByAura->GetCaster()) { - if (Player * modOwner = caster->GetSpellModOwner()) + if (Player* modOwner = caster->GetSpellModOwner()) modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_RADIUS, radius, NULL); if (Unit *target = GetNextRandomRaidMemberOrPet(radius)) @@ -15189,9 +15189,9 @@ bool Unit::HandleAuraRaidProcFromCharge(AuraEffect* triggeredByAura) else radius = (float)GetSpellMaxRangeForTarget(triggeredByAura->GetCaster() , sSpellRangeStore.LookupEntry(spellProto->rangeIndex)); - if (Unit * caster = triggeredByAura->GetCaster()) + if (Unit* caster = triggeredByAura->GetCaster()) { - if (Player * modOwner = caster->GetSpellModOwner()) + if (Player* modOwner = caster->GetSpellModOwner()) modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_RADIUS, radius, NULL); if (Unit* target= GetNextRandomRaidMemberOrPet(radius)) @@ -15701,7 +15701,7 @@ void Unit::SetConfused(bool apply) this->ToPlayer()->SetClientControl(this, !apply); } -bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const * aurApp) +bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* aurApp) { if (!charmer) return false; diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 3b2fc825b74..9912b6b638c 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -802,17 +802,17 @@ struct CleanDamage class DamageInfo { private: - Unit * const m_attacker; - Unit * const m_victim; + Unit* const m_attacker; + Unit* const m_victim; uint32 m_damage; - SpellEntry const * const m_spellInfo; + SpellEntry const* const m_spellInfo; SpellSchoolMask const m_schoolMask; DamageEffectType const m_damageType; uint32 m_absorb; uint32 m_resist; uint32 m_block; public: - explicit DamageInfo(Unit * _attacker, Unit * _victim, uint32 _damage, SpellEntry const * _spellInfo, SpellSchoolMask _schoolMask, DamageEffectType _damageType) + explicit DamageInfo(Unit* _attacker, Unit* _victim, uint32 _damage, SpellEntry const* _spellInfo, SpellSchoolMask _schoolMask, DamageEffectType _damageType) : m_attacker(_attacker), m_victim(_victim), m_damage(_damage), m_spellInfo(_spellInfo), m_schoolMask(_schoolMask), m_damageType(_damageType) { m_absorb = 0; @@ -842,10 +842,10 @@ public: m_block += amount; m_damage -= amount; } - Unit * GetAttacker() const { return m_attacker; }; - Unit * GetVictim() const { return m_victim; }; + Unit* GetAttacker() const { return m_attacker; }; + Unit* GetVictim() const { return m_victim; }; DamageEffectType GetDamageType() const { return m_damageType; }; - SpellEntry const * GetSpellInfo() const { return m_spellInfo; }; + SpellEntry const* GetSpellInfo() const { return m_spellInfo; }; SpellSchoolMask GetSchoolMask() const { return m_schoolMask; }; uint32 GetDamage() const { return m_damage; }; uint32 GetAbsorb() const { return m_absorb; }; @@ -903,7 +903,7 @@ struct SpellPeriodicAuraLogInfo SpellPeriodicAuraLogInfo(AuraEffect const *_auraEff, uint32 _damage, uint32 _overDamage, uint32 _absorb, uint32 _resist, float _multiplier, bool _critical) : auraEff(_auraEff), damage(_damage), overDamage(_overDamage), absorb(_absorb), resist(_resist), multiplier(_multiplier), critical(_critical){} - AuraEffect const * auraEff; + AuraEffect const* auraEff; uint32 damage; uint32 overDamage; // overkill/overheal uint32 absorb; @@ -1203,7 +1203,7 @@ class Unit : public WorldObject { m_attackers.erase(pAttacker); } - Unit * getAttackerForHelper() const // If someone wants to help, who to give them + Unit* getAttackerForHelper() const // If someone wants to help, who to give them { if (getVictim() != NULL) return getVictim(); @@ -1357,8 +1357,8 @@ class Unit : public WorldObject void Kill(Unit *pVictim, bool durabilityLoss = true); int32 DealHeal(Unit *pVictim, uint32 addhealth); - void ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procEx, uint32 amount, WeaponAttackType attType = BASE_ATTACK, SpellEntry const *procSpell = NULL, SpellEntry const * procAura = NULL); - void ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage , SpellEntry const * procAura = NULL); + void ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procEx, uint32 amount, WeaponAttackType attType = BASE_ATTACK, SpellEntry const *procSpell = NULL, SpellEntry const* procAura = NULL); + void ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellEntry const* procSpell, uint32 damage , SpellEntry const* procAura = NULL); void HandleEmoteCommand(uint32 anim_id); void AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType = BASE_ATTACK, bool extra = false); @@ -1384,7 +1384,7 @@ class Unit : public WorldObject uint32 GetRangedDamageReduction(uint32 damage) const { return GetCombatRatingDamageReduction(CR_CRIT_TAKEN_RANGED, 2.0f, 100.0f, damage); } uint32 GetSpellDamageReduction(uint32 damage) const { return GetCombatRatingDamageReduction(CR_CRIT_TAKEN_SPELL, 2.0f, 100.0f, damage); } - void ApplyResilience(const Unit * pVictim, float * crit, int32 * damage, bool isCrit, CombatRating type) const; + void ApplyResilience(const Unit* pVictim, float * crit, int32 * damage, bool isCrit, CombatRating type) const; float MeleeSpellMissChance(const Unit *pVictim, WeaponAttackType attType, int32 skillDiff, uint32 spellId) const; SpellMissInfo MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell); @@ -1462,29 +1462,29 @@ class Unit : public WorldObject bool isFrozen() const; bool isTargetableForAttack() const; - bool isAttackableByAOE(SpellEntry const * spellProto = NULL) const; + bool isAttackableByAOE(SpellEntry const* spellProto = NULL) const; bool canAttack(Unit const* target, bool force = true) const; virtual bool IsInWater() const; virtual bool IsUnderWater() const; bool isInAccessiblePlaceFor(Creature const* c) const; void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, uint32 Absorb, bool critical = false); - int32 HealBySpell(Unit * pVictim, SpellEntry const * spellInfo, uint32 addHealth, bool critical = false); + int32 HealBySpell(Unit* pVictim, SpellEntry const* spellInfo, uint32 addHealth, bool critical = false); void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype); void EnergizeBySpell(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype); uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage); - void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem = NULL, AuraEffect const * triggeredByAura = NULL, uint64 originalCaster = 0); - void CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, Item *castItem= NULL, AuraEffect const * triggeredByAura = NULL, uint64 originalCaster = 0); - void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem = NULL, AuraEffect const * triggeredByAura = NULL, uint64 originalCaster = 0, Unit* originalVictim = 0); - void CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, AuraEffect const * triggeredByAura = NULL, uint64 originalCaster = 0); - void CastCustomSpell(uint32 spellId, SpellValueMod mod, int32 value, Unit* Victim = NULL, bool triggered = true, Item *castItem = NULL, AuraEffect const * triggeredByAura = NULL, uint64 originalCaster = 0); - void CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* Victim = NULL, bool triggered = true, Item *castItem = NULL, AuraEffect const * triggeredByAura = NULL, uint64 originalCaster = 0); + void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem = NULL, AuraEffect const* triggeredByAura = NULL, uint64 originalCaster = 0); + void CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, Item *castItem= NULL, AuraEffect const* triggeredByAura = NULL, uint64 originalCaster = 0); + void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem = NULL, AuraEffect const* triggeredByAura = NULL, uint64 originalCaster = 0, Unit* originalVictim = 0); + void CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, AuraEffect const* triggeredByAura = NULL, uint64 originalCaster = 0); + void CastCustomSpell(uint32 spellId, SpellValueMod mod, int32 value, Unit* Victim = NULL, bool triggered = true, Item *castItem = NULL, AuraEffect const* triggeredByAura = NULL, uint64 originalCaster = 0); + void CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* Victim = NULL, bool triggered = true, Item *castItem = NULL, AuraEffect const* triggeredByAura = NULL, uint64 originalCaster = 0); void CastSpell(GameObject *go, uint32 spellId, bool triggered, Item *castItem = NULL, AuraEffect* triggeredByAura = NULL, uint64 originalCaster = 0); Aura * AddAura(uint32 spellId, Unit *target); Aura * AddAura(SpellEntry const *spellInfo, uint8 effMask, Unit *target); void SetAuraStack(uint32 spellId, Unit *target, uint32 stack); - bool IsDamageToThreatSpell(SpellEntry const * spellInfo) const; + bool IsDamageToThreatSpell(SpellEntry const* spellInfo) const; void DeMorph(); @@ -1579,7 +1579,7 @@ class Unit : public WorldObject void RemoveAllMinionsByEntry(uint32 entry); void SetCharm(Unit* target, bool apply); Unit* GetNextRandomRaidMemberOrPet(float radius); - bool SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const * aurApp = NULL); + bool SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* aurApp = NULL); void RemoveCharmedBy(Unit* charmer); void RestoreFaction(); @@ -1603,8 +1603,8 @@ class Unit : public WorldObject CharmInfo* InitCharmInfo(); void DeleteCharmInfo(); void UpdateCharmAI(); - //Player * GetMoverSource() const; - Player * m_movedPlayer; + //Player* GetMoverSource() const; + Player* m_movedPlayer; SharedVisionList const& GetSharedVisionList() { return m_sharedVision; } void AddPlayerToVision(Player* plr); void RemovePlayerFromVision(Player* plr); @@ -1618,7 +1618,7 @@ class Unit : public WorldObject // aura apply/remove helpers - you should better not use these Aura* _TryStackingOrRefreshingExistingAura(SpellEntry const* newAura, uint8 effMask, Unit* caster, int32* baseAmount = NULL, Item* castItem = NULL, uint64 casterGUID = 0); - void _AddAura(UnitAura * aura, Unit * caster); + void _AddAura(UnitAura* aura, Unit* caster); AuraApplication * _CreateAuraApplication(Aura * aura, uint8 effMask); void _ApplyAuraEffect(Aura * aura, uint8 effIndex); void _ApplyAura(AuraApplication * aurApp, uint8 effMask); @@ -1694,13 +1694,13 @@ class Unit : public WorldObject bool HasAuraType(AuraType auraType) const; bool HasAuraTypeWithCaster(AuraType auratype, uint64 caster) const; bool HasAuraTypeWithMiscvalue(AuraType auratype, int32 miscvalue) const; - bool HasAuraTypeWithAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const; + bool HasAuraTypeWithAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const; bool HasAuraTypeWithValue(AuraType auratype, int32 value) const; bool HasNegativeAuraWithInterruptFlag(uint32 flag, uint64 guid = 0); bool HasNegativeAuraWithAttribute(uint32 flag, uint64 guid = 0); bool HasAuraWithMechanic(uint32 mechanicMask); - AuraEffect * IsScriptOverriden(SpellEntry const * spell, int32 script) const; + AuraEffect * IsScriptOverriden(SpellEntry const* spell, int32 script) const; uint32 GetDiseasesByCaster(uint64 casterGUID, bool remove = false); uint32 GetDoTsByCaster(uint64 casterGUID) const; @@ -1719,10 +1719,10 @@ class Unit : public WorldObject int32 GetMaxPositiveAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const; int32 GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const; - int32 GetTotalAuraModifierByAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const; - float GetTotalAuraMultiplierByAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const; - int32 GetMaxPositiveAuraModifierByAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const; - int32 GetMaxNegativeAuraModifierByAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const; + int32 GetTotalAuraModifierByAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const; + float GetTotalAuraMultiplierByAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const; + int32 GetMaxPositiveAuraModifierByAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const; + int32 GetMaxNegativeAuraModifierByAffectMask(AuraType auratype, SpellEntry const* affectedSpell) const; float GetResistanceBuffMods(SpellSchools school, bool positive) const { return GetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school); } void SetResistanceBuffMods(SpellSchools school, bool positive, float val) { SetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val); } @@ -1749,7 +1749,7 @@ class Unit : public WorldObject float GetNegStat(Stats stat) const { return GetFloatValue(UNIT_FIELD_NEGSTAT0+stat); } float GetCreateStat(Stats stat) const { return m_createStats[stat]; } - void SetCurrentCastedSpell(Spell * pSpell); + void SetCurrentCastedSpell(Spell* pSpell); virtual void ProhibitSpellSchool(SpellSchoolMask /*idSchoolMask*/, uint32 /*unTimeMs*/) { } void InterruptSpell(CurrentSpellTypes spellType, bool withDelayed = true, bool withInstant = true); void FinishSpell(CurrentSpellTypes spellType, bool ok = true); @@ -1904,8 +1904,8 @@ class Unit : public WorldObject uint32 CalculateDamage(WeaponAttackType attType, bool normalized, bool addTotalPct); float GetAPMultiplier(WeaponAttackType attType, bool normalized); void ModifyAuraState(AuraState flag, bool apply); - uint32 BuildAuraStateUpdateForTarget(Unit * target) const; - bool HasAuraState(AuraState flag, SpellEntry const *spellProto = NULL, Unit const * Caster = NULL) const ; + uint32 BuildAuraStateUpdateForTarget(Unit* target) const; + bool HasAuraState(AuraState flag, SpellEntry const *spellProto = NULL, Unit const* Caster = NULL) const ; void UnsummonAllTotems(); Unit* SelectMagnetTarget(Unit *victim, SpellEntry const *spellInfo = NULL); int32 SpellBaseDamageBonus(SpellSchoolMask schoolMask); @@ -1956,7 +1956,7 @@ class Unit : public WorldObject int32 CalculateSpellDamage(Unit const* target, SpellEntry const* spellProto, uint8 effect_index, int32 const* basePoints = NULL) const; int32 CalcSpellDuration(SpellEntry const* spellProto); int32 ModSpellDuration(SpellEntry const* spellProto, Unit const* target, int32 duration, bool positive); - void ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spell * spell=NULL); + void ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spell* spell=NULL); float CalculateLevelPenalty(SpellEntry const* spellProto) const; void addFollower(FollowerReference* pRef) { m_FollowingRefManager.insertFirst(pRef); } @@ -2158,13 +2158,13 @@ class Unit : public WorldObject bool isAlwaysDetectableFor(WorldObject const* seer) const; private: - bool IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry const * procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, bool active, SpellProcEventEntry const *& spellProcEvent); + bool IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, bool active, SpellProcEventEntry const *& spellProcEvent); bool HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown); bool HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown); bool HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown); bool HandleObsModEnergyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown); bool HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown); - bool HandleAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown, bool * handled); + bool HandleAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const* procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown, bool * handled); bool HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown); bool HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 cooldown); bool HandleAuraRaidProcFromChargeWithValue(AuraEffect* triggeredByAura); diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 582a389d1fb..eccbf9b2950 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -910,7 +910,7 @@ void GameEventMgr::LoadFromDB() } } -uint32 GameEventMgr::GetNPCFlag(Creature * cr) +uint32 GameEventMgr::GetNPCFlag(Creature* cr) { uint32 mask = 0; uint32 guid = cr->GetDBTableGUIDLow(); @@ -1109,7 +1109,7 @@ void GameEventMgr::UpdateEventNPCFlags(uint16 event_id) // get the creature data from the low guid to get the entry, to be able to find out the whole guid if (CreatureData const* data = sObjectMgr->GetCreatureData(itr->first)) { - Creature * cr = HashMapHolder<Creature>::Find(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT)); + Creature* cr = HashMapHolder<Creature>::Find(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT)); // if we found the creature, modify its npcflag if (cr) { @@ -1480,7 +1480,7 @@ void GameEventMgr::UpdateWorldStates(uint16 event_id, bool Activate) BattlegroundTypeId bgTypeId = BattlegroundMgr::WeekendHolidayIdToBGType(event.holiday_id); if (bgTypeId != BATTLEGROUND_TYPE_NONE) { - BattlemasterListEntry const * bl = sBattlemasterListStore.LookupEntry(bgTypeId); + BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeId); if (bl && bl->HolidayWorldStateId) { WorldPacket data; @@ -1583,7 +1583,7 @@ void GameEventMgr::SaveWorldEventStateToDB(uint16 event_id) CharacterDatabase.CommitTransaction(trans); } -void GameEventMgr::SendWorldStateUpdate(Player * plr, uint16 event_id) +void GameEventMgr::SendWorldStateUpdate(Player* plr, uint16 event_id) { std::map<uint32, GameEventFinishCondition>::iterator itr; for (itr = mGameEvent[event_id].conditions.begin(); itr !=mGameEvent[event_id].conditions.end(); ++itr) diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index 8e71d4f5a13..80cd8262515 100755 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -111,11 +111,11 @@ class GameEventMgr bool StartEvent(uint16 event_id, bool overwrite = false); void StopEvent(uint16 event_id, bool overwrite = false); void HandleQuestComplete(uint32 quest_id); // called on world event type quest completions - void HandleWorldEventGossip(Player * plr, Creature * c); - uint32 GetNPCFlag(Creature * cr); + void HandleWorldEventGossip(Player* plr, Creature* c); + uint32 GetNPCFlag(Creature* cr); uint32 GetNpcTextId(uint32 guid); private: - void SendWorldStateUpdate(Player * plr, uint16 event_id); + void SendWorldStateUpdate(Player* plr, uint16 event_id); void AddActiveEvent(uint16 event_id) { m_ActiveEvents.insert(event_id); } void RemoveActiveEvent(uint16 event_id) { m_ActiveEvents.erase(event_id); } void ApplyNewEvent(uint16 event_id); diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index c8be042ef8d..78f98ed9fca 100755 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -122,7 +122,7 @@ class ObjectAccessor // Player may be not in world while in ObjectAccessor static Player* GetObjectInWorld(uint64 guid, Player* /*typeSpecifier*/) { - Player * player = HashMapHolder<Player>::Find(guid); + Player* player = HashMapHolder<Player>::Find(guid); if (player && player->IsInWorld()) return player; return NULL; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index d072cd0c970..25d8b1a8800 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -222,7 +222,7 @@ bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clicke if (clicker->HasAura(auraForbidden)) return false; - Unit const * summoner = NULL; + Unit const* summoner = NULL; // Check summoners for party if (clickee->isSummon()) summoner = clickee->ToTempSummon()->GetSummoner(); @@ -987,7 +987,7 @@ void ObjectMgr::LoadCreatureAddons() sLog->outString(); } -CreatureAddon const * ObjectMgr::GetCreatureAddon(uint32 lowguid) +CreatureAddon const* ObjectMgr::GetCreatureAddon(uint32 lowguid) { CreatureAddonContainer::const_iterator itr = CreatureAddonStore.find(lowguid); if (itr != CreatureAddonStore.end()) @@ -996,7 +996,7 @@ CreatureAddon const * ObjectMgr::GetCreatureAddon(uint32 lowguid) return NULL; } -CreatureAddon const * ObjectMgr::GetCreatureTemplateAddon(uint32 entry) +CreatureAddon const* ObjectMgr::GetCreatureTemplateAddon(uint32 entry) { CreatureAddonContainer::const_iterator itr = CreatureTemplateAddonStore.find(entry); if (itr != CreatureTemplateAddonStore.end()) @@ -4906,7 +4906,7 @@ void ObjectMgr::LoadEventScripts() // Load all possible script entries from spells for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) { - SpellEntry const * spell = sSpellStore.LookupEntry(i); + SpellEntry const* spell = sSpellStore.LookupEntry(i); if (spell) { for (uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j) @@ -5048,7 +5048,7 @@ void ObjectMgr::ValidateSpellScripts() for (SpellScriptsMap::iterator itr = mSpellScripts.begin(); itr != mSpellScripts.end();) { - SpellEntry const * spellEntry = sSpellStore.LookupEntry(itr->first); + SpellEntry const* spellEntry = sSpellStore.LookupEntry(itr->first); std::vector<std::pair<SpellScriptLoader *, SpellScriptsMap::iterator> > SpellScriptLoaders; sScriptMgr->CreateSpellScriptLoaders(itr->first, SpellScriptLoaders); itr = mSpellScripts.upper_bound(itr->first); diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 35ebf4c3be5..bb4e539c63e 100755 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -348,7 +348,7 @@ struct SpellClickInfo SpellClickUserTypes userType; // helpers - bool IsFitToRequirements(Unit const* clicker, Unit const * clickee) const; + bool IsFitToRequirements(Unit const* clicker, Unit const* clickee) const; }; typedef std::multimap<uint32, SpellClickInfo> SpellClickInfoMap; diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index 9fa6c70cc96..13a88a26b89 100755 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -144,7 +144,7 @@ void PlayerRelocationNotifier::Visit(CreatureMapType &m) for (CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { - Creature * c = iter->getSource(); + Creature* c = iter->getSource(); vis_guids.erase(c->GetGUID()); @@ -159,7 +159,7 @@ void CreatureRelocationNotifier::Visit(PlayerMapType &m) { for (PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { - Player * pl = iter->getSource(); + Player* pl = iter->getSource(); if (!pl->m_seer->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) pl->UpdateVisibilityOf(&i_creature); @@ -187,7 +187,7 @@ void DelayedUnitRelocation::Visit(CreatureMapType &m) { for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Creature * unit = iter->getSource(); + Creature* unit = iter->getSource(); if (!unit->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) continue; @@ -205,7 +205,7 @@ void DelayedUnitRelocation::Visit(PlayerMapType &m) { for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { - Player * player = iter->getSource(); + Player* player = iter->getSource(); WorldObject const *viewPoint = player->m_seer; if (!viewPoint->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 840408c0d7e..fade98b3ea8 100755 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -54,7 +54,7 @@ ObjectGridRespawnMover::Visit(CreatureMapType &m) // move to respawn point to prevent this case. For player view in respawn grid this will be normal respawn. for (CreatureMapType::iterator iter = m.begin(); iter != m.end();) { - Creature * c = iter->getSource(); + Creature* c = iter->getSource(); ++iter; ASSERT(!c->isPet() && "ObjectGridRespawnMover don't must be called for pets"); diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index ce8cc7e4197..8e70eea7243 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1466,7 +1466,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* return ERR_BATTLEGROUND_NONE; // ERR_GROUP_JOIN_BATTLEGROUND_TOO_MANY handled on client side // get a player as reference, to compare other players' stats to (arena team id, queue id based on level, etc.) - Player * reference = GetFirstMember()->getSource(); + Player* reference = GetFirstMember()->getSource(); // no reference found, can't join this way if (!reference) return ERR_BATTLEGROUND_JOIN_FAILED; diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index a336e776ebb..25a826993c4 100755 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -53,7 +53,7 @@ class LootTemplate::LootGroup // A set of loot def public: void AddEntry(LootStoreItem& item); // Adds an entry to the group (at loading stage) bool HasQuestDrop() const; // True if group includes at least 1 quest drop entry - bool HasQuestDropForPlayer(Player const * player) const; + bool HasQuestDropForPlayer(Player const* player) const; // The same for active quests of the player void Process(Loot& loot, uint16 lootMode) const; // Rolls an item from the group (if any) and adds the item to the loot float RawTotalChance() const; // Overall chance for the group (without equal chanced items) @@ -69,7 +69,7 @@ class LootTemplate::LootGroup // A set of loot def LootStoreItemList ExplicitlyChanced; // Entries with chances defined in DB LootStoreItemList EqualChanced; // Zero chances - every entry takes the same chance - LootStoreItem const * Roll() const; // Rolls an item from the group, returns NULL if all miss their chances + LootStoreItem const* Roll() const; // Rolls an item from the group, returns NULL if all miss their chances }; //Remove all data and free all memory @@ -337,7 +337,7 @@ LootItem::LootItem(LootStoreItem const& li) } // Basic checks for player/item compatibility - if false no chance to see the item in the loot -bool LootItem::AllowedForPlayer(Player const * player) const +bool LootItem::AllowedForPlayer(Player const* player) const { // DB conditions check if (!sConditionMgr->IsPlayerMeetToConditions(const_cast<Player*>(player), conditions)) @@ -972,7 +972,7 @@ void LootTemplate::LootGroup::AddEntry(LootStoreItem& item) } // Rolls an item from the group, returns NULL if all miss their chances -LootStoreItem const * LootTemplate::LootGroup::Roll() const +LootStoreItem const* LootTemplate::LootGroup::Roll() const { if (!ExplicitlyChanced.empty()) // First explicitly chanced entries are checked { @@ -1007,7 +1007,7 @@ bool LootTemplate::LootGroup::HasQuestDrop() const } // True if group includes at least 1 quest drop entry for active quests of the player -bool LootTemplate::LootGroup::HasQuestDropForPlayer(Player const * player) const +bool LootTemplate::LootGroup::HasQuestDropForPlayer(Player const* player) const { for (LootStoreItemList::const_iterator i = ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i) if (player->HasQuestForItem(i->itemid)) diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index 7a9601030bd..28bcf395ebd 100755 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -146,7 +146,7 @@ struct LootItem explicit LootItem(LootStoreItem const& li); // Basic checks for player/item compatibility - if false no chance to see the item in the loot - bool AllowedForPlayer(Player const * player) const; + bool AllowedForPlayer(Player const* player) const; void AddAllowedLooter(Player const* player); AllowedLooterSet* GetAllowedLooters() { return &allowedGUIDs; } @@ -226,7 +226,7 @@ class LootTemplate // True if template includes at least 1 quest drop entry bool HasQuestDrop(LootTemplateMap const& store, uint8 groupId = 0) const; // True if template includes at least 1 quest drop for an active quest of the player - bool HasQuestDropForPlayer(LootTemplateMap const& store, Player const * player, uint8 groupId = 0) const; + bool HasQuestDropForPlayer(LootTemplateMap const& store, Player const* player, uint8 groupId = 0) const; // Checks integrity of the template void Verify(LootStore const& store, uint32 Id) const; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 51b03e85581..baefb084702 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1866,7 +1866,7 @@ void Map::UpdateObjectsVisibilityFor(Player* player, Cell cell, CellPair cellpai notifier.SendToSelf(); } -void Map::SendInitSelf(Player * player) +void Map::SendInitSelf(Player* player) { sLog->outDetail("Creating player data for himself %u", player->GetGUIDLow()); @@ -1898,7 +1898,7 @@ void Map::SendInitSelf(Player * player) player->GetSession()->SendPacket(&packet); } -void Map::SendInitTransports(Player * player) +void Map::SendInitTransports(Player* player) { // Hack to send out transports MapManager::TransportMap& tmap = sMapMgr->m_TransportsByMap; @@ -1925,7 +1925,7 @@ void Map::SendInitTransports(Player * player) player->GetSession()->SendPacket(&packet); } -void Map::SendRemoveTransports(Player * player) +void Map::SendRemoveTransports(Player* player) { // Hack to send out transports MapManager::TransportMap& tmap = sMapMgr->m_TransportsByMap; @@ -2583,7 +2583,7 @@ void BattlegroundMap::InitVisibilityDistance() m_VisibilityNotifyPeriod = World::GetVisibilityNotifyPeriodInBGArenas(); } -bool BattlegroundMap::CanEnter(Player * player) +bool BattlegroundMap::CanEnter(Player* player) { if (player->GetMapRef().getTarget() == this) { @@ -2600,7 +2600,7 @@ bool BattlegroundMap::CanEnter(Player * player) return Map::CanEnter(player); } -bool BattlegroundMap::Add(Player * player) +bool BattlegroundMap::Add(Player* player) { { ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, Lock, false); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 57372c0c259..10935ee2b9a 100755 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -309,7 +309,7 @@ class Map : public GridRefManager<NGridType> static void InitStateMachine(); static void DeleteStateMachine(); - Map const * GetParent() const { return m_parentMap; } + Map const* GetParent() const { return m_parentMap; } // some calls like isInWater should not use vmaps due to processor power // can return INVALID_HEIGHT if under z+2 z coord not found height @@ -446,10 +446,10 @@ class Map : public GridRefManager<NGridType> void SetTimer(uint32 t) { i_gridExpiry = t < MIN_GRID_DELAY ? MIN_GRID_DELAY : t; } - void SendInitSelf(Player * player); + void SendInitSelf(Player* player); - void SendInitTransports(Player * player); - void SendRemoveTransports(Player * player); + void SendInitTransports(Player* player); + void SendRemoveTransports(Player* player); bool CreatureCellRelocation(Creature *creature, Cell new_cell); diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index b64f4a030f3..cae027c2b8e 100755 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -107,7 +107,7 @@ void MapInstanced::UnloadAll() - create the instance if it's not created already - the player is not actually added to the instance (only in InstanceMap::Add) */ -Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player) +Map* MapInstanced::CreateInstance(const uint32 mapId, Player* player) { if (GetId() != mapId || !player) return NULL; @@ -257,7 +257,7 @@ bool MapInstanced::DestroyInstance(InstancedMaps::iterator &itr) return true; } -bool MapInstanced::CanEnter(Player * /*player*/) +bool MapInstanced::CanEnter(Player* /*player*/) { //ASSERT(false); return true; diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h index 38ae8ca8fbc..16aeffe8580 100755 --- a/src/server/game/Maps/MapInstanced.h +++ b/src/server/game/Maps/MapInstanced.h @@ -39,7 +39,7 @@ class MapInstanced : public Map void UnloadAll(); bool CanEnter(Player* player); - Map* CreateInstance(const uint32 mapId, Player * player); + Map* CreateInstance(const uint32 mapId, Player* player); Map* FindMap(uint32 InstanceId) const { return _FindMap(InstanceId); } bool DestroyInstance(InstancedMaps::iterator &itr); diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index ae091289299..74ee5b74a4f 100755 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -232,7 +232,7 @@ FleeingMovementGenerator<T>::_setMoveData(T &owner) float cur_dist; float angle_to_caster; - Unit * fright = ObjectAccessor::GetUnit(owner, i_frightGUID); + Unit* fright = ObjectAccessor::GetUnit(owner, i_frightGUID); if (fright) { @@ -307,7 +307,7 @@ FleeingMovementGenerator<T>::Initialize(T &owner) owner.SetUInt64Value(UNIT_FIELD_TARGET, 0); owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if (Unit * fright = ObjectAccessor::GetUnit(owner, i_frightGUID)) + if (Unit* fright = ObjectAccessor::GetUnit(owner, i_frightGUID)) { i_caster_x = fright->GetPositionX(); i_caster_y = fright->GetPositionY(); diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 777087f6b1d..9a152198fbb 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -36,7 +36,7 @@ m_State(OBJECTIVESTATE_NEUTRAL), m_neutralValuePct(0), m_PvP(pvp) { } -bool OPvPCapturePoint::HandlePlayerEnter(Player * plr) +bool OPvPCapturePoint::HandlePlayerEnter(Player* plr) { if (m_capturePoint) { @@ -47,7 +47,7 @@ bool OPvPCapturePoint::HandlePlayerEnter(Player * plr) return m_activePlayers[plr->GetTeamId()].insert(plr).second; } -void OPvPCapturePoint::HandlePlayerLeave(Player * plr) +void OPvPCapturePoint::HandlePlayerLeave(Player* plr) { if (m_capturePoint) plr->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldState1, 0); @@ -239,12 +239,12 @@ OutdoorPvP::~OutdoorPvP() DeleteSpawns(); } -void OutdoorPvP::HandlePlayerEnterZone(Player * plr, uint32 /*zone*/) +void OutdoorPvP::HandlePlayerEnterZone(Player* plr, uint32 /*zone*/) { m_players[plr->GetTeamId()].insert(plr); } -void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 /*zone*/) +void OutdoorPvP::HandlePlayerLeaveZone(Player* plr, uint32 /*zone*/) { // inform the objectives of the leaving for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) @@ -256,7 +256,7 @@ void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 /*zone*/) sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %s left an outdoorpvp zone", plr->GetName()); } -void OutdoorPvP::HandlePlayerResurrects(Player * /*plr*/, uint32 /*zone*/) +void OutdoorPvP::HandlePlayerResurrects(Player* /*plr*/, uint32 /*zone*/) { } @@ -430,7 +430,7 @@ void OPvPCapturePoint::SendObjectiveComplete(uint32 id, uint64 guid) (*itr)->KilledMonsterCredit(id, guid); } -void OutdoorPvP::HandleKill(Player *killer, Unit * killed) +void OutdoorPvP::HandleKill(Player *killer, Unit* killed) { if (Group * pGroup = killer->GetGroup()) { @@ -477,7 +477,7 @@ bool OPvPCapturePoint::IsInsideObjective(Player *plr) const return m_activePlayers[plr->GetTeamId()].find(plr) != m_activePlayers[plr->GetTeamId()].end(); } -bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) +bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go) { for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if (itr->second->HandleCustomSpell(plr, spellId, go)) @@ -486,7 +486,7 @@ bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) return false; } -bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 /*spellId*/, GameObject * /*go*/) +bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 /*spellId*/, GameObject* /*go*/) { if (!plr->IsOutdoorPvPActive()) return false; @@ -502,7 +502,7 @@ bool OutdoorPvP::HandleOpenGo(Player *plr, uint64 guid) return false; } -bool OutdoorPvP::HandleGossipOption(Player * plr, uint64 guid, uint32 id) +bool OutdoorPvP::HandleGossipOption(Player* plr, uint64 guid, uint32 id) { for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if (itr->second->HandleGossipOption(plr, guid, id)) @@ -520,7 +520,7 @@ bool OutdoorPvP::CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso) return false; } -bool OutdoorPvP::HandleDropFlag(Player * plr, uint32 id) +bool OutdoorPvP::HandleDropFlag(Player* plr, uint32 id) { for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if (itr->second->HandleDropFlag(plr, id)) @@ -529,7 +529,7 @@ bool OutdoorPvP::HandleDropFlag(Player * plr, uint32 id) return false; } -bool OPvPCapturePoint::HandleGossipOption(Player * /*plr*/, uint64 /*guid*/, uint32 /*id*/) +bool OPvPCapturePoint::HandleGossipOption(Player* /*plr*/, uint64 /*guid*/, uint32 /*id*/) { return false; } @@ -539,12 +539,12 @@ bool OPvPCapturePoint::CanTalkTo(Player* /*plr*/, Creature* /*c*/, GossipMenuIte return false; } -bool OPvPCapturePoint::HandleDropFlag(Player * /*plr*/, uint32 /*id*/) +bool OPvPCapturePoint::HandleDropFlag(Player* /*plr*/, uint32 /*id*/) { return false; } -int32 OPvPCapturePoint::HandleOpenGo(Player * /*plr*/, uint64 guid) +int32 OPvPCapturePoint::HandleOpenGo(Player* /*plr*/, uint64 guid) { std::map<uint64, uint32>::iterator itr = m_ObjectTypes.find(guid); if (itr != m_ObjectTypes.end()) @@ -554,7 +554,7 @@ int32 OPvPCapturePoint::HandleOpenGo(Player * /*plr*/, uint64 guid) return -1; } -bool OutdoorPvP::HandleAreaTrigger(Player * /*plr*/, uint32 /*trigger*/) +bool OutdoorPvP::HandleAreaTrigger(Player* /*plr*/, uint32 /*trigger*/) { return false; } diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index eac9f8a8a5f..e3cb9ee5c17 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -104,13 +104,13 @@ class OPvPCapturePoint void SendObjectiveComplete(uint32 id, uint64 guid); // used when player is activated/inactivated in the area - virtual bool HandlePlayerEnter(Player * plr); - virtual void HandlePlayerLeave(Player * plr); + virtual bool HandlePlayerEnter(Player* plr); + virtual void HandlePlayerLeave(Player* plr); // checks if player is in range of a capture credit marker - bool IsInsideObjective(Player * plr) const; + bool IsInsideObjective(Player* plr) const; - virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go); + virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go); virtual int32 HandleOpenGo(Player *plr, uint64 guid); @@ -127,7 +127,7 @@ class OPvPCapturePoint virtual bool CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso); - virtual bool HandleDropFlag(Player * plr, uint32 spellId); + virtual bool HandleDropFlag(Player* plr, uint32 spellId); virtual void DeleteSpawns(); @@ -208,10 +208,10 @@ class OutdoorPvP : public ZoneScript virtual void FillInitialWorldStates(WorldPacket & /*data*/) {} // called when a player triggers an areatrigger - virtual bool HandleAreaTrigger(Player * plr, uint32 trigger); + virtual bool HandleAreaTrigger(Player* plr, uint32 trigger); // called on custom spell - virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go); + virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go); // called on go use virtual bool HandleOpenGo(Player *plr, uint64 guid); @@ -230,18 +230,18 @@ class OutdoorPvP : public ZoneScript virtual bool Update(uint32 diff); // handle npc/player kill - virtual void HandleKill(Player * killer, Unit * killed); - virtual void HandleKillImpl(Player * /*killer*/, Unit * /*killed*/) {} + virtual void HandleKill(Player* killer, Unit* killed); + virtual void HandleKillImpl(Player* /*killer*/, Unit* /*killed*/) {} // checks if player is in range of a capture credit marker - bool IsInsideObjective(Player * plr) const; + bool IsInsideObjective(Player* plr) const; // awards rewards for player kill - virtual void AwardKillBonus(Player * /*plr*/) {} + virtual void AwardKillBonus(Player* /*plr*/) {} uint32 GetTypeId() {return m_TypeId;} - virtual bool HandleDropFlag(Player * plr, uint32 spellId); + virtual bool HandleDropFlag(Player* plr, uint32 spellId); virtual bool HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid); @@ -261,14 +261,14 @@ class OutdoorPvP : public ZoneScript bool m_sendUpdate; // world state stuff - virtual void SendRemoveWorldStates(Player * /*plr*/) {} + virtual void SendRemoveWorldStates(Player* /*plr*/) {} void BroadcastPacket(WorldPacket & data) const; - virtual void HandlePlayerEnterZone(Player * plr, uint32 zone); - virtual void HandlePlayerLeaveZone(Player * plr, uint32 zone); + virtual void HandlePlayerEnterZone(Player* plr, uint32 zone); + virtual void HandlePlayerLeaveZone(Player* plr, uint32 zone); - virtual void HandlePlayerResurrects(Player * plr, uint32 zone); + virtual void HandlePlayerResurrects(Player* plr, uint32 zone); void AddCapturePoint(OPvPCapturePoint* cp) { diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp index 78ce17aefc3..11675edd3ff 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -164,7 +164,7 @@ void OutdoorPvPMgr::Update(uint32 diff) } } -bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) +bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go) { for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h index ae3fe5ee32f..00b89527349 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h @@ -50,22 +50,22 @@ class OutdoorPvPMgr void InitOutdoorPvP(); // called when a player enters an outdoor pvp area - void HandlePlayerEnterZone(Player * plr, uint32 areaflag); + void HandlePlayerEnterZone(Player* plr, uint32 areaflag); // called when player leaves an outdoor pvp area - void HandlePlayerLeaveZone(Player * plr, uint32 areaflag); + void HandlePlayerLeaveZone(Player* plr, uint32 areaflag); // called when player resurrects - void HandlePlayerResurrects(Player * plr, uint32 areaflag); + void HandlePlayerResurrects(Player* plr, uint32 areaflag); // return assigned outdoor pvp OutdoorPvP * GetOutdoorPvPToZoneId(uint32 zoneid); // handle custom (non-exist in dbc) spell if registered - bool HandleCustomSpell(Player * plr, uint32 spellId, GameObject* go); + bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject* go); // handle custom go if registered - bool HandleOpenGo(Player * plr, uint64 guid); + bool HandleOpenGo(Player* plr, uint64 guid); ZoneScript * GetZoneScript(uint32 zoneId); @@ -73,11 +73,11 @@ class OutdoorPvPMgr void Update(uint32 diff); - void HandleGossipOption(Player * player, uint64 guid, uint32 gossipid); + void HandleGossipOption(Player* player, uint64 guid, uint32 gossipid); bool CanTalkTo(Player* player, Creature* creature, GossipMenuItems const& gso); - void HandleDropFlag(Player * plr, uint32 spellId); + void HandleDropFlag(Player* plr, uint32 spellId); typedef std::vector<OutdoorPvP*> OutdoorPvPSet; typedef std::map<uint32 /* zoneid */, OutdoorPvP*> OutdoorPvPMap; diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 3fa4fa9f1a0..00c79ff272a 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -700,7 +700,7 @@ class PlayerScript : public ScriptObject virtual void OnTextEmote(Player* /*player*/, uint32 /*text_emote*/, uint32 /*emoteNum*/, uint64 /*guid*/) { } // Called in Spell::cast - virtual void OnSpellCast(Player* /*player*/, Spell * /*spell*/, bool /*skipCheck*/) { } + virtual void OnSpellCast(Player* /*player*/, Spell* /*spell*/, bool /*skipCheck*/) { } // Called when a player logs in or out virtual void OnLogin(Player* /*player*/) { } diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index bbdc0cd8523..6aa84a77438 100755 --- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp @@ -548,7 +548,7 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket & recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "Character creation %s (account %u) has unhandled tail data: [%u]", name.c_str(), GetAccountId(), unk); } - Player * pNewChar = new Player(this); + Player* pNewChar = new Player(this); if (!pNewChar->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_PLAYER), name, race_, class_, gender, skin, face, hairStyle, hairColor, facialHair, outfitId)) { // Player not create (race/class/etc problem?) diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp index af76ef53f47..7f4f88de59b 100755 --- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp @@ -776,7 +776,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke { if (auramask & (uint64(1) << i)) { - AuraApplication const * aurApp = player->GetVisibleAura(i); + AuraApplication const* aurApp = player->GetVisibleAura(i); *data << uint32(aurApp ? aurApp->GetBase()->GetId() : 0); *data << uint8(1); } @@ -866,7 +866,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke { if (auramask & (uint64(1) << i)) { - AuraApplication const * aurApp = player->GetVisibleAura(i); + AuraApplication const* aurApp = player->GetVisibleAura(i); *data << uint32(aurApp ? aurApp->GetBase()->GetId() : 0); *data << uint8(1); } diff --git a/src/server/game/Server/Protocol/Handlers/LootHandler.cpp b/src/server/game/Server/Protocol/Handlers/LootHandler.cpp index 53d1da261be..bb2944a9857 100755 --- a/src/server/game/Server/Protocol/Handlers/LootHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/LootHandler.cpp @@ -491,7 +491,7 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket & recv_data) AllowedLooterSet* looters = item.GetAllowedLooters(); // not move item from loot to target inventory - Item * newitem = target->StoreNewItem(dest, item.itemid, true, item.randomPropertyId, (looters->size() > 1) ? looters : NULL); + Item* newitem = target->StoreNewItem(dest, item.itemid, true, item.randomPropertyId, (looters->size() > 1) ? looters : NULL); target->SendNewItem(newitem, uint32(item.count), false, false, true); target->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM, item.itemid, item.count); target->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE, pLoot->loot_type, item.count); diff --git a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp index 6f282c9ad3d..34a36f84c2e 100755 --- a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp @@ -583,7 +583,7 @@ void WorldSession::HandleMirrorImageDataRequest(WorldPacket & recv_data) data << uint32(creator->GetDisplayId()); if (creator->GetTypeId() == TYPEID_PLAYER) { - Player * pCreator = creator->ToPlayer(); + Player* pCreator = creator->ToPlayer(); data << uint8(pCreator->getRace()); data << uint8(pCreator->getGender()); data << uint8(pCreator->getClass()); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 05b4a61c2cd..f28c1de5430 100755 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -297,7 +297,7 @@ class WorldSession //used with item_page table bool SendItemInfo(uint32 itemid, WorldPacket data); //auction - void SendAuctionHello(uint64 guid, Creature * unit); + void SendAuctionHello(uint64 guid, Creature* unit); void SendAuctionCommandResult(uint32 auctionId, uint32 Action, uint32 ErrorCode, uint32 bidError = 0); void SendAuctionBidderNotification(uint32 location, uint32 auctionId, uint64 bidder, uint32 bidSum, uint32 diff, uint32 item_template); void SendAuctionOwnerNotification(AuctionEntry * auction); diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp index f4aaa26a251..64b5187c2ee 100755 --- a/src/server/game/Skills/SkillExtraItems.cpp +++ b/src/server/game/Skills/SkillExtraItems.cpp @@ -114,7 +114,7 @@ void LoadSkillExtraItemTable() sLog->outString(); } -bool canCreateExtraItems(Player * player, uint32 spellId, float &additionalChance, uint8 &additionalMax) +bool canCreateExtraItems(Player* player, uint32 spellId, float &additionalChance, uint8 &additionalMax) { // get the info for the specified spell SkillExtraItemMap::const_iterator ret = SkillExtraItemStore.find(spellId); diff --git a/src/server/game/Skills/SkillExtraItems.h b/src/server/game/Skills/SkillExtraItems.h index 0d24c84cf47..2b453508c8c 100755 --- a/src/server/game/Skills/SkillExtraItems.h +++ b/src/server/game/Skills/SkillExtraItems.h @@ -24,7 +24,7 @@ // predef classes used in functions class Player; // returns true and sets the appropriate info if the player can create extra items with the given spellId -bool canCreateExtraItems(Player * player, uint32 spellId, float &additionalChance, uint8 &additionalMax); +bool canCreateExtraItems(Player* player, uint32 spellId, float &additionalChance, uint8 &additionalMax); // function to load the extra item creation info from DB void LoadSkillExtraItemTable(); #endif diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index a4c136c7885..f2c51933e82 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -371,7 +371,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNoImmediateEffect, //316 SPELL_AURA_PERIODIC_HASTE implemented in AuraEffect::CalculatePeriodic }; -AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * caster): +AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit* caster): m_base(base), m_spellProto(base->GetSpellProto()), m_effIndex(effIndex), m_baseAmount(baseAmount ? *baseAmount : m_spellProto->EffectBasePoints[m_effIndex]), m_canBeRecalculated(true), m_spellmod(NULL), m_isPeriodic(false), @@ -410,7 +410,7 @@ void AuraEffect::GetApplicationList(std::list<AuraApplication*> & applicationLis } } -int32 AuraEffect::CalculateAmount(Unit * caster) +int32 AuraEffect::CalculateAmount(Unit* caster) { int32 amount; // default amount calculation @@ -623,7 +623,7 @@ int32 AuraEffect::CalculateAmount(Unit * caster) uint8 cp = caster->ToPlayer()->GetComboPoints(); // Idol of Feral Shadows. Cant be handled as SpellMod in SpellAura:Dummy due its dependency from CPs - if (AuraEffect const * aurEff = caster->GetAuraEffect(34241, 0)) + if (AuraEffect const* aurEff = caster->GetAuraEffect(34241, 0)) amount += cp * aurEff->GetAmount(); amount += uint32(CalculatePctU(caster->GetTotalAttackPowerValue(BASE_ATTACK), cp)); @@ -697,7 +697,7 @@ int32 AuraEffect::CalculateAmount(Unit * caster) value += int32((defva - 400) * 0.15); // Glyph of Icebound Fortitude - if (AuraEffect const * aurEff = caster->GetAuraEffect(58625, 0)) + if (AuraEffect const* aurEff = caster->GetAuraEffect(58625, 0)) { int32 valMax = aurEff->GetAmount(); if (value < valMax) @@ -711,7 +711,7 @@ int32 AuraEffect::CalculateAmount(Unit * caster) { //Glyph of Salvation if (caster->GetGUID() == GetBase()->GetUnitOwner()->GetGUID()) - if (AuraEffect const * aurEff = caster->GetAuraEffect(63225, 0)) + if (AuraEffect const* aurEff = caster->GetAuraEffect(63225, 0)) amount = -aurEff->GetAmount(); } break; @@ -765,7 +765,7 @@ int32 AuraEffect::CalculateAmount(Unit * caster) return amount; } -void AuraEffect::CalculatePeriodic(Unit * caster, bool create, bool load) +void AuraEffect::CalculatePeriodic(Unit* caster, bool create, bool load) { m_amplitude = m_spellProto->EffectAmplitude[m_effIndex]; @@ -1024,14 +1024,14 @@ void AuraEffect::HandleEffect(AuraApplication * aurApp, uint8 mode, bool apply) GetBase()->CallScriptAfterEffectRemoveHandlers(const_cast<AuraEffect const *>(this), const_cast<AuraApplication const *>(aurApp), (AuraEffectHandleModes)mode); } -void AuraEffect::HandleEffect(Unit * target, uint8 mode, bool apply) +void AuraEffect::HandleEffect(Unit* target, uint8 mode, bool apply) { AuraApplication * aurApp = GetBase()->GetApplicationOfTarget(target->GetGUID()); ASSERT(aurApp); HandleEffect(aurApp, mode, apply); } -void AuraEffect::ApplySpellMod(Unit * target, bool apply) +void AuraEffect::ApplySpellMod(Unit* target, bool apply) { if (!m_spellmod || target->GetTypeId() != TYPEID_PLAYER) return; @@ -1090,7 +1090,7 @@ void AuraEffect::ApplySpellMod(Unit * target, bool apply) } } -void AuraEffect::Update(uint32 diff, Unit * caster) +void AuraEffect::Update(uint32 diff, Unit* caster) { if (m_isPeriodic && (GetBase()->GetDuration() >=0 || GetBase()->IsPassive() || GetBase()->IsPermanent())) { @@ -1114,7 +1114,7 @@ void AuraEffect::Update(uint32 diff, Unit * caster) } } -void AuraEffect::UpdatePeriodic(Unit * caster) +void AuraEffect::UpdatePeriodic(Unit* caster) { switch(GetAuraType()) { @@ -1245,7 +1245,7 @@ void AuraEffect::UpdatePeriodic(Unit * caster) GetBase()->CallScriptEffectUpdatePeriodicHandlers(this); } -bool AuraEffect::IsPeriodicTickCrit(Unit * target, Unit const * caster) const +bool AuraEffect::IsPeriodicTickCrit(Unit* target, Unit const* caster) const { ASSERT(caster); Unit::AuraEffectList const& mPeriodicCritAuras= caster->GetAuraEffectsByType(SPELL_AURA_ABILITY_PERIODIC_CRIT); @@ -1263,19 +1263,19 @@ bool AuraEffect::IsPeriodicTickCrit(Unit * target, Unit const * caster) const return false; } -void AuraEffect::SendTickImmune(Unit * target, Unit *caster) const +void AuraEffect::SendTickImmune(Unit* target, Unit *caster) const { if (caster) caster->SendSpellDamageImmune(target, m_spellProto->Id); } -void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const +void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit* caster) const { bool prevented = GetBase()->CallScriptEffectPeriodicHandlers(this, aurApp); if (prevented) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); switch(GetAuraType()) { @@ -1771,7 +1771,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const && m_spellProto->SpellFamilyFlags[0] & 0x00000010) { int32 manaFeedVal = 0; - if (AuraEffect const * aurEff = GetBase()->GetEffect(1)) + if (AuraEffect const* aurEff = GetBase()->GetEffect(1)) manaFeedVal = aurEff->GetAmount(); // Mana Feed - Drain Mana if (manaFeedVal > 0) @@ -1935,7 +1935,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const } } -void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const +void AuraEffect::PeriodicDummyTick(Unit* target, Unit* caster) const { switch (GetSpellProto()->SpellFamilyName) { @@ -2184,7 +2184,7 @@ void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const } } -void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const +void AuraEffect::TriggerSpell(Unit* target, Unit* caster) const { if (!caster || !target) return; @@ -2456,7 +2456,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const // Beacon of Light case 53563: { - Unit * triggerCaster = (Unit *)(GetBase()->GetOwner()); + Unit* triggerCaster = (Unit *)(GetBase()->GetOwner()); triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, 0, this, triggerCaster->GetGUID()); return; } @@ -2475,7 +2475,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const if (triggeredSpellInfo) { - Unit * triggerCaster = GetTriggeredSpellCaster(triggeredSpellInfo, caster, triggerTarget); + Unit* triggerCaster = GetTriggeredSpellCaster(triggeredSpellInfo, caster, triggerTarget); triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, NULL, this); sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::TriggerSpell: Spell %u Trigger %u", GetId(), triggeredSpellInfo->Id); } @@ -2488,7 +2488,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const } } -void AuraEffect::TriggerSpellWithValue(Unit * target, Unit * caster) const +void AuraEffect::TriggerSpellWithValue(Unit* target, Unit* caster) const { if (!caster || !target) return; @@ -2499,7 +2499,7 @@ void AuraEffect::TriggerSpellWithValue(Unit * target, Unit * caster) const SpellEntry const *triggeredSpellInfo = sSpellStore.LookupEntry(triggerSpellId); if (triggeredSpellInfo) { - Unit * triggerCaster = GetTriggeredSpellCaster(triggeredSpellInfo, caster, triggerTarget); + Unit* triggerCaster = GetTriggeredSpellCaster(triggeredSpellInfo, caster, triggerTarget); // generic casting code with custom spells and target/caster customs int32 basepoints0 = GetAmount(); @@ -2523,7 +2523,7 @@ bool AuraEffect::IsAffectedOnSpell(SpellEntry const *spell) const return false; } -void AuraEffect::CleanupTriggeredSpells(Unit * target) +void AuraEffect::CleanupTriggeredSpells(Unit* target) { uint32 tSpellId = m_spellProto->EffectTriggerSpell[GetEffIndex()]; if (!tSpellId) @@ -2545,7 +2545,7 @@ void AuraEffect::CleanupTriggeredSpells(Unit * target) target->RemoveAurasDueToSpell(tSpellId, GetCasterGUID()); } -void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const +void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const { uint32 spellId = 0; uint32 spellId2 = 0; @@ -2689,7 +2689,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const if (target->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 0 , 0x10000000, 0)) target->CastSpell(target, 62071, true); // Nurturing Instinct - if (AuraEffect const * aurEff = target->GetAuraEffect(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT, SPELLFAMILY_DRUID, 2254, 0)) + if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT, SPELLFAMILY_DRUID, 2254, 0)) { uint32 spellId = 0; switch (aurEff->GetId()) @@ -2704,7 +2704,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const target->CastSpell(target, spellId, true, NULL, this); } // Master Shapeshifter - Cat - if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) + if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) { int32 bp = aurEff->GetAmount(); target->CastCustomSpell(target, 48420, &bp, NULL, NULL, true); @@ -2713,13 +2713,13 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const case FORM_DIREBEAR: case FORM_BEAR: // Master Shapeshifter - Bear - if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) + if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) { int32 bp = aurEff->GetAmount(); target->CastCustomSpell(target, 48418, &bp, NULL, NULL, true); } // Survival of the Fittest - if (AuraEffect const * aurEff = target->GetAuraEffect(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE, SPELLFAMILY_DRUID, 961, 0)) + if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE, SPELLFAMILY_DRUID, 961, 0)) { int32 bp = 100 + SpellMgr::CalculateSpellEffectAmount(aurEff->GetSpellProto(), 2); target->CastCustomSpell(target, 62069, &bp, NULL, NULL, true, 0, this); @@ -2727,7 +2727,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const break; case FORM_MOONKIN: // Master Shapeshifter - Moonkin - if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) + if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) { int32 bp = aurEff->GetAmount(); target->CastCustomSpell(target, 48421, &bp, NULL, NULL, true); @@ -2735,7 +2735,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const break; // Master Shapeshifter - Tree of Life case FORM_TREE: - if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) + if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) { int32 bp = aurEff->GetAmount(); target->CastCustomSpell(target, 48422, &bp, NULL, NULL, true); @@ -2780,12 +2780,12 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const /*** VISIBILITY & PHASES ***/ /**************************************/ -void AuraEffect::HandleModInvisibilityDetect(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModInvisibilityDetect(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); InvisibilityType type = InvisibilityType(GetMiscValue()); if (apply) @@ -2805,12 +2805,12 @@ void AuraEffect::HandleModInvisibilityDetect(AuraApplication const * aurApp, uin target->UpdateObjectVisibility(); } -void AuraEffect::HandleModInvisibility(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModInvisibility(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); InvisibilityType type = InvisibilityType(GetMiscValue()); if (apply) @@ -2861,12 +2861,12 @@ void AuraEffect::HandleModInvisibility(AuraApplication const * aurApp, uint8 mod target->UpdateObjectVisibility(); } -void AuraEffect::HandleModStealthDetect(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModStealthDetect(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); StealthType type = StealthType(GetMiscValue()); if (apply) @@ -2886,12 +2886,12 @@ void AuraEffect::HandleModStealthDetect(AuraApplication const * aurApp, uint8 mo target->UpdateObjectVisibility(); } -void AuraEffect::HandleModStealth(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModStealth(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); StealthType type = StealthType(GetMiscValue()); if (apply) @@ -2926,12 +2926,12 @@ void AuraEffect::HandleModStealth(AuraApplication const * aurApp, uint8 mode, bo target->UpdateObjectVisibility(); } -void AuraEffect::HandleModStealthLevel(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModStealthLevel(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); StealthType type = StealthType(GetMiscValue()); if (apply) @@ -2943,12 +2943,12 @@ void AuraEffect::HandleModStealthLevel(AuraApplication const * aurApp, uint8 mod target->UpdateObjectVisibility(); } -void AuraEffect::HandleSpiritOfRedemption(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleSpiritOfRedemption(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -2974,12 +2974,12 @@ void AuraEffect::HandleSpiritOfRedemption(AuraApplication const * aurApp, uint8 target->setDeathState(JUST_DIED); } -void AuraEffect::HandleAuraGhost(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraGhost(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -3001,12 +3001,12 @@ void AuraEffect::HandleAuraGhost(AuraApplication const * aurApp, uint8 mode, boo } } -void AuraEffect::HandlePhase(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandlePhase(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // no-phase is also phase state so same code for apply and remove uint32 newPhase = 0; @@ -3057,12 +3057,12 @@ void AuraEffect::HandlePhase(AuraApplication const * aurApp, uint8 mode, bool ap /*** UNIT MODEL ***/ /**********************/ -void AuraEffect::HandleAuraModShapeshift(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); uint32 modelid = 0; Powers PowerType = POWER_MANA; @@ -3243,7 +3243,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const * aurApp, uint8 m // Defensive Tactics if (form == FORM_DEFENSIVESTANCE) { - if (AuraEffect const * aurEff = target->IsScriptOverriden(m_spellProto, 831)) + if (AuraEffect const* aurEff = target->IsScriptOverriden(m_spellProto, 831)) Rage_val += aurEff->GetAmount() * 10; } // Stance mastery + Tactical mastery (both passive, and last have aura only in defense stance, but need apply at any stance switch) @@ -3312,12 +3312,12 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const * aurApp, uint8 m } } -void AuraEffect::HandleAuraTransform(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraTransform(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) { @@ -3535,26 +3535,26 @@ void AuraEffect::HandleAuraTransform(AuraApplication const * aurApp, uint8 mode, } } -void AuraEffect::HandleAuraModScale(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModScale(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplyPercentModFloatValue(OBJECT_FIELD_SCALE_X, (float)GetAmount(), apply); } -void AuraEffect::HandleAuraCloneCaster(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraCloneCaster(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) { - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster || caster == target) return; // What must be cloned? at least display and scale @@ -3575,12 +3575,12 @@ void AuraEffect::HandleAuraCloneCaster(AuraApplication const * aurApp, uint8 mod /*** FIGHT ***/ /************************/ -void AuraEffect::HandleFeignDeath(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -3652,12 +3652,12 @@ void AuraEffect::HandleFeignDeath(AuraApplication const * aurApp, uint8 mode, bo } } -void AuraEffect::HandleModUnattackable(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModUnattackable(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit if (!apply && target->HasAuraType(SPELL_AURA_MOD_UNATTACKABLE)) @@ -3673,12 +3673,12 @@ void AuraEffect::HandleModUnattackable(AuraApplication const * aurApp, uint8 mod } } -void AuraEffect::HandleAuraModDisarm(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModDisarm(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); AuraType type = GetAuraType(); @@ -3734,12 +3734,12 @@ void AuraEffect::HandleAuraModDisarm(AuraApplication const * aurApp, uint8 mode, target->UpdateDamagePhysical(attType); } -void AuraEffect::HandleAuraModSilence(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModSilence(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) { @@ -3763,12 +3763,12 @@ void AuraEffect::HandleAuraModSilence(AuraApplication const * aurApp, uint8 mode } } -void AuraEffect::HandleAuraModPacify(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModPacify(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED); @@ -3781,12 +3781,12 @@ void AuraEffect::HandleAuraModPacify(AuraApplication const * aurApp, uint8 mode, } } -void AuraEffect::HandleAuraModPacifyAndSilence(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModPacifyAndSilence(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // Vengeance of the Blue Flight (TODO: REMOVE THIS!) if (m_spellProto->Id == 45839) @@ -3806,12 +3806,12 @@ void AuraEffect::HandleAuraModPacifyAndSilence(AuraApplication const * aurApp, u HandleAuraModSilence(aurApp, mode, apply); } -void AuraEffect::HandleAuraAllowOnlyAbility(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraAllowOnlyAbility(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() == TYPEID_PLAYER) { @@ -3831,12 +3831,12 @@ void AuraEffect::HandleAuraAllowOnlyAbility(AuraApplication const * aurApp, uint /*** TRACKING ***/ /****************************/ -void AuraEffect::HandleAuraTrackCreatures(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraTrackCreatures(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -3844,12 +3844,12 @@ void AuraEffect::HandleAuraTrackCreatures(AuraApplication const * aurApp, uint8 target->SetUInt32Value(PLAYER_TRACK_CREATURES, (apply) ? ((uint32)1)<<(GetMiscValue()-1) : 0); } -void AuraEffect::HandleAuraTrackResources(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraTrackResources(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -3857,12 +3857,12 @@ void AuraEffect::HandleAuraTrackResources(AuraApplication const * aurApp, uint8 target->SetUInt32Value(PLAYER_TRACK_RESOURCES, (apply) ? ((uint32)1)<<(GetMiscValue()-1): 0); } -void AuraEffect::HandleAuraTrackStealthed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraTrackStealthed(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -3876,12 +3876,12 @@ void AuraEffect::HandleAuraTrackStealthed(AuraApplication const * aurApp, uint8 target->ApplyModFlag(PLAYER_FIELD_BYTES, PLAYER_FIELD_BYTE_TRACK_STEALTHED, apply); } -void AuraEffect::HandleAuraModStalked(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModStalked(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // used by spells: Hunter's Mark, Mind Vision, Syndicate Tracker (MURP) DND if (apply) @@ -3897,12 +3897,12 @@ void AuraEffect::HandleAuraModStalked(AuraApplication const * aurApp, uint8 mode target->UpdateObjectVisibility(); } -void AuraEffect::HandleAuraUntrackable(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraUntrackable(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) target->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE); @@ -3919,12 +3919,12 @@ void AuraEffect::HandleAuraUntrackable(AuraApplication const * aurApp, uint8 mod /*** SKILLS & TALENTS ***/ /****************************/ -void AuraEffect::HandleAuraModPetTalentsPoints(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModPetTalentsPoints(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -3934,11 +3934,11 @@ void AuraEffect::HandleAuraModPetTalentsPoints(AuraApplication const * aurApp, u pet->InitTalentForLevel(); } -void AuraEffect::HandleAuraModSkill(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModSkill(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_SKILL))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -3955,12 +3955,12 @@ void AuraEffect::HandleAuraModSkill(AuraApplication const * aurApp, uint8 mode, /*** MOVEMENT ***/ /****************************/ -void AuraEffect::HandleAuraMounted(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraMounted(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) { @@ -4008,12 +4008,12 @@ void AuraEffect::HandleAuraMounted(AuraApplication const * aurApp, uint8 mode, b } } -void AuraEffect::HandleAuraAllowFlight(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraAllowFlight(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (!apply) { @@ -4039,12 +4039,12 @@ void AuraEffect::HandleAuraAllowFlight(AuraApplication const * aurApp, uint8 mod } } -void AuraEffect::HandleAuraWaterWalk(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraWaterWalk(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (!apply) { @@ -4063,12 +4063,12 @@ void AuraEffect::HandleAuraWaterWalk(AuraApplication const * aurApp, uint8 mode, target->SendMessageToSet(&data, true); } -void AuraEffect::HandleAuraFeatherFall(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraFeatherFall(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (!apply) { @@ -4091,12 +4091,12 @@ void AuraEffect::HandleAuraFeatherFall(AuraApplication const * aurApp, uint8 mod target->ToPlayer()->SetFallInformation(0, target->GetPositionZ()); } -void AuraEffect::HandleAuraHover(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraHover(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (!apply) { @@ -4115,24 +4115,24 @@ void AuraEffect::HandleAuraHover(AuraApplication const * aurApp, uint8 mode, boo target->SendMessageToSet(&data, true); } -void AuraEffect::HandleWaterBreathing(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleWaterBreathing(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // update timers in client if (target->GetTypeId() == TYPEID_PLAYER) target->ToPlayer()->UpdateMirrorTimers(); } -void AuraEffect::HandleForceMoveForward(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleForceMoveForward(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FORCE_MOVE); @@ -4149,45 +4149,45 @@ void AuraEffect::HandleForceMoveForward(AuraApplication const * aurApp, uint8 mo /*** THREAT ***/ /****************************/ -void AuraEffect::HandleModThreat(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModThreat(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); for (int32 i = 0; i < MAX_SPELL_SCHOOL; ++i) if (GetMiscValue() & (1 << i)) ApplyPercentModFloatVar(target->m_threatModifier[i], float(GetAmount()), apply); } -void AuraEffect::HandleAuraModTotalThreat(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModTotalThreat(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (!target->isAlive() || target->GetTypeId() != TYPEID_PLAYER) return; - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster || !caster->isAlive()) return; target->getHostileRefManager().addTempThreat((float)GetAmount(), apply); } -void AuraEffect::HandleModTaunt(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModTaunt(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (!target->isAlive() || !target->CanHaveThreatList()) return; - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster || !caster->isAlive()) return; @@ -4204,52 +4204,52 @@ void AuraEffect::HandleModTaunt(AuraApplication const * aurApp, uint8 mode, bool /*** CONTROL ***/ /*****************************/ -void AuraEffect::HandleModConfuse(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModConfuse(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->SetControlled(apply, UNIT_STAT_CONFUSED); } -void AuraEffect::HandleModFear(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModFear(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->SetControlled(apply, UNIT_STAT_FLEEING); } -void AuraEffect::HandleAuraModStun(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModStun(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->SetControlled(apply, UNIT_STAT_STUNNED); } -void AuraEffect::HandleAuraModRoot(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModRoot(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->SetControlled(apply, UNIT_STAT_ROOT); } -void AuraEffect::HandlePreventFleeing(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandlePreventFleeing(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->HasAuraType(SPELL_AURA_MOD_FEAR)) target->SetControlled(!(apply), UNIT_STAT_FLEEING); @@ -4259,14 +4259,14 @@ void AuraEffect::HandlePreventFleeing(AuraApplication const * aurApp, uint8 mode /*** CHARM ***/ /***************************/ -void AuraEffect::HandleModPossess(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModPossess(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); // no support for posession AI yet if (caster && caster->GetTypeId() == TYPEID_UNIT) @@ -4282,7 +4282,7 @@ void AuraEffect::HandleModPossess(AuraApplication const * aurApp, uint8 mode, bo } // only one spell has this aura -void AuraEffect::HandleModPossessPet(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModPossessPet(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; @@ -4328,14 +4328,14 @@ void AuraEffect::HandleModPossessPet(AuraApplication const * aurApp, uint8 mode, } } -void AuraEffect::HandleModCharm(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModCharm(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (apply) target->SetCharmedBy(caster, CHARM_TYPE_CHARM, aurApp); @@ -4343,14 +4343,14 @@ void AuraEffect::HandleModCharm(AuraApplication const * aurApp, uint8 mode, bool target->RemoveCharmedBy(caster); } -void AuraEffect::HandleCharmConvert(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleCharmConvert(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (apply) target->SetCharmedBy(caster, CHARM_TYPE_CONVERT, aurApp); @@ -4362,17 +4362,17 @@ void AuraEffect::HandleCharmConvert(AuraApplication const * aurApp, uint8 mode, * Such auras are applied from a caster(=player) to a vehicle. * This has been verified using spell #49256 */ -void AuraEffect::HandleAuraControlVehicle(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraControlVehicle(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (!target->IsVehicle()) return; - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster || caster == target) return; @@ -4398,27 +4398,27 @@ void AuraEffect::HandleAuraControlVehicle(AuraApplication const * aurApp, uint8 /*********************************************************/ /*** MODIFY SPEED ***/ /*********************************************************/ -void AuraEffect::HandleAuraModIncreaseSpeed(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModIncreaseSpeed(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->UpdateSpeed(MOVE_RUN, true); } -void AuraEffect::HandleAuraModIncreaseMountedSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseMountedSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const { HandleAuraModIncreaseSpeed(aurApp, mode, apply); } -void AuraEffect::HandleAuraModIncreaseFlightSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseFlightSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // Enable Fly mode for flying mounts if (GetAuraType() == SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) @@ -4455,22 +4455,22 @@ void AuraEffect::HandleAuraModIncreaseFlightSpeed(AuraApplication const * aurApp target->UpdateSpeed(MOVE_FLIGHT, true); } -void AuraEffect::HandleAuraModIncreaseSwimSpeed(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModIncreaseSwimSpeed(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->UpdateSpeed(MOVE_SWIM, true); } -void AuraEffect::HandleAuraModDecreaseSpeed(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModDecreaseSpeed(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->UpdateSpeed(MOVE_RUN, true); target->UpdateSpeed(MOVE_SWIM, true); @@ -4480,12 +4480,12 @@ void AuraEffect::HandleAuraModDecreaseSpeed(AuraApplication const * aurApp, uint target->UpdateSpeed(MOVE_FLIGHT_BACK, true); } -void AuraEffect::HandleAuraModUseNormalSpeed(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModUseNormalSpeed(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->UpdateSpeed(MOVE_RUN, true); target->UpdateSpeed(MOVE_SWIM, true); @@ -4496,12 +4496,12 @@ void AuraEffect::HandleAuraModUseNormalSpeed(AuraApplication const * aurApp, uin /*** IMMUNITY ***/ /*********************************************************/ -void AuraEffect::HandleModStateImmunityMask(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModStateImmunityMask(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); std::list <AuraType> immunity_list; if (GetMiscValue() & (1<<10)) @@ -4539,12 +4539,12 @@ void AuraEffect::HandleModStateImmunityMask(AuraApplication const * aurApp, uint target->RemoveAurasByType(*iter); } -void AuraEffect::HandleModMechanicImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModMechanicImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); uint32 mechanic; switch (GetId()) @@ -4588,12 +4588,12 @@ void AuraEffect::HandleModMechanicImmunity(AuraApplication const * aurApp, uint8 target->RemoveAurasWithMechanic(mechanic, AURA_REMOVE_BY_DEFAULT, GetId()); } -void AuraEffect::HandleAuraModEffectImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModEffectImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplySpellImmune(GetId(), IMMUNITY_EFFECT, GetMiscValue(), apply); @@ -4614,12 +4614,12 @@ void AuraEffect::HandleAuraModEffectImmunity(AuraApplication const * aurApp, uin } } -void AuraEffect::HandleAuraModStateImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModStateImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplySpellImmune(GetId(), IMMUNITY_STATE, GetMiscValue(), apply); @@ -4627,12 +4627,12 @@ void AuraEffect::HandleAuraModStateImmunity(AuraApplication const * aurApp, uint target->RemoveAurasByType(AuraType(GetMiscValue()), 0 , GetBase()); } -void AuraEffect::HandleAuraModSchoolImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModSchoolImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplySpellImmune(GetId(), IMMUNITY_SCHOOL, GetMiscValue(), (apply)); @@ -4686,22 +4686,22 @@ void AuraEffect::HandleAuraModSchoolImmunity(AuraApplication const * aurApp, uin } } -void AuraEffect::HandleAuraModDmgImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModDmgImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplySpellImmune(GetId(), IMMUNITY_DAMAGE, GetMiscValue(), apply); } -void AuraEffect::HandleAuraModDispelImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModDispelImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplySpellDispelImmunity(m_spellProto, DispelType(GetMiscValue()), (apply)); } @@ -4714,12 +4714,12 @@ void AuraEffect::HandleAuraModDispelImmunity(AuraApplication const * aurApp, uin /*** RESISTANCE ***/ /********************************/ -void AuraEffect::HandleAuraModResistanceExclusive(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModResistanceExclusive(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; x++) { @@ -4736,12 +4736,12 @@ void AuraEffect::HandleAuraModResistanceExclusive(AuraApplication const * aurApp } } -void AuraEffect::HandleAuraModResistance(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModResistance(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; x++) { @@ -4754,12 +4754,12 @@ void AuraEffect::HandleAuraModResistance(AuraApplication const * aurApp, uint8 m } } -void AuraEffect::HandleAuraModBaseResistancePCT(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModBaseResistancePCT(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // only players have base stats if (target->GetTypeId() != TYPEID_PLAYER) @@ -4778,12 +4778,12 @@ void AuraEffect::HandleAuraModBaseResistancePCT(AuraApplication const * aurApp, } } -void AuraEffect::HandleModResistancePercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModResistancePercent(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); for (int8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++) { @@ -4799,12 +4799,12 @@ void AuraEffect::HandleModResistancePercent(AuraApplication const * aurApp, uint } } -void AuraEffect::HandleModBaseResistance(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModBaseResistance(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // only players have base stats if (target->GetTypeId() != TYPEID_PLAYER) @@ -4821,12 +4821,12 @@ void AuraEffect::HandleModBaseResistance(AuraApplication const * aurApp, uint8 m } } -void AuraEffect::HandleModTargetResistance(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModTargetResistance(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // applied to damage as HandleNoImmediateEffect in Unit::CalcAbsorbResist and Unit::CalcArmorReducedDamage @@ -4843,12 +4843,12 @@ void AuraEffect::HandleModTargetResistance(AuraApplication const * aurApp, uint8 /*** STAT ***/ /********************************/ -void AuraEffect::HandleAuraModStat(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModStat(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (GetMiscValue() < -2 || GetMiscValue() > 4) { @@ -4869,12 +4869,12 @@ void AuraEffect::HandleAuraModStat(AuraApplication const * aurApp, uint8 mode, b } } -void AuraEffect::HandleModPercentStat(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModPercentStat(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (GetMiscValue() < -1 || GetMiscValue() > 4) { @@ -4893,12 +4893,12 @@ void AuraEffect::HandleModPercentStat(AuraApplication const * aurApp, uint8 mode } } -void AuraEffect::HandleModSpellDamagePercentFromStat(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleModSpellDamagePercentFromStat(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -4909,12 +4909,12 @@ void AuraEffect::HandleModSpellDamagePercentFromStat(AuraApplication const * aur target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); } -void AuraEffect::HandleModSpellHealingPercentFromStat(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleModSpellHealingPercentFromStat(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -4923,12 +4923,12 @@ void AuraEffect::HandleModSpellHealingPercentFromStat(AuraApplication const * au target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); } -void AuraEffect::HandleModSpellDamagePercentFromAttackPower(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleModSpellDamagePercentFromAttackPower(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -4939,12 +4939,12 @@ void AuraEffect::HandleModSpellDamagePercentFromAttackPower(AuraApplication cons target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); } -void AuraEffect::HandleModSpellHealingPercentFromAttackPower(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleModSpellHealingPercentFromAttackPower(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -4953,12 +4953,12 @@ void AuraEffect::HandleModSpellHealingPercentFromAttackPower(AuraApplication con target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); } -void AuraEffect::HandleModHealingDone(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleModHealingDone(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -4967,12 +4967,12 @@ void AuraEffect::HandleModHealingDone(AuraApplication const * aurApp, uint8 mode target->ToPlayer()->UpdateSpellDamageAndHealingBonus(); } -void AuraEffect::HandleModTotalPercentStat(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModTotalPercentStat(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (GetMiscValue() < -1 || GetMiscValue() > 4) { @@ -4999,12 +4999,12 @@ void AuraEffect::HandleModTotalPercentStat(AuraApplication const * aurApp, uint8 target->SetHealth(std::max<uint32>(uint32(healthPct * target->GetMaxHealth() * 0.01f), (alive ? 1 : 0))); } -void AuraEffect::HandleAuraModResistenceOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModResistenceOfStatPercent(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5021,12 +5021,12 @@ void AuraEffect::HandleAuraModResistenceOfStatPercent(AuraApplication const * au target->UpdateArmor(); } -void AuraEffect::HandleAuraModExpertise(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModExpertise(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5038,12 +5038,12 @@ void AuraEffect::HandleAuraModExpertise(AuraApplication const * aurApp, uint8 mo /********************************/ /*** HEAL & ENERGIZE ***/ /********************************/ -void AuraEffect::HandleModPowerRegen(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleModPowerRegen(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5054,17 +5054,17 @@ void AuraEffect::HandleModPowerRegen(AuraApplication const * aurApp, uint8 mode, // other powers are not immediate effects - implemented in Player::Regenerate, Creature::Regenerate } -void AuraEffect::HandleModPowerRegenPCT(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModPowerRegenPCT(AuraApplication const* aurApp, uint8 mode, bool apply) const { HandleModPowerRegen(aurApp, mode, apply); } -void AuraEffect::HandleModManaRegen(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleModManaRegen(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5073,12 +5073,12 @@ void AuraEffect::HandleModManaRegen(AuraApplication const * aurApp, uint8 mode, target->ToPlayer()->UpdateManaRegen(); } -void AuraEffect::HandleAuraModIncreaseHealth(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseHealth(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) { @@ -5095,12 +5095,12 @@ void AuraEffect::HandleAuraModIncreaseHealth(AuraApplication const * aurApp, uin } } -void AuraEffect::HandleAuraModIncreaseMaxHealth(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseMaxHealth(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); uint32 oldhealth = target->GetHealth(); double healthPercentage = (double)oldhealth / (double)target->GetMaxHealth(); @@ -5118,12 +5118,12 @@ void AuraEffect::HandleAuraModIncreaseMaxHealth(AuraApplication const * aurApp, } } -void AuraEffect::HandleAuraModIncreaseEnergy(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseEnergy(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); Powers powerType = Powers(GetMiscValue()); // do not check power type, we can always modify the maximum @@ -5151,12 +5151,12 @@ void AuraEffect::HandleAuraModIncreaseEnergy(AuraApplication const * aurApp, uin target->HandleStatModifier(unitMod, TOTAL_VALUE, float(GetAmount()), apply); } -void AuraEffect::HandleAuraModIncreaseEnergyPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseEnergyPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); Powers powerType = Powers(GetMiscValue()); // do not check power type, we can always modify the maximum @@ -5171,12 +5171,12 @@ void AuraEffect::HandleAuraModIncreaseEnergyPercent(AuraApplication const * aurA target->HandleStatModifier(unitMod, TOTAL_PCT, float(GetAmount()), apply); } -void AuraEffect::HandleAuraModIncreaseHealthPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModIncreaseHealthPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // Unit will keep hp% after MaxHealth being modified if unit is alive. float percent = target->GetHealthPct(); @@ -5185,12 +5185,12 @@ void AuraEffect::HandleAuraModIncreaseHealthPercent(AuraApplication const * aurA target->SetHealth(target->CountPctFromMaxHealth(int32(percent))); } -void AuraEffect::HandleAuraIncreaseBaseHealthPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraIncreaseBaseHealthPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->HandleStatModifier(UNIT_MOD_HEALTH, BASE_PCT, float(GetAmount()), apply); } @@ -5199,12 +5199,12 @@ void AuraEffect::HandleAuraIncreaseBaseHealthPercent(AuraApplication const * aur /*** FIGHT ***/ /********************************/ -void AuraEffect::HandleAuraModParryPercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModParryPercent(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5212,12 +5212,12 @@ void AuraEffect::HandleAuraModParryPercent(AuraApplication const * aurApp, uint8 target->ToPlayer()->UpdateParryPercentage(); } -void AuraEffect::HandleAuraModDodgePercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModDodgePercent(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5225,12 +5225,12 @@ void AuraEffect::HandleAuraModDodgePercent(AuraApplication const * aurApp, uint8 target->ToPlayer()->UpdateDodgePercentage(); } -void AuraEffect::HandleAuraModBlockPercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModBlockPercent(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5238,17 +5238,17 @@ void AuraEffect::HandleAuraModBlockPercent(AuraApplication const * aurApp, uint8 target->ToPlayer()->UpdateBlockPercentage(); } -void AuraEffect::HandleAuraModRegenInterrupt(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModRegenInterrupt(AuraApplication const* aurApp, uint8 mode, bool apply) const { HandleModManaRegen(aurApp, mode, apply); } -void AuraEffect::HandleAuraModWeaponCritPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModWeaponCritPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5273,12 +5273,12 @@ void AuraEffect::HandleAuraModWeaponCritPercent(AuraApplication const * aurApp, } } -void AuraEffect::HandleModHitChance(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModHitChance(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() == TYPEID_PLAYER) { @@ -5292,12 +5292,12 @@ void AuraEffect::HandleModHitChance(AuraApplication const * aurApp, uint8 mode, } } -void AuraEffect::HandleModSpellHitChance(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModSpellHitChance(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() == TYPEID_PLAYER) target->ToPlayer()->UpdateSpellHitChances(); @@ -5305,12 +5305,12 @@ void AuraEffect::HandleModSpellHitChance(AuraApplication const * aurApp, uint8 m target->m_modSpellHitChance += (apply) ? GetAmount(): (-GetAmount()); } -void AuraEffect::HandleModSpellCritChance(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModSpellCritChance(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() == TYPEID_PLAYER) target->ToPlayer()->UpdateAllSpellCritChances(); @@ -5318,12 +5318,12 @@ void AuraEffect::HandleModSpellCritChance(AuraApplication const * aurApp, uint8 target->m_baseSpellCritChance += (apply) ? GetAmount():-GetAmount(); } -void AuraEffect::HandleModSpellCritChanceShool(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleModSpellCritChanceShool(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5333,12 +5333,12 @@ void AuraEffect::HandleModSpellCritChanceShool(AuraApplication const * aurApp, u target->ToPlayer()->UpdateSpellCritChance(school); } -void AuraEffect::HandleAuraModCritPct(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModCritPct(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) { @@ -5358,34 +5358,34 @@ void AuraEffect::HandleAuraModCritPct(AuraApplication const * aurApp, uint8 mode /*** ATTACK SPEED ***/ /********************************/ -void AuraEffect::HandleModCastingSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModCastingSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplyCastTimePercentMod((float)GetAmount(), apply); } -void AuraEffect::HandleModMeleeRangedSpeedPct(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModMeleeRangedSpeedPct(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplyAttackTimePercentMod(BASE_ATTACK, (float)GetAmount(), apply); target->ApplyAttackTimePercentMod(OFF_ATTACK, (float)GetAmount(), apply); target->ApplyAttackTimePercentMod(RANGED_ATTACK, (float)GetAmount(), apply); } -void AuraEffect::HandleModCombatSpeedPct(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModCombatSpeedPct(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplyCastTimePercentMod(float(m_amount), apply); target->ApplyAttackTimePercentMod(BASE_ATTACK, float(GetAmount()), apply); @@ -5393,44 +5393,44 @@ void AuraEffect::HandleModCombatSpeedPct(AuraApplication const * aurApp, uint8 m target->ApplyAttackTimePercentMod(RANGED_ATTACK, float(GetAmount()), apply); } -void AuraEffect::HandleModAttackSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModAttackSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplyAttackTimePercentMod(BASE_ATTACK, (float)GetAmount(), apply); target->UpdateDamagePhysical(BASE_ATTACK); } -void AuraEffect::HandleModMeleeSpeedPct(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModMeleeSpeedPct(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplyAttackTimePercentMod(BASE_ATTACK, (float)GetAmount(), apply); target->ApplyAttackTimePercentMod(OFF_ATTACK, (float)GetAmount(), apply); } -void AuraEffect::HandleAuraModRangedHaste(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModRangedHaste(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->ApplyAttackTimePercentMod(RANGED_ATTACK, (float)GetAmount(), apply); } -void AuraEffect::HandleRangedAmmoHaste(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleRangedAmmoHaste(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5442,12 +5442,12 @@ void AuraEffect::HandleRangedAmmoHaste(AuraApplication const * aurApp, uint8 mod /*** COMBAT RATING ***/ /********************************/ -void AuraEffect::HandleModRating(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModRating(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5457,12 +5457,12 @@ void AuraEffect::HandleModRating(AuraApplication const * aurApp, uint8 mode, boo target->ToPlayer()->ApplyRatingMod(CombatRating(rating), GetAmount(), apply); } -void AuraEffect::HandleModRatingFromStat(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModRatingFromStat(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5477,22 +5477,22 @@ void AuraEffect::HandleModRatingFromStat(AuraApplication const * aurApp, uint8 m /*** ATTACK POWER ***/ /********************************/ -void AuraEffect::HandleAuraModAttackPower(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModAttackPower(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->HandleStatModifier(UNIT_MOD_ATTACK_POWER, TOTAL_VALUE, float(GetAmount()), apply); } -void AuraEffect::HandleAuraModRangedAttackPower(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModRangedAttackPower(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if ((target->getClassMask() & CLASSMASK_WAND_USERS) != 0) return; @@ -5500,23 +5500,23 @@ void AuraEffect::HandleAuraModRangedAttackPower(AuraApplication const * aurApp, target->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_VALUE, float(GetAmount()), apply); } -void AuraEffect::HandleAuraModAttackPowerPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModAttackPowerPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); //UNIT_FIELD_ATTACK_POWER_MULTIPLIER = multiplier - 1 target->HandleStatModifier(UNIT_MOD_ATTACK_POWER, TOTAL_PCT, float(GetAmount()), apply); } -void AuraEffect::HandleAuraModRangedAttackPowerPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModRangedAttackPowerPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if ((target->getClassMask() & CLASSMASK_WAND_USERS) != 0) return; @@ -5525,29 +5525,29 @@ void AuraEffect::HandleAuraModRangedAttackPowerPercent(AuraApplication const * a target->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_PCT, float(GetAmount()), apply); } -void AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // Recalculate bonus if (target->GetTypeId() == TYPEID_PLAYER && !(target->getClassMask() & CLASSMASK_WAND_USERS)) target->ToPlayer()->UpdateAttackPowerAndDamage(true); } -void AuraEffect::HandleAuraModAttackPowerOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModAttackPowerOfStatPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const { HandleAuraModAttackPowerOfArmor(aurApp, mode, apply); } -void AuraEffect::HandleAuraModAttackPowerOfArmor(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleAuraModAttackPowerOfArmor(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // Recalculate bonus if (target->GetTypeId() == TYPEID_PLAYER) @@ -5556,12 +5556,12 @@ void AuraEffect::HandleAuraModAttackPowerOfArmor(AuraApplication const * aurApp, /********************************/ /*** DAMAGE BONUS ***/ /********************************/ -void AuraEffect::HandleModDamageDone(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModDamageDone(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); // apply item specific bonuses for already equipped weapon if (target->GetTypeId() == TYPEID_PLAYER) @@ -5641,7 +5641,7 @@ void AuraEffect::HandleModDamageDone(AuraApplication const * aurApp, uint8 mode, } } -void AuraEffect::HandleModDamagePercentDone(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModDamagePercentDone(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -5654,22 +5654,22 @@ void AuraEffect::HandleModDamagePercentDone(AuraApplication const * aurApp, uint aurApp->GetTarget()->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT, GetAmount()/100.0f, apply); } -void AuraEffect::HandleModOffhandDamagePercent(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModOffhandDamagePercent(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->HandleStatModifier(UNIT_MOD_DAMAGE_OFFHAND, TOTAL_PCT, float(GetAmount()), apply); } -void AuraEffect::HandleShieldBlockValue(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleShieldBlockValue(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); BaseModType modType = FLAT_MOD; if (GetAuraType() == SPELL_AURA_MOD_SHIELD_BLOCKVALUE_PCT) @@ -5683,12 +5683,12 @@ void AuraEffect::HandleShieldBlockValue(AuraApplication const * aurApp, uint8 mo /*** POWER COST ***/ /********************************/ -void AuraEffect::HandleModPowerCostPCT(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModPowerCostPCT(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); float amount = CalculatePctN(1.0f, GetAmount()); for (int i = 0; i < MAX_SPELL_SCHOOL; ++i) @@ -5696,24 +5696,24 @@ void AuraEffect::HandleModPowerCostPCT(AuraApplication const * aurApp, uint8 mod target->ApplyModSignedFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER + i, amount, apply); } -void AuraEffect::HandleModPowerCost(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModPowerCost(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); for (int i = 0; i < MAX_SPELL_SCHOOL; ++i) if (GetMiscValue() & (1<<i)) target->ApplyModInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i, GetAmount(), apply); } -void AuraEffect::HandleArenaPreparation(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleArenaPreparation(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PREPARATION); @@ -5726,12 +5726,12 @@ void AuraEffect::HandleArenaPreparation(AuraApplication const * aurApp, uint8 mo } } -void AuraEffect::HandleNoReagentUseAura(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const +void AuraEffect::HandleNoReagentUseAura(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5746,12 +5746,12 @@ void AuraEffect::HandleNoReagentUseAura(AuraApplication const * aurApp, uint8 mo target->SetUInt32Value(PLAYER_NO_REAGENT_COST_1+2, mask[2]); } -void AuraEffect::HandleAuraRetainComboPoints(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraRetainComboPoints(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -5767,14 +5767,14 @@ void AuraEffect::HandleAuraRetainComboPoints(AuraApplication const * aurApp, uin /*** OTHERS ***/ /*********************************************************/ -void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_REAPPLY))) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (mode & AURA_EFFECT_HANDLE_REAL) { @@ -5829,7 +5829,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo break; case 34026: // kill command { - Unit * pet = target->GetGuardianPet(); + Unit* pet = target->GetGuardianPet(); if (!pet) break; @@ -5923,7 +5923,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo break; case 52916: // Honor Among Thieves if (target->GetTypeId() == TYPEID_PLAYER) - if (Unit * spellTarget = ObjectAccessor::GetUnit(*target, target->ToPlayer()->GetComboTarget())) + if (Unit* spellTarget = ObjectAccessor::GetUnit(*target, target->ToPlayer()->GetComboTarget())) target->CastSpell(spellTarget, 51699, true); break; case 28832: // Mark of Korth'azz @@ -6084,7 +6084,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo // Vampiric Touch if (m_spellProto->SpellFamilyFlags[1] & 0x0400 && aurApp->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL && GetEffIndex() == 0) { - if (AuraEffect const * aurEff = GetBase()->GetEffect(1)) + if (AuraEffect const* aurEff = GetBase()->GetEffect(1)) { int32 damage = aurEff->GetAmount() * 8; // backfire damage @@ -6128,7 +6128,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo uint32 spellId = 24659; if (apply && caster) { - SpellEntry const * spell = sSpellStore.LookupEntry(spellId); + SpellEntry const* spell = sSpellStore.LookupEntry(spellId); for (uint32 i = 0; i < spell->StackAmount; ++i) caster->CastSpell(target, spell->Id, true, NULL, NULL, GetCasterGUID()); @@ -6143,7 +6143,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo uint32 spellId = 24662; if (apply && caster) { - SpellEntry const * spell = sSpellStore.LookupEntry(spellId); + SpellEntry const* spell = sSpellStore.LookupEntry(spellId); for (uint32 i = 0; i < spell->StackAmount; ++i) caster->CastSpell(target, spell->Id, true, NULL, NULL, GetCasterGUID()); break; @@ -6365,14 +6365,14 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo } } -void AuraEffect::HandleChannelDeathItem(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleChannelDeathItem(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; if (!apply) { - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster || caster->GetTypeId() != TYPEID_PLAYER) return; @@ -6432,14 +6432,14 @@ void AuraEffect::HandleChannelDeathItem(AuraApplication const * aurApp, uint8 mo } } -void AuraEffect::HandleBindSight(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleBindSight(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster || caster->GetTypeId() != TYPEID_PLAYER) return; @@ -6447,12 +6447,12 @@ void AuraEffect::HandleBindSight(AuraApplication const * aurApp, uint8 mode, boo caster->ToPlayer()->SetViewpoint(target, apply); } -void AuraEffect::HandleForceReaction(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleForceReaction(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -6470,12 +6470,12 @@ void AuraEffect::HandleForceReaction(AuraApplication const * aurApp, uint8 mode, player->StopAttackFaction(faction_id); } -void AuraEffect::HandleAuraEmpathy(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraEmpathy(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_UNIT) return; @@ -6487,17 +6487,17 @@ void AuraEffect::HandleAuraEmpathy(AuraApplication const * aurApp, uint8 mode, b return; } - CreatureTemplate const * ci = sObjectMgr->GetCreatureTemplate(target->GetEntry()); + CreatureTemplate const* ci = sObjectMgr->GetCreatureTemplate(target->GetEntry()); if (ci && ci->type == CREATURE_TYPE_BEAST) target->ApplyModUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_SPECIALINFO, apply); } -void AuraEffect::HandleAuraModFaction(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModFaction(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) { @@ -6513,12 +6513,12 @@ void AuraEffect::HandleAuraModFaction(AuraApplication const * aurApp, uint8 mode } } -void AuraEffect::HandleComprehendLanguage(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleComprehendLanguage(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (apply) target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_COMPREHEND_LANG); @@ -6531,12 +6531,12 @@ void AuraEffect::HandleComprehendLanguage(AuraApplication const * aurApp, uint8 } } -void AuraEffect::HandleAuraConvertRune(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraConvertRune(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER) return; @@ -6565,9 +6565,9 @@ void AuraEffect::HandleAuraConvertRune(AuraApplication const * aurApp, uint8 mod plr->RemoveRunesByAuraEffect(this); } -void AuraEffect::HandleAuraLinked(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraLinked(AuraApplication const* aurApp, uint8 mode, bool apply) const { - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); uint32 triggeredSpellId = m_spellProto->EffectTriggerSpell[m_effIndex]; @@ -6575,7 +6575,7 @@ void AuraEffect::HandleAuraLinked(AuraApplication const * aurApp, uint8 mode, bo { if (apply) { - Unit * caster = GetTriggeredSpellCaster(m_spellProto, GetCaster(), target); + Unit* caster = GetTriggeredSpellCaster(m_spellProto, GetCaster(), target); if (!caster) return; @@ -6601,12 +6601,12 @@ void AuraEffect::HandleAuraLinked(AuraApplication const * aurApp, uint8 mode, bo } } -void AuraEffect::HandleAuraOpenStable(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraOpenStable(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER || !target->IsInWorld()) return; @@ -6617,7 +6617,7 @@ void AuraEffect::HandleAuraOpenStable(AuraApplication const * aurApp, uint8 mode // client auto close stable dialog at !apply aura } -void AuraEffect::HandleAuraModFakeInebriation(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraModFakeInebriation(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; @@ -6658,12 +6658,12 @@ void AuraEffect::HandleAuraModFakeInebriation(AuraApplication const * aurApp, ui target->UpdateObjectVisibility(); } -void AuraEffect::HandleAuraOverrideSpells(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraOverrideSpells(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Player * target = aurApp->GetTarget()->ToPlayer(); + Player* target = aurApp->GetTarget()->ToPlayer(); if (!target || !target->IsInWorld()) return; @@ -6688,12 +6688,12 @@ void AuraEffect::HandleAuraOverrideSpells(AuraApplication const * aurApp, uint8 } } -void AuraEffect::HandleAuraSetVehicle(AuraApplication const * aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleAuraSetVehicle(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->GetTypeId() != TYPEID_PLAYER || !target->IsInWorld()) return; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h index 2a5a0e72805..45b4d86c35b 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.h +++ b/src/server/game/Spells/Auras/SpellAuraEffects.h @@ -9,24 +9,24 @@ class Aura; #include "SpellAuras.h" -typedef void(AuraEffect::*pAuraEffectHandler)(AuraApplication const * aurApp, uint8 mode, bool apply) const; +typedef void(AuraEffect::*pAuraEffectHandler)(AuraApplication const* aurApp, uint8 mode, bool apply) const; class AuraEffect { - friend void Aura::_InitEffects(uint8 effMask, Unit * caster, int32 *baseAmount); + friend void Aura::_InitEffects(uint8 effMask, Unit* caster, int32 *baseAmount); friend Aura * Unit::_TryStackingOrRefreshingExistingAura(SpellEntry const* newAura, uint8 effMask, Unit* caster, int32* baseAmount, Item* castItem, uint64 casterGUID); friend Aura::~Aura(); private: ~AuraEffect(); - explicit AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * caster); + explicit AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit* caster); public: - Unit * GetCaster() const { return GetBase()->GetCaster(); } + Unit* GetCaster() const { return GetBase()->GetCaster(); } uint64 GetCasterGUID() const { return GetBase()->GetCasterGUID(); } Aura * GetBase() const { return m_base; } void GetTargetList(std::list<Unit*> & targetList) const; void GetApplicationList(std::list<AuraApplication*> & applicationList) const; - SpellEntry const * GetSpellProto() const { return m_spellProto; } + SpellEntry const* GetSpellProto() const { return m_spellProto; } uint32 GetId() const { return m_spellProto->Id; } uint32 GetEffIndex() const { return m_effIndex; } int32 GetBaseAmount() const { return m_baseAmount; } @@ -41,20 +41,20 @@ class AuraEffect int32 GetPeriodicTimer() const { return m_periodicTimer; } void SetPeriodicTimer(int32 periodicTimer) { m_periodicTimer = periodicTimer; } - int32 CalculateAmount(Unit * caster); - void CalculatePeriodic(Unit * caster, bool create = false, bool load = false); + int32 CalculateAmount(Unit* caster); + void CalculatePeriodic(Unit* caster, bool create = false, bool load = false); void CalculateSpellMod(); void ChangeAmount(int32 newAmount, bool mark = true, bool onStackOrReapply = false); void RecalculateAmount() { if (!CanBeRecalculated()) return; ChangeAmount(CalculateAmount(GetCaster()), false); } - void RecalculateAmount(Unit * caster) { if (!CanBeRecalculated()) return; ChangeAmount(CalculateAmount(caster), false); } + void RecalculateAmount(Unit* caster) { if (!CanBeRecalculated()) return; ChangeAmount(CalculateAmount(caster), false); } bool CanBeRecalculated() const { return m_canBeRecalculated; } void SetCanBeRecalculated(bool val) { m_canBeRecalculated = val; } void HandleEffect(AuraApplication * aurApp, uint8 mode, bool apply); - void HandleEffect(Unit * target, uint8 mode, bool apply); - void ApplySpellMod(Unit * target, bool apply); + void HandleEffect(Unit* target, uint8 mode, bool apply); + void ApplySpellMod(Unit* target, bool apply); - void Update(uint32 diff, Unit * caster); - void UpdatePeriodic(Unit * caster); + void Update(uint32 diff, Unit* caster); + void UpdatePeriodic(Unit* caster); uint32 GetTickNumber() const { return m_tickNumber; } int32 GetTotalTicks() const { return m_amplitude ? (GetBase()->GetMaxDuration() / m_amplitude) : 1;} @@ -64,21 +64,21 @@ class AuraEffect void SetPeriodic(bool isPeriodic) { m_isPeriodic = isPeriodic; } bool IsAffectedOnSpell(SpellEntry const *spell) const; - void SendTickImmune(Unit * target, Unit *caster) const; + void SendTickImmune(Unit* target, Unit *caster) const; - void PeriodicTick(AuraApplication * aurApp, Unit * caster) const; - void PeriodicDummyTick(Unit * target, Unit * caster) const; - void TriggerSpell(Unit * target, Unit * caster) const; - void TriggerSpellWithValue(Unit * target, Unit * caster) const; + void PeriodicTick(AuraApplication * aurApp, Unit* caster) const; + void PeriodicDummyTick(Unit* target, Unit* caster) const; + void TriggerSpell(Unit* target, Unit* caster) const; + void TriggerSpellWithValue(Unit* target, Unit* caster) const; - void CleanupTriggeredSpells(Unit * target); + void CleanupTriggeredSpells(Unit* target); // add/remove SPELL_AURA_MOD_SHAPESHIFT (36) linked auras - void HandleShapeshiftBoosts(Unit * target, bool apply) const; + void HandleShapeshiftBoosts(Unit* target, bool apply) const; private: Aura * const m_base; - SpellEntry const * const m_spellProto; + SpellEntry const* const m_spellProto; uint8 const m_effIndex; int32 const m_baseAmount; @@ -92,176 +92,176 @@ class AuraEffect int32 m_amplitude; uint32 m_tickNumber; private: - bool IsPeriodicTickCrit(Unit * target, Unit const * caster) const; + bool IsPeriodicTickCrit(Unit* target, Unit const* caster) const; public: // aura effect handlers - void HandleNULL(AuraApplication const * /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const + void HandleNULL(AuraApplication const* /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const { // not implemented } - void HandleUnused(AuraApplication const * /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const + void HandleUnused(AuraApplication const* /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const { // useless } - void HandleNoImmediateEffect(AuraApplication const * /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const + void HandleNoImmediateEffect(AuraApplication const* /*aurApp*/, uint8 /*mode*/, bool /*apply*/) const { // aura type not have immediate effect at add/remove and handled by ID in other code place } // visibility & phases - void HandleModInvisibilityDetect(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModInvisibility(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModStealth(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModStealthLevel(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModStealthDetect(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleSpiritOfRedemption(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraGhost(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandlePhase(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModInvisibilityDetect(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModInvisibility(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModStealth(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModStealthLevel(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModStealthDetect(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleSpiritOfRedemption(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraGhost(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandlePhase(AuraApplication const* aurApp, uint8 mode, bool apply) const; // unit model - void HandleAuraModShapeshift(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraTransform(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModScale(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraCloneCaster(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraTransform(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModScale(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraCloneCaster(AuraApplication const* aurApp, uint8 mode, bool apply) const; // fight - void HandleFeignDeath(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModUnattackable(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModDisarm(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModSilence(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModPacify(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModPacifyAndSilence(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraAllowOnlyAbility(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModUnattackable(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModDisarm(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModSilence(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModPacify(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModPacifyAndSilence(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraAllowOnlyAbility(AuraApplication const* aurApp, uint8 mode, bool apply) const; // tracking - void HandleAuraTrackResources(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraTrackCreatures(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraTrackStealthed(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModStalked(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraUntrackable(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraTrackResources(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraTrackCreatures(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraTrackStealthed(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModStalked(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraUntrackable(AuraApplication const* aurApp, uint8 mode, bool apply) const; // skills & talents - void HandleAuraModPetTalentsPoints(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModSkill(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraModPetTalentsPoints(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModSkill(AuraApplication const* aurApp, uint8 mode, bool apply) const; // movement - void HandleAuraMounted(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraAllowFlight(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraWaterWalk(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraFeatherFall(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraHover(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleWaterBreathing(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleForceMoveForward(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraMounted(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraAllowFlight(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraWaterWalk(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraFeatherFall(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraHover(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleWaterBreathing(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleForceMoveForward(AuraApplication const* aurApp, uint8 mode, bool apply) const; // threat - void HandleModThreat(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModTotalThreat(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModTaunt(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModThreat(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModTotalThreat(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModTaunt(AuraApplication const* aurApp, uint8 mode, bool apply) const; // control - void HandleModConfuse(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModFear(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModStun(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModRoot(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandlePreventFleeing(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModConfuse(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModFear(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModStun(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModRoot(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandlePreventFleeing(AuraApplication const* aurApp, uint8 mode, bool apply) const; // charm - void HandleModPossess(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModPossessPet(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModCharm(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleCharmConvert(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraControlVehicle(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModPossess(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModPossessPet(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModCharm(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleCharmConvert(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraControlVehicle(AuraApplication const* aurApp, uint8 mode, bool apply) const; // modify speed - void HandleAuraModIncreaseSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModIncreaseMountedSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModIncreaseFlightSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModIncreaseSwimSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModDecreaseSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModUseNormalSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraModIncreaseSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModIncreaseMountedSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModIncreaseFlightSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModIncreaseSwimSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModDecreaseSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModUseNormalSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const; // immunity - void HandleModStateImmunityMask(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModMechanicImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModEffectImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModStateImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModSchoolImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModDmgImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModDispelImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModStateImmunityMask(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModMechanicImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModEffectImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModStateImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModSchoolImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModDmgImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModDispelImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const; // modify stats // resistance - void HandleAuraModResistanceExclusive(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModResistance(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModBaseResistancePCT(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModResistancePercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModBaseResistance(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModTargetResistance(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraModResistanceExclusive(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModResistance(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModBaseResistancePCT(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModResistancePercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModBaseResistance(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModTargetResistance(AuraApplication const* aurApp, uint8 mode, bool apply) const; // stat - void HandleAuraModStat(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModPercentStat(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModSpellDamagePercentFromStat(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModSpellHealingPercentFromStat(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModSpellDamagePercentFromAttackPower(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModSpellHealingPercentFromAttackPower(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModHealingDone(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModTotalPercentStat(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModResistenceOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModExpertise(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraModStat(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModPercentStat(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModSpellDamagePercentFromStat(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModSpellHealingPercentFromStat(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModSpellDamagePercentFromAttackPower(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModSpellHealingPercentFromAttackPower(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModHealingDone(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModTotalPercentStat(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModResistenceOfStatPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModExpertise(AuraApplication const* aurApp, uint8 mode, bool apply) const; // heal and energize - void HandleModPowerRegen(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModPowerRegenPCT(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModManaRegen(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModIncreaseHealth(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModIncreaseMaxHealth(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModIncreaseEnergy(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModIncreaseEnergyPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModIncreaseHealthPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraIncreaseBaseHealthPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModPowerRegen(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModPowerRegenPCT(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModManaRegen(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModIncreaseHealth(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModIncreaseMaxHealth(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModIncreaseEnergy(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModIncreaseEnergyPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModIncreaseHealthPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraIncreaseBaseHealthPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; // fight - void HandleAuraModParryPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModDodgePercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModBlockPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModRegenInterrupt(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModWeaponCritPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModHitChance(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModSpellHitChance(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModSpellCritChance(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModSpellCritChanceShool(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModCritPct(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraModParryPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModDodgePercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModBlockPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModRegenInterrupt(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModWeaponCritPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModHitChance(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModSpellHitChance(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModSpellCritChance(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModSpellCritChanceShool(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModCritPct(AuraApplication const* aurApp, uint8 mode, bool apply) const; // attack speed - void HandleModCastingSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModMeleeRangedSpeedPct(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModCombatSpeedPct(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModAttackSpeed(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModMeleeSpeedPct(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModRangedHaste(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleRangedAmmoHaste(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModCastingSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModMeleeRangedSpeedPct(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModCombatSpeedPct(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModAttackSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModMeleeSpeedPct(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModRangedHaste(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleRangedAmmoHaste(AuraApplication const* aurApp, uint8 mode, bool apply) const; // combat rating - void HandleModRating(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModRatingFromStat(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModRating(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModRatingFromStat(AuraApplication const* aurApp, uint8 mode, bool apply) const; // attack power - void HandleAuraModAttackPower(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModRangedAttackPower(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModAttackPowerPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModRangedAttackPowerPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModAttackPowerOfStatPercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModAttackPowerOfArmor(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraModAttackPower(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModRangedAttackPower(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModAttackPowerPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModRangedAttackPowerPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModRangedAttackPowerOfStatPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModAttackPowerOfStatPercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModAttackPowerOfArmor(AuraApplication const* aurApp, uint8 mode, bool apply) const; // damage bonus - void HandleModDamageDone(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModDamagePercentDone(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModOffhandDamagePercent(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleShieldBlockValue(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModDamageDone(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModDamagePercentDone(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModOffhandDamagePercent(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleShieldBlockValue(AuraApplication const* aurApp, uint8 mode, bool apply) const; // power cost - void HandleModPowerCostPCT(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleModPowerCost(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleArenaPreparation(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleNoReagentUseAura(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraRetainComboPoints(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleModPowerCostPCT(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleModPowerCost(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleArenaPreparation(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleNoReagentUseAura(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraRetainComboPoints(AuraApplication const* aurApp, uint8 mode, bool apply) const; // others - void HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleChannelDeathItem(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleBindSight(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleForceReaction(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraEmpathy(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModFaction(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleComprehendLanguage(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraConvertRune(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraLinked(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraOpenStable(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraOverrideSpells(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraSetVehicle(AuraApplication const * aurApp, uint8 mode, bool apply) const; - void HandleAuraModFakeInebriation(AuraApplication const * aurApp, uint8 mode, bool apply) const; + void HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleChannelDeathItem(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleBindSight(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleForceReaction(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraEmpathy(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModFaction(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleComprehendLanguage(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraConvertRune(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraLinked(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraOpenStable(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraOverrideSpells(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraSetVehicle(AuraApplication const* aurApp, uint8 mode, bool apply) const; + void HandleAuraModFakeInebriation(AuraApplication const* aurApp, uint8 mode, bool apply) const; }; namespace Trinity @@ -273,8 +273,8 @@ namespace Trinity AbsorbAuraOrderPred() { } bool operator() (AuraEffect * aurEffA, AuraEffect * aurEffB) const { - SpellEntry const * spellProtoA = aurEffA->GetSpellProto(); - SpellEntry const * spellProtoB = aurEffB->GetSpellProto(); + SpellEntry const* spellProtoA = aurEffA->GetSpellProto(); + SpellEntry const* spellProtoB = aurEffB->GetSpellProto(); // Wards if ((spellProtoA->SpellFamilyName == SPELLFAMILY_MAGE) || diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 822392747aa..6a692d47605 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -35,7 +35,7 @@ #include "ScriptMgr.h" #include "SpellScript.h" -AuraApplication::AuraApplication(Unit * target, Unit * caster, Aura * aura, uint8 effMask): +AuraApplication::AuraApplication(Unit* target, Unit* caster, Aura * aura, uint8 effMask): m_target(target), m_base(aura), m_slot(MAX_AURAS), m_flags(AFLAG_NONE), m_effectsToApply(effMask), m_removeMode(AURA_REMOVE_NONE), m_needClientUpdate(false) { @@ -53,7 +53,7 @@ m_effectsToApply(effMask), m_removeMode(AURA_REMOVE_NONE), m_needClientUpdate(fa } else { - Unit::VisibleAuraMap const * visibleAuras = GetTarget()->GetVisibleAuras(); + Unit::VisibleAuraMap const* visibleAuras = GetTarget()->GetVisibleAuras(); // lookup for free slots in units visibleAuras Unit::VisibleAuraMap::const_iterator itr = visibleAuras->find(0); for (uint32 freeSlot = 0; freeSlot < MAX_AURAS; ++itr , ++freeSlot) @@ -111,7 +111,7 @@ void AuraApplication::_Remove() } } -void AuraApplication::_InitFlags(Unit * caster, uint8 effMask) +void AuraApplication::_InitFlags(Unit* caster, uint8 effMask) { // mark as selfcasted if needed m_flags |= (GetBase()->GetCasterGUID() == GetTarget()->GetGUID()) ? AFLAG_CASTER : AFLAG_NONE; @@ -186,7 +186,7 @@ void AuraApplication::BuildUpdatePacket(ByteBuffer& data, bool remove) const } ASSERT(m_target->GetVisibleAura(m_slot)); - Aura const * aura = GetBase(); + Aura const* aura = GetBase(); data << uint32(aura->GetId()); uint32 flags = m_flags; if (aura->GetMaxDuration() > 0 && !(aura->GetSpellProto()->AttributesEx5 & SPELL_ATTR5_HIDE_DURATION)) @@ -327,7 +327,7 @@ Aura* Aura::Create(SpellEntry const* spellproto, uint8 effMask, WorldObject* own return aura; } -Aura::Aura(SpellEntry const* spellproto, WorldObject * owner, Unit * caster, Item * castItem, uint64 casterGUID) : +Aura::Aura(SpellEntry const* spellproto, WorldObject * owner, Unit* caster, Item* castItem, uint64 casterGUID) : m_spellProto(spellproto), m_casterGuid(casterGUID ? casterGUID : caster->GetGUID()), m_castItemGuid(castItem ? castItem->GetGUID() : 0), m_applyTime(time(NULL)), m_owner(owner), m_timeCla(0), m_updateTargetMapInterval(0), @@ -342,7 +342,7 @@ m_isRemoved(false), m_isSingleTarget(false) m_procCharges = CalcMaxCharges(caster); } -void Aura::_InitEffects(uint8 effMask, Unit * caster, int32 *baseAmount) +void Aura::_InitEffects(uint8 effMask, Unit* caster, int32 *baseAmount) { // shouldn't be in constructor - functions in AuraEffect::AuraEffect use polymorphism for (uint8 i=0 ; i<MAX_SPELL_EFFECTS; ++i) @@ -377,7 +377,7 @@ Unit* Aura::GetCaster() const { if (GetOwner()->GetGUID() == GetCasterGUID()) return GetUnitOwner(); - if (AuraApplication const * aurApp = GetApplicationOfTarget(GetCasterGUID())) + if (AuraApplication const* aurApp = GetApplicationOfTarget(GetCasterGUID())) return aurApp->GetTarget(); return ObjectAccessor::GetUnit(*GetOwner(), GetCasterGUID()); @@ -388,7 +388,7 @@ AuraObjectType Aura::GetType() const return (m_owner->GetTypeId() == TYPEID_DYNAMICOBJECT) ? DYNOBJ_AURA_TYPE : UNIT_AURA_TYPE; } -void Aura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * auraApp) +void Aura::_ApplyForTarget(Unit* target, Unit* caster, AuraApplication * auraApp) { ASSERT(target); ASSERT(auraApp); @@ -408,7 +408,7 @@ void Aura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * auraA } } -void Aura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * auraApp) +void Aura::_UnapplyForTarget(Unit* target, Unit* caster, AuraApplication * auraApp) { ASSERT(target); ASSERT(auraApp->GetRemoveMode()); @@ -449,13 +449,13 @@ void Aura::_Remove(AuraRemoveMode removeMode) for (appItr = m_applications.begin(); appItr != m_applications.end();) { AuraApplication * aurApp = appItr->second; - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); target->_UnapplyAura(aurApp, removeMode); appItr = m_applications.begin(); } } -void Aura::UpdateTargetMap(Unit * caster, bool apply) +void Aura::UpdateTargetMap(Unit* caster, bool apply) { if (IsRemoved()) return; @@ -537,7 +537,7 @@ void Aura::UpdateTargetMap(Unit * caster, bool apply) // this one prevents unwanted usefull buff loss because of stacking and prevents overriding auras periodicaly by 2 near area aura owners for (Unit::AuraApplicationMap::iterator iter = itr->first->GetAppliedAuras().begin(); iter != itr->first->GetAppliedAuras().end(); ++iter) { - Aura const * aura = iter->second->GetBase(); + Aura const* aura = iter->second->GetBase(); if (!sSpellMgr->CanAurasStack(this, aura, aura->GetCasterGUID() == GetCasterGUID())) { addUnit = false; @@ -604,11 +604,11 @@ void Aura::UpdateOwner(uint32 diff, WorldObject * owner) { ASSERT(owner == m_owner); - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); // Apply spellmods for channeled auras // used for example when triggered spell of spell:10 is modded - Spell * modSpell = NULL; - Player * modOwner = NULL; + Spell* modSpell = NULL; + Player* modOwner = NULL; if (caster) { modOwner = caster->GetSpellModOwner(); @@ -639,7 +639,7 @@ void Aura::UpdateOwner(uint32 diff, WorldObject * owner) _DeleteRemovedApplications(); } -void Aura::Update(uint32 diff, Unit * caster) +void Aura::Update(uint32 diff, Unit* caster) { if (m_duration > 0) { @@ -710,8 +710,8 @@ void Aura::SetDuration(int32 duration, bool withMods) { if (withMods) { - if (Unit * caster = GetCaster()) - if (Player * modOwner = caster->GetSpellModOwner()) + if (Unit* caster = GetCaster()) + if (Player* modOwner = caster->GetSpellModOwner()) modOwner->ApplySpellMod(GetId(), SPELLMOD_DURATION, duration); } m_duration = duration; @@ -730,7 +730,7 @@ void Aura::RefreshTimers() { m_maxDuration = CalcMaxDuration(); RefreshDuration(); - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (HasEffect(i)) GetEffect(i)->CalculatePeriodic(caster, false, false); @@ -744,7 +744,7 @@ void Aura::SetCharges(uint8 charges) SetNeedClientUpdateForTargets(); } -uint8 Aura::CalcMaxCharges(Unit * caster) const +uint8 Aura::CalcMaxCharges(Unit* caster) const { uint8 maxProcCharges = m_spellProto->procCharges; @@ -779,7 +779,7 @@ bool Aura::ModCharges(int32 num, AuraRemoveMode removeMode) void Aura::SetStackAmount(uint8 stackAmount) { m_stackAmount = stackAmount; - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); std::list<AuraApplication*> applications; GetApplicationList(applications); @@ -878,7 +878,7 @@ bool Aura::CanBeSentToClient() const void Aura::UnregisterSingleTarget() { ASSERT(m_isSingleTarget); - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); // TODO: find a better way to do this. if (!caster) caster = ObjectAccessor::GetObjectInOrOutOfWorld(GetCasterGUID(), (Unit*)NULL); @@ -893,7 +893,7 @@ void Aura::SetLoadedState(int32 maxduration, int32 duration, int32 charges, uint m_duration = duration; m_procCharges = charges; m_stackAmount = stackamount; - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (m_effects[i]) { @@ -918,7 +918,7 @@ bool Aura::HasEffectType(AuraType type) const void Aura::RecalculateAmountOfEffects() { ASSERT (!IsRemoved()); - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (HasEffect(i)) m_effects[i]->RecalculateAmount(caster); @@ -948,9 +948,9 @@ void Aura::SetNeedClientUpdateForTargets() const } // trigger effects on real aura apply/remove -void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, bool apply, bool onReapply) +void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, bool apply, bool onReapply) { - Unit * target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); AuraRemoveMode removeMode = aurApp->GetRemoveMode(); // spell_area table SpellAreaForAreaMapBounds saBounds = sSpellMgr->GetSpellAreaForAuraMapBounds(GetId()); @@ -1057,7 +1057,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, case 12536: // Clearcasting case 12043: // Presence of Mind // Arcane Potency - if (AuraEffect const * aurEff = caster->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_MAGE, 2120, 0)) + if (AuraEffect const* aurEff = caster->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_MAGE, 2120, 0)) { uint32 spellId = 0; @@ -1108,7 +1108,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (GetSpellProto()->SpellFamilyFlags[0] & 0x02000000 && GetEffect(0)) { // Improved Devouring Plague - if (AuraEffect const * aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, 3790, 1)) + if (AuraEffect const* aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, 3790, 1)) { int32 basepoints0 = aurEff->GetAmount() * GetEffect(0)->GetTotalTicks() * caster->SpellDamageBonus(target, GetSpellProto(), GetEffect(0)->GetAmount(), DOT) / 100; int32 heal = int32(CalculatePctN(basepoints0, 15)); @@ -1120,7 +1120,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, else if (GetSpellProto()->SpellFamilyFlags[0] & 0x00000040 && GetEffect(0)) { // Empowered Renew - if (AuraEffect const * aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, 3021, 1)) + if (AuraEffect const* aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, 3021, 1)) { int32 basepoints0 = aurEff->GetAmount() * GetEffect(0)->GetTotalTicks() * caster->SpellHealingBonus(target, GetSpellProto(), GetEffect(0)->GetAmount(), HEAL) / 100; caster->CastCustomSpell(target, 63544, &basepoints0, NULL, NULL, true, NULL, GetEffect(0)); @@ -1350,7 +1350,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (removeMode == AURA_REMOVE_BY_ENEMY_SPELL && (GetSpellProto()->SpellFamilyFlags[0] & 0x00008000 || GetSpellProto()->SpellFamilyFlags[1] & 0x00000400)) { // Shadow Affinity - if (AuraEffect const * aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, 178, 1)) + if (AuraEffect const* aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, 178, 1)) { int32 basepoints0 = aurEff->GetAmount() * caster->GetCreateMana() / 100; caster->CastCustomSpell(caster, 64103, &basepoints0, NULL, NULL, true, NULL, GetEffect(0)); @@ -1360,7 +1360,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, else if (removeMode == AURA_REMOVE_BY_ENEMY_SPELL && GetSpellProto()->SpellFamilyFlags[0] & 0x00000001) { // Rapture - if (Aura const * aura = caster->GetAuraOfRankedSpell(47535)) + if (Aura const* aura = caster->GetAuraOfRankedSpell(47535)) { // check cooldown if (caster->GetTypeId() == TYPEID_PLAYER) @@ -1371,7 +1371,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, caster->ToPlayer()->AddSpellCooldown(aura->GetId(), 0, uint32(time(NULL) + 12)); } // effect on caster - if (AuraEffect const * aurEff = aura->GetEffect(0)) + if (AuraEffect const* aurEff = aura->GetEffect(0)) { float multiplier = (float)aurEff->GetAmount(); if (aurEff->GetId() == 47535) @@ -1383,7 +1383,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, caster->CastCustomSpell(caster, 47755, &basepoints0, NULL, NULL, true); } // effect on aura target - if (AuraEffect const * aurEff = aura->GetEffect(1)) + if (AuraEffect const* aurEff = aura->GetEffect(1)) { if (!roll_chance_i(aurEff->GetAmount())) break; @@ -1491,7 +1491,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (GetSpellProto()->SpellFamilyFlags[0] & 0x00400000) { // Master of subtlety - if (AuraEffect const * aurEff = target->GetAuraEffectOfRankedSpell(31221, 0)) + if (AuraEffect const* aurEff = target->GetAuraEffectOfRankedSpell(31221, 0)) { if (!apply) target->CastSpell(target, 31666, true); @@ -1741,7 +1741,7 @@ bool Aura::CallScriptCheckAreaTargetHandlers(Unit* target) return true; } -bool Aura::CallScriptEffectApplyHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode) +bool Aura::CallScriptEffectApplyHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode) { bool preventDefault = false; for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) @@ -1760,7 +1760,7 @@ bool Aura::CallScriptEffectApplyHandlers(AuraEffect const * aurEff, AuraApplicat return preventDefault; } -bool Aura::CallScriptEffectRemoveHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode) +bool Aura::CallScriptEffectRemoveHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode) { bool preventDefault = false; for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) @@ -1779,7 +1779,7 @@ bool Aura::CallScriptEffectRemoveHandlers(AuraEffect const * aurEff, AuraApplica return preventDefault; } -void Aura::CallScriptAfterEffectApplyHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode) +void Aura::CallScriptAfterEffectApplyHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { @@ -1794,7 +1794,7 @@ void Aura::CallScriptAfterEffectApplyHandlers(AuraEffect const * aurEff, AuraApp } } -void Aura::CallScriptAfterEffectRemoveHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode) +void Aura::CallScriptAfterEffectRemoveHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { @@ -1809,7 +1809,7 @@ void Aura::CallScriptAfterEffectRemoveHandlers(AuraEffect const * aurEff, AuraAp } } -bool Aura::CallScriptEffectPeriodicHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp) +bool Aura::CallScriptEffectPeriodicHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp) { bool preventDefault = false; for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) @@ -1843,7 +1843,7 @@ void Aura::CallScriptEffectUpdatePeriodicHandlers(AuraEffect * aurEff) } } -void Aura::CallScriptEffectCalcAmountHandlers(AuraEffect const * aurEff, int32 & amount, bool & canBeRecalculated) +void Aura::CallScriptEffectCalcAmountHandlers(AuraEffect const* aurEff, int32 & amount, bool & canBeRecalculated) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { @@ -1858,7 +1858,7 @@ void Aura::CallScriptEffectCalcAmountHandlers(AuraEffect const * aurEff, int32 & } } -void Aura::CallScriptEffectCalcPeriodicHandlers(AuraEffect const * aurEff, bool & isPeriodic, int32 & amplitude) +void Aura::CallScriptEffectCalcPeriodicHandlers(AuraEffect const* aurEff, bool & isPeriodic, int32 & amplitude) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { @@ -1873,7 +1873,7 @@ void Aura::CallScriptEffectCalcPeriodicHandlers(AuraEffect const * aurEff, bool } } -void Aura::CallScriptEffectCalcSpellModHandlers(AuraEffect const * aurEff, SpellModifier *& spellMod) +void Aura::CallScriptEffectCalcSpellModHandlers(AuraEffect const* aurEff, SpellModifier *& spellMod) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { @@ -1888,7 +1888,7 @@ void Aura::CallScriptEffectCalcSpellModHandlers(AuraEffect const * aurEff, Spell } } -void Aura::CallScriptEffectAbsorbHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & /*defaultPrevented*/) +void Aura::CallScriptEffectAbsorbHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & /*defaultPrevented*/) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { @@ -1903,7 +1903,7 @@ void Aura::CallScriptEffectAbsorbHandlers(AuraEffect * aurEff, AuraApplication c } } -void Aura::CallScriptEffectAfterAbsorbHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount) +void Aura::CallScriptEffectAfterAbsorbHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { @@ -1918,7 +1918,7 @@ void Aura::CallScriptEffectAfterAbsorbHandlers(AuraEffect * aurEff, AuraApplicat } } -void Aura::CallScriptEffectManaShieldHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & /*defaultPrevented*/) +void Aura::CallScriptEffectManaShieldHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & /*defaultPrevented*/) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { @@ -1933,7 +1933,7 @@ void Aura::CallScriptEffectManaShieldHandlers(AuraEffect * aurEff, AuraApplicati } } -void Aura::CallScriptEffectAfterManaShieldHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount) +void Aura::CallScriptEffectAfterManaShieldHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount) { for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { @@ -1948,7 +1948,7 @@ void Aura::CallScriptEffectAfterManaShieldHandlers(AuraEffect * aurEff, AuraAppl } } -UnitAura::UnitAura(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID) +UnitAura::UnitAura(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit* caster, int32 *baseAmount, Item* castItem, uint64 casterGUID) : Aura(spellproto, owner, caster, castItem, casterGUID) { m_AuraDRGroup = DIMINISHING_NONE; @@ -1957,7 +1957,7 @@ UnitAura::UnitAura(SpellEntry const* spellproto, uint8 effMask, WorldObject * ow GetUnitOwner()->_AddAura(this, caster); }; -void UnitAura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * aurApp) +void UnitAura::_ApplyForTarget(Unit* target, Unit* caster, AuraApplication * aurApp) { Aura::_ApplyForTarget(target, caster, aurApp); @@ -1966,7 +1966,7 @@ void UnitAura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * a target->ApplyDiminishingAura(group, true); } -void UnitAura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * aurApp) +void UnitAura::_UnapplyForTarget(Unit* target, Unit* caster, AuraApplication * aurApp) { Aura::_UnapplyForTarget(target, caster, aurApp); @@ -1982,9 +1982,9 @@ void UnitAura::Remove(AuraRemoveMode removeMode) GetUnitOwner()->RemoveOwnedAura(this, removeMode); } -void UnitAura::FillTargetMap(std::map<Unit *, uint8> & targets, Unit * caster) +void UnitAura::FillTargetMap(std::map<Unit *, uint8> & targets, Unit* caster) { - Player * modOwner = NULL; + Player* modOwner = NULL; if (caster) modOwner = caster->GetSpellModOwner(); @@ -2060,7 +2060,7 @@ void UnitAura::FillTargetMap(std::map<Unit *, uint8> & targets, Unit * caster) } } -DynObjAura::DynObjAura(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID) +DynObjAura::DynObjAura(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit* caster, int32 *baseAmount, Item* castItem, uint64 casterGUID) : Aura(spellproto, owner, caster, castItem, casterGUID) { LoadScripts(); @@ -2078,9 +2078,9 @@ void DynObjAura::Remove(AuraRemoveMode removeMode) _Remove(removeMode); } -void DynObjAura::FillTargetMap(std::map<Unit *, uint8> & targets, Unit * /*caster*/) +void DynObjAura::FillTargetMap(std::map<Unit *, uint8> & targets, Unit* /*caster*/) { - Unit * dynObjOwnerCaster = GetDynobjOwner()->GetCaster(); + Unit* dynObjOwnerCaster = GetDynobjOwner()->GetCaster(); float radius = GetDynobjOwner()->GetRadius(); for (uint8 effIndex = 0; effIndex < MAX_SPELL_EFFECTS; ++effIndex) diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index 69792a6e513..ef23070b84f 100755 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -43,7 +43,7 @@ class AuraApplication friend void Unit::RemoveAura(AuraApplication * aurApp, AuraRemoveMode mode); friend AuraApplication * Unit::_CreateAuraApplication(Aura * aura, uint8 effMask); private: - Unit * const m_target; + Unit* const m_target; Aura * const m_base; uint8 m_slot; // Aura slot on unit uint8 m_flags; // Aura info flag @@ -51,14 +51,14 @@ class AuraApplication AuraRemoveMode m_removeMode:8; // Store info for know remove aura reason bool m_needClientUpdate:1; - explicit AuraApplication(Unit * target, Unit * caster, Aura * base, uint8 effMask); + explicit AuraApplication(Unit* target, Unit* caster, Aura * base, uint8 effMask); void _Remove(); private: - void _InitFlags(Unit * caster, uint8 effMask); + void _InitFlags(Unit* caster, uint8 effMask); void _HandleEffect(uint8 effIndex, bool apply); public: - Unit * GetTarget() const { return m_target; } + Unit* GetTarget() const { return m_target; } Aura * GetBase() const { return m_base; } uint8 GetSlot() const { return m_slot; } @@ -80,16 +80,16 @@ class AuraApplication class Aura { - friend Aura * Unit::_TryStackingOrRefreshingExistingAura(SpellEntry const * newAura, uint8 effMask, Unit* caster, int32 *baseAmount, Item * castItem, uint64 casterGUID); + friend Aura * Unit::_TryStackingOrRefreshingExistingAura(SpellEntry const* newAura, uint8 effMask, Unit* caster, int32 *baseAmount, Item* castItem, uint64 casterGUID); public: typedef std::map<uint64, AuraApplication *> ApplicationMap; static uint8 BuildEffectMaskForOwner(SpellEntry const* spellProto, uint8 avalibleEffectMask, WorldObject* owner); static Aura* TryRefreshStackOrCreate(SpellEntry const* spellproto, uint8 tryEffMask, WorldObject* owner, Unit* caster, int32* baseAmount = NULL, Item* castItem = NULL, uint64 casterGUID = 0, bool* refresh = NULL); - static Aura* TryCreate(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount = NULL, Item * castItem = NULL, uint64 casterGUID = 0); + static Aura* TryCreate(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit* caster, int32 *baseAmount = NULL, Item* castItem = NULL, uint64 casterGUID = 0); static Aura* Create(SpellEntry const* spellproto, uint8 effMask, WorldObject* owner, Unit* caster, int32* baseAmount, Item* castItem, uint64 casterGUID); - explicit Aura(SpellEntry const* spellproto, WorldObject * owner, Unit * caster, Item * castItem, uint64 casterGUID); - void _InitEffects(uint8 effMask, Unit * caster, int32 *baseAmount); + explicit Aura(SpellEntry const* spellproto, WorldObject * owner, Unit* caster, Item* castItem, uint64 casterGUID); + void _InitEffects(uint8 effMask, Unit* caster, int32 *baseAmount); virtual ~Aura(); SpellEntry const* GetSpellProto() const { return m_spellProto; } @@ -99,31 +99,31 @@ class Aura uint64 const& GetCasterGUID() const { return m_casterGuid; } Unit* GetCaster() const; WorldObject * GetOwner() const { return m_owner; } - Unit * GetUnitOwner() const { ASSERT(GetType() == UNIT_AURA_TYPE); return (Unit*)m_owner; } + Unit* GetUnitOwner() const { ASSERT(GetType() == UNIT_AURA_TYPE); return (Unit*)m_owner; } DynamicObject * GetDynobjOwner() const { ASSERT(GetType() == DYNOBJ_AURA_TYPE); return (DynamicObject*)m_owner; } AuraObjectType GetType() const; - virtual void _ApplyForTarget(Unit * target, Unit * caster, AuraApplication * auraApp); - virtual void _UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * auraApp); + virtual void _ApplyForTarget(Unit* target, Unit* caster, AuraApplication * auraApp); + virtual void _UnapplyForTarget(Unit* target, Unit* caster, AuraApplication * auraApp); void _Remove(AuraRemoveMode removeMode); virtual void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT) = 0; - virtual void FillTargetMap(std::map<Unit *, uint8> & targets, Unit * caster) = 0; - void UpdateTargetMap(Unit * caster, bool apply = true); + virtual void FillTargetMap(std::map<Unit *, uint8> & targets, Unit* caster) = 0; + void UpdateTargetMap(Unit* caster, bool apply = true); - void _RegisterForTargets() {Unit * caster = GetCaster(); UpdateTargetMap(caster, false);} - void ApplyForTargets() {Unit * caster = GetCaster(); UpdateTargetMap(caster, true);} + void _RegisterForTargets() {Unit* caster = GetCaster(); UpdateTargetMap(caster, false);} + void ApplyForTargets() {Unit* caster = GetCaster(); UpdateTargetMap(caster, true);} void _ApplyEffectForTargets(uint8 effIndex); void UpdateOwner(uint32 diff, WorldObject * owner); - void Update(uint32 diff, Unit * caster); + void Update(uint32 diff, Unit* caster); time_t GetApplyTime() const { return m_applyTime; } int32 GetMaxDuration() const { return m_maxDuration; } void SetMaxDuration(int32 duration) { m_maxDuration = duration; } int32 CalcMaxDuration() const { return CalcMaxDuration(GetCaster()); } - int32 CalcMaxDuration(Unit * caster) const; + int32 CalcMaxDuration(Unit* caster) const; int32 GetDuration() const { return m_duration; } void SetDuration(int32 duration, bool withMods = false); void RefreshDuration(); @@ -133,7 +133,7 @@ class Aura uint8 GetCharges() const { return m_procCharges; } void SetCharges(uint8 charges); - uint8 CalcMaxCharges(Unit * caster) const; + uint8 CalcMaxCharges(Unit* caster) const; uint8 CalcMaxCharges() const { return CalcMaxCharges(GetCaster()); } bool ModCharges(int32 num, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); bool DropCharge(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT) { return ModCharges(-1, removeMode); } @@ -146,7 +146,7 @@ class Aura bool IsPassive() const; bool IsDeathPersistent() const; - bool IsRemovedOnShapeLost(Unit * target) const { return (GetCasterGUID() == target->GetGUID() && m_spellProto->Stances && !(m_spellProto->AttributesEx2 & SPELL_ATTR2_NOT_NEED_SHAPESHIFT) && !(m_spellProto->Attributes & SPELL_ATTR0_NOT_SHAPESHIFT)); } + bool IsRemovedOnShapeLost(Unit* target) const { return (GetCasterGUID() == target->GetGUID() && m_spellProto->Stances && !(m_spellProto->AttributesEx2 & SPELL_ATTR2_NOT_NEED_SHAPESHIFT) && !(m_spellProto->Attributes & SPELL_ATTR0_NOT_SHAPESHIFT)); } bool CanBeSaved() const; bool IsRemoved() const { return m_isRemoved; } bool CanBeSentToClient() const; @@ -173,31 +173,31 @@ class Aura bool IsAppliedOnTarget(uint64 const & guid) const { return m_applications.find(guid) != m_applications.end(); } void SetNeedClientUpdateForTargets() const; - void HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, bool apply, bool onReapply); + void HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, bool apply, bool onReapply); bool CanBeAppliedOn(Unit *target); bool CheckAreaTarget(Unit *target); // AuraScript void LoadScripts(); - bool CallScriptCheckAreaTargetHandlers(Unit * target); - bool CallScriptEffectApplyHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode); - bool CallScriptEffectRemoveHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode); - void CallScriptAfterEffectApplyHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode); - void CallScriptAfterEffectRemoveHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode); - bool CallScriptEffectPeriodicHandlers(AuraEffect const * aurEff, AuraApplication const * aurApp); + bool CallScriptCheckAreaTargetHandlers(Unit* target); + bool CallScriptEffectApplyHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode); + bool CallScriptEffectRemoveHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode); + void CallScriptAfterEffectApplyHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode); + void CallScriptAfterEffectRemoveHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, AuraEffectHandleModes mode); + bool CallScriptEffectPeriodicHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp); void CallScriptEffectUpdatePeriodicHandlers(AuraEffect * aurEff); - void CallScriptEffectCalcAmountHandlers(AuraEffect const * aurEff, int32 & amount, bool & canBeRecalculated); - void CallScriptEffectCalcPeriodicHandlers(AuraEffect const * aurEff, bool & isPeriodic, int32 & amplitude); - void CallScriptEffectCalcSpellModHandlers(AuraEffect const * aurEff, SpellModifier *& spellMod); - void CallScriptEffectAbsorbHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & defaultPrevented); - void CallScriptEffectAfterAbsorbHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount); - void CallScriptEffectManaShieldHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & defaultPrevented); - void CallScriptEffectAfterManaShieldHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount); + void CallScriptEffectCalcAmountHandlers(AuraEffect const* aurEff, int32 & amount, bool & canBeRecalculated); + void CallScriptEffectCalcPeriodicHandlers(AuraEffect const* aurEff, bool & isPeriodic, int32 & amplitude); + void CallScriptEffectCalcSpellModHandlers(AuraEffect const* aurEff, SpellModifier *& spellMod); + void CallScriptEffectAbsorbHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & defaultPrevented); + void CallScriptEffectAfterAbsorbHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount); + void CallScriptEffectManaShieldHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & defaultPrevented); + void CallScriptEffectAfterManaShieldHandlers(AuraEffect * aurEff, AuraApplication const* aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount); std::list<AuraScript *> m_loadedScripts; private: void _DeleteRemovedApplications(); protected: - SpellEntry const * const m_spellProto; + SpellEntry const* const m_spellProto; uint64 const m_casterGuid; uint64 const m_castItemGuid; // it is NOT safe to keep a pointer to the item because it may get deleted time_t const m_applyTime; @@ -224,16 +224,16 @@ class Aura class UnitAura : public Aura { - friend Aura * Aura::Create(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID); + friend Aura * Aura::Create(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit* caster, int32 *baseAmount, Item* castItem, uint64 casterGUID); protected: - explicit UnitAura(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID); + explicit UnitAura(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit* caster, int32 *baseAmount, Item* castItem, uint64 casterGUID); public: - void _ApplyForTarget(Unit * target, Unit * caster, AuraApplication * aurApp); - void _UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * aurApp); + void _ApplyForTarget(Unit* target, Unit* caster, AuraApplication * aurApp); + void _UnapplyForTarget(Unit* target, Unit* caster, AuraApplication * aurApp); void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); - void FillTargetMap(std::map<Unit *, uint8> & targets, Unit * caster); + void FillTargetMap(std::map<Unit *, uint8> & targets, Unit* caster); // Allow Apply Aura Handler to modify and access m_AuraDRGroup void SetDiminishGroup(DiminishingGroup group) { m_AuraDRGroup = group; } @@ -245,12 +245,12 @@ class UnitAura : public Aura class DynObjAura : public Aura { - friend Aura * Aura::Create(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID); + friend Aura * Aura::Create(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit* caster, int32 *baseAmount, Item* castItem, uint64 casterGUID); protected: - explicit DynObjAura(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit * caster, int32 *baseAmount, Item * castItem, uint64 casterGUID); + explicit DynObjAura(SpellEntry const* spellproto, uint8 effMask, WorldObject * owner, Unit* caster, int32 *baseAmount, Item* castItem, uint64 casterGUID); public: void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); - void FillTargetMap(std::map<Unit *, uint8> & targets, Unit * caster); + void FillTargetMap(std::map<Unit *, uint8> & targets, Unit* caster); }; #endif diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 72bf8f9c31c..a9489eeb1af 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -284,7 +284,7 @@ void SpellCastTargets::OutDebug() sLog->outString("elevation: %f", m_elevation); } -void SpellCastTargets::read (ByteBuffer & data, Unit * caster) +void SpellCastTargets::read (ByteBuffer & data, Unit* caster) { data >> m_targetMask; @@ -801,7 +801,7 @@ void Spell::SelectSpellTargets() } } -void Spell::prepareDataForTriggerSystem(AuraEffect const * /*triggeredByAura*/) +void Spell::prepareDataForTriggerSystem(AuraEffect const* /*triggeredByAura*/) { //========================================================================================== // Now fill data for trigger system, need know: @@ -913,7 +913,7 @@ void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex) ihit->scaleAura = false; if (m_auraScaleMask && ihit->effectMask == m_auraScaleMask && m_caster != pVictim) { - SpellEntry const * auraSpell = sSpellStore.LookupEntry(sSpellMgr->GetFirstSpellInChain(m_spellInfo->Id)); + SpellEntry const* auraSpell = sSpellStore.LookupEntry(sSpellMgr->GetFirstSpellInChain(m_spellInfo->Id)); if (uint32(pVictim->getLevel() + 10) >= auraSpell->spellLevel) ihit->scaleAura = true; } @@ -934,7 +934,7 @@ void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex) target.scaleAura = false; if (m_auraScaleMask && target.effectMask == m_auraScaleMask && m_caster != pVictim) { - SpellEntry const * auraSpell = sSpellStore.LookupEntry(sSpellMgr->GetFirstSpellInChain(m_spellInfo->Id)); + SpellEntry const* auraSpell = sSpellStore.LookupEntry(sSpellMgr->GetFirstSpellInChain(m_spellInfo->Id)); if (uint32(pVictim->getLevel() + 10) >= auraSpell->spellLevel) target.scaleAura = true; } @@ -1127,7 +1127,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) //Spells with this flag cannot trigger if effect is casted on self // Slice and Dice, relentless strikes, eviscerate bool canEffectTrigger = unitTarget->CanProc() && (m_spellInfo->AttributesEx4 & (SPELL_ATTR4_CANT_PROC_FROM_SELFCAST) ? m_caster != unitTarget : true); - Unit * spellHitTarget = NULL; + Unit* spellHitTarget = NULL; if (missInfo == SPELL_MISS_NONE) // In case spell hit target, do all effect on that target spellHitTarget = unit; @@ -1408,7 +1408,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool { // Select rank for aura with level requirements only in specific cases // Unit has to be target only of aura effect, both caster and target have to be players, target has to be other than unit target - SpellEntry const * aurSpellInfo = m_spellInfo; + SpellEntry const* aurSpellInfo = m_spellInfo; int32 basePoints[3]; if (scaleAura) { @@ -1612,7 +1612,7 @@ bool Spell::UpdateChanneledTargetList() if (channelAuraMask) { range = GetSpellMaxRange(m_spellInfo, IsPositiveSpell(m_spellInfo->Id)); - if (Player * modOwner = m_caster->GetSpellModOwner()) + if (Player* modOwner = m_caster->GetSpellModOwner()) modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, range, this); } @@ -2299,7 +2299,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) AddItemTarget(m_targets.getItemTarget(), i); break; case TARGET_UNIT_DRIVER: - if (Unit * driver = m_targets.getUnitTarget()) + if (Unit* driver = m_targets.getUnitTarget()) if (driver->IsOnVehicle(m_caster)) AddUnitTarget(driver, i); break; @@ -2736,7 +2736,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) } } -void Spell::prepare(SpellCastTargets const* targets, AuraEffect const * triggeredByAura) +void Spell::prepare(SpellCastTargets const* targets, AuraEffect const* triggeredByAura) { if (m_CastItem) m_castItemGUID = m_CastItem->GetGUID(); @@ -3927,7 +3927,7 @@ void Spell::WriteAmmoToPacket(WorldPacket * data) { if (uint32 item_id = m_caster->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i)) { - if (ItemEntry const * itemEntry = sItemStore.LookupEntry(item_id)) + if (ItemEntry const* itemEntry = sItemStore.LookupEntry(item_id)) { if (itemEntry->Class == ITEM_CLASS_WEAPON) { @@ -4043,7 +4043,7 @@ void Spell::SendLogExecute() m_caster->SendMessageToSet(&data, true); } -void Spell::ExecuteLogEffectTakeTargetPower(uint8 effIndex, Unit * target, uint32 powerType, uint32 powerTaken, float gainMultiplier) +void Spell::ExecuteLogEffectTakeTargetPower(uint8 effIndex, Unit* target, uint32 powerType, uint32 powerTaken, float gainMultiplier) { InitEffectExecuteData(effIndex); m_effectExecuteData[effIndex]->append(target->GetPackGUID()); @@ -4052,21 +4052,21 @@ void Spell::ExecuteLogEffectTakeTargetPower(uint8 effIndex, Unit * target, uint3 *m_effectExecuteData[effIndex] << float(gainMultiplier); } -void Spell::ExecuteLogEffectExtraAttacks(uint8 effIndex, Unit * victim, uint32 attCount) +void Spell::ExecuteLogEffectExtraAttacks(uint8 effIndex, Unit* victim, uint32 attCount) { InitEffectExecuteData(effIndex); m_effectExecuteData[effIndex]->append(victim->GetPackGUID()); *m_effectExecuteData[effIndex] << uint32(attCount); } -void Spell::ExecuteLogEffectInterruptCast(uint8 effIndex, Unit * victim, uint32 spellId) +void Spell::ExecuteLogEffectInterruptCast(uint8 effIndex, Unit* victim, uint32 spellId) { InitEffectExecuteData(effIndex); m_effectExecuteData[effIndex]->append(victim->GetPackGUID()); *m_effectExecuteData[effIndex] << uint32(spellId); } -void Spell::ExecuteLogEffectDurabilityDamage(uint8 effIndex, Unit * victim, uint32 /*itemslot*/, uint32 damage) +void Spell::ExecuteLogEffectDurabilityDamage(uint8 effIndex, Unit* victim, uint32 /*itemslot*/, uint32 damage) { InitEffectExecuteData(effIndex); m_effectExecuteData[effIndex]->append(victim->GetPackGUID()); @@ -4104,7 +4104,7 @@ void Spell::ExecuteLogEffectUnsummonObject(uint8 effIndex, WorldObject * obj) m_effectExecuteData[effIndex]->append(obj->GetPackGUID()); } -void Spell::ExecuteLogEffectResurrect(uint8 effIndex, Unit * target) +void Spell::ExecuteLogEffectResurrect(uint8 effIndex, Unit* target) { InitEffectExecuteData(effIndex); m_effectExecuteData[effIndex]->append(target->GetPackGUID()); @@ -4615,7 +4615,7 @@ SpellCastResult Spell::CheckCast(bool strict) // only allow triggered spells if at an ended battleground if (!m_IsTriggeredSpell && m_caster->GetTypeId() == TYPEID_PLAYER) - if (Battleground * bg = m_caster->ToPlayer()->GetBattleground()) + if (Battleground* bg = m_caster->ToPlayer()->GetBattleground()) if (bg->GetStatus() == STATUS_WAIT_LEAVE) return SPELL_FAILED_DONT_REPORT; @@ -5623,7 +5623,7 @@ SpellCastResult Spell::CheckCasterAuras() const Unit::AuraApplicationMap const& auras = m_caster->GetAppliedAuras(); for (Unit::AuraApplicationMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) { - Aura const * aura = itr->second->GetBase(); + Aura const* aura = itr->second->GetBase(); if (GetAllSpellMechanicMask(aura->GetSpellProto()) & mechanic_immune) continue; if (GetSpellSchoolMask(aura->GetSpellProto()) & school_immune) diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 52c16ba5b0e..f3f666790c4 100755 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -162,7 +162,7 @@ class SpellCastTargets return *this; } - void read (ByteBuffer & data, Unit * caster); + void read (ByteBuffer & data, Unit* caster); void write (ByteBuffer & data); uint32 getTargetMask() const { return m_targetMask; } @@ -285,7 +285,7 @@ enum SpellTargets class Spell { friend struct Trinity::SpellNotifierCreatureAndPlayer; - friend void Unit::SetCurrentCastedSpell(Spell * pSpell); + friend void Unit::SetCurrentCastedSpell(Spell* pSpell); friend class SpellScript; public: @@ -421,7 +421,7 @@ class Spell Spell(Unit* Caster, SpellEntry const *info, bool triggered, uint64 originalCasterGUID = 0, bool skipCheck = false); ~Spell(); - void prepare(SpellCastTargets const* targets, AuraEffect const * triggeredByAura = NULL); + void prepare(SpellCastTargets const* targets, AuraEffect const* triggeredByAura = NULL); void cancel(); void update(uint32 difftime); void cast(bool skipCheck = false); @@ -478,16 +478,16 @@ class Spell void SendSpellGo(); void SendSpellCooldown(); void SendLogExecute(); - void ExecuteLogEffectTakeTargetPower(uint8 effIndex, Unit * target, uint32 powerType, uint32 powerTaken, float gainMultiplier); - void ExecuteLogEffectExtraAttacks(uint8 effIndex, Unit * victim, uint32 attCount); - void ExecuteLogEffectInterruptCast(uint8 effIndex, Unit * victim, uint32 spellId); - void ExecuteLogEffectDurabilityDamage(uint8 effIndex, Unit * victim, uint32 itemslot, uint32 damage); + void ExecuteLogEffectTakeTargetPower(uint8 effIndex, Unit* target, uint32 powerType, uint32 powerTaken, float gainMultiplier); + void ExecuteLogEffectExtraAttacks(uint8 effIndex, Unit* victim, uint32 attCount); + void ExecuteLogEffectInterruptCast(uint8 effIndex, Unit* victim, uint32 spellId); + void ExecuteLogEffectDurabilityDamage(uint8 effIndex, Unit* victim, uint32 itemslot, uint32 damage); void ExecuteLogEffectOpenLock(uint8 effIndex, Object * obj); void ExecuteLogEffectCreateItem(uint8 effIndex, uint32 entry); void ExecuteLogEffectDestroyItem(uint8 effIndex, uint32 entry); void ExecuteLogEffectSummonObject(uint8 effIndex, WorldObject * obj); void ExecuteLogEffectUnsummonObject(uint8 effIndex, WorldObject * obj); - void ExecuteLogEffectResurrect(uint8 effIndex, Unit * target); + void ExecuteLogEffectResurrect(uint8 effIndex, Unit* target); void SendInterrupted(uint8 result); void SendChannelUpdate(uint32 time); void SendChannelStart(uint32 duration); @@ -535,7 +535,7 @@ class Spell Unit* GetCaster() const { return m_caster; } Unit* GetOriginalCaster() const { return m_originalCaster; } - SpellEntry const * GetSpellInfo() const { return m_spellInfo; } + SpellEntry const* GetSpellInfo() const { return m_spellInfo; } int32 GetPowerCost() const { return m_powerCost; } void UpdatePointers(); // must be used at call Spell code after time delay (non triggered spell cast/update spell call/etc) @@ -618,7 +618,7 @@ class Spell uint32 m_procAttacker; // Attacker trigger flags uint32 m_procVictim; // Victim trigger flags uint32 m_procEx; - void prepareDataForTriggerSystem(AuraEffect const * triggeredByAura); + void prepareDataForTriggerSystem(AuraEffect const* triggeredByAura); // ***************************************** // Spell target subsystem @@ -745,14 +745,14 @@ namespace Trinity SpellNotifyPushType i_push_type; float i_radius; SpellTargets i_TargetType; - const Unit * const i_source; + const Unit* const i_source; uint32 i_entry; const Position * const i_pos; bool i_requireDeadTarget; - SpellEntry const * i_spellProto; + SpellEntry const* i_spellProto; SpellNotifierCreatureAndPlayer(Unit *source, std::list<Unit*> &data, float radius, SpellNotifyPushType type, - SpellTargets TargetType = SPELL_TARGETS_ENEMY, const Position *pos = NULL, uint32 entry = 0, SpellEntry const * spellProto = NULL) + SpellTargets TargetType = SPELL_TARGETS_ENEMY, const Position *pos = NULL, uint32 entry = 0, SpellEntry const* spellProto = NULL) : i_data(&data), i_push_type(type), i_radius(radius), i_TargetType(TargetType), i_source(source), i_entry(entry), i_pos(pos), i_spellProto(spellProto) { diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 10c4fd7b059..77391ef03ae 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -606,7 +606,7 @@ void Spell::SpellDamageSchoolDmg(SpellEffIndex effIndex) else if (m_spellInfo->SpellFamilyFlags[0] & 0x00000001) { // Improved Insect Swarm - if (AuraEffect const * aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_DRUID, 1771, 0)) + if (AuraEffect const* aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_DRUID, 1771, 0)) if (unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, 0x00200000, 0, 0)) AddPctN(damage, aurEff->GetAmount()); } @@ -621,7 +621,7 @@ void Spell::SpellDamageSchoolDmg(SpellEffIndex effIndex) if (uint32 combo = m_caster->ToPlayer()->GetComboPoints()) { // Lookup for Deadly poison (only attacker applied) - if (AuraEffect const * aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_ROGUE, 0x10000, 0, 0, m_caster->GetGUID())) + if (AuraEffect const* aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_ROGUE, 0x10000, 0, 0, m_caster->GetGUID())) { // count consumed deadly poison doses at target bool needConsume = true; @@ -1321,14 +1321,14 @@ void Spell::EffectDummy(SpellEffIndex effIndex) unitTarget->ModifyHealth(-damage); // Improved Life Tap mod - if (AuraEffect const * aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_WARLOCK, 208, 0)) + if (AuraEffect const* aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_WARLOCK, 208, 0)) AddPctN(mana, aurEff->GetAmount()); m_caster->CastCustomSpell(unitTarget, 31818, &mana, NULL, NULL, true); // Mana Feed int32 manaFeedVal = 0; - if (AuraEffect const * aurEff = m_caster->GetAuraEffect(SPELL_AURA_ADD_FLAT_MODIFIER, SPELLFAMILY_WARLOCK, 1982, 0)) + if (AuraEffect const* aurEff = m_caster->GetAuraEffect(SPELL_AURA_ADD_FLAT_MODIFIER, SPELLFAMILY_WARLOCK, 1982, 0)) manaFeedVal = aurEff->GetAmount(); if (manaFeedVal > 0) @@ -1459,7 +1459,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) uint32 count = unitTarget->GetDiseasesByCaster(m_caster->GetGUID()); int32 bp = int32(count * m_caster->CountPctFromMaxHealth(int32(m_spellInfo->EffectDamageMultiplier[0]))); // Improved Death Strike - if (AuraEffect const * aurEff = m_caster->GetAuraEffect(SPELL_AURA_ADD_PCT_MODIFIER, SPELLFAMILY_DEATHKNIGHT, 2751, 0)) + if (AuraEffect const* aurEff = m_caster->GetAuraEffect(SPELL_AURA_ADD_PCT_MODIFIER, SPELLFAMILY_DEATHKNIGHT, 2751, 0)) AddPctN(bp, m_caster->CalculateSpellDamage(m_caster, aurEff->GetSpellProto(), 2)); m_caster->CastCustomSpell(m_caster, 45470, &bp, NULL, NULL, false); return; @@ -1576,7 +1576,7 @@ void Spell::EffectTriggerSpellWithValue(SpellEffIndex effIndex) } int32 bp = damage; - Unit * caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); + Unit* caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); caster->CastCustomSpell(unitTarget, triggered_spell_id, &bp, &bp, &bp, true); } @@ -1635,7 +1635,7 @@ void Spell::EffectForceCast(SpellEffIndex effIndex) } } - Unit * caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); + Unit* caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); caster->CastSpell(unitTarget, spellInfo, true, NULL, NULL, m_originalCasterGUID); } @@ -1656,7 +1656,7 @@ void Spell::EffectForceCastWithValue(SpellEffIndex effIndex) return; } int32 bp = damage; - Unit * caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); + Unit* caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); caster->CastCustomSpell(unitTarget, spellInfo->Id, &bp, &bp, &bp, true, NULL, NULL, m_originalCasterGUID); } @@ -1808,7 +1808,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) // Note: not exist spells with weapon req. and IsSpellHaveCasterSourceTargets == true // so this just for speedup places in else - Unit * caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); + Unit* caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); caster->CastSpell(unitTarget, spellInfo, true, 0, 0, (originalCaster ? originalCaster->GetGUID() : 0)); } @@ -2219,7 +2219,7 @@ void Spell::SpellDamageHeal(SpellEffIndex /*effIndex*/) { // Amount of heal - depends from stacked Holy Energy int damageAmount = 0; - if (AuraEffect const * aurEff = m_caster->GetAuraEffect(45062, 0)) + if (AuraEffect const* aurEff = m_caster->GetAuraEffect(45062, 0)) { damageAmount+= aurEff->GetAmount(); m_caster->RemoveAurasDueToSpell(45062); @@ -3279,7 +3279,7 @@ void Spell::EffectDispel(SpellEffIndex effIndex) int32 heal_amount = SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 1); m_caster->CastCustomSpell(m_caster, 19658, &heal_amount, NULL, NULL, true); // Glyph of Felhunter - if (Unit * pOwner = m_caster->GetOwner()) + if (Unit* pOwner = m_caster->GetOwner()) if (pOwner->GetAura(56249)) pOwner->CastCustomSpell(pOwner, 19658, &heal_amount, NULL, NULL, true); } @@ -4041,7 +4041,7 @@ void Spell::SpellDamageWeaponDmg(SpellEffIndex effIndex) if (m_spellInfo->SpellFamilyFlags[EFFECT_0] & 0x1) { // Glyph of Plague Strike - if (AuraEffect const * aurEff = m_caster->GetAuraEffect(58657, EFFECT_0)) + if (AuraEffect const* aurEff = m_caster->GetAuraEffect(58657, EFFECT_0)) AddPctN(totalDamagePercentMod, aurEff->GetAmount()); break; } @@ -4060,7 +4060,7 @@ void Spell::SpellDamageWeaponDmg(SpellEffIndex effIndex) if (m_spellInfo->SpellFamilyFlags[EFFECT_0] & 0x10) { // Glyph of Death Strike - if (AuraEffect const * aurEff = m_caster->GetAuraEffect(59336, EFFECT_0)) + if (AuraEffect const* aurEff = m_caster->GetAuraEffect(59336, EFFECT_0)) if (uint32 runic = std::min<uint32>(m_caster->GetPower(POWER_RUNIC_POWER), SpellMgr::CalculateSpellEffectAmount(aurEff->GetSpellProto(), EFFECT_1))) AddPctN(totalDamagePercentMod, runic); break; @@ -4070,7 +4070,7 @@ void Spell::SpellDamageWeaponDmg(SpellEffIndex effIndex) { bool consumeDiseases = true; // Annihilation - if (AuraEffect const * aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_DEATHKNIGHT, 2710, EFFECT_0)) + if (AuraEffect const* aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_DEATHKNIGHT, 2710, EFFECT_0)) // Do not consume diseases if roll sucesses if (roll_chance_i(aurEff->GetAmount())) consumeDiseases = false; @@ -4341,7 +4341,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) // Glyph of Backstab case 63975: { - if (AuraEffect const * aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_ROGUE, 0x00100000, 0, 0, m_caster->GetGUID())) + if (AuraEffect const* aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_ROGUE, 0x00100000, 0, 0, m_caster->GetGUID())) { uint32 countMin = aurEff->GetBase()->GetMaxDuration(); uint32 countMax = 12000; @@ -5885,7 +5885,7 @@ void Spell::EffectReputation(SpellEffIndex effIndex) if (!factionEntry) return; - if (RepRewardRate const * repData = sObjectMgr->GetRepRewardRate(faction_id)) + if (RepRewardRate const* repData = sObjectMgr->GetRepRewardRate(faction_id)) { rep_change = int32((float)rep_change * repData->spell_rate); } @@ -6649,7 +6649,7 @@ void Spell::EffectQuestStart(SpellEffIndex effIndex) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; - Player * player = unitTarget->ToPlayer(); + Player* player = unitTarget->ToPlayer(); if (Quest const* qInfo = sObjectMgr->GetQuestTemplate(m_spellInfo->EffectMiscValue[effIndex])) { if (player->CanTakeQuest(qInfo, false) && player->CanAddQuest(qInfo, false)) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 66b0e15ae26..a267f6bdd72 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -312,7 +312,7 @@ uint32 GetDispelChance(Unit* auraCaster, Unit* target, uint32 spellId, bool offe return 100 - resist_chance; } -uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell * spell) +uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell* spell) { SpellCastTimesEntry const *spellCastTimeEntry = sSpellCastTimesStore.LookupEntry(spellInfo->CastingTimeIndex); @@ -339,7 +339,7 @@ bool IsPassiveSpell(uint32 spellId) return IsPassiveSpell(spellInfo); } -bool IsPassiveSpell(SpellEntry const * spellInfo) +bool IsPassiveSpell(SpellEntry const* spellInfo) { if (spellInfo->Attributes & SPELL_ATTR0_PASSIVE) return true; @@ -363,7 +363,7 @@ bool IsHigherHankOfSpell(uint32 spellId_1, uint32 spellId_2) return sSpellMgr->GetSpellRank(spellId_1) < sSpellMgr->GetSpellRank(spellId_2); } -uint32 CalculatePowerCost(SpellEntry const * spellInfo, Unit const * caster, SpellSchoolMask schoolMask) +uint32 CalculatePowerCost(SpellEntry const* spellInfo, Unit const* caster, SpellSchoolMask schoolMask) { // Spell drain all exist power on cast (Only paladin lay of Hands) if (spellInfo->AttributesEx & SPELL_ATTR1_DRAIN_ALL_POWER) @@ -427,7 +427,7 @@ uint32 CalculatePowerCost(SpellEntry const * spellInfo, Unit const * caster, Spe return powerCost; } -bool IsSpellRequiringFocusedTarget(SpellEntry const * spellInfo) +bool IsSpellRequiringFocusedTarget(SpellEntry const* spellInfo) { for (uint8 i = 0 ; i < MAX_SPELL_EFFECTS; ++i) { @@ -442,7 +442,7 @@ bool IsSpellRequiringFocusedTarget(SpellEntry const * spellInfo) return false; } -Unit* GetTriggeredSpellCaster(SpellEntry const * spellInfo, Unit * caster, Unit * target) +Unit* GetTriggeredSpellCaster(SpellEntry const* spellInfo, Unit* caster, Unit* target) { if (IsSpellRequiringFocusedTarget(spellInfo)) return caster; @@ -508,7 +508,7 @@ AuraState GetSpellAuraState(SpellEntry const* spellInfo) return AURA_STATE_NONE; } -SpellSpecific GetSpellSpecific(SpellEntry const * spellInfo) +SpellSpecific GetSpellSpecific(SpellEntry const* spellInfo) { switch(spellInfo->SpellFamilyName) { @@ -1207,7 +1207,7 @@ void SpellMgr::LoadSpellTargetPositions() // Check all spells for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) { - SpellEntry const * spellInfo = sSpellStore.LookupEntry(i); + SpellEntry const* spellInfo = sSpellStore.LookupEntry(i); if (!spellInfo) continue; @@ -1365,7 +1365,7 @@ void SpellMgr::LoadSpellBonusess() sLog->outString(); } -bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra, bool active) +bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellEntry const* procSpell, uint32 procFlags, uint32 procExtra, bool active) { // No extra req need uint32 procEvent_procEx = PROC_EX_NONE; @@ -1809,7 +1809,7 @@ bool SpellMgr::IsSkillTypeSpell(uint32 spellId, SkillType type) const } // basepoints provided here have to be valid basepoints (use SpellMgr::CalculateSpellEffectBaseAmount) -int32 SpellMgr::CalculateSpellEffectAmount(SpellEntry const * spellEntry, uint8 effIndex, Unit const * caster, int32 const * effBasePoints, Unit const * /*target*/) +int32 SpellMgr::CalculateSpellEffectAmount(SpellEntry const* spellEntry, uint8 effIndex, Unit const* caster, int32 const* effBasePoints, Unit const* /*target*/) { float basePointsPerLevel = spellEntry->EffectRealPointsPerLevel[effIndex]; int32 basePoints = effBasePoints ? *effBasePoints : spellEntry->EffectBasePoints[effIndex]; @@ -1871,7 +1871,7 @@ int32 SpellMgr::CalculateSpellEffectAmount(SpellEntry const * spellEntry, uint8 return int32(value); } -int32 SpellMgr::CalculateSpellEffectBaseAmount(int32 value, SpellEntry const * spellEntry, uint8 effIndex) +int32 SpellMgr::CalculateSpellEffectBaseAmount(int32 value, SpellEntry const* spellEntry, uint8 effIndex) { if (spellEntry->EffectDieSides[effIndex] == 0) return value; @@ -1879,22 +1879,22 @@ int32 SpellMgr::CalculateSpellEffectBaseAmount(int32 value, SpellEntry const * s return value - 1; } -float SpellMgr::CalculateSpellEffectValueMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell * spell) +float SpellMgr::CalculateSpellEffectValueMultiplier(SpellEntry const* spellEntry, uint8 effIndex, Unit* caster, Spell* spell) { float multiplier = spellEntry->EffectValueMultiplier[effIndex]; if (caster) - if (Player * modOwner = caster->GetSpellModOwner()) + if (Player* modOwner = caster->GetSpellModOwner()) modOwner->ApplySpellMod(spellEntry->Id, SPELLMOD_VALUE_MULTIPLIER, multiplier, spell); return multiplier; } -float SpellMgr::CalculateSpellEffectDamageMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell * spell) +float SpellMgr::CalculateSpellEffectDamageMultiplier(SpellEntry const* spellEntry, uint8 effIndex, Unit* caster, Spell* spell) { float multiplier = spellEntry->EffectDamageMultiplier[effIndex]; if (caster) - if (Player * modOwner = caster->GetSpellModOwner()) + if (Player* modOwner = caster->GetSpellModOwner()) modOwner->ApplySpellMod(spellEntry->Id, SPELLMOD_DAMAGE_MULTIPLIER, multiplier, spell); return multiplier; } @@ -3228,7 +3228,7 @@ bool SpellMgr::CanAurasStack(Aura const *aura1, Aura const *aura2, bool sameCast return true; } -bool CanSpellDispelAura(SpellEntry const * dispelSpell, SpellEntry const * aura) +bool CanSpellDispelAura(SpellEntry const* dispelSpell, SpellEntry const* aura) { // These auras (like ressurection sickness) can't be dispelled if (aura->Attributes & SPELL_ATTR0_NEGATIVE_1) @@ -3249,7 +3249,7 @@ bool CanSpellDispelAura(SpellEntry const * dispelSpell, SpellEntry const * aura) return true; } -bool CanSpellPierceImmuneAura(SpellEntry const * pierceSpell, SpellEntry const * aura) +bool CanSpellPierceImmuneAura(SpellEntry const* pierceSpell, SpellEntry const* aura) { // these spells pierce all avalible spells (Resurrection Sickness for example) if (pierceSpell->Attributes & SPELL_ATTR0_UNAFFECTED_BY_INVULNERABILITY) @@ -3336,13 +3336,13 @@ void SpellMgr::LoadSpellRequired() uint32 spell_id = fields[0].GetUInt32(); uint32 spell_req = fields[1].GetUInt32(); // check if chain is made with valid first spell - SpellEntry const * spell = sSpellStore.LookupEntry(spell_id); + SpellEntry const* spell = sSpellStore.LookupEntry(spell_id); if (!spell) { sLog->outErrorDb("spell_id %u in `spell_required` table is not found in dbcs, skipped", spell_id); continue; } - SpellEntry const * req_spell = sSpellStore.LookupEntry(spell_req); + SpellEntry const* req_spell = sSpellStore.LookupEntry(spell_req); if (!req_spell) { sLog->outErrorDb("req_spell %u in `spell_required` table is not found in dbcs, skipped", spell_req); @@ -3417,7 +3417,7 @@ void SpellMgr::LoadSpellRanks() break; } // check if chain is made with valid first spell - SpellEntry const * first = sSpellStore.LookupEntry(lastSpell); + SpellEntry const* first = sSpellStore.LookupEntry(lastSpell); if (!first) { sLog->outErrorDb("Spell rank identifier(first_spell_id) %u listed in `spell_ranks` does not exist!", lastSpell); @@ -3434,7 +3434,7 @@ void SpellMgr::LoadSpellRanks() // check spells in chain for (std::list<std::pair<int32, int32> >::iterator itr = rankChain.begin() ; itr!= rankChain.end(); ++itr) { - SpellEntry const * spell = sSpellStore.LookupEntry(itr->first); + SpellEntry const* spell = sSpellStore.LookupEntry(itr->first); if (!spell) { sLog->outErrorDb("Spell %u (rank %u) listed in `spell_ranks` for chain %u does not exist!", itr->first, itr->second, lastSpell); diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index e423461c987..82aac7ebe14 100755 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -173,15 +173,15 @@ enum SpellLinkedType SPELL_LINK_REMOVE = 0, }; -bool IsSpellRequiringFocusedTarget(SpellEntry const * spellInfo); -Unit * GetTriggeredSpellCaster(SpellEntry const * spellInfo, Unit * caster, Unit * target); -SpellSpecific GetSpellSpecific(SpellEntry const * spellInfo); -AuraState GetSpellAuraState(SpellEntry const * spellInfo); +bool IsSpellRequiringFocusedTarget(SpellEntry const* spellInfo); +Unit* GetTriggeredSpellCaster(SpellEntry const* spellInfo, Unit* caster, Unit* target); +SpellSpecific GetSpellSpecific(SpellEntry const* spellInfo); +AuraState GetSpellAuraState(SpellEntry const* spellInfo); // Different spell properties inline float GetSpellRadiusForHostile(SpellRadiusEntry const *radius) { return (radius ? radius->radiusHostile : 0); } inline float GetSpellRadiusForFriend(SpellRadiusEntry const *radius) { return (radius ? radius->radiusFriend : 0); } -uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell * spell = NULL); +uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell* spell = NULL); uint32 GetDispelChance(Unit* auraCaster, Unit* target, uint32 spellId, bool offensive, bool *result); inline float GetSpellMinRangeForHostile(SpellRangeEntry const *range) { return (range ? range->minRangeHostile : 0); } inline float GetSpellMaxRangeForHostile(SpellRangeEntry const *range) { return (range ? range->maxRangeHostile : 0); } @@ -230,7 +230,7 @@ inline float GetSpellMaxRange(uint32 id, bool positive) { uint64 casterGuid; uint32 spellId; - Unit * caster; + Unit* caster; uint8 stackAmount; bool operator < (const DispelEntry & _Right) const @@ -293,10 +293,10 @@ bool IsHigherHankOfSpell(uint32 spellId_1, uint32 spellId_2); bool IsSingleFromSpellSpecificPerCaster(SpellSpecific spellSpec1, SpellSpecific spellSpec2); bool IsSingleFromSpellSpecificPerTarget(SpellSpecific spellSpec1, SpellSpecific spellSpec2); bool IsPassiveSpell(uint32 spellId); -bool IsPassiveSpell(SpellEntry const * spellInfo); +bool IsPassiveSpell(SpellEntry const* spellInfo); bool IsAutocastableSpell(uint32 spellId); -uint32 CalculatePowerCost(SpellEntry const * spellInfo, Unit const * caster, SpellSchoolMask schoolMask); +uint32 CalculatePowerCost(SpellEntry const* spellInfo, Unit const* caster, SpellSchoolMask schoolMask); inline bool IsPassiveSpellStackableWithRanks(SpellEntry const* spellProto) { @@ -334,8 +334,8 @@ inline bool IsNonCombatSpell(SpellEntry const *spellInfo) bool IsPositiveSpell(uint32 spellId); bool IsPositiveEffect(uint32 spellId, uint32 effIndex); bool IsPositiveTarget(uint32 targetA, uint32 targetB); -bool CanSpellDispelAura(SpellEntry const * dispelSpell, SpellEntry const * aura); -bool CanSpellPierceImmuneAura(SpellEntry const * pierceSpell, SpellEntry const * aura); +bool CanSpellDispelAura(SpellEntry const* dispelSpell, SpellEntry const* aura); +bool CanSpellPierceImmuneAura(SpellEntry const* pierceSpell, SpellEntry const* aura); bool IsSingleTargetSpell(SpellEntry const *spellInfo); bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellInfo2); @@ -1025,7 +1025,7 @@ class SpellMgr return NULL; } - bool IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const * spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra, bool active); + bool IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellEntry const* procSpell, uint32 procFlags, uint32 procExtra, bool active); SpellEnchantProcEntry const* GetSpellEnchantProcEvent(uint32 enchId) const { @@ -1261,13 +1261,13 @@ class SpellMgr bool IsSkillBonusSpell(uint32 spellId) const; bool IsSkillTypeSpell(uint32 spellId, SkillType type) const; - static int32 CalculateSpellEffectAmount(SpellEntry const * spellEntry, uint8 effIndex, Unit const * caster = NULL, int32 const * basePoints = NULL, Unit const * target = NULL); - static int32 CalculateSpellEffectBaseAmount(int32 value, SpellEntry const * spellEntry, uint8 effIndex); - static float CalculateSpellEffectValueMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell * spell = NULL); - static float CalculateSpellEffectDamageMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell * spell = NULL); + static int32 CalculateSpellEffectAmount(SpellEntry const* spellEntry, uint8 effIndex, Unit const* caster = NULL, int32 const* basePoints = NULL, Unit const* target = NULL); + static int32 CalculateSpellEffectBaseAmount(int32 value, SpellEntry const* spellEntry, uint8 effIndex); + static float CalculateSpellEffectValueMultiplier(SpellEntry const* spellEntry, uint8 effIndex, Unit* caster, Spell* spell = NULL); + static float CalculateSpellEffectDamageMultiplier(SpellEntry const* spellEntry, uint8 effIndex, Unit* caster, Spell* spell = NULL); // Spell correctess for client using - static bool IsSpellValid(SpellEntry const * spellInfo, Player* pl = NULL, bool msg = true); + static bool IsSpellValid(SpellEntry const* spellInfo, Player* pl = NULL, bool msg = true); SkillLineAbilityMapBounds GetSkillLineAbilityMapBounds(uint32 spell_id) const { diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index d6c95ed4187..f38133ebad2 100755 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -213,7 +213,7 @@ void SpellScript::UnitTargetHandler::Call(SpellScript* spellScript, std::list<Un (spellScript->*pUnitTargetHandlerScript)(unitTargets); } -bool SpellScript::_Validate(SpellEntry const * entry) +bool SpellScript::_Validate(SpellEntry const* entry) { for (std::list<EffectHandler>::iterator itr = OnEffect.begin(); itr != OnEffect.end(); ++itr) if (!(*itr).GetAffectedEffectsMask(entry)) @@ -467,7 +467,7 @@ void SpellScript::SetCustomCastResultMessage(SpellCustomErrors result) m_spell->m_customError = result; } -bool AuraScript::_Validate(SpellEntry const * entry) +bool AuraScript::_Validate(SpellEntry const* entry) { for (std::list<CheckAreaTargetHandler>::iterator itr = DoCheckAreaTarget.begin(); itr != DoCheckAreaTarget.end(); ++itr) if (!HasAreaAuraEffect(entry)) @@ -533,7 +533,7 @@ AuraScript::CheckAreaTargetHandler::CheckAreaTargetHandler(AuraCheckAreaTargetFn pHandlerScript = _pHandlerScript; } -bool AuraScript::CheckAreaTargetHandler::Call(AuraScript* auraScript, Unit * _target) +bool AuraScript::CheckAreaTargetHandler::Call(AuraScript* auraScript, Unit* _target) { return (auraScript->*pHandlerScript)(_target); } @@ -615,7 +615,7 @@ AuraScript::EffectApplyHandler::EffectApplyHandler(AuraEffectApplicationModeFnTy mode = _mode; } -void AuraScript::EffectApplyHandler::Call(AuraScript* auraScript, AuraEffect const * _aurEff, AuraEffectHandleModes _mode) +void AuraScript::EffectApplyHandler::Call(AuraScript* auraScript, AuraEffect const* _aurEff, AuraEffectHandleModes _mode) { if (_mode & mode) (auraScript->*pEffectHandlerScript)(_aurEff, _mode); diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 5deb035160d..5428c606035 100755 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -281,7 +281,7 @@ class SpellScript : public _SpellScript // returns: target of current effect if it was Player otherwise NULL Player* GetHitPlayer(); // returns: target of current effect if it was Item otherwise NULL - Item * GetHitItem(); + Item* GetHitItem(); // returns: target of current effect if it was GameObject otherwise NULL GameObject* GetHitGObj(); // setter/getter for for damage done by spell to target of spell hit @@ -355,7 +355,7 @@ class AuraScript : public _SpellScript public: #define AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \ - typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit * target); \ + typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit* target); \ typedef void(CLASSNAME::*AuraEffectApplicationModeFnType)(AuraEffect const *, AuraEffectHandleModes); \ typedef void(CLASSNAME::*AuraEffectPeriodicFnType)(AuraEffect const *); \ typedef void(CLASSNAME::*AuraEffectUpdatePeriodicFnType)(AuraEffect *); \ @@ -370,7 +370,7 @@ class AuraScript : public _SpellScript { public: CheckAreaTargetHandler(AuraCheckAreaTargetFnType pHandlerScript); - bool Call(AuraScript* auraScript, Unit * target); + bool Call(AuraScript* auraScript, Unit* target); private: AuraCheckAreaTargetFnType pHandlerScript; }; @@ -379,13 +379,13 @@ class AuraScript : public _SpellScript public: EffectBase(uint8 _effIndex, uint16 _effName); std::string ToString(); - bool CheckEffect(SpellEntry const * spellEntry, uint8 effIndex); + bool CheckEffect(SpellEntry const* spellEntry, uint8 effIndex); }; class EffectPeriodicHandler : public EffectBase { public: EffectPeriodicHandler(AuraEffectPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); - void Call(AuraScript * auraScript, AuraEffect const * _aurEff); + void Call(AuraScript * auraScript, AuraEffect const* _aurEff); private: AuraEffectPeriodicFnType pEffectHandlerScript; }; @@ -425,7 +425,7 @@ class AuraScript : public _SpellScript { public: EffectApplyHandler(AuraEffectApplicationModeFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode); - void Call(AuraScript * auraScript, AuraEffect const * _aurEff, AuraEffectHandleModes _mode); + void Call(AuraScript * auraScript, AuraEffect const* _aurEff, AuraEffectHandleModes _mode); private: AuraEffectApplicationModeFnType pEffectHandlerScript; AuraEffectHandleModes mode; @@ -463,23 +463,23 @@ class AuraScript : public _SpellScript public: AuraScript() : _SpellScript(), m_aura(NULL), m_auraApplication(NULL), m_defaultActionPrevented(false) {} - bool _Validate(SpellEntry const * entry); + bool _Validate(SpellEntry const* entry); bool _Load(Aura * aura); - void _PrepareScriptCall(AuraScriptHookType hookType, AuraApplication const * aurApp = NULL); + void _PrepareScriptCall(AuraScriptHookType hookType, AuraApplication const* aurApp = NULL); void _FinishScriptCall(); bool _IsDefaultActionPrevented(); private: Aura * m_aura; - AuraApplication const * m_auraApplication; + AuraApplication const* m_auraApplication; bool m_defaultActionPrevented; class ScriptStateStore { public: uint8 _currentScriptState; - AuraApplication const * _auraApplication; + AuraApplication const* _auraApplication; bool _defaultActionPrevented; - ScriptStateStore(uint8 currentScriptState, AuraApplication const * auraApplication, bool defaultActionPrevented) + ScriptStateStore(uint8 currentScriptState, AuraApplication const* auraApplication, bool defaultActionPrevented) : _currentScriptState(currentScriptState), _auraApplication(auraApplication), _defaultActionPrevented(defaultActionPrevented) {} }; @@ -493,7 +493,7 @@ class AuraScript : public _SpellScript // // executed when area aura checks if it can be applied on target // example: OnEffectApply += AuraEffectApplyFn(class::function); - // where function is: bool function (Unit * target); + // where function is: bool function (Unit* target); HookList<CheckAreaTargetHandler> DoCheckAreaTarget; #define AuraCheckAreaTargetFn(F) CheckAreaTargetFunction(&F) // executed when aura effect is applied with specified mode to target @@ -589,7 +589,7 @@ class AuraScript : public _SpellScript // returns object on which aura was casted, target for non-area auras, area aura source for area auras WorldObject * GetOwner() const; // returns owner if it's unit or unit derived object, NULL otherwise (only for persistent area auras NULL is returned) - Unit * GetUnitOwner() const; + Unit* GetUnitOwner() const; // returns owner if it's dynobj, NULL otherwise DynamicObject * GetDynobjOwner() const; @@ -647,9 +647,9 @@ class AuraScript : public _SpellScript // returns currently processed target of an aura // Return value does not need to be NULL-checked, the only situation this will (always) // return NULL is when the call happens in an unsupported hook, in other cases, it is always valid - Unit * GetTarget() const; + Unit* GetTarget() const; // returns AuraApplication object of currently processed target - AuraApplication const * GetTargetApplication() const; + AuraApplication const* GetTargetApplication() const; }; // diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index a1961ae6c63..29033627ee0 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -732,7 +732,7 @@ public: handler->PSendSysMessage("Hostil reference list of %s (guid %u)", target->GetName(), target->GetGUIDLow()); while (ref) { - if (Unit * unit = ref->getSource()->getOwner()) + if (Unit* unit = ref->getSource()->getOwner()) { ++cnt; handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", cnt, unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index fc46ffec497..7129aa67c99 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -143,7 +143,7 @@ public: uint32 id = fields[6].GetUInt32(); // if creature is in same map with caster go at its current location - if (Creature * creature = sObjectAccessor->GetCreature(*_player, MAKE_NEW_GUID(guid, id, HIGHGUID_UNIT))) + if (Creature* creature = sObjectAccessor->GetCreature(*_player, MAKE_NEW_GUID(guid, id, HIGHGUID_UNIT))) { x = creature->GetPositionX(); y = creature->GetPositionY(); diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 726b937cf95..44d87729719 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -556,7 +556,7 @@ public: float z = fields[4].GetFloat(); uint16 mapid = fields[5].GetUInt16(); - GameObjectTemplate const * gInfo = sObjectMgr->GetGameObjectTemplate(entry); + GameObjectTemplate const* gInfo = sObjectMgr->GetGameObjectTemplate(entry); if (!gInfo) continue; diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index eac6d29651b..af8debd8844 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -208,7 +208,7 @@ public: return false; } - MapEntry const * map = sMapStore.LookupEntry(tele->mapId); + MapEntry const* map = sMapStore.LookupEntry(tele->mapId); if (!map || map->IsBattlegroundOrArena()) { handler->SendSysMessage(LANG_CANNOT_TELE_TO_BG); @@ -289,7 +289,7 @@ public: return false; } - MapEntry const * map = sMapStore.LookupEntry(tele->mapId); + MapEntry const* map = sMapStore.LookupEntry(tele->mapId); if (!map || map->IsBattlegroundOrArena()) { handler->SendSysMessage(LANG_CANNOT_TELE_TO_BG); diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index b96b656e7d8..fc268afe75a 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -69,7 +69,7 @@ public: return false; } - Player * target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) { handler->SendSysMessage(LANG_NO_CHAR_SELECTED); @@ -114,7 +114,7 @@ public: return false; } - Player * target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) { handler->SendSysMessage(LANG_NO_CHAR_SELECTED); @@ -161,7 +161,7 @@ public: return false; } - Player * target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) { handler->SendSysMessage(LANG_NO_CHAR_SELECTED); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index c3518115f54..fc3c469771a 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -120,7 +120,7 @@ public: Summons.DespawnAll(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 2639d2ab5c6..2e162dde5b8 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -67,7 +67,7 @@ public: uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); //20 to 30 seconds } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 7014bfde7c4..e25df98863b 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -58,7 +58,7 @@ public: uiResetTimer = 5*IN_MILLISECONDS; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index a04cb1b55b5..dbaf7a77fa0 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -63,7 +63,7 @@ public: uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp index 1e8e5e74750..238e72474b7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -53,7 +53,7 @@ public: Spirit_Timer = 24000; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void SummonSpirits(Unit* victim) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp index 450a22d3799..db6e2547381 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp @@ -63,7 +63,7 @@ public: EnvelopingWeb_Timer = 16000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 2b90ddbcd11..7a662d8e99b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -62,7 +62,7 @@ public: //Counter= 0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); me->CallForHelp(VISIBLE_RANGE); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp index e067cd90221..33f72025dfc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp @@ -61,7 +61,7 @@ public: Medics = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp index e8c3ca21352..414748bccca 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -54,7 +54,7 @@ public: MortalStrike_Timer = 22000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp index 56e4d503dbf..9303475328b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp @@ -54,7 +54,7 @@ public: Frenzy_Timer =0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index 79562c59d96..1403c0e44d9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -60,7 +60,7 @@ public: ShadowShield_Timer = 8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index 22500b9c17e..0ff398193d1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -59,7 +59,7 @@ public: WarStomp_Timer =0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp index 1ad7b532706..4247a7d3ea4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -62,7 +62,7 @@ public: Smite_Timer = 8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 149b5ffc192..684002acfd3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -184,7 +184,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -201,7 +201,7 @@ public: pInstance->SetData64(DATA_EVENSTARTER, 0); } - void JustDied(Unit * /*who*/) + void JustDied(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_GHOSTKILL, 1); diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp index 244f2b21f74..b08478a1145 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp @@ -87,8 +87,8 @@ public: void SummonCreatureWithRandomTarget(uint32 creatureId, uint8 count) { for (uint8 n = 0; n < count; n++) - if (Unit * Summoned = me->SummonCreature(creatureId, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240*IN_MILLISECONDS)) - if (Unit * target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* Summoned = me->SummonCreature(creatureId, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240*IN_MILLISECONDS)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) Summoned->AddThreat(target, 250.0f); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index 6133379822f..be6aa718a98 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -54,7 +54,7 @@ public: //DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2*IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp index bb49385f373..b1ae9b07630 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp @@ -59,7 +59,7 @@ public: _Reset(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_SNAP_KICK, 8*IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp index 14870a81289..fd870eb0f2f 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -60,7 +60,7 @@ public: KnockBack_Timer = 30000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index 2202982e595..766c74563cf 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -197,7 +197,7 @@ public: Enraged = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp index 73bea5bbc3c..019db29a508 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp @@ -57,7 +57,7 @@ public: Heal_Timer = 1000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp index 8ae3b52d289..7a300e9a368 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -54,7 +54,7 @@ public: FlameBuffet_Timer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp index 25e5306dae5..848e95f6e1c 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp @@ -56,7 +56,7 @@ public: Frenzy_Timer = 10000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index 0c975bdd171..e92483ff734 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -110,7 +110,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoScriptText(RAND(SAY_XHEALTH, SAY_AGGRO, SAY_SHADOWFLAME), me); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index f97f081594e..424d8b723dc 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -64,7 +64,7 @@ public: Conflagration_Timer = 12000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index c502828ab36..dd10305638f 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -130,7 +130,7 @@ public: me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (rand()%5) return; @@ -138,7 +138,7 @@ public: DoScriptText(SAY_KILLTARGET, me, victim); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoCast(me, SPELL_ESSENCEOFTHERED); DoZoneInCombat(); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index a2165dbbd92..57a34de3804 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -243,7 +243,7 @@ public: AttackStart(pTarget); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 94155f51f11..858374a8399 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -75,17 +75,17 @@ public: me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, true); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 84dcf2d40b8..d06e68ddf37 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -83,7 +83,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index ba6908fd2e9..1ccb913d8ba 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -84,12 +84,12 @@ public: void EnterCombat(Unit* /*who*/) {} - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); if (Unit *pMidnight = Unit::GetUnit(*me, Midnight)) @@ -98,7 +98,7 @@ public: void UpdateAI(const uint32 diff); - void SpellHit(Unit * /*source*/, const SpellEntry *spell) + void SpellHit(Unit* /*source*/, const SpellEntry *spell) { if (spell->Mechanic == MECHANIC_DISARM) DoScriptText(SAY_DISARMED, me); @@ -137,7 +137,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (Phase == 2) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 8a96f761798..1e17b720220 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -251,7 +251,7 @@ public: Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { HandleDoors(false); SwitchToPortalPhase(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 4c954c2dd51..6beaf3a906b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -154,7 +154,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(TYPE_NIGHTBANE, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index c016b232939..f0c38af0ab6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -117,8 +117,8 @@ public: InfernalPoint *point; void Reset() {} - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -149,7 +149,7 @@ public: CAST_CRE(pMalchezaar)->AI()->KilledUnit(who); } - void SpellHit(Unit * /*who*/, const SpellEntry *spell) + void SpellHit(Unit* /*who*/, const SpellEntry *spell) { if (spell->Id == SPELL_INFERNAL_RELAY) { @@ -238,12 +238,12 @@ public: pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -259,7 +259,7 @@ public: pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); 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 6218b72bcdf..d30494333a2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -157,12 +157,12 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -173,7 +173,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index 9c60fafb5a3..e11f85c02ca 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -85,7 +85,7 @@ public: AmplifyTimer = 2000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (!pInstance) { @@ -153,7 +153,7 @@ public: void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (SacrificeGUID) { @@ -226,7 +226,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -339,12 +339,12 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { for (uint8 i = 0; i < 2; ++i) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 9d0c540223d..253878eefe7 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -147,7 +147,7 @@ public: } } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -164,7 +164,7 @@ public: RemoveGravityLapse(); // Remove Gravity Lapse so that players fall to ground if they kill him when in air. } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (!pInstance) return; @@ -457,8 +457,8 @@ public: DoCast(me, SPELL_FLAMESTRIKE2, true); } - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { if (FlameStrikeTimer <= diff) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index cd7eb6e9015..0bf0b8f0129 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -96,18 +96,18 @@ public: pInstance->SetData(DATA_VEXALLUS_EVENT, NOT_STARTED); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_KILL, me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) pInstance->SetData(DATA_VEXALLUS_EVENT, DONE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -219,9 +219,9 @@ public: } } - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} - void AttackStart(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} }; }; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index a205b3e5ad8..a1f6e47c755 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -321,7 +321,7 @@ class mob_son_of_flame : public CreatureScript instance = me->GetInstanceScript(); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (instance) instance->SetData(DATA_RAGNAROS_ADDS, 1); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 0477b41dacd..889b487a330 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -130,7 +130,7 @@ public: me->LoadEquipment(0, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST); events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST); @@ -694,7 +694,7 @@ public: { npc_ros_dark_riderAI(Creature *c) : ScriptedAI(c) {} - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->ExitVehicle(); } @@ -902,7 +902,7 @@ public: } } - void PassengerBoarded(Unit * /*who*/, int8 /*seatId*/, bool apply) + void PassengerBoarded(Unit* /*who*/, int8 /*seatId*/, bool apply) { if (!apply) if (Creature *miner = Unit::GetCreature(*me, minerGUID)) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index f30d0be1f74..3f22aee29cd 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -375,7 +375,7 @@ public: uiStage_timer = 3000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_TREE2, me); me->Unmount(); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index fb98668f3f7..d5965aa2dbf 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1680,7 +1680,7 @@ public: { npc_the_lich_king_tirion_dawnAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); } void Reset() {} - void AttackStart(Unit * /*who*/) {} // very sample, just don't make them aggreesive + void AttackStart(Unit* /*who*/) {} // very sample, just don't make them aggreesive void UpdateAI(const uint32 /*diff*/) {} void JustDied(Unit* /*killer*/) {} }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 6b0ddf80096..3aba9f3ffca 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -66,7 +66,7 @@ public: bShielded = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index 53f6693a60d..d0dcc4c9d83 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -54,7 +54,7 @@ public: Terrify_Timer = 20000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index 8fe766409e4..f5a8479faa3 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -66,7 +66,7 @@ public: FireNova_Timer = 40000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 3b5c3a064d4..dd877a2d257 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -157,7 +157,7 @@ public: uint32 spell; uint32 spell2; void Reset(){} - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void SetType(uint32 _type) { switch(Creaturetype = _type) @@ -248,7 +248,7 @@ public: laugh = urand(15000, 30000); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void SaySound(int32 textEntry, Unit *pTarget = 0) { DoScriptText(textEntry, me, pTarget); @@ -478,7 +478,7 @@ public: ++id; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); @@ -780,9 +780,9 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_SPROUTING) { @@ -804,7 +804,7 @@ public: debuffGUID = 0; } - void JustDied(Unit * /*killer*/) { if (!sprouted) Despawn(); } + void JustDied(Unit* /*killer*/) { if (!sprouted) Despawn(); } void MoveInLineOfSight(Unit *who) { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index a97377f9d01..3ec4d9c91fa 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -66,13 +66,13 @@ public: Whirlwind_Timer = 60000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_RUSHINGCHARGE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_KILL, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index be37b82e8b0..664521dd7a2 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -68,7 +68,7 @@ public: PowerWordShield = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 2392927b488..4aa6b74681a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -53,7 +53,7 @@ public: BloodLust_Timer = 20000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index eb7ffbc111a..6168b5d8939 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -65,7 +65,7 @@ public: ShadowWordPain_Timer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index 86f5a0037f7..de190f9d260 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -57,7 +57,7 @@ public: FrostNova_Timer = 30000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index eff0adccffb..a303761e500 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -82,11 +82,11 @@ public: Teleport_Timer = 16000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(TYPE_GANDLING, DONE); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp index 7b03c22a9ca..ea07e6d5da9 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp @@ -43,13 +43,13 @@ public: { } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (me->GetHealth() <= damage) DoCast(me, 23261, true); //Summon Darkreaver's Fallen Charger } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } }; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 9009cdcd1c2..80e35195bd2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -58,7 +58,7 @@ public: Fear_Timer = 30000; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -70,7 +70,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 467c4f1cd18..74d6c994464 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -65,7 +65,7 @@ public: TouchCounter = 0; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -77,7 +77,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index 39f491d779f..f75042b5d8e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -59,7 +59,7 @@ public: Invisible = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -175,7 +175,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index b104a0a9b4c..25a2b9ed10d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -57,7 +57,7 @@ public: Mages = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index e5bf50b6162..269364bca1a 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -54,7 +54,7 @@ public: me->LoadCreaturesAddon(); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -66,7 +66,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index e2231cdff80..149b51ab397 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -58,7 +58,7 @@ public: NoxiousCatalyst_Timer = 35000; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -70,7 +70,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index f29f9d3f2d8..8444a426ebc 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -65,7 +65,7 @@ public: DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 0c81be88038..19a3183c91d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -60,7 +60,7 @@ public: HasYelled = false; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -72,7 +72,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 1dd9ecea38c..d27990be43b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -63,7 +63,7 @@ public: //Possess_Timer = 35000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 3c24fd48010..e86521225ba 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -114,7 +114,7 @@ public: me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 424602d3d5a..5f8a91c65a6 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -115,7 +115,7 @@ public: TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILLISECONDS); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index d2eac9f2efd..dada1176cf0 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -80,7 +80,7 @@ public: me->SetDisplayId(MODEL_HUMAN); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 1b14261e212..ac4ad7f63a7 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -61,7 +61,7 @@ public: DrainLife_Timer = 31000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 36b2cfc07a6..6413a953bd2 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -63,7 +63,7 @@ public: RaiseUndeadScarab_Timer = 3000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index c2e392f92a4..04a9e4690aa 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -67,7 +67,7 @@ public: HasYelled = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 714c3b81ee8..54cdcf2ae04 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -59,7 +59,7 @@ public: Knockout_Timer = 12000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index faf35185559..129d9ead38e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -52,7 +52,7 @@ public: HasYelled = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (!HasYelled) { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index c71394227f0..d8b33bbae93 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -224,7 +224,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (!Tagged && spell->Id == SPELL_EGAN_BLASTER) Tagged = true; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 950d5f2731d..b0c6c42876d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -119,7 +119,7 @@ public: pInstance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 5604f1d4a39..2f03d57af91 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -146,7 +146,7 @@ public: pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoZoneInCombat(); @@ -161,7 +161,7 @@ public: pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (rand()%4 == 0) DoScriptText(RAND(YELL_SAC_KILL_1, YELL_SAC_KILL_2), me); @@ -409,7 +409,7 @@ public: pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoZoneInCombat(); @@ -455,7 +455,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (rand()%4 == 0) { @@ -699,7 +699,7 @@ public: KillTimer = 15000; } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index efcb1e1b29e..3d8673d712c 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -159,7 +159,7 @@ public: pInstance->SetData(DATA_FELMYST_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_BERSERK, 600000); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index cc7ede77917..bdce8d1dd15 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -358,7 +358,7 @@ public: pInstance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_EVIL_SLAY1, SAY_EVIL_SLAY2), me); } @@ -661,7 +661,7 @@ public: DoScriptText(RAND(SAY_SATH_SLAY1, SAY_SATH_SLAY2), me); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_SATH_DEATH, me); me->GetMap()->CreatureRelocation(me, me->GetPositionX(), me->GetPositionY(), DRAGON_REALM_Z, me->GetOrientation()); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 721659611de..a9fbc693bd5 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -1078,7 +1078,7 @@ public: bLockedTarget = false; } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage > me->GetHealth()) DoCast(me, SPELL_FELFIRE_FISSION, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 015f7b9e40c..83ea67c33e3 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -134,7 +134,7 @@ public: pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoCastAOE(SPELL_NEGATIVE_ENERGY_E, true); DoCast(me, SPELL_ENTROPIUS_SPAWN, false); @@ -246,7 +246,7 @@ public: pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoCastAOE(SPELL_NEGATIVE_ENERGY, false); @@ -254,7 +254,7 @@ public: pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage > me->GetHealth() && Phase == 1) { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 01730f8142a..ae3db51890a 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -105,7 +105,7 @@ class boss_archaedas : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -124,7 +124,7 @@ class boss_archaedas : public CreatureScript } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { me->MonsterYell(SAY_KILL, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_KILL); @@ -196,7 +196,7 @@ class boss_archaedas : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied (Unit * /*pKiller*/) + void JustDied (Unit* /*pKiller*/) { if (pInstance) { @@ -258,7 +258,7 @@ class mob_archaedas_minions : public CreatureScript me->RemoveAllAuras(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->setFaction (14); me->RemoveAllAuras(); @@ -346,7 +346,7 @@ class mob_stonekeepers : public CreatureScript me->RemoveAllAuras(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -362,7 +362,7 @@ class mob_stonekeepers : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit * /*attacker*/) + void JustDied(Unit* /*attacker*/) { DoCast (me, SPELL_SELF_DESTRUCT, true); if (pInstance) diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp index 5ccfb7b8b19..f3cc42fcf47 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp @@ -55,7 +55,7 @@ class boss_ironaya : public CreatureScript bHasCastedWstomp = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 29dbe1c56e5..efb14fc8c49 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -62,7 +62,7 @@ class mob_jadespine_basilisk : public CreatureScript uiCslumberTimer = 2000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 043243a7d8f..bdca5ad1fa3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -126,7 +126,7 @@ class boss_akilzon : public CreatureScript SetWeather(WEATHER_STATE_FINE, 0.0f); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_ONAGGRO); @@ -417,7 +417,7 @@ class mob_akilzon_eagle : public CreatureScript me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } - void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} + void EnterCombat(Unit* /*who*/) {DoZoneInCombat();} void MoveInLineOfSight(Unit* /*who*/) {} diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 109a3f14760..f38ffe564b5 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -123,7 +123,7 @@ class boss_halazzi : public CreatureScript EnterPhase(PHASE_LYNX); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS); @@ -141,7 +141,7 @@ class boss_halazzi : public CreatureScript LynxGUID = summon->GetGUID(); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth() && Phase != PHASE_ENRAGE) damage = 0; @@ -368,7 +368,7 @@ class mob_halazzi_lynx : public CreatureScript shredder_timer = 4000; } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) damage = 0; @@ -380,7 +380,7 @@ class mob_halazzi_lynx : public CreatureScript ScriptedAI::AttackStart(who); } - void EnterCombat(Unit * /*who*/) {/*DoZoneInCombat();*/} + void EnterCombat(Unit* /*who*/) {/*DoZoneInCombat();*/} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index c4ab983677a..bfe833cbed8 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -172,7 +172,7 @@ class boss_janalai : public CreatureScript DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_JANALAIEVENT, IN_PROGRESS); @@ -454,7 +454,7 @@ class mob_janalai_firebomb : public CreatureScript void Reset() {} - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_FIRE_BOMB_THROW) DoCast(me, SPELL_FIRE_BOMB_DUMMY, true); @@ -638,7 +638,7 @@ class mob_janalai_hatchling : public CreatureScript me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } - void EnterCombat(Unit * /*who*/) {/*DoZoneInCombat();*/} + void EnterCombat(Unit* /*who*/) {/*DoZoneInCombat();*/} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 76a2d09df75..69e051f52f6 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -267,7 +267,7 @@ class boss_nalorakk : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 26bb7bb631c..c301447fa61 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -58,7 +58,7 @@ class npc_forest_frog : public CreatureScript void Reset() {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void DoSpawnRandom() { @@ -132,7 +132,7 @@ class npc_zulaman_hostage : public CreatureScript bool IsLoot; uint64 PlayerGUID; void Reset() {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* /*who*/) { Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp index 3070a0a2fd7..2eac011f8c9 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -52,7 +52,7 @@ class boss_gahzranka : public CreatureScript Slam_Timer = 17000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 06ea67db8c1..0fb323982f1 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -51,7 +51,7 @@ class boss_grilek : public CreatureScript GroundTremor_Timer = 8000 + rand()%8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 70d4d160ca0..f1f65e4408d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -105,7 +105,7 @@ class boss_hakkar : public CreatureScript Enraged = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index eef2c3cce01..db8182113ce 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -53,7 +53,7 @@ class boss_hazzarah : public CreatureScript Illusions_Timer = 10000 + rand()%8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index c9cfffd690d..706fc14327e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -88,7 +88,7 @@ class boss_jeklik : public CreatureScript PhaseTwo = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_BAT_FORM); @@ -254,7 +254,7 @@ class mob_batrider : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI (const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 4096f982095..c9ac816ecea 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -69,7 +69,7 @@ class boss_jindo : public CreatureScript Teleport_Timer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -201,7 +201,7 @@ class mob_healing_ward : public CreatureScript Heal_Timer = 2000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -251,7 +251,7 @@ class mob_shade_of_jindo : public CreatureScript DoCast(me, SPELL_INVISIBLE, true); } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI (const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 5c8ba750bda..60db1387276 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -134,7 +134,7 @@ class boss_mandokir : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -307,7 +307,7 @@ class mob_ohgan : public CreatureScript SunderArmor_Timer = 5000; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* /*Killer*/) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index ad6950c8f30..fa6fe02f5a0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -83,7 +83,7 @@ class boss_marli : public CreatureScript PhaseTwo = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -239,7 +239,7 @@ class mob_spawn_of_marli : public CreatureScript LevelUp_Timer = 3000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index b5550e6e740..d534c1788eb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -65,7 +65,7 @@ class boss_renataki : public CreatureScript Ambushed = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 796124be1dd..efdd095681e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -103,7 +103,7 @@ class boss_thekal : public CreatureScript WasDead = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -309,7 +309,7 @@ class mob_zealot_lorkhan : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -471,7 +471,7 @@ class mob_zealot_zath : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index a623c8e3760..9973dcd8724 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -84,7 +84,7 @@ class boss_venoxis : public CreatureScript InBerserk= false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index e6e38b761ee..9ea2dbdcf91 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -51,7 +51,7 @@ class boss_wushoolay : public CreatureScript LightningWave_Timer = 8000 + rand()%8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp index 5c1a1d77b0d..d1c2220c262 100644 --- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp +++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp @@ -66,7 +66,7 @@ public: Hound_Timer = 8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp index 4d2abdea18c..42435714261 100644 --- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp @@ -145,7 +145,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} }; }; diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp index 2d9f6ab9cc0..0457c58b2f7 100644 --- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp @@ -128,7 +128,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} }; diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index c4bd0e022a4..d720b37f056 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -247,7 +247,7 @@ public: } } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -396,7 +396,7 @@ public: paladinGuid[i] = 0; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp index 4b29e2d71f9..6c598cb85b6 100644 --- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp @@ -62,7 +62,7 @@ public: Timer = 2500; } - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp index f99fa6119c3..7fb5a028d41 100644 --- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp @@ -66,11 +66,11 @@ public: spellHit = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } - void MoveInLineOfSight(Unit * /*who*/) + void MoveInLineOfSight(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index a1c75f4bbc5..6446b8d2dfe 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -91,7 +91,7 @@ public: { } - void JustDied(Unit * /*who*/) + void JustDied(Unit* /*who*/) { me->setFaction(68); } @@ -271,7 +271,7 @@ public: } } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void JustSummoned(Creature *pSummoned) { @@ -308,7 +308,7 @@ public: } } - void JustDied(Unit * /*pKiller*/) + void JustDied(Unit* /*pKiller*/) { if (PlayerGUID) if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID)) diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp index 18ba799a60a..b213190425c 100644 --- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp @@ -78,7 +78,7 @@ public: return; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index ea78f0892e0..cbd9c1fe665 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -101,7 +101,7 @@ public: targetGUID = 0; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void JustSummoned(Creature *summoned) { @@ -177,7 +177,7 @@ public: EventCast = true; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index 453a9414234..4e50126cf92 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -280,7 +280,7 @@ class spell_ex_66244 : public SpellScriptLoader { } - bool DoCheckAreaTarget(Unit * proposedTarget) + bool DoCheckAreaTarget(Unit* proposedTarget) { }*/ }; @@ -379,7 +379,7 @@ class spell_ex : public SpellScriptLoader { PrepareSpellScript(spell_ex_SpellScript); - //bool Validate(SpellEntry const * spellEntry){return true;} + //bool Validate(SpellEntry const* spellEntry){return true;} //bool Load(){return true;} //void Unload(){} diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 424ddcc16e4..23c5b18e28e 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -51,7 +51,7 @@ class go_blackfathom_fire : public GameObjectScript public: go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject* pGo) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) { InstanceScript *pInstance = pGo->GetInstanceScript(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 978b0b822b1..59878e2e354 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -96,7 +96,7 @@ public: pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); @@ -104,7 +104,7 @@ public: me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { switch (urand(0, 2)) { @@ -273,15 +273,15 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 8b2aa35e2ce..83077c8250a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -148,7 +148,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {} - void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { damage = 0; } }; }; @@ -188,7 +188,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { damage = 0; } void UpdateAI(const uint32 diff) { @@ -291,7 +291,7 @@ public: IsChanneling = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->InterruptSpell(CURRENT_CHANNELED_SPELL); DoScriptText(SAY_AGGRO, me); @@ -301,7 +301,7 @@ public: pInstance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 77a3549dbc3..688e6b7f4e1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -89,7 +89,7 @@ public: pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); @@ -97,7 +97,7 @@ public: me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { switch (urand(0, 2)) { @@ -239,11 +239,11 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { } @@ -257,7 +257,7 @@ public: AttackStart(who); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 86e1348f399..5b4ceada677 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -84,7 +84,7 @@ public: pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); @@ -92,7 +92,7 @@ public: me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { switch (urand(0, 2)) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index fdd046b454f..09e254c4339 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -84,7 +84,7 @@ public: pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); @@ -92,7 +92,7 @@ public: me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { switch (urand(0, 1)) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 1db2a350dac..809a0ec9438 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -422,7 +422,7 @@ void hyjalAI::EnterEvadeMode() me->SetLootRecipient(NULL); } -void hyjalAI::EnterCombat(Unit * /*who*/) +void hyjalAI::EnterCombat(Unit* /*who*/) { if (IsDummy)return; for (uint8 i = 0; i < HYJAL_AI_MAX_SPELLS; ++i) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index 322c2572a21..faf4d3d4393 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -177,7 +177,7 @@ struct hyjalAI : public npc_escortAI void EnterEvadeMode(); // Send creature back to spawn location and evade. - void EnterCombat(Unit * /*who*/); // Used to reset cooldowns for our spells and to inform the raid that we're under attack + void EnterCombat(Unit* /*who*/); // Used to reset cooldowns for our spells and to inform the raid that we're under attack void UpdateAI(const uint32 diff); // Called to summon waves, check for boss deaths and to cast our spells. diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index c0be18cdb7f..228db1b7cb4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -377,7 +377,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) } } -void hyjal_trashAI::JustDied(Unit * /*victim*/) +void hyjal_trashAI::JustDied(Unit* /*victim*/) { if (!pInstance) return; @@ -1193,7 +1193,7 @@ public: } } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_TRASH, 0);//signal trash is dead @@ -1445,7 +1445,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 426fcf50fc0..20277a15ddd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -139,7 +139,7 @@ public: pInstance->SetData(DATA_EPOCH_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 78d22aeb18a..00ca4e325ad 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -243,7 +243,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index ff3ca08c3f2..20675eebeba 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -124,7 +124,7 @@ public: pInstance->SetData(DATA_MEATHOOK_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 7b26df8871a..c3370fb00a7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -151,7 +151,7 @@ public: pInstance->SetData(DATA_SALRAMM_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; 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 7a1e8179151..d959adf6c93 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -398,7 +398,7 @@ public: DoCast(me, SPELL_ARTHAS_AURA); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_ARTHAS_EVENT, FAIL); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 438a53c16ef..0378ed7581b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -73,7 +73,7 @@ public: Frenzy_Timer = 30000+rand()%15000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -93,7 +93,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -104,7 +104,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index 89e2fc763dd..5d3aebc49fe 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -75,7 +75,7 @@ public: Attraction_Timer = 25000+rand()%10000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -95,12 +95,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index 3151a773a9b..971e7ac741d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -74,17 +74,17 @@ public: WingBuffet_Timer = 25000+rand()%10000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index f6f45069b38..ce295b5a301 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -131,7 +131,7 @@ public: } } - void AttackStart(Unit * /*who*/) + void AttackStart(Unit* /*who*/) { //if (pInstance && pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) //return; @@ -139,7 +139,7 @@ public: //ScriptedAI::AttackStart(who); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void SpellHit(Unit* /*caster*/, const SpellEntry* spell) { @@ -291,7 +291,7 @@ public: else mWaveId = 1; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void DoSummonAtRift(uint32 creature_entry) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index f2dd3e2d481..239aba88ad2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -76,19 +76,19 @@ public: Consecration_Timer = 8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { //This is not correct. Should taunt Thrall before engage in combat DoScriptText(SAY_TAUNT1, me); DoScriptText(SAY_TAUNT2, me); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index ac934c4e5f4..2df7cf9b170 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -74,17 +74,17 @@ public: Mda_Timer = 40000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), me); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 0cdbcf9fc20..9bad835943f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -132,17 +132,17 @@ public: ExplodingShout_Timer = 25000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index ff296d3ce3b..455c95dc8cc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -528,7 +528,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_TH_RANDOM_KILL1, SAY_TH_RANDOM_KILL2, SAY_TH_RANDOM_KILL3), me); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 5ff4d8e1381..1016207febe 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -54,7 +54,7 @@ public: CorruptForces_Timer = 30000; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void JustDied(Unit* /*Killer*/) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp index e13de82e22d..00328bead1f 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp @@ -54,7 +54,7 @@ public: Landslide_Timer = 0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index a8f088f343b..431c0a43f17 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -57,7 +57,7 @@ public: Invisible = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 147e20fab80..926fcf18850 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -57,7 +57,7 @@ public: RepulsiveGaze_Timer = 23000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 596d4eb8bbe..2aa6e49fd88 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -225,7 +225,7 @@ public: DoScriptText(SAY_KILL, me); } - void SpellHit(Unit * /*pCaster*/, const SpellEntry* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) { if (pSpell->Id == SPELL_BREATH_EAST_TO_WEST || pSpell->Id == SPELL_BREATH_WEST_TO_EAST || diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 44e62de17b7..5096f9d4604 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -67,7 +67,7 @@ public: Hp = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index c870d049461..3bc09e57de0 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -74,13 +74,13 @@ public: pInstance->SetData(DATA_AYAMISS_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_AYAMISS_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_AYAMISS_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index b0acd48c83c..8854dde89df 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -56,13 +56,13 @@ public: pInstance->SetData(DATA_BURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_BURU_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_BURU_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 38477ab8486..ae55a3821eb 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -75,13 +75,13 @@ public: pInstance->SetData(DATA_KURINNAXX_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_KURINNAXX_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_KURINNAXX_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 37579f32a5e..80e29f361c1 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -88,7 +88,7 @@ public: pInstance->SetData(DATA_MOAM_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(EMOTE_AGGRO, me); @@ -96,7 +96,7 @@ public: pInstance->SetData(DATA_MOAM_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_MOAM_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index b0b5f063948..699735933ea 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -64,13 +64,13 @@ public: pInstance->SetData(DATA_OSSIRIAN_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_OSSIRIAN_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_OSSIRIAN_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index d798d3f3023..80966ae7dbf 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -70,13 +70,13 @@ public: pInstance->SetData(DATA_RAJAXX_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_RAJAXX_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_RAJAXX_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 50aeea950d8..bf85905098e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -73,7 +73,7 @@ public: Death = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -180,7 +180,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -280,7 +280,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 69db789e87d..857dfb7efde 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -231,7 +231,7 @@ public: pPortal->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); if (pInst) @@ -418,7 +418,7 @@ public: } } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { //No instance if (!pInst) @@ -548,7 +548,7 @@ public: pInst->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } @@ -884,7 +884,7 @@ public: pInst->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { //No instance if (!pInst) @@ -967,7 +967,7 @@ public: KillSelfTimer = 35000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } @@ -1042,7 +1042,7 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } @@ -1154,7 +1154,7 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } @@ -1267,7 +1267,7 @@ public: BeamTimer = 500; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 8a17b7285e2..1189427ff0b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -92,7 +92,7 @@ public: Spawn->AI()->AttackStart(victim); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 02b671083b3..9a4e035bb92 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -72,7 +72,7 @@ public: Berserk = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 439ca675f1e..8c9b1342b40 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -70,7 +70,7 @@ public: Submerged = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoCast(me->getVictim(), SPELL_BIRTH); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 4c9e2f5eb7f..73fd532b158 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -79,7 +79,7 @@ public: } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -219,7 +219,7 @@ public: AggroReset = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index e6ad78a9d85..6b73e6c4778 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -111,7 +111,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (IsImage || Images75) return; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index ceeb593d131..1eddbace893 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -103,7 +103,7 @@ struct boss_twinemperorsAI : public ScriptedAI return NULL; } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { Unit *pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -139,7 +139,7 @@ struct boss_twinemperorsAI : public ScriptedAI DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoZoneInCombat(); Creature *pOtherBoss = GetOtherBoss(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 8f228ada972..0803e0ca70f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -149,7 +149,7 @@ public: } } - void AddSentinelsNear(Unit * /*nears*/) + void AddSentinelsNear(Unit* /*nears*/) { std::list<Creature*> assistList; me->GetCreatureListWithEntryInGrid(assistList, 15264, 70.0f); @@ -233,7 +233,7 @@ public: me->AddAura(id, me); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (gatherOthersWhenAggro) GetOtherSentinels(who); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 8eb379024cb..019ee2fb8ae 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -193,7 +193,7 @@ public: DoScriptText(SAY_ATTACKED, me, who); } - void JustDied(Unit * /*slayer*/) + void JustDied(Unit* /*slayer*/) { if (pInstance) { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 950ed2d7fc3..8582f840c84 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -322,7 +322,7 @@ public: AttackStartCaster(victim, 10);//keep back & toss bombs/shoot } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { /*if (pInstance) pInstance->SetData(0, DONE);*/ diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp index 4915eb9625b..357f1dce8c8 100644 --- a/src/server/scripts/Kalimdor/azshara.cpp +++ b/src/server/scripts/Kalimdor/azshara.cpp @@ -61,7 +61,7 @@ public: spellhit = false; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) { @@ -508,7 +508,7 @@ public: } } - void AttackStart(Unit * /*who*/) + void AttackStart(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index 18d59538d32..4540f5296bd 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -97,7 +97,7 @@ public: me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { @@ -314,9 +314,9 @@ public: } } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) + void MoveInLineOfSight(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 454592e45dd..60c79998bb3 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -72,7 +72,7 @@ public: Enraged = false; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp index d32eed17fcd..ff3be7ca8c0 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/durotar.cpp @@ -424,7 +424,7 @@ class spell_mount_check : public SpellScriptLoader class spell_mount_check_AuraScript : public AuraScript { PrepareAuraScript(spell_mount_check_AuraScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MOUNTING_CHECK)) return false; @@ -472,7 +472,7 @@ class spell_voljin_war_drums : public SpellScriptLoader class spell_voljin_war_drums_SpellScript : public SpellScript { PrepareSpellScript(spell_voljin_war_drums_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MOTIVATE_1)) return false; diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index c3706ae377f..82c705c3efa 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -320,7 +320,7 @@ public: } } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (!PlayerGUID) return; diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp index 1d487d2a023..7004bbea2d4 100644 --- a/src/server/scripts/Kalimdor/orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/orgrimmar.cpp @@ -216,7 +216,7 @@ public: Shock_Timer = 8000; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 9c425d7e1fd..b721d9106af 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -265,7 +265,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { @@ -381,7 +381,7 @@ public: BigWill = 0; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void MoveInLineOfSight(Unit *who) { @@ -394,7 +394,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) { } + void KilledUnit(Unit* /*victim*/) { } void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp index 7dd6b5b21eb..db326f7657f 100644 --- a/src/server/scripts/Kalimdor/thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp @@ -90,7 +90,7 @@ public: Uppercut_Timer = 10000; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 4e751419303..38acda8e5ca 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -159,7 +159,7 @@ public: return NULL; } - void EnterCombat(Unit * /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) @@ -325,7 +325,7 @@ public: } } - void JustDied(Unit * /*pKiller*/) + void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_DEATH, me); lSummons.DespawnAll(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 9048d2cfae8..3184500870b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -207,7 +207,7 @@ public: pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 73ab6501ffa..2a3fbeb8859 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -83,7 +83,7 @@ public: } } - void JustDied(Unit * /*Killer*/) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -92,7 +92,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS); @@ -195,8 +195,8 @@ public: } } - void EnterCombat(Unit * /*who*/) {} - void AttackStart(Unit * /*victim*/) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*victim*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp index 4ab8519ac4a..8a37f409f72 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -95,7 +95,7 @@ public: pInstance->SetData(DATA_ELDER_NADOX_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_DEATH, me); @@ -103,7 +103,7 @@ public: pInstance->SetData(DATA_ELDER_NADOX_EVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } @@ -212,13 +212,13 @@ public: uiSprintTimer = 10*IN_MILLISECONDS; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (me->GetEntry() == MOB_AHNKAHAR_GUARDIAN_ENTRY) DeadAhnkaharGuardian = true; } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index da3eff81e6e..75a0420231c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -88,7 +88,7 @@ public: return 100*(me->GetHealth()-damage)/me->GetMaxHealth(); } - void DamageTaken(Unit * /*pAttacker*/, uint32 &damage) + void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) damage = 0; @@ -307,7 +307,7 @@ public: ResetPlayersPhaseMask(); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } 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 5bcddf61bbc..951af65fced 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -266,7 +266,7 @@ public: pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; @@ -357,8 +357,8 @@ public: uiDespawnTimer = 10*IN_MILLISECONDS; } - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void JustDied(Unit* /*who*/) { @@ -385,7 +385,7 @@ class prince_taldaram_sphere : public GameObjectScript public: prince_taldaram_sphere() : GameObjectScript("prince_taldaram_sphere") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index f125630fc45..79a864d02b1 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -315,7 +315,7 @@ class spell_baltharus_enervating_brand : public SpellScriptLoader uint32 triggerSpellId = GetSpellProto()->EffectTriggerSpell[aurEff->GetEffIndex()]; target->CastSpell(target, triggerSpellId, true); - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) if (target->GetDistance(caster) <= 12.0f) target->CastSpell(caster, SPELL_SIPHONED_MIGHT, true); } 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 5309cfdd747..3e8ca0a31d2 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -126,7 +126,7 @@ public: bDone = false; } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) { @@ -252,7 +252,7 @@ public: me->RemoveAura(SPELL_SHIELD); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 45ce90ffa4a..2672a22d26c 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -191,7 +191,7 @@ public: lSummons.DespawnAll(); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 0f3725dce21..f6f8624664b 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -220,7 +220,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 7c605d6d6ca..db285306071 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -170,7 +170,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 7c0afe830f2..ce297af9fd8 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -105,7 +105,7 @@ class boss_bronjahm : public CreatureScript instance->SetBossState(DATA_BRONJAHM, DONE); } - void KilledUnit(Unit * who) + void KilledUnit(Unit* who) { if (who->GetTypeId() == TYPEID_PLAYER) DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); 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 63c8cbe85b2..fb0c516cf5b 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 @@ -162,7 +162,7 @@ class boss_devourer_of_souls : public CreatureScript instance->SetData(DATA_DEVOURER_EVENT, IN_PROGRESS); } - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) { if (mirroredSoulTarget && me->HasAura(SPELL_MIRRORED_SOUL)) { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 28d9e406e92..2bfdcbc60e2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -90,7 +90,7 @@ public: pInstance->SetData(DATA_FALRIC_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 6574846831e..2f0e9f4703e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -87,7 +87,7 @@ public: pInstance->SetData(DATA_MARWYN_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } 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 a6307f3c796..ee914e9acb2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -796,7 +796,7 @@ public: { } - void JustDied(Unit * /*pWho*/) + void JustDied(Unit* /*pWho*/) { DoCast(SPELL_HALLUCINATION_2); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index c7d1baabe28..fa31154e86c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -96,7 +96,7 @@ struct boss_horAI : ScriptedAI me->SetReactState(REACT_PASSIVE); } - void DamageTaken(Unit * /*pWho*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pWho*/, uint32 &uiDamage) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) uiDamage = 0; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 6462485282a..1c454738484 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -160,7 +160,7 @@ class boss_ick : public CreatureScript return ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KRICK)); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (Creature* krick = GetKrick()) DoScriptText(SAY_KRICK_AGGRO, krick); 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 3a555da9a81..8153b748933 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -465,7 +465,7 @@ class spell_tyrannus_mark_of_rimefang : public SpellScriptLoader void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster || caster->GetTypeId() != TYPEID_UNIT) return; diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index d0825f79af0..b7ecb36e8a6 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -152,7 +152,7 @@ public: InstanceScript* pInstance; - void JustDied(Unit * /*who*/) + void JustDied(Unit* /*who*/) { if (pInstance) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 968be40223b..c1b82f71687 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -272,7 +272,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 2d1a6b4a5ea..5fc1f5d5f07 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -176,7 +176,7 @@ public: pInstance->SetData(DATA_SLAD_RAN_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index e21b3ee5e10..2186aa205ab 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -519,7 +519,7 @@ class go_gundrak_altar : public GameObjectScript public: go_gundrak_altar() : GameObjectScript("go_gundrak_altar") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject* pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); uint64 uiStatue = 0; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index c2f2b93089c..72421d23a36 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -439,7 +439,7 @@ class spell_festergut_blighted_spores : public SpellScriptLoader void ExtraEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) { uint32 inoculatedId = sSpellMgr->GetSpellIdForDifficulty(SPELL_INOCULATED, caster); uint32 currStack = 0; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 999676d736d..e7999b1ec3d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -107,7 +107,7 @@ public: if (instance) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index fe0e94c76e1..2be01e72177 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -315,7 +315,7 @@ public: DoScriptText(SAY_DEATH[id], me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index dccce84818b..6c7eab3cbbe 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -75,7 +75,7 @@ public: BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_WOUND, 10000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index bd2c05b3c01..209a0391736 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -182,7 +182,7 @@ class boss_gothik : public CreatureScript thirtyPercentReached = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { for (uint32 i = 0; i < POS_LIVE; ++i) if (Creature* trigger = DoSummon(WORLD_TRIGGER, PosSummonLive[i])) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 098b22e30ac..a5ccbd2f6a5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -50,7 +50,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_POISON_CLOUD_ADD, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_CLOUD, 15000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 5bf864d8ed3..6dcfea6a483 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -72,7 +72,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index a615f7437c5..de5f3cdd1be 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -50,7 +50,7 @@ public: { boss_loathebAI(Creature *c) : BossAI(c, BOSS_LOATHEB) {} - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_AURA, 10000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 50ee49203d5..12a1abb043f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -72,7 +72,7 @@ public: bool enraged; - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); enraged = false; @@ -171,7 +171,7 @@ public: victim->CastSpell(victim, me->m_spells[0], true, NULL, NULL, me->GetGUID()); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (me->m_spells[0] && victimGUID) if (Unit *victim = Unit::GetUnit(*me, victimGUID)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 80174a610ee..21d8a1af44c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -86,7 +86,7 @@ public: _Reset(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index e2fe4135996..3906528a1a0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -86,7 +86,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); Enraged = false; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 7056eb0ea33..5b0420cd3bc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -88,7 +88,7 @@ public: me->CastSpell(me, SPELL_HOPELESS, true); // TODO: this may affect other creatures } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoPlaySoundToSet(me, SOUND_AGGRO); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 9bd06669d5c..916e096be92 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -120,7 +120,7 @@ public: CheckFrostResistTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index c61f5bddc7d..6d6c824e04b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -180,7 +180,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); @@ -189,7 +189,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 360000); } - void DamageTaken(Unit * /*pDoneBy*/, uint32 & /*uiDamage*/) + void DamageTaken(Unit* /*pDoneBy*/, uint32 & /*uiDamage*/) { me->SetReactState(REACT_AGGRESSIVE); } @@ -286,12 +286,12 @@ public: magneticPullTimer = 20000; } - void EnterCombat(Unit * /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { DoCast(SPELL_STALAGG_TESLA); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) @@ -370,12 +370,12 @@ public: staticFieldTimer = 5000; } - void EnterCombat(Unit * /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { DoCast(SPELL_FEUGEN_TESLA); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 908813e241c..f65fab3310e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -671,7 +671,7 @@ class spell_malygos_vortex_visual : public SpellScriptLoader void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) { std::list<HostileReference*> &m_threatlist = caster->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 001547379a3..415c510f001 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -212,7 +212,7 @@ public: DoCast(me, SPELL_ARCANEFORM, false); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0)) CAST_AI(boss_anomalus::boss_anomalusAI, pAnomalus->AI())->bDeadChaoticRift = true; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index c7fa97899a1..7a5261a0548 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -118,7 +118,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_SLAY, me); } @@ -228,7 +228,7 @@ class containment_sphere : public GameObjectScript public: containment_sphere() : GameObjectScript("containment_sphere") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); 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 1fd13bc1619..66d98186975 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -140,7 +140,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_KILL, me); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 360e003c0ca..aff5f15c923 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -113,7 +113,7 @@ public: pInstance->SetData(DATA_ORMOROK_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_KILL, me); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index ec8abc257d6..3bd8531aa9f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -254,7 +254,7 @@ class spell_eregos_planar_shift : public SpellScriptLoader void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) if (Creature* creatureCaster = caster->ToCreature()) creatureCaster->AI()->DoAction(ACTION_SET_NORMAL_EVENTS); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 6ba9db3d407..5d35b94217e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -246,13 +246,13 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader bool Load() { - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); return (caster && caster->ToCreature()); } void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) { // flags taken from sniffs // UNIT_FLAG_UNK_9 -> means passive but it is not yet implemented in core @@ -266,7 +266,7 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) { caster->ToCreature()->SetReactState(REACT_AGGRESSIVE); caster->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15|UNIT_FLAG_PASSIVE|UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_UNK_6); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 3a14946dfc0..fb2432e6f26 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -138,7 +138,7 @@ public: pInstance->SetData(TYPE_IONAR, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } @@ -185,7 +185,7 @@ public: } } - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) { if (!me->IsVisible()) uiDamage = 0; @@ -332,7 +332,7 @@ public: me->DespawnOrUnsummon(); } - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) { uiDamage = 0; } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 1f11e7a254a..eaf9f71f6fe 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -150,7 +150,7 @@ public: pInstance->SetData(DATA_KRYSTALLUS_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 7cf99900672..235a36e661a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -165,7 +165,7 @@ public: pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 92ec5db126e..2377c5e908a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -227,7 +227,7 @@ public: pInstance->DoCompleteAchievement(ACHIEV_ABUSE_THE_OOZE); } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index fee78783528..3003ebc2b7f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -126,7 +126,7 @@ public: pInstance->SetData(BOSS_ALGALON, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } 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 b739e41150c..67ea6bd23ba 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 @@ -230,7 +230,7 @@ public: InstanceScript* pInstance; uint32 phase; - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { StartEncounter(pInstance, me, who); DoScriptText(SAY_STEELBREAKER_AGGRO, me); @@ -291,7 +291,7 @@ public: pInstance->SetData(BOSS_ASSEMBLY_OF_IRON, DONE); } - void KilledUnit(Unit * /*who*/) + void KilledUnit(Unit* /*who*/) { DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1, SAY_STEELBREAKER_SLAY_2), me); @@ -299,7 +299,7 @@ public: DoCast(me, SPELL_ELECTRICAL_CHARGE); } - void SpellHit(Unit * /*from*/, const SpellEntry *spell) + void SpellHit(Unit* /*from*/, const SpellEntry *spell) { if (spell->Id == SPELL_SUPERCHARGE) DoAction(EVENT_UPDATEPHASE); @@ -438,12 +438,12 @@ public: pInstance->SetData(BOSS_ASSEMBLY_OF_IRON, DONE); } - void KilledUnit(Unit * /*who*/) + void KilledUnit(Unit* /*who*/) { DoScriptText(RAND(SAY_MOLGEIM_SLAY_1, SAY_MOLGEIM_SLAY_2), me); } - void SpellHit(Unit * /*from*/, const SpellEntry *spell) + void SpellHit(Unit* /*from*/, const SpellEntry *spell) { if (spell->Id == SPELL_SUPERCHARGE) DoAction(EVENT_UPDATEPHASE); @@ -683,12 +683,12 @@ public: pInstance->SetData(BOSS_ASSEMBLY_OF_IRON, DONE); } - void KilledUnit(Unit * /*who*/) + void KilledUnit(Unit* /*who*/) { DoScriptText(RAND(SAY_BRUNDIR_SLAY_1, SAY_BRUNDIR_SLAY_2), me); } - void SpellHit(Unit * /*from*/, const SpellEntry *spell) + void SpellHit(Unit* /*from*/, const SpellEntry *spell) { if (spell->Id == SPELL_SUPERCHARGE) DoAction(EVENT_UPDATEPHASE); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index 56930a0833a..c2d81a5f562 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -71,7 +71,7 @@ public: DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); 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 79570d86a0e..c4651612aed 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -448,7 +448,7 @@ class spell_mark_of_the_faceless : public SpellScriptLoader void HandleEffectPeriodic(AuraEffect const* aurEff) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) caster->CastCustomSpell(SPELL_MARK_OF_THE_FACELESS_DAMAGE, SPELLVALUE_BASE_POINT1, aurEff->GetAmount(), GetTarget(), true); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 5faa94ed5c8..662f1225b74 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -432,7 +432,7 @@ class spell_ignis_slag_pot : public SpellScriptLoader class spell_ignis_slag_pot_AuraScript : public AuraScript { PrepareAuraScript(spell_ignis_slag_pot_AuraScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_SLAG_POT_DAMAGE)) return false; @@ -443,13 +443,13 @@ class spell_ignis_slag_pot : public SpellScriptLoader return true; } - void HandleEffectPeriodic(AuraEffect const * aurEff) + void HandleEffectPeriodic(AuraEffect const* aurEff) { Unit* aurEffCaster = aurEff->GetCaster(); if (!aurEffCaster) return; - Unit * target = GetTarget(); + Unit* target = GetTarget(); aurEffCaster->CastSpell(target, SPELL_SLAG_POT_DAMAGE, true); if (target->isAlive() && !GetDuration()) target->CastSpell(target, SPELL_SLAG_IMBUED, true); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index 866cb60d3d0..eccc497a748 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -144,7 +144,7 @@ class boss_kologarn : public CreatureScript eyebeamTarget = 0; } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); DoCast(SPELL_KOLOGARN_PACIFY); @@ -437,7 +437,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader void HandleForceCast(SpellEffIndex i) { - Player * plr = GetHitPlayer(); + Player* plr = GetHitPlayer(); if (!plr) return; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp index f8a474f3810..7a16644099d 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp @@ -68,12 +68,12 @@ public: _EnterEvadeMode(); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index ac23c28ddeb..b7f2af822d4 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -277,7 +277,7 @@ class boss_xt002 : public CreatureScript DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); @@ -441,7 +441,7 @@ public: InstanceScript* m_pInstance; uint32 _damageTaken; - void DamageTaken(Unit * /*pDone*/, uint32 &damage) + void DamageTaken(Unit* /*pDone*/, uint32 &damage) { Creature* XT002 = me->GetCreature(*me, m_pInstance->GetData64(BOSS_XT002)); if (!XT002 || !XT002->AI()) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 8977e4860b6..5938b09e9da 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -121,7 +121,7 @@ public: pInstance->SetData(DATA_INGVAR_EVENT, NOT_STARTED); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth() && !bIsUndead) { @@ -160,7 +160,7 @@ public: DoScriptText(YELL_AGGRO_2, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO_1, me); @@ -176,7 +176,7 @@ public: pInstance->SetData(DATA_INGVAR_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (bIsUndead) DoScriptText(YELL_KILL_1, me); @@ -353,7 +353,7 @@ public: void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { if (uiResurectTimer) @@ -429,7 +429,7 @@ public: } void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { if (uiDespawnTimer <= diff) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 096ee335077..26c345c4009 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -152,7 +152,7 @@ public: pInstance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; @@ -286,7 +286,7 @@ public: isDead = false; } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void DamageTaken(Unit *done_by, uint32 &damage) { if (done_by->GetGUID() == me->GetGUID()) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 6ff8e4d9ac8..b3e5e16e2c7 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -101,7 +101,7 @@ public: } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (!ghost && pInstance) { @@ -145,7 +145,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (!ghost) { @@ -258,7 +258,7 @@ public: } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (!ghost && pInstance) { @@ -304,7 +304,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (!ghost) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 0b9bd93e2ee..a8ccd970e45 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -71,7 +71,7 @@ public: } } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) @@ -91,7 +91,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 7f0d4dbed5b..a4385d861c2 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -219,7 +219,7 @@ public: pTemp->DisappearAndDie(); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } @@ -834,7 +834,7 @@ class go_palehoof_sphere : public GameObjectScript public: go_palehoof_sphere() : GameObjectScript("go_palehoof_sphere") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 9da89393f02..7da067b87cb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -276,7 +276,7 @@ public: Summons.Despawn(pSummoned); } - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_HARPOON_DAMAGE) { @@ -415,7 +415,7 @@ public: m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 3c04d522c4c..60e1743a508 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -356,7 +356,7 @@ public: pInstance->SetData(DATA_KING_YMIRON_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index f2c59b63e86..66487c6f6f9 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -63,7 +63,7 @@ class boss_archavon : public CreatureScript { } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000); events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 9f4a2eb0192..04935d3fb99 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -203,7 +203,7 @@ class mob_tempest_minion : public CreatureScript } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoZoneInCombat(); events.ScheduleEvent(EVENT_SHOCK, 20000); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 9a25c5a5961..3c752ae6ae0 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -140,7 +140,7 @@ class mob_flame_warder : public CreatureScript events.Reset(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 6041c0dca15..41d43a08f5d 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -190,7 +190,7 @@ public: killTimer = 60000; // if after this time there is no victim -> destroy! } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 5ddd2f02a17..017da20a176 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -149,7 +149,7 @@ public: pInstance->SetData(DATA_CYANIGOSA_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index c1f7aac1779..d36533cb906 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -225,7 +225,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index b82996bfc89..3f2ea65958d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -320,7 +320,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 9b6cb6c2964..405c6833693 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -166,7 +166,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index ead4cd439e2..d009063109f 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -571,9 +571,9 @@ public: bPortalGuardianOrKeeperOrEliteSpawn = false; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -778,7 +778,7 @@ struct violet_hold_trashAI : public npc_escortAI } } - void JustDied(Unit * /*unit*/) + void JustDied(Unit* /*unit*/) { if (Creature* portal = Unit::GetCreature((*me), pInstance->GetData64(DATA_TELEPORTATION_PORTAL))) CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI, portal->AI())->SummonedMobDied(me); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 6f4dcd50571..00d9b943f0b 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -353,8 +353,8 @@ public: mob_nerubar_victimAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void JustDied(Unit* Killer) { @@ -588,10 +588,10 @@ public: Phase = 1; go_caribouGUID = 0; } - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} - void JustDied(Unit * /*who*/) + void JustDied(Unit* /*who*/) { if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetLootState(GO_JUST_DEACTIVATED); diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index fa08e8cafb4..1678e36b1a8 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -367,7 +367,7 @@ public: void EnterEvadeMode() {} - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 /*diff*/) { @@ -675,7 +675,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit * pKiller) + void JustDied(Unit* pKiller) { if (pKiller->ToPlayer() && pKiller->ToPlayer()->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index aa4d10ae980..255a1779ff7 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -155,7 +155,7 @@ public: return true; } - bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, Quest const * /*_Quest*/) + bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, Quest const* /*_Quest*/) { DoScriptText(SAY_QUEST_ACCEPT_IRO, pCreature); return false; diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index befe34faeed..eab88800203 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -144,7 +144,7 @@ public: DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P } - void MoveInLineOfSight(Unit * /*who*/){} + void MoveInLineOfSight(Unit* /*who*/){} void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 1a69c6a828d..ad39be101ac 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -302,7 +302,7 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team) m_SummonedGOSide = team; DelObject(EP_NPT_BUFF); AddObject(EP_NPT_BUFF, EP_NPT_LordaeronShrine.entry, EP_NPT_LordaeronShrine.map, EP_NPT_LordaeronShrine.x, EP_NPT_LordaeronShrine.y, EP_NPT_LordaeronShrine.z, EP_NPT_LordaeronShrine.o, EP_NPT_LordaeronShrine.rot0, EP_NPT_LordaeronShrine.rot1, EP_NPT_LordaeronShrine.rot2, EP_NPT_LordaeronShrine.rot3); - GameObject * go = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_BUFF]); + GameObject* go = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_BUFF]); if (go) go->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 84 : 83)); } @@ -576,7 +576,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) /* // sky - we need update gso code - Creature * c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]); + Creature* c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]); //Spawn flight master as friendly to capturing team c->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 55 : 68)); if(c) @@ -658,7 +658,7 @@ bool OutdoorPvPEP::Update(uint32 diff) return false; } -void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPEP::HandlePlayerEnterZone(Player* plr, uint32 zone) { // add buffs if (plr->GetTeam() == ALLIANCE) @@ -674,7 +674,7 @@ void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPEP::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs if (plr->GetTeam() == ALLIANCE) @@ -694,7 +694,7 @@ void OutdoorPvPEP::BuffTeams() { for (PlayerSet::iterator itr = m_players[0].begin(); itr != m_players[0].end(); ++itr) { - Player * plr = *itr; + Player* plr = *itr; { for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]); @@ -704,7 +704,7 @@ void OutdoorPvPEP::BuffTeams() } for (PlayerSet::iterator itr = m_players[1].begin(); itr != m_players[1].end(); ++itr) { - Player * plr = *itr; + Player* plr = *itr; { for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h index 6ce4cd1bcb2..b0a3f744c3d 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h @@ -197,8 +197,8 @@ class OPvPCapturePointEP_EWT : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); protected: @@ -228,8 +228,8 @@ class OPvPCapturePointEP_NPT : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); protected: @@ -259,8 +259,8 @@ class OPvPCapturePointEP_CGT : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); protected: @@ -290,8 +290,8 @@ class OPvPCapturePointEP_PWT : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); protected: @@ -326,7 +326,7 @@ class OutdoorPvPEP : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); void BuffTeams(); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 7a4e3b2abaf..cf754e528a4 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -81,7 +81,7 @@ bool OutdoorPvPHP::SetupOutdoorPvP() return true; } -void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPHP::HandlePlayerEnterZone(Player* plr, uint32 zone) { // add buffs if (plr->GetTeam() == ALLIANCE) @@ -97,7 +97,7 @@ void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPHP::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPHP::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs if (plr->GetTeam() == ALLIANCE) @@ -320,7 +320,7 @@ void OPvPCapturePointHP::HandlePlayerLeave(Player *plr) OPvPCapturePoint::HandlePlayerLeave(plr); } -void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit * killed) +void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit* killed) { if (killed->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h index e53a3537b83..42c62c2584b 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h @@ -98,8 +98,8 @@ class OPvPCapturePointHP : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); private: @@ -123,9 +123,9 @@ class OutdoorPvPHP : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); - void HandleKillImpl(Player * plr, Unit * killed); + void HandleKillImpl(Player* plr, Unit* killed); private: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index a015de48f88..bff1e8e011d 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -29,7 +29,7 @@ OutdoorPvPNA::OutdoorPvPNA() m_TypeId = OUTDOOR_PVP_NA; } -void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit * killed) +void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit* killed) { if (killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != killed->ToPlayer()->GetTeam()) { @@ -64,12 +64,12 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount() case NA_NPC_GUARD_14: case NA_NPC_GUARD_15: { - if (Creature * cr = HashMapHolder<Creature>::Find(itr->second)) + if (Creature* cr = HashMapHolder<Creature>::Find(itr->second)) { if (cr->isAlive()) ++cnt; } - else if (CreatureData const * cd = sObjectMgr->GetCreatureData(GUID_LOPART(itr->second))) + else if (CreatureData const* cd = sObjectMgr->GetCreatureData(GUID_LOPART(itr->second))) { if (!cd->is_dead) ++cnt; @@ -225,7 +225,7 @@ bool OutdoorPvPNA::SetupOutdoorPvP() return true; } -void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPNA::HandlePlayerEnterZone(Player* plr, uint32 zone) { // add buffs if (plr->GetTeam() == m_obj->m_ControllingFaction) @@ -233,7 +233,7 @@ void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPNA::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPNA::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); @@ -334,7 +334,7 @@ bool OutdoorPvPNA::Update(uint32 diff) return m_obj->Update(diff); } -bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObject * /*go*/) +bool OPvPCapturePointNA::HandleCustomSpell(Player* plr, uint32 spellId, GameObject* /*go*/) { std::vector<uint32> nodes; nodes.resize(2); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index eba273245eb..8a50ef65ba1 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -267,10 +267,10 @@ class OPvPCapturePointNA : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); - bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go); + bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go); int32 HandleOpenGo(Player *plr, uint64 guid); @@ -327,9 +327,9 @@ class OutdoorPvPNA : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); - void HandleKillImpl(Player * plr, Unit * killed); + void HandleKillImpl(Player* plr, Unit* killed); private: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index ab336e3b2ba..627bb28b0e7 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -67,14 +67,14 @@ bool OutdoorPvPSI::Update(uint32 /*diff*/) return false; } -void OutdoorPvPSI::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPSI::HandlePlayerEnterZone(Player* plr, uint32 zone) { if (plr->GetTeam() == m_LastController) plr->CastSpell(plr, SI_CENARION_FAVOR, true); OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPSI::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPSI::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs plr->RemoveAurasDueToSpell(SI_CENARION_FAVOR); @@ -155,7 +155,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius) { // he dropped it further, summon mound - GameObject * go = new GameObject; + GameObject* go = new GameObject; Map * map = plr->GetMap(); if (!map) { @@ -185,7 +185,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius) { // he dropped it further, summon mound - GameObject * go = new GameObject; + GameObject* go = new GameObject; Map * map = plr->GetMap(); if (!map) { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h index 0acec8c3213..b93a0f2a5a5 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h @@ -66,13 +66,13 @@ class OutdoorPvPSI : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); - bool HandleAreaTrigger(Player * plr, uint32 trigger); + bool HandleAreaTrigger(Player* plr, uint32 trigger); - bool HandleDropFlag(Player * plr, uint32 spellId); + bool HandleDropFlag(Player* plr, uint32 spellId); - bool HandleCustomSpell(Player * plr, uint32 spellId, GameObject *go); + bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject *go); void UpdateWorldState(); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index ffcbfd7997e..a4fc38e7e80 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -67,7 +67,7 @@ void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data) } } -void OutdoorPvPTF::SendRemoveWorldStates(Player * plr) +void OutdoorPvPTF::SendRemoveWorldStates(Player* plr) { plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, uint32(0)); plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, uint32(0)); @@ -186,7 +186,7 @@ bool OutdoorPvPTF::Update(uint32 diff) return changed; } -void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPTF::HandlePlayerEnterZone(Player* plr, uint32 zone) { if (plr->GetTeam() == ALLIANCE) { @@ -201,7 +201,7 @@ void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPTF::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPTF::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs plr->RemoveAurasDueToSpell(TF_CAPTURE_BUFF); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h index e42dd54777f..f04faf81fd8 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h @@ -136,8 +136,8 @@ class OPvPCapturePointTF : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); void UpdateTowerState(); @@ -165,7 +165,7 @@ class OutdoorPvPTF : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); private: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 1bcb18821b4..4fdc22f04b3 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -139,7 +139,7 @@ bool OutdoorPvPZM::Update(uint32 diff) return changed; } -void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPZM::HandlePlayerEnterZone(Player* plr, uint32 zone) { if (plr->GetTeam() == ALLIANCE) { @@ -154,7 +154,7 @@ void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPZM::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPZM::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs plr->RemoveAurasDueToSpell(ZM_CAPTURE_BUFF); @@ -190,7 +190,7 @@ bool OutdoorPvPZM::SetupOutdoorPvP() return true; } -void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit * killed) +void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit* killed) { if (killed->GetTypeId() != TYPEID_PLAYER) return; @@ -311,7 +311,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) if (m_FlagCarrierGUID) { // remove flag from carrier, reset flag carrier guid - Player * p = sObjectMgr->GetPlayer(m_FlagCarrierGUID); + Player* p = sObjectMgr->GetPlayer(m_FlagCarrierGUID); if (p) { p->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A); @@ -326,7 +326,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) UpdateTowerState(); } -bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems const& /*gso*/) +bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& /*gso*/) { uint64 guid = c->GetGUID(); std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); @@ -345,7 +345,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); if (itr != m_CreatureTypes.end()) { - Creature * cr = HashMapHolder<Creature>::Find(guid); + Creature* cr = HashMapHolder<Creature>::Find(guid); if (!cr) return true; // if the flag is already taken, then return @@ -368,7 +368,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, return false; } -bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * /*plr*/, uint32 spellId) +bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*plr*/, uint32 spellId) { switch(spellId) { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index a1ac4d4bbda..5cd2afde243 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -181,8 +181,8 @@ class OPvPCapturePointZM_Beacon : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); void UpdateTowerState(); @@ -219,11 +219,11 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint void SetBeaconState(uint32 controlling_team); // not good atm - bool HandleGossipOption(Player * plr, uint64 guid, uint32 gossipid); + bool HandleGossipOption(Player* plr, uint64 guid, uint32 gossipid); - bool HandleDropFlag(Player * plr, uint32 spellId); + bool HandleDropFlag(Player* plr, uint32 spellId); - bool CanTalkTo(Player * plr, Creature * c, GossipMenuItems const& gso); + bool CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso); private: @@ -253,9 +253,9 @@ class OutdoorPvPZM : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); - void HandleKillImpl(Player * plr, Unit * killed); + void HandleKillImpl(Player* plr, Unit* killed); private: diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 285a7e6ed81..378a60fbefa 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -63,7 +63,7 @@ public: Class_Timer = 1000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } void SetMyClass(uint8 myclass) @@ -202,7 +202,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } @@ -328,7 +328,7 @@ public: Mortal_Strike_timer = 10000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } 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 5371d8493e3..6aeb4bfc02f 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 @@ -72,7 +72,7 @@ public: FocusedTargetGUID = 0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } void JustSummoned(Creature *summoned) @@ -185,7 +185,7 @@ public: fiery1 = fiery2 = true; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 42256b6a501..7d5c64ca182 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -114,7 +114,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); @@ -253,7 +253,7 @@ public: Check_Timer = 1000; } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { // Send Shaffar to fight Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 586a8dcc96d..e79d712aef4 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -78,7 +78,7 @@ public: DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 5bafe396b0d..c0fd4433b16 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -92,7 +92,7 @@ public: summon10 = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } @@ -220,7 +220,7 @@ public: flamebuffet_timer = 5000; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void UpdateAI(const uint32 diff) { @@ -279,7 +279,7 @@ public: arcanebuffet_timer = 5000; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void UpdateAI(const uint32 diff) { @@ -333,7 +333,7 @@ public: frostbuffet_timer = 5000; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void UpdateAI(const uint32 diff) { @@ -388,7 +388,7 @@ public: shadowbuffet_timer = 5000; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index c7ea5523dac..2dec3658b39 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -113,7 +113,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 6be6824953c..40db25798b3 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -126,17 +126,17 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 17174439e58..1fbf91e8598 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -91,12 +91,12 @@ public: pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -104,7 +104,7 @@ public: pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index c7954000934..70439bf9027 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -89,7 +89,7 @@ public: sacrificed = false; } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { @@ -227,12 +227,12 @@ public: CAST_AI(mob_voidtraveler::mob_voidtravelerAI, summoned->AI())->VorpilGUID = me->GetGUID(); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); destroyPortals(); @@ -241,7 +241,7 @@ public: pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); summonPortals(); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 58859e0230d..a220531a929 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -95,7 +95,7 @@ public: } } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } // Sonic Boom instant damage (needs core fix instead of this) void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index d8c389eef1a..6bec350adfc 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -117,7 +117,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); DoScriptText(SAY_AGGRO, me); @@ -125,12 +125,12 @@ public: pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index d357faee386..dad131eb6f5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -388,7 +388,7 @@ public: GlaiveGUID = 0; } - void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} + void EnterCombat(Unit* /*who*/) {DoZoneInCombat();} void ChargeCheck() { @@ -532,7 +532,7 @@ public: Timer[EVENT_FLIGHT_SEQUENCE] = 1000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->setActive(true); DoZoneInCombat(); @@ -551,7 +551,7 @@ public: void MoveInLineOfSight(Unit *) {} - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -564,7 +564,7 @@ public: pInstance->HandleGameObject(pInstance->GetData64(i), true); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; // TODO: Find better way to handle emote @@ -589,7 +589,7 @@ public: done_by->AddThreat(me, -(3*(float)damage)/4); // do not let maiev tank him } - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades! { @@ -1178,8 +1178,8 @@ public: me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, 45738); } - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void EnterEvadeMode() {} void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; } @@ -1457,7 +1457,7 @@ public: me->CombatStop(true); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} void MovementInform(uint32 MovementType, uint32 /*Data*/) @@ -2037,7 +2037,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void MoveInLineOfSight(Unit *who) { @@ -2118,7 +2118,7 @@ public: uint64 TargetGUID; - void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} + void EnterCombat(Unit* /*who*/) {DoZoneInCombat();} void Reset() { @@ -2126,7 +2126,7 @@ public: DoCast(me, SPELL_SHADOW_DEMON_PASSIVE, true); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (Unit *pTarget = Unit::GetUnit((*me), TargetGUID)) pTarget->RemoveAurasDueToSpell(SPELL_PARALYZE); @@ -2167,7 +2167,7 @@ public: { blade_of_azzinothAI(Creature* c) : NullCreatureAI(c) {} - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE) me->SetDisplayId(21431);//appear when hit by Illidan's glaive diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 6eb6bb620c8..309b1884685 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -135,7 +135,7 @@ public: Enraged = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS); @@ -144,12 +144,12 @@ public: DoScriptText(SAY_AGGRO, me); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE); diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index ae4d9790fca..4e545087303 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -125,7 +125,7 @@ public: DoZoneInCombat(); } - void JustDied(Unit * /*killer*/); + void JustDied(Unit* /*killer*/); }; }; @@ -358,7 +358,7 @@ public: }; -void npc_enslaved_soul::npc_enslaved_soulAI::JustDied(Unit * /*killer*/) +void npc_enslaved_soul::npc_enslaved_soulAI::JustDied(Unit* /*killer*/) { if (ReliquaryGUID) if (Creature *Reliquary = (Unit::GetCreature((*me), ReliquaryGUID))) @@ -400,7 +400,7 @@ public: AuraTimer = 5000; } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) { @@ -411,7 +411,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { @@ -424,7 +424,7 @@ public: else return; } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SUFF_SAY_SLAY1, SUFF_SAY_SLAY2, SUFF_SAY_SLAY3), me); } @@ -536,7 +536,7 @@ public: } } - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL)) for (uint8 i = 0; i < 3; ++i) @@ -546,14 +546,14 @@ public: me->InterruptSpell(CURRENT_GENERIC_SPELL, false); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(DESI_SAY_FREED, me); DoZoneInCombat(); DoCast(me, AURA_OF_DESIRE, true); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(DESI_SAY_SLAY1, DESI_SAY_SLAY2, DESI_SAY_SLAY3), me); } @@ -632,7 +632,7 @@ public: CheckedAggro = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(ANGER_SAY_FREED, ANGER_SAY_FREED2), me); @@ -640,12 +640,12 @@ public: DoCast(me, AURA_OF_ANGER, true); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(ANGER_SAY_DEATH, me); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(ANGER_SAY_SLAY1, ANGER_SAY_SLAY2), me); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 3a8f367bd43..e0b732b42c3 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -289,7 +289,7 @@ public: summons.Despawn(summon); } - void MoveInLineOfSight(Unit * /*who*/) + void MoveInLineOfSight(Unit* /*who*/) { if (!GridSearcherSucceeded) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index fd741088ecc..49eaeea2767 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -119,7 +119,7 @@ public: summons.DespawnAll(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_SUPREMUSEVENT, IN_PROGRESS); @@ -155,7 +155,7 @@ public: events.ScheduleEvent(EVENT_SWITCH_PHASE, 60000, GCD_CAST); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -275,9 +275,9 @@ public: } uint32 wait; - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void DoAction(const int32 /*info*/) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 4153c4c234f..c5491ed2d0c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -76,7 +76,7 @@ public: TeronGUID = 0; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} @@ -263,7 +263,7 @@ public: Done = false; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit* pWho) { @@ -286,12 +286,12 @@ public: ScriptedAI::MoveInLineOfSight(pWho); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) pInstance->SetData(DATA_TERONGOREFIENDEVENT, DONE); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index fb8711ec7ac..e3c59203903 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -92,13 +92,13 @@ public: pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, NOT_STARTED); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(rand()%2 ? SAY_SLAY1 : SAY_SLAY2, me); events.DelayEvents(5000, GCD_YELL); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE); @@ -106,7 +106,7 @@ public: DoScriptText(SAY_DEATH, me); } - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD)) { @@ -116,7 +116,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS); diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 0ae6d62e175..fc3ac269260 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -271,7 +271,7 @@ public: me->SetDisplayId(11686); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} @@ -492,12 +492,12 @@ public: BlessingTimer = 60000; } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_GATH_SLAY, me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_GATH_DEATH, me); } @@ -621,12 +621,12 @@ public: Cooldown = 0; } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_ZERE_SLAY, me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_ZERE_DEATH, me); } @@ -721,12 +721,12 @@ public: ReflectiveShieldTimer = 0; } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_MALA_SLAY, me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_MALA_DEATH, me); } @@ -807,12 +807,12 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_VERA_SLAY, me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_VERA_DEATH, me); } @@ -891,14 +891,14 @@ public: { PrepareAuraScript(spell_boss_lady_malande_shield_AuraScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(SPELL_REFLECTIVE_SHIELD_T); } void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (dmgInfo.GetAttacker() == target) return; int32 bp = absorbAmount / 2; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index b5e0120d004..499652f6034 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -199,12 +199,12 @@ public: pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -215,7 +215,7 @@ public: me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { StartEvent(who); } @@ -354,7 +354,7 @@ public: pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) { @@ -367,7 +367,7 @@ public: } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (pInstance) { @@ -494,7 +494,7 @@ public: pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) { @@ -507,7 +507,7 @@ public: } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (pInstance) { @@ -621,7 +621,7 @@ public: pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) { @@ -634,7 +634,7 @@ public: } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (pInstance) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 9c79808b589..520a22e414d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -166,7 +166,7 @@ public: } } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -174,7 +174,7 @@ public: pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (CorruptedForm) { @@ -207,7 +207,7 @@ public: Summons.Despawn(summon); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (CorruptedForm) DoScriptText(SAY_CORRUPT_DEATH, me); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index f9879dee03a..45b8b5d3590 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -226,12 +226,12 @@ public: if (TaintedElemental_Timer > 50000) TaintedElemental_Timer = 50000; } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -249,7 +249,7 @@ public: pInstance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (pInstance) { @@ -630,9 +630,9 @@ public: VashjGUID = pInstance->GetData64(DATA_LADYVASHJ); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -705,7 +705,7 @@ public: Despawn_Timer = 30000; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) { @@ -717,7 +717,7 @@ public: } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { me->AddThreat(who, 0.1f); } @@ -787,12 +787,12 @@ public: Check_Timer = 1000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } - void MoveInLineOfSight(Unit * /*who*/) + void MoveInLineOfSight(Unit* /*who*/) { } @@ -939,9 +939,9 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI (const uint32 diff) { 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 d8e3b1158e9..f69a8cc7589 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 @@ -94,7 +94,7 @@ public: ShadowBolt_Timer = 10000; Link_Timer = 1000; } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { Unit* pUnit = Unit::GetUnit((*me), victimGUID); if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER)) @@ -110,7 +110,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (!victimGUID) return; } @@ -367,7 +367,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -382,7 +382,7 @@ public: } } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -396,7 +396,7 @@ public: pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (me->HasAura(AURA_BANISH)) return; @@ -520,7 +520,7 @@ public: { if ((*itr) && (*itr)->isAlive()) { - Creature * demon = me->SummonCreature(INNER_DEMON_ID, (*itr)->GetPositionX()+10, (*itr)->GetPositionY()+10, (*itr)->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + Creature* demon = me->SummonCreature(INNER_DEMON_ID, (*itr)->GetPositionX()+10, (*itr)->GetPositionY()+10, (*itr)->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (demon) { demon->AI()->AttackStart((*itr)); @@ -616,7 +616,7 @@ public: DoScriptText(SAY_FREE, me); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -624,13 +624,13 @@ public: DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { //invisibility (blizzlike, at the end of the fight he doesn't die, he disappears) DoCast(me, 8149, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { StartEvent(); } @@ -703,7 +703,7 @@ public: } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { me->InterruptNonMeleeSpells(false); if (pInstance) @@ -792,7 +792,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit * /*killer*/) {} + void JustDied(Unit* /*killer*/) {} }; }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 67cb8797593..51327f5d985 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -157,7 +157,7 @@ public: Summons.DespawnAll(); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (pInstance) pInstance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); @@ -425,7 +425,7 @@ public: } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 62b41cd4c0f..ce80a1b3ee7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -135,12 +135,12 @@ public: pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -148,7 +148,7 @@ public: pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { PlayerList = &me->GetMap()->GetPlayers(); Playercount = PlayerList->getSize(); @@ -309,7 +309,7 @@ public: me->setFaction(14); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index dcc88ba5d78..e84ced2db5a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -92,7 +92,7 @@ public: DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); @@ -167,7 +167,7 @@ public: WaterBoltVolley_Timer = 3000+rand()%3000; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 6781e3562c2..4129438f140 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -101,7 +101,7 @@ public: DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); @@ -223,7 +223,7 @@ public: //react only if attacked } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index d91750beaa3..ffe7265a566 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -77,9 +77,9 @@ public: } } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } - void StartRageGen(Unit * /*caster*/) + void StartRageGen(Unit* /*caster*/) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -90,7 +90,7 @@ public: pInstance->SetData(TYPE_DISTILLER, IN_PROGRESS); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (me->GetHealth() <= damage) if (pInstance) @@ -135,7 +135,7 @@ public: pInstance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); @@ -148,7 +148,7 @@ public: DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { //hack :( if (spell->Id == SPELL_WARLORDS_RAGE_PROC) diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index 6ccce4646ba..d9a8b629d68 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -55,7 +55,7 @@ public: AcidGeyser_Timer = 10000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -128,7 +128,7 @@ public: DoCast(me, SPELL_SPORE_CLOUD, true); } - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void AttackStart(Unit* /*who*/) {} diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index d77cdcf69f0..00559eeec99 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -73,7 +73,7 @@ public: Striders.clear(); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void JustSummoned(Creature *summon) { @@ -88,7 +88,7 @@ public: } } - void JustDied(Unit * /*who*/) + void JustDied(Unit* /*who*/) { for (std::list<uint64>::const_iterator i = Striders.begin(); i != Striders.end(); ++i) if (Creature *strider = Unit::GetCreature(*me, *i)) diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index dad5f356a1c..67dfd42815b 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -96,7 +96,7 @@ public: pInstance->SetData(DATA_GRUULEVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 4d835a680c0..b1b19898161 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -589,7 +589,7 @@ public: pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (pInstance) { @@ -699,7 +699,7 @@ public: pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (pInstance) { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index a21ce8473b7..f07f559df8e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -71,7 +71,7 @@ class boss_broggok : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 7f2b5f7bd78..2c559c9bf34 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -78,7 +78,7 @@ class boss_the_maker : public CreatureScript pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 6afbe18a78e..85f8c394fb2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -90,7 +90,7 @@ class boss_omor_the_unscarred : public CreatureScript CanPullBack = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 6622c42827b..a8fe1458cf9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -225,7 +225,7 @@ class boss_vazruden : public CreatureScript WipeSaid = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index f1b21b1da69..c8163e19da5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -78,7 +78,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript YelledForHeal = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index d58cb83ce92..793d49e8cae 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -352,7 +352,7 @@ class boss_magtheridon : public CreatureScript ScriptedAI::AttackStart(who); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); @@ -519,7 +519,7 @@ class mob_hellfire_channeler : public CreatureScript Check_Timer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); @@ -611,7 +611,7 @@ public: { } - bool OnGossipHello(Player *pPlayer, GameObject * pGO) + bool OnGossipHello(Player *pPlayer, GameObject* pGO) { InstanceScript* pInstance = pGO->GetInstanceScript(); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 71c05cbf93a..b29d41070bc 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -203,7 +203,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } @@ -332,7 +332,7 @@ class mob_fel_orc_convert : public CreatureScript Hemorrhage_Timer = 3000; } - void MoveInLineOfSight(Unit * /*who*/) + void MoveInLineOfSight(Unit* /*who*/) { } @@ -404,7 +404,7 @@ class mob_lesser_shadow_fissure : public CreatureScript mob_lesser_shadow_fissureAI(Creature* pCreature) : ScriptedAI(pCreature) {} void Reset() { } - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void AttackStart(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {} }; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 69e8c12ac41..44397fe4299 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -237,7 +237,7 @@ class boss_warbringer_omrogg : public CreatureScript ThreatYell = true; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 417eb865b4d..018aefaa3d1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -108,7 +108,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript resetcheck_timer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 7eef901f83e..8fa39447198 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -135,7 +135,7 @@ class boss_alar : public CreatureScript me->setActive(false); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_ALAREVENT, IN_PROGRESS); @@ -145,7 +145,7 @@ class boss_alar : public CreatureScript me->setActive(true); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) pInstance->SetData(DATA_ALAREVENT, DONE); @@ -158,7 +158,7 @@ class boss_alar : public CreatureScript summon->AI()->AttackStart(pTarget); } - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void AttackStart(Unit* who) { @@ -481,7 +481,7 @@ class mob_ember_of_alar : public CreatureScript { toDie = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } @@ -548,7 +548,7 @@ class mob_flame_patch_alar : public CreatureScript { mob_flame_patch_alarAI(Creature* pCreature) : ScriptedAI(pCreature) {} void Reset() {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 /*diff*/) {} diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index d50ac198eff..e894cd2be78 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -143,12 +143,12 @@ class boss_high_astromancer_solarian : public CreatureScript Summons.DespawnAll(); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize); me->SetDisplayId(MODEL_HUMAN); @@ -157,7 +157,7 @@ class boss_high_astromancer_solarian : public CreatureScript pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); @@ -435,7 +435,7 @@ class mob_solarium_priest : public CreatureScript aoesilenceTimer = 15000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 95e6a52db2b..5c4f3cb959a 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -423,7 +423,7 @@ class boss_kaelthas : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); @@ -1425,9 +1425,9 @@ class mob_kael_flamestrike : public CreatureScript me->setFaction(14); } - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 988524b35f3..e348ac5aab4 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -80,12 +80,12 @@ class boss_void_reaver : public CreatureScript pInstance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); DoZoneInCombat(); @@ -94,7 +94,7 @@ class boss_void_reaver : public CreatureScript pInstance->SetData(DATA_VOIDREAVEREVENT, DONE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index a0b954870df..12f95fdb4aa 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -57,7 +57,7 @@ class mob_crystalcore_devastator : public CreatureScript Knockaway_Timer = 25000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 2b575d2b499..b81b74a7fa9 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -73,7 +73,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript Stream_of_Machine_Fluid_Timer = 55000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO_1, me); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index ecaf72d8567..f4eacb9bf3c 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -93,7 +93,7 @@ class boss_pathaleon_the_calculator : public CreatureScript Counter = 0; summons.DespawnAll(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index c67e70a8614..57d9cacd5a6 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -122,14 +122,14 @@ class npc_millhouse_manastorm : public CreatureScript } } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -328,7 +328,7 @@ class npc_warden_mellichar : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_INTRO1, me); DoCast(me, SPELL_BUBBLE_VISUAL); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 040b1469130..75a1d3b51a0 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -110,7 +110,7 @@ class boss_harbinger_skyriss : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* /*Killer*/) { @@ -294,7 +294,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript void Reset() { } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } }; CreatureAI* GetAI(Creature* creature) const diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 4d031be1195..56377818eae 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -80,7 +80,7 @@ class boss_high_botanist_freywinn : public CreatureScript MoveFree = true; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index eaaaaec92cd..6e2ba1ad4d7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -155,7 +155,7 @@ class boss_laj : public CreatureScript CanSummon = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index ac69e21a30b..2fccfd0eddc 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -86,7 +86,7 @@ class mob_warp_splinter_treant : public CreatureScript check_Timer = 0; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} @@ -159,7 +159,7 @@ class boss_warp_splinter : public CreatureScript me->SetSpeed(MOVE_RUN, 0.7f, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index 54ff410a2ca..e7f1f01b670 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -200,7 +200,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (me->HasAura(SPELL_VISUAL_SLEEP)) me->RemoveAura(SPELL_VISUAL_SLEEP); @@ -267,9 +267,9 @@ public: me->SetStandState(UNIT_STAND_STATE_DEAD); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == 32146) { @@ -301,7 +301,7 @@ class npc_altruis_the_sufferer : public CreatureScript public: npc_altruis_the_sufferer() : CreatureScript("npc_altruis_the_sufferer") { } - bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const * /*quest*/) + bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const* /*quest*/) { if (!pPlayer->GetQuestRewardStatus(9991)) //Survey the Land, q-id 9991 { diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index 6bd250dd171..3e801bd1eed 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -98,7 +98,7 @@ public: add = NULL; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} /*void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -421,7 +421,7 @@ public: isEvent = false; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void JustSummoned(Creature *summoned) { @@ -776,13 +776,13 @@ public: me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (who->GetTypeId() == TYPEID_PLAYER) PlayerGUID = who->GetGUID(); } - void SpellHit(Unit * /*caster*/, const SpellEntry * /*spell*/) + void SpellHit(Unit* /*caster*/, const SpellEntry * /*spell*/) { DoCast(me, SPELL_DE_MATERIALIZE); } diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 8eda56d77e1..7b571c5874c 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -1495,7 +1495,7 @@ public: } void EnterCombat(Unit* /*who*/) {} - void JustDied(Unit * /*slayer*/) + void JustDied(Unit* /*slayer*/) { me->RemoveCorpse(); if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID))) @@ -1739,7 +1739,7 @@ public: void Reset() { } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void JustDied(Unit* /*killer*/) { diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 0bf7e99ad80..92765ec61de 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -77,7 +77,7 @@ public: me->setFaction(FACTION_HOSTILE); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void DoNice() { @@ -172,7 +172,7 @@ public: mob_infested_root_walkerAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void DamageTaken(Unit *done_by, uint32 &damage) { @@ -267,7 +267,7 @@ public: mob_rotting_forest_ragerAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void DamageTaken(Unit *done_by, uint32 &damage) { @@ -307,8 +307,8 @@ public: mob_netherweb_victimAI(Creature *c) : ScriptedAI(c) {} void Reset() { } - void EnterCombat(Unit * /*who*/) { } - void MoveInLineOfSight(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } + void MoveInLineOfSight(Unit* /*who*/) { } void JustDied(Unit* Killer) { @@ -411,7 +411,7 @@ public: me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 32095a26140..3c2f4c991ee 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -164,7 +164,7 @@ public: me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 80ee96a7578..f6492c9dee7 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -55,7 +55,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // TODO: this should absorb limited amount of damage, but no info on calculation formula amount = -1; @@ -97,12 +97,12 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader return true; } - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(DK_SPELL_RUNIC_POWER_ENERGIZE); } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -115,7 +115,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); // damage absorbed by Anti-Magic Shell energizes the DK with additional runic power. // This, if I'm not mistaken, shows that we get back ~20% of the absorbed damage as runic power. int32 bp = absorbAmount * 2 / 10; @@ -154,17 +154,17 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader return true; } - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { - SpellEntry const * talentSpell = sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); + SpellEntry const* talentSpell = sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); amount = SpellMgr::CalculateSpellEffectAmount(talentSpell, EFFECT_0, GetCaster()); // assume caster is a player here - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) amount += int32(2 * caster->ToPlayer()->GetTotalAttackPowerValue(BASE_ATTACK)); } @@ -196,7 +196,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader { PrepareSpellScript(spell_dk_corpse_explosion_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(DK_SPELL_CORPSE_EXPLOSION_TRIGGERED)) return false; @@ -370,7 +370,7 @@ class spell_dk_scourge_strike : public SpellScriptLoader { PrepareSpellScript(spell_dk_scourge_strike_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(DK_SPELL_SCOURGE_STRIKE_TRIGGERED)) return false; @@ -417,7 +417,7 @@ class spell_dk_spell_deflection : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -453,7 +453,7 @@ class spell_dk_blood_boil : public SpellScriptLoader { PrepareSpellScript(spell_dk_blood_boil_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(DK_SPELL_BLOOD_BOIL_TRIGGERED)) return false; @@ -520,7 +520,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -530,7 +530,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader { // min pct of hp is stored in effect 0 of talent spell uint32 rank = sSpellMgr->GetSpellRank(GetSpellProto()->Id); - SpellEntry const * talentProto = sSpellStore.LookupEntry(sSpellMgr->GetSpellWithRank(DK_SPELL_WILL_OF_THE_NECROPOLIS_TALENT_R1, rank)); + SpellEntry const* talentProto = sSpellStore.LookupEntry(sSpellMgr->GetSpellWithRank(DK_SPELL_WILL_OF_THE_NECROPOLIS_TALENT_R1, rank)); int32 remainingHp = int32(GetTarget()->GetHealth() - dmgInfo.GetDamage()); int32 minHp = int32(GetTarget()->CountPctFromMaxHealth(SpellMgr::CalculateSpellEffectAmount(talentProto, EFFECT_0, GetCaster()))); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index c2805715afa..1166ccdebb0 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -40,7 +40,7 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader { PrepareSpellScript(spell_dru_glyph_of_starfire_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(DRUID_INCREASED_MOONFIRE_DURATION)) return false; @@ -53,7 +53,7 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader { Unit* caster = GetCaster(); if (Unit* unitTarget = GetHitUnit()) - if (AuraEffect const * aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, 0x00000002, 0, 0, caster->GetGUID())) + if (AuraEffect const* aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, 0x00000002, 0, 0, caster->GetGUID())) { Aura* aura = aurEff->GetBase(); @@ -102,7 +102,7 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -146,7 +146,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -190,7 +190,7 @@ class spell_dru_savage_defense : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 0b27375fcf3..d809df9f449 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -49,7 +49,7 @@ public: class spell_hun_chimera_shot_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_chimera_shot_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_SPELL_CHIMERA_SHOT_SERPENT)) return false; @@ -80,7 +80,7 @@ public: flag96 familyFlag = aura->GetSpellProto()->SpellFamilyFlags; if (!(familyFlag[1] & 0x00000080 || familyFlag[0] & 0x0000C000)) continue; - if (AuraEffect const * aurEff = aura->GetEffect(0)) + if (AuraEffect const* aurEff = aura->GetEffect(0)) { // Serpent Sting - Instantly deals 40% of the damage done by your Serpent Sting. if (familyFlag[0] & 0x4000) @@ -145,7 +145,7 @@ public: class spell_hun_invigoration_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_invigoration_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_SPELL_INVIGORATION_TRIGGERED)) return false; @@ -180,7 +180,7 @@ public: class spell_hun_last_stand_pet_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_last_stand_pet_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_PET_SPELL_LAST_STAND_TRIGGERED)) return false; @@ -215,7 +215,7 @@ public: class spell_hun_masters_call_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_masters_call_SpellScript) - bool Validate(SpellEntry const * spellEntry) + bool Validate(SpellEntry const* spellEntry) { if (!sSpellStore.LookupEntry(HUNTER_SPELL_MASTERS_CALL_TRIGGERED)) return false; @@ -228,14 +228,14 @@ public: void HandleScriptEffect(SpellEffIndex /*effIndex*/) { - if (Unit * target = GetHitUnit()) + if (Unit* target = GetHitUnit()) { target->CastSpell(target, GetEffectValue(), true); target->CastSpell(target, HUNTER_SPELL_MASTERS_CALL_TRIGGERED, true); // there is a possibility that this effect should access effect 0 (dummy) target, but i dubt that // it's more likely that on on retail it's possible to call target selector based on dbc values // anyways, we're using GetTargetUnit() here and it's ok - if (Unit * ally = GetTargetUnit()) + if (Unit* ally = GetTargetUnit()) { target->CastSpell(ally, GetEffectValue(), true); target->CastSpell(ally, SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), EFFECT_0), true); @@ -348,7 +348,7 @@ public: class spell_hun_sniper_training_AuraScript : public AuraScript { PrepareAuraScript(spell_hun_sniper_training_AuraScript) - bool Validate(SpellEntry const * /*entry*/) + bool Validate(SpellEntry const* /*entry*/) { if (!sSpellStore.LookupEntry(SPELL_SNIPER_TRAINING_R1)) return false; @@ -357,22 +357,22 @@ public: return true; } - void HandlePeriodic(AuraEffect const * aurEff) + void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); if (aurEff->GetAmount() > 0) return; - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster) return; uint32 spellId = SPELL_SNIPER_TRAINING_BUFF_R1 + GetId() - SPELL_SNIPER_TRAINING_R1; - Unit * pTarget = GetTarget(); + Unit* pTarget = GetTarget(); if (!pTarget->HasAura(spellId)) { - SpellEntry const * triggeredSpellInfo = sSpellStore.LookupEntry(spellId); + SpellEntry const* triggeredSpellInfo = sSpellStore.LookupEntry(spellId); Unit* triggerCaster = GetTriggeredSpellCaster(triggeredSpellInfo, caster, pTarget); triggerCaster->CastSpell(pTarget, triggeredSpellInfo, true, 0, aurEff); } @@ -380,7 +380,7 @@ public: void HandleUpdatePeriodic(AuraEffect * aurEff) { - Unit * pTarget = GetUnitOwner(); + Unit* pTarget = GetUnitOwner(); if (Player* pPlayerTarget = pTarget->ToPlayer()) { int32 baseAmount = aurEff->GetBaseAmount(); @@ -412,7 +412,7 @@ public: class spell_hun_pet_heart_of_the_phoenix_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED)) return false; @@ -459,7 +459,7 @@ public: class spell_hun_pet_carrion_feeder_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_PET_SPELL_CARRION_FEEDER_TRIGGERED)) return false; diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index ef3409b8ab7..76ef4eb2ccc 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -42,7 +42,7 @@ public: public: spell_item_trigger_spell_SpellScript(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { } - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(_triggeredSpellId)) return false; @@ -87,7 +87,7 @@ public: { PrepareSpellScript(spell_item_deviate_fish_SpellScript) public: - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { for (uint32 spellId = SPELL_SLEEPY; spellId <= SPELL_HEALTHY_SPIRIT; ++spellId) if (!sSpellStore.LookupEntry(spellId)) @@ -135,7 +135,7 @@ public: { public: PrepareSpellScript(spell_item_flask_of_the_north_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_FLASK_OF_THE_NORTH_SP)) return false; @@ -211,7 +211,7 @@ public: { public: PrepareSpellScript(spell_item_gnomish_death_ray_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_GNOMISH_DEATH_RAY_SELF)) return false; @@ -264,7 +264,7 @@ public: { public: PrepareSpellScript(spell_item_make_a_wish_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MR_PINCHYS_BLESSING)) return false; @@ -381,7 +381,7 @@ public: { public: PrepareSpellScript(spell_item_net_o_matic_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_NET_O_MATIC_TRIGGERED1)) return false; @@ -437,7 +437,7 @@ public: { public: PrepareSpellScript(spell_item_noggenfogger_elixir_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED1)) return false; @@ -495,7 +495,7 @@ public: { public: PrepareSpellScript(spell_item_savory_deviate_delight_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { for (uint32 spellId = SPELL_FLIP_OUT_MALE; spellId <= SPELL_YAAARRRR_FEMALE; ++spellId) if (!sSpellStore.LookupEntry(spellId)) @@ -553,7 +553,7 @@ public: { public: PrepareSpellScript(spell_item_six_demon_bag_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_FROSTBOLT)) return false; @@ -632,7 +632,7 @@ public: { public: PrepareSpellScript(spell_item_underbelly_elixir_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_UNDERBELLY_ELIXIR_TRIGGERED1)) return false; diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 7fee2db9aa1..95ed91f5a77 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -46,7 +46,7 @@ class spell_mage_blast_wave : public SpellScriptLoader class spell_mage_blast_wave_SpellScript : public SpellScript { PrepareSpellScript(spell_mage_blast_wave_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MAGE_GLYPH_OF_BLAST_WAVE)) return false; @@ -126,7 +126,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader PrepareSpellScript(spell_mage_polymorph_cast_visual_SpellScript) static const uint32 spell_list[6]; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { // check if spell ids exist in dbc for (int i = 0; i < 6; i++) @@ -173,7 +173,7 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader class spell_mage_summon_water_elemental_SpellScript : public SpellScript { PrepareSpellScript(spell_mage_summon_water_elemental_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MAGE_GLYPH_OF_ETERNAL_WATER)) return false; @@ -225,7 +225,7 @@ public: SPELL_MAGE_FROST_WARDING_R1 = 28332, }; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_TRIGGERED) && sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_R1); @@ -233,7 +233,7 @@ public: void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (AuraEffect * talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_MAGE_FROST_WARDING_R1, EFFECT_0)) { int32 chance = SpellMgr::CalculateSpellEffectAmount(talentAurEff->GetSpellProto(), EFFECT_1); @@ -268,7 +268,7 @@ public: SPELL_MAGE_INCANTERS_ABSORBTION_R1 = 44394, }; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED) && sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1); @@ -276,7 +276,7 @@ public: void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (AuraEffect * talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_MAGE_INCANTERS_ABSORBTION_R1, EFFECT_0)) { diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index fd37c258fc4..5902bc04885 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -63,7 +63,7 @@ public: return GetUnitOwner()->ToPlayer(); } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -71,7 +71,7 @@ public: void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * pVictim = GetTarget(); + Unit* pVictim = GetTarget(); int32 remainingHealth = pVictim->GetHealth() - dmgInfo.GetDamage(); uint32 allowedHealth = pVictim->CountPctFromMaxHealth(35); // If damage kills us @@ -123,7 +123,7 @@ public: class spell_pal_blessing_of_faith_SpellScript : public SpellScript { PrepareSpellScript(spell_pal_blessing_of_faith_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_BLESSING_OF_LOWER_CITY_DRUID)) return false; @@ -184,14 +184,14 @@ public: return true; } - void HandleEffectApply(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* pTarget = GetTarget(); if (Unit* pCaster = GetCaster()) pCaster->CastSpell(pTarget, PALADIN_SPELL_BLESSING_OF_SANCTUARY_BUFF, true); } - void HandleEffectRemove(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* pTarget = GetTarget(); pTarget->RemoveAura(PALADIN_SPELL_BLESSING_OF_SANCTUARY_BUFF, GetCasterGUID()); @@ -219,7 +219,7 @@ public: class spell_pal_guarded_by_the_light_SpellScript : public SpellScript { PrepareSpellScript(spell_pal_guarded_by_the_light_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(PALADIN_SPELL_DIVINE_PLEA)) return false; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 98504899da5..d4b6c293af7 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -46,7 +46,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader uint32 healPct; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(PRIEST_SPELL_GUARDIAN_SPIRIT_HEAL) != NULL; } @@ -57,7 +57,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -65,7 +65,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (dmgInfo.GetDamage() < target->GetHealth()) return; @@ -184,7 +184,7 @@ class spell_pri_penance : public SpellScriptLoader { PrepareSpellScript(spell_pri_penance_SpellScript); - bool Validate(SpellEntry const * spellEntry) + bool Validate(SpellEntry const* spellEntry) { if (!sSpellStore.LookupEntry(PRIEST_SPELL_PENANCE_R1)) return false; @@ -240,17 +240,17 @@ class spell_pri_reflective_shield_trigger : public SpellScriptLoader { PrepareAuraScript(spell_pri_reflective_shield_trigger_AuraScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(PRIEST_SPELL_REFLECTIVE_SHIELD_TRIGGERED) && sSpellStore.LookupEntry(PRIEST_SPELL_REFLECTIVE_SHIELD_R1); } void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (dmgInfo.GetAttacker() == target) return; - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster) return; if (AuraEffect * talentAurEff = target->GetAuraEffectOfRankedSpell(PRIEST_SPELL_REFLECTIVE_SHIELD_R1, EFFECT_0)) diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 8c0f17d8d95..75cb838b1c0 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -94,7 +94,7 @@ public: class spell_q5206_test_fetid_skull_SpellScript : public SpellScript { PrepareSpellScript(spell_q5206_test_fetid_skull_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_CREATE_RESONATING_SKULL)) return false; @@ -219,14 +219,14 @@ public: class spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript : public AuraScript { PrepareAuraScript(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript) - void HandleEffectApply(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* pTarget = GetTarget(); pTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); pTarget->AddUnitState(UNIT_STAT_ROOT); } - void HandleEffectRemove(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); } @@ -254,7 +254,7 @@ public: class spell_q11396_11399_scourging_crystal_controller_SpellScript : public SpellScript { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3)) return false; @@ -293,7 +293,7 @@ public: class spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript : public SpellScript { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3)) return false; @@ -355,7 +355,7 @@ public: class spell_q11587_arcane_prisoner_rescue_SpellScript : public SpellScript { PrepareSpellScript(spell_q11587_arcane_prisoner_rescue_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_SUMMON_ARCANE_PRISONER_MALE)) return false; @@ -416,7 +416,7 @@ public: class spell_q11730_ultrasonic_screwdriver_SpellScript : public SpellScript { PrepareSpellScript(spell_q11730_ultrasonic_screwdriver_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_SUMMON_SCAVENGEBOT_004A8)) return false; @@ -545,7 +545,7 @@ public: { public: PrepareSpellScript(spell_q12634_despawn_fruit_tosser_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_BANANAS_FALL_TO_GROUND)) return false; @@ -640,7 +640,7 @@ public: { public: PrepareAuraScript(spell_q12851_going_bearback_AuraScript) - void HandleEffectApply(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) { @@ -694,7 +694,7 @@ public: { public: PrepareSpellScript(spell_q12937_relief_for_the_fallen_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_TRIGGER_AID_OF_THE_EARTHEN)) return false; @@ -745,7 +745,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader { PrepareSpellScript(spell_q10041_q10040_who_are_they_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_QUESTGIVER)) return false; diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index b5be2691ae8..3dc3e315c6e 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -48,7 +48,7 @@ public: ROG_SPELL_CHEAT_DEATH_COOLDOWN = 31231, }; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(ROG_SPELL_CHEAT_DEATH_COOLDOWN); } @@ -59,7 +59,7 @@ public: return GetUnitOwner()->ToPlayer(); } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -67,7 +67,7 @@ public: void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (dmgInfo.GetDamage() < target->GetHealth()) return; if (target->ToPlayer()->HasSpellCooldown(ROG_SPELL_CHEAT_DEATH_COOLDOWN)) @@ -119,7 +119,7 @@ public: return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -153,7 +153,7 @@ class spell_rog_preparation : public SpellScriptLoader class spell_rog_preparation_SpellScript : public SpellScript { PrepareSpellScript(spell_rog_preparation_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(ROGUE_SPELL_GLYPH_OF_PREPARATION)) return false; @@ -217,14 +217,14 @@ public: class spell_rog_prey_on_the_weak_AuraScript : public AuraScript { PrepareAuraScript(spell_rog_prey_on_the_weak_AuraScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(ROGUE_SPELL_PREY_ON_THE_WEAK)) return false; return true; } - void HandleEffectPeriodic(AuraEffect const * /*aurEff*/) + void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* pTarget = GetTarget(); Unit* pVictim = pTarget->getVictim(); @@ -260,7 +260,7 @@ class spell_rog_shiv : public SpellScriptLoader class spell_rog_shiv_SpellScript : public SpellScript { PrepareSpellScript(spell_rog_shiv_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(ROGUE_SPELL_SHIV_TRIGGERED)) return false; diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 762dd9292a8..63c57155cec 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -54,7 +54,7 @@ public: return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -89,7 +89,7 @@ public: class spell_sha_fire_nova_SpellScript : public SpellScript { PrepareSpellScript(spell_sha_fire_nova_SpellScript) - bool Validate(SpellEntry const * spellEntry) + bool Validate(SpellEntry const* spellEntry) { if (!sSpellStore.LookupEntry(SHAMAN_SPELL_FIRE_NOVA_R1)) return false; @@ -148,7 +148,7 @@ public: class spell_sha_mana_tide_totem_SpellScript : public SpellScript { PrepareSpellScript(spell_sha_mana_tide_totem_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SHAMAN_SPELL_GLYPH_OF_MANA_TIDE)) return false; @@ -198,7 +198,7 @@ public: { PrepareAuraScript(spell_sha_earthbind_totem_AuraScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM)) return false; @@ -207,7 +207,7 @@ public: return true; } - void HandleEffectPeriodic(AuraEffect const * aurEff) + void HandleEffectPeriodic(AuraEffect const* aurEff) { Unit* target = GetTarget(); if (Unit *caster = aurEff->GetBase()->GetCaster()) diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 0a361e642ab..a7b99aed6b5 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -46,7 +46,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader { PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(WARLOCK_DEMONIC_EMPOWERMENT_SUCCUBUS)) return false; @@ -67,7 +67,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader { if (targetCreature->isPet()) { - CreatureTemplate const * ci = sObjectMgr->GetCreatureTemplate(targetCreature->GetEntry()); + CreatureTemplate const* ci = sObjectMgr->GetCreatureTemplate(targetCreature->GetEntry()); switch (ci->family) { case CREATURE_FAMILY_SUCCUBUS: @@ -119,7 +119,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader static uint32 const iTypes[8][3]; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(WARLOCK_IMPROVED_HEALTHSTONE_R1)) return false; @@ -134,7 +134,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader { uint32 rank = 0; // Improved Healthstone - if (AuraEffect const * aurEff = unitTarget->GetDummyAuraEffect(SPELLFAMILY_WARLOCK, 284, 0)) + if (AuraEffect const* aurEff = unitTarget->GetDummyAuraEffect(SPELLFAMILY_WARLOCK, 284, 0)) { switch (aurEff->GetId()) { diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 83c3d9c137c..3574c5c03fc 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -37,7 +37,7 @@ class spell_warr_last_stand : public SpellScriptLoader { PrepareSpellScript(spell_warr_last_stand_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(WARRIOR_SPELL_LAST_STAND_TRIGGERED)) return false; diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index fc0c8f058af..4ebb0fc3aea 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -65,7 +65,7 @@ class go_cat_figurine : public GameObjectScript public: go_cat_figurine() : GameObjectScript("go_cat_figurine") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true); return false; @@ -144,7 +144,7 @@ class go_barov_journal : public GameObjectScript public: go_barov_journal() : GameObjectScript("go_barov_journal") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086)) { @@ -163,7 +163,7 @@ class go_field_repair_bot_74A : public GameObjectScript public: go_field_repair_bot_74A() : GameObjectScript("go_field_repair_bot_74A") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704)) { @@ -210,7 +210,7 @@ class go_orb_of_command : public GameObjectScript public: go_orb_of_command() : GameObjectScript("go_orb_of_command") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(7761)) pPlayer->CastSpell(pPlayer, 23460, true); @@ -228,7 +228,7 @@ class go_tablet_of_madness : public GameObjectScript public: go_tablet_of_madness() : GameObjectScript("go_tablet_of_madness") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266)) { @@ -269,7 +269,7 @@ class go_jump_a_tron : public GameObjectScript public: go_jump_a_tron() : GameObjectScript("go_jump_a_tron") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) pPlayer->CastSpell(pPlayer, 33382, true); @@ -379,7 +379,7 @@ class go_resonite_cask : public GameObjectScript public: go_resonite_cask() : GameObjectScript("go_resonite_cask") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) pGO->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000); @@ -470,7 +470,7 @@ class go_southfury_moonstone : public GameObjectScript public: go_southfury_moonstone() : GameObjectScript("go_southfury_moonstone") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose //pPlayer->CastSpell(pPlayer, SPELL_SUMMON_RIZZLE, false); @@ -498,7 +498,7 @@ class go_tele_to_dalaran_crystal : public GameObjectScript public: go_tele_to_dalaran_crystal() : GameObjectScript("go_tele_to_dalaran_crystal") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) { @@ -520,7 +520,7 @@ class go_tele_to_violet_stand : public GameObjectScript public: go_tele_to_violet_stand() : GameObjectScript("go_tele_to_violet_stand") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || pPlayer->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 4b15cc79dd9..c6a74841fd1 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -190,7 +190,7 @@ class item_mysterious_egg : public ItemScript { public: item_mysterious_egg() : ItemScript("item_mysterious_egg") { } - bool OnExpire(Player *pPlayer, ItemTemplate const * /*pItemProto*/) + bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg @@ -210,7 +210,7 @@ class item_disgusting_jar : public ItemScript public: item_disgusting_jar() : ItemScript("item_disgusting_jar") {} - bool OnExpire(Player *pPlayer, ItemTemplate const * /*pItemProto*/) + bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar @@ -259,7 +259,7 @@ class item_pile_fake_furs : public ItemScript public: item_pile_fake_furs() : ItemScript("item_pile_fake_furs") { } - bool OnUse(Player *pPlayer, Item * /*pItem*/, SpellCastTargets const & /*targets*/) + bool OnUse(Player *pPlayer, Item* /*pItem*/, SpellCastTargets const & /*targets*/) { GameObject *pGo = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index c78bbb2bdd8..671892e9ef2 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -330,7 +330,7 @@ public: me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -922,7 +922,7 @@ public: me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void SpellHit(Unit* pCaster, const SpellEntry *Spell) { @@ -1094,7 +1094,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -1507,7 +1507,7 @@ public: npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void OnPossess(bool apply) { @@ -1552,9 +1552,9 @@ public: ExplosionTimer = 3000; } - void EnterCombat(Unit * /*who*/) {} - void AttackStart(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -1668,7 +1668,7 @@ public: uint32 SpellTimer; bool IsViper; - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void Reset() { @@ -1689,7 +1689,7 @@ public: // Start attacking attacker of owner on first ai update after spawn - move in line of sight may choose better target if (!me->getVictim() && me->isSummon()) - if (Unit * Owner = me->ToTempSummon()->GetSummoner()) + if (Unit* Owner = me->ToTempSummon()->GetSummoner()) if (Owner->getAttackerForHelper()) AttackStart(Owner->getAttackerForHelper()); } @@ -1781,7 +1781,7 @@ public: if (Unit* own = me->GetOwner()) me->GetMotionMaster()->MoveFollow(own, 0, 0); } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { if (me->HasAura(20372)) @@ -1851,7 +1851,7 @@ public: void InitializeAI() { CasterAI::InitializeAI(); - Unit * owner = me->GetOwner(); + Unit* owner = me->GetOwner(); if (!owner) return; // Inherit Master's Threat List (not yet implemented) @@ -1899,7 +1899,7 @@ public: void InitializeAI() { CasterAI::InitializeAI(); - Unit * owner = me->GetOwner(); + Unit* owner = me->GetOwner(); if (!owner) return; // Not needed to be despawned now @@ -1917,7 +1917,7 @@ public: } } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { // Stop Feeding Gargoyle when it dies if (Unit *owner = me->GetOwner()) @@ -2037,13 +2037,13 @@ public: Reset(); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { uiResetTimer = 5000; damage = 0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (uiEntry != NPC_ADVANCED_TARGET_DUMMY && uiEntry != NPC_TARGET_DUMMY) return; @@ -2076,7 +2076,7 @@ public: uiDespawnTimer -= uiDiff; } } - void MoveInLineOfSight(Unit * /*who*/){return;} + void MoveInLineOfSight(Unit* /*who*/){return;} }; CreatureAI* GetAI(Creature* pCreature) const diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h index be0e62135ec..87c17ce7738 100755 --- a/src/server/shared/Dynamic/LinkedReference/Reference.h +++ b/src/server/shared/Dynamic/LinkedReference/Reference.h @@ -72,14 +72,14 @@ template <class TO, class FROM> class Reference : public LinkedListElement } Reference<TO, FROM> * next() { return((Reference<TO, FROM> *) LinkedListElement::next()); } - Reference<TO, FROM> const * next() const { return((Reference<TO, FROM> const *) LinkedListElement::next()); } + Reference<TO, FROM> const* next() const { return((Reference<TO, FROM> const *) LinkedListElement::next()); } Reference<TO, FROM> * prev() { return((Reference<TO, FROM> *) LinkedListElement::prev()); } - Reference<TO, FROM> const * prev() const { return((Reference<TO, FROM> const *) LinkedListElement::prev()); } + Reference<TO, FROM> const* prev() const { return((Reference<TO, FROM> const *) LinkedListElement::prev()); } Reference<TO, FROM> * nocheck_next() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_next()); } - Reference<TO, FROM> const * nocheck_next() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_next()); } + Reference<TO, FROM> const* nocheck_next() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_next()); } Reference<TO, FROM> * nocheck_prev() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_prev()); } - Reference<TO, FROM> const * nocheck_prev() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_prev()); } + Reference<TO, FROM> const* nocheck_prev() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_prev()); } TO* operator ->() const { return iRefTo; } TO* getTarget() const { return iRefTo; } diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 47e91fbfa7d..3cea21f7928 100755 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -415,7 +415,7 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension) { &ie_End[1], &i_End[1], NULL, NULL, NULL, NULL, NULL, NULL } }; - for (wchar_t const * const* itr = &dropEnds[declension][0]; *itr; ++itr) + for (wchar_t const* const* itr = &dropEnds[declension][0]; *itr; ++itr) { size_t len = size_t((*itr)[-1]); // get length from string size field |