From f16df538eeaecbb5e9364368cfa48d04f48db4de Mon Sep 17 00:00:00 2001 From: click Date: Sun, 12 Jun 2011 01:47:45 +0200 Subject: Core: More codestyle cleanups --- src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp | 4 ++-- src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp | 2 +- .../CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp | 4 ++-- .../Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp | 2 +- .../Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp | 2 +- .../scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp | 2 +- src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 2 +- src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp | 4 ++-- .../scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 38acda8e5ca..7ee829ab5d9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -182,7 +182,7 @@ public: switch(uiImpalePhase) { case IMPALE_PHASE_TARGET: - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SHAKEGROUND, true); @@ -312,7 +312,7 @@ public: if (uiPoundTimer <= diff) { - if (Unit *target = me->getVictim()) + if (Unit* target = me->getVictim()) { if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_POUND, SPELL_POUND_H), false); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 2a3fbeb8859..0e069e5ba43 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -183,7 +183,7 @@ public: uiDeathTimer = 30*IN_MILLISECONDS; } - void JustDied(Unit *killer) + void JustDied(Unit* killer) { if (!killer) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 62fa2f8a2ad..fb41d7bedbd 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -381,7 +381,7 @@ struct boss_faction_championsAI : public ScriptedAI { std::list const& tList = me->getThreatManager().getThreatList(); std::list::const_iterator iter; - Unit *target; + Unit* target; for (iter = tList.begin(); iter!=tList.end(); ++iter) { target = Unit::GetUnit((*me), (*iter)->getUnitGuid()); @@ -396,7 +396,7 @@ struct boss_faction_championsAI : public ScriptedAI std::list const& tList = me->getThreatManager().getThreatList(); std::list::const_iterator iter; uint32 count = 0; - Unit *target; + Unit* target; for (iter = tList.begin(); iter!=tList.end(); ++iter) { target = Unit::GetUnit((*me), (*iter)->getUnitGuid()); 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 fb0c516cf5b..95d33d70402 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 @@ -166,7 +166,7 @@ class boss_devourer_of_souls : public CreatureScript { if (mirroredSoulTarget && me->HasAura(SPELL_MIRRORED_SOUL)) { - if (Player *player = Unit::GetPlayer(*me, mirroredSoulTarget)) + if (Player* player = Unit::GetPlayer(*me, mirroredSoulTarget)) { if (player->GetAura(SPELL_MIRRORED_SOUL)) { 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 8153b748933..f9f301018d5 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -240,7 +240,7 @@ class boss_tyrannus : public CreatureScript events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, urand(25000, 27000)); break; case EVENT_OVERLORD_BRAND: - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) DoCast(target, SPELL_OVERLORD_BRAND); events.ScheduleEvent(EVENT_OVERLORD_BRAND, urand(11000, 12000)); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index e3ac89c4b2a..941c2195198 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -283,7 +283,7 @@ class boss_blood_queen_lana_thel : public CreatureScript me->SetFlying(false); me->SendMovementFlagUpdate(); me->SetReactState(REACT_AGGRESSIVE); - if (Unit *victim = me->SelectVictim()) + if (Unit* victim = me->SelectVictim()) AttackStart(victim); events.ScheduleEvent(EVENT_BLOOD_MIRROR, 2500, EVENT_GROUP_CANCELLABLE); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index ca4c9a8d4ca..6c7f619bf30 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -791,7 +791,7 @@ class npc_rimefang : public CreatureScript } _events.ScheduleEvent(EVENT_ICY_BLAST_CAST, 3000); } - else if (Unit *victim = me->SelectVictim()) + else if (Unit* victim = me->SelectVictim()) { me->SetReactState(REACT_DEFENSIVE); AttackStart(victim); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 12a1abb043f..4f9d853e9f4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -167,14 +167,14 @@ public: { victimGUID = guid; if (me->m_spells[0] && victimGUID) - if (Unit *victim = Unit::GetUnit(*me, victimGUID)) + if (Unit* victim = Unit::GetUnit(*me, victimGUID)) victim->CastSpell(victim, me->m_spells[0], true, NULL, NULL, me->GetGUID()); } void JustDied(Unit* /*killer*/) { if (me->m_spells[0] && victimGUID) - if (Unit *victim = Unit::GetUnit(*me, victimGUID)) + if (Unit* victim = Unit::GetUnit(*me, victimGUID)) victim->RemoveAurasDueToSpell(me->m_spells[0], me->GetGUID()); } }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 26c345c4009..0e7e5b1700b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -89,7 +89,7 @@ public: void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void JustDied(Unit *killer) + void JustDied(Unit* killer) { if (killer->GetGUID() != me->GetGUID()) ShatterFrostTomb = true; -- cgit v1.2.3