diff options
Diffstat (limited to 'src/server/scripts')
26 files changed, 37 insertions, 37 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 29033627ee0..4c192ec1d90 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -250,7 +250,7 @@ public: static bool HandleDebugSendOpcodeCommand(ChatHandler* handler, const char* /*args*/) { Unit *unit = handler->getSelectedUnit(); - Player *player = NULL; + Player* player = NULL; if (!unit || (unit->GetTypeId() != TYPEID_PLAYER)) player = handler->GetSession()->GetPlayer(); else diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index 40f91eb833b..b2ba23c0186 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -75,7 +75,7 @@ public: } static bool HandleHonorAddKillCommand(ChatHandler* handler, const char* /*args*/) { - Unit *target = handler->getSelectedUnit(); + Unit* target = handler->getSelectedUnit(); if (!target) { handler->SendSysMessage(LANG_PLAYER_NOT_FOUND); diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 6e1ea1a6be8..7686ff66ae8 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -495,7 +495,7 @@ public: //npc follow handling static bool HandleNpcFollowCommand(ChatHandler* handler, const char* /*args*/) { - Player *player = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); Creature *creature = handler->getSelectedCreature(); if (!creature) @@ -986,7 +986,7 @@ public: //npc unfollow handling static bool HandleNpcUnFollowCommand(ChatHandler* handler, const char* /*args*/) { - Player *player = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); Creature *creature = handler->getSelectedCreature(); if (!creature) @@ -1101,7 +1101,7 @@ public: return false; } - Player *player = handler->GetSession()->GetPlayer (); + Player* player = handler->GetSession()->GetPlayer (); if (player->GetPetGUID ()) { diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index af8debd8844..501cfcdb6c3 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -57,7 +57,7 @@ public: if (!*args) return false; - Player *player = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); if (!player) return false; @@ -187,7 +187,7 @@ public: if (!*args) return false; - Player *player = handler->getSelectedPlayer(); + Player* player = handler->getSelectedPlayer(); if (!player) { handler->SendSysMessage(LANG_NO_CHAR_SELECTED); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 889b487a330..4ef1ad7ee2e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -710,7 +710,7 @@ public: me->EnterVehicle(deathcharger); } - void JustDied(Unit *killer) + void JustDied(Unit* killer) { Creature* deathcharger = me->FindNearestCreature(28782, 30); if (!deathcharger) return; diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp index b213190425c..0908e4e994a 100644 --- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp @@ -97,7 +97,7 @@ public: { if (me->getVictim()->GetTypeId() == TYPEID_PLAYER) { - Unit *victim = me->getVictim(); + Unit* victim = me->getVictim(); if (CAST_PLR(victim)->GetTeam() == HORDE) { me->CombatStop(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 59878e2e354..62592353380 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -134,7 +134,7 @@ public: } } - void JustDied(Unit *victim) + void JustDied(Unit* victim) { hyjal_trashAI::JustDied(victim); if (pInstance && IsEvent) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 83077c8250a..8d8771eb3cf 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -334,7 +334,7 @@ public: ++SoulChargeCount; } - void JustDied(Unit *victim) + void JustDied(Unit* victim) { hyjal_trashAI::JustDied(victim); DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 688e6b7f4e1..5a1d0dedccd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -127,7 +127,7 @@ public: } } - void JustDied(Unit *victim) + void JustDied(Unit* victim) { hyjal_trashAI::JustDied(victim); if (pInstance && IsEvent) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 5b4ceada677..54e187536de 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -122,7 +122,7 @@ public: } } - void JustDied(Unit *victim) + void JustDied(Unit* victim) { hyjal_trashAI::JustDied(victim); if (pInstance && IsEvent) 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 09e254c4339..4db6d7cd225 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -118,7 +118,7 @@ public: } } - void JustDied(Unit *victim) + void JustDied(Unit* victim) { hyjal_trashAI::JustDied(victim); if (pInstance && IsEvent) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 228db1b7cb4..650862bb008 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -1315,7 +1315,7 @@ public: } } - void JustDied(Unit *victim) + void JustDied(Unit* victim) { float x, y, z; me->GetPosition(x, y, z); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 8582f840c84..ad784d2afb2 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -317,7 +317,7 @@ public: pInstance->SetData(0, NOT_STARTED);*/ } - void AttackStart(Unit *victim) + void AttackStart(Unit* victim) { AttackStartCaster(victim, 10);//keep back & toss bombs/shoot } 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<HostileReference*> const& tList = me->getThreatManager().getThreatList(); std::list<HostileReference*>::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<HostileReference*> const& tList = me->getThreatManager().getThreatList(); std::list<HostileReference*>::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; 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 f69a8cc7589..dd2d980e8d7 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 @@ -304,7 +304,7 @@ public: if (pInstance && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) { - Unit *victim = NULL; + Unit* victim = NULL; victim = Unit::GetUnit(*me, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); if (victim) me->getThreatManager().addThreat(victim, 1); @@ -738,7 +738,7 @@ public: if (!me->isInCombat() && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) { - Unit *victim = NULL; + Unit* victim = NULL; victim = Unit::GetUnit(*me, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); if (victim) AttackStart(victim); 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 a8fe1458cf9..f3675e4f40b 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 @@ -262,7 +262,7 @@ class boss_vazruden : public CreatureScript if (Revenge_Timer <= diff) { - if (Unit *victim = me->getVictim()) + if (Unit* victim = me->getVictim()) DoCast(victim, DUNGEON_MODE(SPELL_REVENGE, SPELL_REVENGE_H)); Revenge_Timer = 5000; } @@ -493,7 +493,7 @@ class mob_hellfire_sentry : public CreatureScript if (KidneyShot_Timer <= diff) { - if (Unit *victim = me->getVictim()) + if (Unit* victim = me->getVictim()) DoCast(victim, SPELL_KIDNEY_SHOT); KidneyShot_Timer = 20000; } diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index 2659e93ced5..60fa01f7127 100755 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -55,14 +55,14 @@ public: } } - void OnChat(Player *player, uint32 /*type*/, uint32 /*lang*/, std::string& msg, Player *receiver) + void OnChat(Player* player, uint32 /*type*/, uint32 /*lang*/, std::string& msg, Player* receiver) { if (sWorld->getBoolConfig(CONFIG_CHATLOG_WHISPER)) sLog->outChat("[WHISPER] Player %s tells %s: %s", player->GetName(), receiver ? receiver->GetName() : "<unknown>", msg.c_str()); } - void OnChat(Player *player, uint32 type, uint32 /*lang*/, std::string& msg, Group *group) + void OnChat(Player* player, uint32 type, uint32 /*lang*/, std::string& msg, Group* group) { switch (type) { @@ -110,7 +110,7 @@ public: } } - void OnChat(Player *player, uint32 type, uint32 lang, std::string& msg, Guild *guild) + void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Guild* guild) { switch(type) { @@ -131,7 +131,7 @@ public: } } - void OnChat(Player *player, uint32 /*type*/, uint32 /*lang*/, std::string& msg, Channel *channel) + void OnChat(Player* player, uint32 /*type*/, uint32 /*lang*/, std::string& msg, Channel* channel) { bool isSystem = channel && (channel->HasFlag(CHANNEL_FLAG_TRADE) || diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 1c146b85aee..455615561f5 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -211,7 +211,7 @@ public: struct trigger_deathAI : public NullCreatureAI { trigger_deathAI(Creature* c) : NullCreatureAI(c) {} - void JustDied(Unit *killer) + void JustDied(Unit* killer) { if (me->m_spells[0]) me->CastSpell(killer, me->m_spells[0], true); |
