diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
63 files changed, 228 insertions, 229 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 23c5b18e28e..0a67e7bf310 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -37,7 +37,7 @@ class go_blackfathom_altar : public GameObjectScript public: go_blackfathom_altar() : GameObjectScript("go_blackfathom_altar") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGo*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGo*/) { if (!pPlayer->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, pPlayer); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index fabe4ce7526..8792f07a9b0 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -36,7 +36,7 @@ public: struct boss_aku_maiAI : public ScriptedAI { - boss_aku_maiAI(Creature *c) : ScriptedAI(c) + boss_aku_maiAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 88b6382c105..5c854b36086 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -35,7 +35,7 @@ public: struct boss_gelihastAI : public ScriptedAI { - boss_gelihastAI(Creature *c) : ScriptedAI(c) + boss_gelihastAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 471d4663b0c..9f465d89b2a 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -44,7 +44,7 @@ public: struct boss_kelrisAI : public ScriptedAI { - boss_kelrisAI(Creature *c) : ScriptedAI(c) + boss_kelrisAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -89,7 +89,7 @@ public: if (uiSleepTimer < diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoScriptText(SAY_SLEEP, me); DoCast(pTarget, SPELL_SLEEP); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 62592353380..566826e6424 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -64,7 +64,7 @@ public: struct boss_anetheronAI : public hyjal_trashAI { - boss_anetheronAI(Creature *c) : hyjal_trashAI(c) + boss_anetheronAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceScript(); pGo = false; @@ -128,7 +128,7 @@ public: pos = i; if (i == 7 && pInstance) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -174,7 +174,7 @@ public: if (SwarmTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CARRION_SWARM); SwarmTimer = urand(45000, 60000); @@ -195,7 +195,7 @@ public: { for (uint8 i = 0; i < 3; ++i) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) pTarget->CastSpell(pTarget, SPELL_SLEEP, true); } SleepTimer = 60000; @@ -254,7 +254,7 @@ public: struct mob_towering_infernalAI : public ScriptedAI { - mob_towering_infernalAI(Creature *c) : ScriptedAI(c) + mob_towering_infernalAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); if (pInstance) @@ -285,7 +285,7 @@ public: { } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsHostileTo(who)) AttackStart(who); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 8d8771eb3cf..6cd239baf8a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -194,7 +194,7 @@ public: { if (ChangeTargetTimer <= diff) { - if (Unit *temp = Unit::GetUnit(*me, TargetGUID)) + if (Unit* temp = Unit::GetUnit(*me, TargetGUID)) { me->GetMotionMaster()->MoveFollow(temp, 0.0f, 0.0f); TargetGUID = 0; @@ -233,7 +233,7 @@ public: struct boss_archimondeAI : public hyjal_trashAI { - boss_archimondeAI(Creature *c) : hyjal_trashAI(c) + boss_archimondeAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -367,7 +367,7 @@ public: return false; targets.sort(Trinity::ObjectDistanceOrderPred(me)); - Unit *pTarget = targets.front(); + Unit* pTarget = targets.front(); if (pTarget) { if (!me->IsWithinDistInMap(pTarget, me->GetAttackDistance(pTarget))) @@ -379,7 +379,7 @@ public: return false; } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned->GetEntry() == CREATURE_ANCIENT_WISP) summoned->AI()->AttackStart(me); @@ -400,7 +400,7 @@ public: summoned->CastSpell(summoned, SPELL_DOOMFIRE_SPAWN, false); summoned->CastSpell(summoned, SPELL_DOOMFIRE, true, 0, 0, me->GetGUID()); - if (Unit *DoomfireSpirit = Unit::GetUnit(*me, DoomfireSpiritGUID)) + if (Unit* DoomfireSpirit = Unit::GetUnit(*me, DoomfireSpiritGUID)) { summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit, 0.0f, 0.0f); DoomfireSpiritGUID = 0; @@ -409,7 +409,7 @@ public: } //this is code doing close to what the summoning spell would do (spell 31903) - void SummonDoomfire(Unit *pTarget) + void SummonDoomfire(Unit* pTarget) { me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, pTarget->GetPositionX()+15.0f, pTarget->GetPositionY()+15.0f, pTarget->GetPositionZ(), 0, @@ -479,12 +479,12 @@ public: { if (!IsChanneling) { - Creature *temp = me->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 1200000); + Creature* temp = me->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 1200000); if (temp) WorldTreeGUID = temp->GetGUID(); - if (Unit *Nordrassil = Unit::GetUnit(*me, WorldTreeGUID)) + if (Unit* Nordrassil = Unit::GetUnit(*me, WorldTreeGUID)) { Nordrassil->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Nordrassil->SetDisplayId(11686); @@ -493,7 +493,7 @@ public: } } - if (Unit *Nordrassil = Unit::GetUnit(*me, WorldTreeGUID)) + if (Unit* Nordrassil = Unit::GetUnit(*me, WorldTreeGUID)) { Nordrassil->CastSpell(me, SPELL_DRAIN_WORLD_TREE_2, true); DrainNordrassilTimer = 1000; @@ -611,7 +611,7 @@ public: else DoScriptText(SAY_DOOMFIRE2, me); - Unit *temp = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!temp) temp = me->getVictim(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 5a1d0dedccd..7ba010f384f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -55,7 +55,7 @@ public: struct boss_azgalorAI : public hyjal_trashAI { - boss_azgalorAI(Creature *c) : hyjal_trashAI(c) + boss_azgalorAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceScript(); pGo = false; @@ -121,7 +121,7 @@ public: pos = i; if (i == 7 && pInstance) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -218,7 +218,7 @@ public: struct mob_lesser_doomguardAI : public hyjal_trashAI { - mob_lesser_doomguardAI(Creature *c) : hyjal_trashAI(c) + mob_lesser_doomguardAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceScript(); if (pInstance) @@ -251,7 +251,7 @@ public: { } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsHostileTo(who)) AttackStart(who); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 54e187536de..15d7cef6e1b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -52,7 +52,7 @@ public: struct boss_kazrogalAI : public hyjal_trashAI { - boss_kazrogalAI(Creature *c) : hyjal_trashAI(c) + boss_kazrogalAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceScript(); pGo = false; @@ -116,7 +116,7 @@ public: pos = i; if (i == 7 && pInstance) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -181,7 +181,7 @@ public: std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) { pTarget->CastSpell(pTarget, SPELL_MARK, true);//only cast on mana users 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 4db6d7cd225..c1dd57f0144 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -58,7 +58,7 @@ public: struct boss_rage_winterchillAI : public hyjal_trashAI { - boss_rage_winterchillAI(Creature *c) : hyjal_trashAI(c) + boss_rage_winterchillAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceScript(); pGo = false; @@ -112,7 +112,7 @@ public: pos = i; if (i == 7 && pInstance) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 809a0ec9438..f54b3c5a86c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -310,7 +310,7 @@ float HordeFirePos[65][8]=//spawn points for the fire visuals (GO) in the horde {5545.43f, -2647.82f, 1483.05f, 5.38848f, 0, 0, 0.432578f, -0.901596f} }; -hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(me) +hyjalAI::hyjalAI(Creature* c) : npc_escortAI(c), Summons(me) { pInstance = c->GetInstanceScript(); VeinsSpawned[0] = false; @@ -332,7 +332,7 @@ hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(me) DoMassTeleport = false; } -void hyjalAI::JustSummoned(Creature *summoned) +void hyjalAI::JustSummoned(Creature* summoned) { Summons.Summon(summoned); } @@ -432,7 +432,7 @@ void hyjalAI::EnterCombat(Unit* /*who*/) Talk(ATTACKED); } -void hyjalAI::MoveInLineOfSight(Unit *who) +void hyjalAI::MoveInLineOfSight(Unit* who) { if (IsDummy) return; @@ -890,7 +890,7 @@ void hyjalAI::UpdateAI(const uint32 diff) if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); - Unit *pTarget = NULL; + Unit* pTarget = NULL; switch(Spells[i].TargetType) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index faf4d3d4393..edf310109d7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -171,7 +171,7 @@ const Yells ThrallQuotes[]= struct hyjalAI : public npc_escortAI { - hyjalAI(Creature *c); + hyjalAI(Creature* c); void Reset(); // Generically used to reset our variables. Do *not* call in EnterEvadeMode as this may make problems if the raid is still in combat @@ -192,13 +192,13 @@ struct hyjalAI : public npc_escortAI void SpawnVeins(); void DeSpawnVeins(); - void JustSummoned(Creature *summoned); + void JustSummoned(Creature* summoned); void SummonedCreatureDespawn(Creature* summoned); void HideNearPos(float x, float y); void RespawnNearPos(float x, float y); void WaypointReached(uint32 i); void DoOverrun(uint32 faction, const uint32 diff); - void MoveInLineOfSight(Unit *who); + void MoveInLineOfSight(Unit* who); void SummonCreature(uint32 entry, float Base[4][3]); // Summons a creature for that wave in that base diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 650862bb008..718ad8ff51e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -155,7 +155,7 @@ float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the {5429.91f, -2718.44f, 1493.42f}//20 end 2 }; -hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c) +hyjal_trashAI::hyjal_trashAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); IsEvent = false; @@ -170,7 +170,7 @@ hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c) Reset(); } -void hyjal_trashAI::DamageTaken(Unit *done_by, uint32 &damage) +void hyjal_trashAI::DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetTypeId() == TYPEID_PLAYER || (done_by->GetTypeId() == TYPEID_UNIT && CAST_CRE(done_by)->isPet())) { @@ -434,7 +434,7 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -475,7 +475,7 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && !pInstance->GetData(DATA_HORDE_RETREAT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ @@ -562,11 +562,11 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -667,11 +667,11 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -768,12 +768,12 @@ public: void JustSummoned(Creature* summon) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); if (pTarget && summon) summon->Attack(pTarget, false); summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} + void SummonedCreatureDespawn(Creature* summon) {summons.Despawn(summon);} void WaypointReached(uint32 i) { pos = i; @@ -781,11 +781,11 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -897,11 +897,11 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -998,11 +998,11 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -1090,11 +1090,11 @@ public: { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) me->AddThreat(pTarget, 0.0f); } @@ -1184,7 +1184,7 @@ public: pos = i; if (i == 2 && pInstance && !IsOverrun) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { me->AddThreat(pTarget, 0.0f); @@ -1306,7 +1306,7 @@ public: pos = i; if (i == 2 && pInstance && !IsOverrun) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { me->AddThreat(pTarget, 0.0f); @@ -1373,7 +1373,7 @@ public: forcemove = false; if (forcemove) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) me->Attack(pTarget, false); } @@ -1416,7 +1416,7 @@ public: struct alliance_riflemanAI : public Scripted_NoMovementAI { - alliance_riflemanAI(Creature *c) : Scripted_NoMovementAI(c) + alliance_riflemanAI(Creature* c) : Scripted_NoMovementAI(c) { Reset(); } @@ -1432,7 +1432,7 @@ public: ExplodeTimer = 5000+rand()%5000; } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || me->getVictim()) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h index ffeae1a3f4b..94b71313dd2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h @@ -25,13 +25,13 @@ struct hyjal_trashAI : public npc_escortAI { - hyjal_trashAI(Creature *c); + hyjal_trashAI(Creature* c); void UpdateAI(const uint32 diff); void JustDied(Unit* /*killer*/); - void DamageTaken(Unit *done_by, uint32 &damage); + void DamageTaken(Unit* done_by, uint32 &damage); public: InstanceScript* pInstance; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 20277a15ddd..e7db72b0a8e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -60,7 +60,7 @@ public: struct boss_epochAI : public ScriptedAI { - boss_epochAI(Creature *c) : ScriptedAI(c) + boss_epochAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -104,7 +104,7 @@ public: if (uiCurseOfExertionTimer < diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CURSE_OF_EXERTION); uiCurseOfExertionTimer = 9300; } else uiCurseOfExertionTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp index 5f0f66b289c..f7c46dc09de 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -43,7 +43,7 @@ public: struct boss_infinite_corruptorAI : public ScriptedAI { - boss_infinite_corruptorAI(Creature *c) : ScriptedAI(c) + boss_infinite_corruptorAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } 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 00ca4e325ad..89a7643112c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -76,7 +76,7 @@ public: struct boss_mal_ganisAI : public ScriptedAI { - boss_mal_ganisAI(Creature *c) : ScriptedAI(c) + boss_mal_ganisAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -118,7 +118,7 @@ public: pInstance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (damage >= me->GetHealth() && done_by != me) damage = me->GetHealth()-1; @@ -171,7 +171,7 @@ public: if (uiMindBlastTimer < diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_MIND_BLAST); uiMindBlastTimer = 6000; } else uiMindBlastTimer -= diff; @@ -185,7 +185,7 @@ public: if (uiSleepTimer < diff) { DoScriptText(RAND(SAY_SLEEP_1, SAY_SLEEP_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SLEEP); uiSleepTimer = urand(15000, 20000); } else uiSleepTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 20675eebeba..29f342dc7e3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -57,7 +57,7 @@ public: struct boss_meathookAI : public ScriptedAI { - boss_meathookAI(Creature *c) : ScriptedAI(c) + boss_meathookAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); if (pInstance) @@ -108,7 +108,7 @@ public: if (uiChainTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CONSTRICTING_CHAINS); //anyone but the tank uiChainTimer = urand(2000, 4000); } else uiChainTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index c3370fb00a7..9312762b4f6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -66,7 +66,7 @@ public: struct boss_salrammAI : public ScriptedAI { - boss_salrammAI(Creature *c) : ScriptedAI(c) + boss_salrammAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); if (pInstance) 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 d959adf6c93..b9c5a71ef8f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -231,7 +231,7 @@ class npc_arthas : public CreatureScript public: npc_arthas() : CreatureScript("npc_arthas") { } - bool OnGossipSelect(Player *pPlayer, Creature *pCreature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*sender*/, uint32 action) { pPlayer->PlayerTalkClass->ClearMenus(); npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, pCreature->AI()); @@ -325,7 +325,7 @@ public: struct npc_arthasAI : public npc_escortAI { - npc_arthasAI(Creature *pCreature) : npc_escortAI(pCreature) + npc_arthasAI(Creature* pCreature) : npc_escortAI(pCreature) { pInstance = pCreature->GetInstanceScript(); Reset(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 0378ed7581b..909c39e3e04 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -55,7 +55,7 @@ public: struct boss_aeonusAI : public ScriptedAI { - boss_aeonusAI(Creature *c) : ScriptedAI(c) + boss_aeonusAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -78,7 +78,7 @@ public: DoScriptText(SAY_AGGRO, me); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) 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 5d3aebc49fe..2a1487e22e5 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 @@ -55,7 +55,7 @@ public: struct boss_chrono_lord_dejaAI : public ScriptedAI { - boss_chrono_lord_dejaAI(Creature *c) : ScriptedAI(c) + boss_chrono_lord_dejaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -80,7 +80,7 @@ public: DoScriptText(SAY_AGGRO, me); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) @@ -124,7 +124,7 @@ public: //Arcane Discharge if (ArcaneDischarge_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); DoCast(pTarget, SPELL_ARCANE_DISCHARGE); ArcaneDischarge_Timer = 20000+rand()%10000; } else ArcaneDischarge_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index 971e7ac741d..ac227d8f369 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -54,7 +54,7 @@ public: struct boss_temporusAI : public ScriptedAI { - boss_temporusAI(Creature *c) : ScriptedAI(c) + boss_temporusAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -92,7 +92,7 @@ public: pInstance->SetData(TYPE_RIFT, SPECIAL); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index ce295b5a301..2b226639412 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -68,7 +68,7 @@ public: struct npc_medivh_bmAI : public ScriptedAI { - npc_medivh_bmAI(Creature *c) : ScriptedAI(c) + npc_medivh_bmAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -97,7 +97,7 @@ public: DoCast(me, SPELL_PORTAL_RUNE, true); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!pInstance) return; @@ -261,7 +261,7 @@ public: struct npc_time_riftAI : public ScriptedAI { - npc_time_riftAI(Creature *c) : ScriptedAI(c) + npc_time_riftAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -311,8 +311,8 @@ public: //normalize Z-level if we can, if rift is not at ground level. pos.m_positionZ = std::max(me->GetMap()->GetHeight(pos.m_positionX, pos.m_positionY, MAX_HEIGHT), me->GetMap()->GetWaterLevel(pos.m_positionX, pos.m_positionY)); - if (Unit *Summon = DoSummon(creature_entry, pos, 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT)) - if (Unit *temp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_MEDIVH) : 0)) + if (Unit* Summon = DoSummon(creature_entry, pos, 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT)) + if (Unit* temp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_MEDIVH) : 0)) Summon->AddThreat(temp, 0.0f); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index 6ea59e4be02..d0c61d28bff 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -116,10 +116,9 @@ public: DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() { - //if (GetData(TYPE_MEDIVH) == IN_PROGRESS) - if (m_auiEncounter[0] == IN_PROGRESS) // compile fix, GetData is not const + if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return true; return false; 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 239aba88ad2..91842f3e8a3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -52,7 +52,7 @@ public: struct boss_captain_skarlocAI : public ScriptedAI { - boss_captain_skarlocAI(Creature *c) : ScriptedAI(c) + boss_captain_skarlocAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } 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 2df7cf9b170..bd113e5285d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -54,7 +54,7 @@ public: struct boss_epoch_hunterAI : public ScriptedAI { - boss_epoch_hunterAI(Creature *c) : ScriptedAI(c) + boss_epoch_hunterAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -119,7 +119,7 @@ public: if (WingBuffet_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WING_BUFFET); WingBuffet_Timer = 25000+rand()%10000; } else WingBuffet_Timer -= diff; 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 9bad835943f..d9af682df20 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -111,7 +111,7 @@ public: struct boss_lieutenant_drakeAI : public ScriptedAI { - boss_lieutenant_drakeAI(Creature *c) : ScriptedAI(c) {} + boss_lieutenant_drakeAI(Creature* c) : ScriptedAI(c) {} bool CanPatrol; uint32 wpId; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 455c95dc8cc..526e2e91c4c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -282,7 +282,7 @@ public: struct npc_thrall_old_hillsbradAI : public npc_escortAI { - npc_thrall_old_hillsbradAI(Creature *c) : npc_escortAI(c) + npc_thrall_old_hillsbradAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); HadMount = false; @@ -532,7 +532,7 @@ public: { DoScriptText(RAND(SAY_TH_RANDOM_KILL1, SAY_TH_RANDOM_KILL2, SAY_TH_RANDOM_KILL3), me); } - void JustDied(Unit *slayer) + void JustDied(Unit* slayer) { if (pInstance) pInstance->SetData(TYPE_THRALL_EVENT, FAIL); @@ -624,7 +624,7 @@ public: struct npc_tarethaAI : public npc_escortAI { - npc_tarethaAI(Creature *c) : npc_escortAI(c) + npc_tarethaAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); } 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 1016207febe..cf5df7eaad3 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -41,7 +41,7 @@ public: struct celebras_the_cursedAI : public ScriptedAI { - celebras_the_cursedAI(Creature *c) : ScriptedAI(c) {} + celebras_the_cursedAI(Creature* c) : ScriptedAI(c) {} uint32 Wrath_Timer; uint32 EntanglingRoots_Timer; @@ -69,7 +69,7 @@ public: //Wrath if (Wrath_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_WRATH); diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp index 00328bead1f..7a38dd2a84a 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp @@ -41,7 +41,7 @@ public: struct boss_landslideAI : public ScriptedAI { - boss_landslideAI(Creature *c) : ScriptedAI(c) {} + boss_landslideAI(Creature* c) : ScriptedAI(c) {} uint32 KnockAway_Timer; uint32 Trample_Timer; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 431c0a43f17..35192b08f48 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -40,7 +40,7 @@ public: struct boss_noxxionAI : public ScriptedAI { - boss_noxxionAI(Creature *c) : ScriptedAI(c) {} + boss_noxxionAI(Creature* c) : ScriptedAI(c) {} uint32 ToxicVolley_Timer; uint32 Uppercut_Timer; @@ -63,7 +63,7 @@ public: void SummonAdds(Unit* pVictim) { - if (Creature *Add = DoSpawnCreature(13456, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) + if (Creature* Add = DoSpawnCreature(13456, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) Add->AI()->AttackStart(pVictim); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 926fcf18850..3e7f6e8da98 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -42,7 +42,7 @@ public: struct boss_ptheradrasAI : public ScriptedAI { - boss_ptheradrasAI(Creature *c) : ScriptedAI(c) {} + boss_ptheradrasAI(Creature* c) : ScriptedAI(c) {} uint32 Dustfield_Timer; uint32 Boulder_Timer; @@ -81,7 +81,7 @@ public: //Boulder_Timer if (Boulder_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_BOULDER); diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 2aa6e49fd88..6292e61d329 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -197,7 +197,7 @@ public: Summons.DespawnAll(); } - void JustSummoned(Creature *pSummoned) + void JustSummoned(Creature* pSummoned) { pSummoned->SetInCombatWithZone(); if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -215,7 +215,7 @@ public: Summons.Summon(pSummoned); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { Summons.Despawn(summon); } 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 5096f9d4604..7deccca4ff0 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -48,7 +48,7 @@ public: struct boss_amnennar_the_coldbringerAI : public ScriptedAI { - boss_amnennar_the_coldbringerAI(Creature *c) : ScriptedAI(c) {} + boss_amnennar_the_coldbringerAI(Creature* c) : ScriptedAI(c) {} uint32 AmnenarsWrath_Timer; uint32 FrostBolt_Timer; diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index cced38cb8c1..01a987e8576 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -70,7 +70,7 @@ public: struct npc_willixAI : public npc_escortAI { - npc_willixAI(Creature *c) : npc_escortAI(c) {} + npc_willixAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index bf85905098e..04eda4ac982 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -49,7 +49,7 @@ public: struct boss_kriAI : public ScriptedAI { - boss_kriAI(Creature *c) : ScriptedAI(c) + boss_kriAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -146,7 +146,7 @@ public: struct boss_vemAI : public ScriptedAI { - boss_vemAI(Creature *c) : ScriptedAI(c) + boss_vemAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -193,7 +193,7 @@ public: //Charge_Timer if (Charge_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { @@ -239,7 +239,7 @@ public: struct boss_yaujAI : public ScriptedAI { - boss_yaujAI(Creature *c) : ScriptedAI(c) + boss_yaujAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -273,7 +273,7 @@ public: for (uint8 i = 0; i < 10; ++i) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Summoned = me->SummonCreature(15621, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000); if (Summoned && pTarget) Summoned->AI()->AttackStart(pTarget); @@ -303,8 +303,8 @@ public: { if (pInstance) { - Unit *pKri = Unit::GetUnit((*me), pInstance->GetData64(DATA_KRI)); - Unit *pVem = Unit::GetUnit((*me), pInstance->GetData64(DATA_VEM)); + Unit* pKri = Unit::GetUnit((*me), pInstance->GetData64(DATA_KRI)); + Unit* pVem = Unit::GetUnit((*me), pInstance->GetData64(DATA_VEM)); switch (urand(0, 2)) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 857dfb7efde..af3059b0474 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -176,7 +176,7 @@ public: struct eye_of_cthunAI : public Scripted_NoMovementAI { - eye_of_cthunAI(Creature *c) : Scripted_NoMovementAI(c) + eye_of_cthunAI(Creature* c) : Scripted_NoMovementAI(c) { pInst = c->GetInstanceScript(); if (!pInst) @@ -241,7 +241,7 @@ public: void SpawnEyeTentacle(float x, float y) { if (Creature* Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500)) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (Spawned->AI()) Spawned->AI()->AttackStart(pTarget); } @@ -328,7 +328,7 @@ public: me->SetUInt64Value(UNIT_FIELD_TARGET, 0); //Select random target for dark beam to start on - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { //Face our target DarkGlareAngle = me->GetAngle(pTarget); @@ -480,7 +480,7 @@ public: struct cthunAI : public Scripted_NoMovementAI { - cthunAI(Creature *c) : Scripted_NoMovementAI(c) + cthunAI(Creature* c) : Scripted_NoMovementAI(c) { SetCombatMovement(false); @@ -558,7 +558,7 @@ public: Creature* Spawned; Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500); if (Spawned && Spawned->AI()) - if (Unit *pTarget = SelectRandomNotStomach()) + if (Unit* pTarget = SelectRandomNotStomach()) Spawned->AI()->AttackStart(pTarget); } @@ -787,7 +787,7 @@ public: //Stomach Enter Timer if (StomachEnterTimer <= diff) { - if (Unit *pTarget = SelectRandomNotStomach()) + if (Unit* pTarget = SelectRandomNotStomach()) { //Set target in stomach Stomach_Map[pTarget->GetGUID()] = true; @@ -820,7 +820,7 @@ public: //GientClawTentacleTimer if (GiantClawTentacleTimer <= diff) { - if (Unit *pTarget = SelectRandomNotStomach()) + if (Unit* pTarget = SelectRandomNotStomach()) { //Spawn claw tentacle on the random target if (Creature* spawned = me->SummonCreature(MOB_GIANT_CLAW_TENTACLE, *pTarget, TEMPSUMMON_CORPSE_DESPAWN, 500)) @@ -835,7 +835,7 @@ public: //GiantEyeTentacleTimer if (GiantEyeTentacleTimer <= diff) { - if (Unit *pTarget = SelectRandomNotStomach()) + if (Unit* pTarget = SelectRandomNotStomach()) { //Spawn claw tentacle on the random target if (Creature* spawned = me->SummonCreature(MOB_GIANT_EYE_TENTACLE, *pTarget, TEMPSUMMON_CORPSE_DESPAWN, 500)) @@ -939,7 +939,7 @@ public: struct eye_tentacleAI : public Scripted_NoMovementAI { - eye_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) + eye_tentacleAI(Creature* c) : Scripted_NoMovementAI(c) { if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN)) { @@ -988,7 +988,7 @@ public: //MindflayTimer if (MindflayTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(pTarget, SPELL_MIND_FLAY); @@ -1012,7 +1012,7 @@ public: struct claw_tentacleAI : public Scripted_NoMovementAI { - claw_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) + claw_tentacleAI(Creature* c) : Scripted_NoMovementAI(c) { SetCombatMovement(false); @@ -1064,7 +1064,7 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) { me->Kill(me); @@ -1122,7 +1122,7 @@ public: struct giant_claw_tentacleAI : public Scripted_NoMovementAI { - giant_claw_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) + giant_claw_tentacleAI(Creature* c) : Scripted_NoMovementAI(c) { SetCombatMovement(false); @@ -1176,7 +1176,7 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) { me->Kill(me); @@ -1241,7 +1241,7 @@ public: struct giant_eye_tentacleAI : public Scripted_NoMovementAI { - giant_eye_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) + giant_eye_tentacleAI(Creature* c) : Scripted_NoMovementAI(c) { SetCombatMovement(false); @@ -1281,7 +1281,7 @@ public: //BeamTimer if (BeamTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(pTarget, SPELL_GREEN_BEAM); @@ -1305,7 +1305,7 @@ public: struct flesh_tentacleAI : public Scripted_NoMovementAI { - flesh_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) + flesh_tentacleAI(Creature* c) : Scripted_NoMovementAI(c) { SetCombatMovement(false); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 1189427ff0b..73face6f52f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -49,7 +49,7 @@ public: struct boss_fankrissAI : public ScriptedAI { - boss_fankrissAI(Creature *c) : ScriptedAI(c) {} + boss_fankrissAI(Creature* c) : ScriptedAI(c) {} uint32 MortalWound_Timer; uint32 SpawnHatchlings_Timer; @@ -136,7 +136,7 @@ public: { if (SpawnHatchlings_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 9a4e035bb92..a7e42f1397f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -47,7 +47,7 @@ public: struct boss_huhuranAI : public ScriptedAI { - boss_huhuranAI(Creature *c) : ScriptedAI(c) {} + boss_huhuranAI(Creature* c) : ScriptedAI(c) {} uint32 Frenzy_Timer; uint32 Wyvern_Timer; @@ -95,7 +95,7 @@ public: // Wyvern Timer if (Wyvern_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WYVERNSTING); Wyvern_Timer = 15000 + rand()%17000; } else Wyvern_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 8c9b1342b40..4b8acdf39f1 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -45,7 +45,7 @@ public: struct boss_ouroAI : public ScriptedAI { - boss_ouroAI(Creature *c) : ScriptedAI(c) {} + boss_ouroAI(Creature* c) : ScriptedAI(c) {} uint32 Sweep_Timer; uint32 SandBlast_Timer; @@ -111,7 +111,7 @@ public: //ChangeTarget_Timer if (Submerged && ChangeTarget_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index e0f87c32387..9582f90c692 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -49,7 +49,7 @@ public: struct boss_sarturaAI : public ScriptedAI { - boss_sarturaAI(Creature *c) : ScriptedAI(c) {} + boss_sarturaAI(Creature* c) : ScriptedAI(c) {} uint32 WhirlWind_Timer; uint32 WhirlWindRandom_Timer; @@ -192,7 +192,7 @@ public: struct mob_sartura_royal_guardAI : public ScriptedAI { - mob_sartura_royal_guardAI(Creature *c) : ScriptedAI(c) {} + mob_sartura_royal_guardAI(Creature* c) : ScriptedAI(c) {} uint32 WhirlWind_Timer; uint32 WhirlWindRandom_Timer; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 6b73e6c4778..f0b6f4c5a49 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -63,7 +63,7 @@ public: struct boss_skeramAI : public ScriptedAI { - boss_skeramAI(Creature *c) : ScriptedAI(c) + boss_skeramAI(Creature* c) : ScriptedAI(c) { IsImage = false; } @@ -236,7 +236,7 @@ public: for (uint16 i = 0; i < 41; ++i) { - if (Player *pTarget = CAST_PLR(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) + if (Player* pTarget = CAST_PLR(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) { if (Group *pGrp = pTarget->GetGroup()) for (uint8 ico = 0; ico < TARGETICONCOUNT; ++ico) @@ -264,9 +264,9 @@ public: case 25: Images25 = true; break; } - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - Creature *Image1 = me->SummonCreature(15263, i1->x, i1->y, i1->z, i1->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); + Creature* Image1 = me->SummonCreature(15263, i1->x, i1->y, i1->z, i1->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image1) { Image1->SetMaxHealth(me->GetMaxHealth() / 5); @@ -276,7 +276,7 @@ public: CAST_AI(boss_skeram::boss_skeramAI, Image1->AI())->IsImage = true; } - Creature *Image2 = me->SummonCreature(15263, i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); + Creature* Image2 = me->SummonCreature(15263, i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image2) { Image2->SetMaxHealth(me->GetMaxHealth() / 5); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 1eddbace893..a7f7defc558 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -61,7 +61,7 @@ EndScriptData */ struct boss_twinemperorsAI : public ScriptedAI { - boss_twinemperorsAI(Creature *c): ScriptedAI(c) + boss_twinemperorsAI(Creature* c): ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -79,7 +79,7 @@ struct boss_twinemperorsAI : public ScriptedAI virtual bool IAmVeklor() = 0; virtual void Reset() = 0; - virtual void CastSpellOnBug(Creature *pTarget) = 0; + virtual void CastSpellOnBug(Creature* pTarget) = 0; void TwinReset() { @@ -95,7 +95,7 @@ struct boss_twinemperorsAI : public ScriptedAI EnrageTimer = 15*60000; } - Creature *GetOtherBoss() + Creature* GetOtherBoss() { if (pInstance) return Unit::GetCreature(*me, pInstance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR)); @@ -105,7 +105,7 @@ struct boss_twinemperorsAI : public ScriptedAI void DamageTaken(Unit* /*done_by*/, uint32 &damage) { - Unit *pOtherBoss = GetOtherBoss(); + Unit* pOtherBoss = GetOtherBoss(); if (pOtherBoss) { float dPercent = ((float)damage) / ((float)me->GetMaxHealth()); @@ -122,7 +122,7 @@ struct boss_twinemperorsAI : public ScriptedAI void JustDied(Unit* /*Killer*/) { - Creature *pOtherBoss = GetOtherBoss(); + Creature* pOtherBoss = GetOtherBoss(); if (pOtherBoss) { pOtherBoss->SetHealth(0); @@ -142,7 +142,7 @@ struct boss_twinemperorsAI : public ScriptedAI void EnterCombat(Unit* who) { DoZoneInCombat(); - Creature *pOtherBoss = GetOtherBoss(); + Creature* pOtherBoss = GetOtherBoss(); if (pOtherBoss) { // TODO: we should activate the other boss location so he can start attackning even if nobody @@ -157,12 +157,12 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void SpellHit(Unit *caster, const SpellEntry *entry) + void SpellHit(Unit* caster, const SpellEntry *entry) { if (caster == me) return; - Creature *pOtherBoss = GetOtherBoss(); + Creature* pOtherBoss = GetOtherBoss(); if (entry->Id != SPELL_HEAL_BROTHER || !pOtherBoss) return; @@ -193,7 +193,7 @@ struct boss_twinemperorsAI : public ScriptedAI if (Heal_Timer <= diff) { - Unit *pOtherBoss = GetOtherBoss(); + Unit* pOtherBoss = GetOtherBoss(); if (pOtherBoss && pOtherBoss->IsWithinDist(me, 60)) { DoCast(pOtherBoss, SPELL_HEAL_BROTHER); @@ -212,7 +212,7 @@ struct boss_twinemperorsAI : public ScriptedAI if (IAmVeklor()) return; // mechanics handled by veknilash so they teleport exactly at the same time and to correct coordinates - Creature *pOtherBoss = GetOtherBoss(); + Creature* pOtherBoss = GetOtherBoss(); if (pOtherBoss) { //me->MonsterYell("Teleporting ...", LANG_UNIVERSAL, 0); @@ -260,7 +260,7 @@ struct boss_twinemperorsAI : public ScriptedAI { AfterTeleport = false; me->ClearUnitState(UNIT_STAT_STUNNED); - if (Unit *nearu = me->SelectNearestTarget(100)) + if (Unit* nearu = me->SelectNearestTarget(100)) { //DoYell(nearu->GetName(), LANG_UNIVERSAL, 0); AttackStart(nearu); @@ -289,7 +289,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || me->getVictim()) return; @@ -308,7 +308,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - Creature *RespawnNearbyBugsAndGetOne() + Creature* RespawnNearbyBugsAndGetOne() { std::list<Creature*> lUnitList; me->GetCreatureListWithEntryInGrid(lUnitList, 15316, 150.0f); @@ -317,11 +317,11 @@ struct boss_twinemperorsAI : public ScriptedAI if (lUnitList.empty()) return NULL; - Creature *nearb = NULL; + Creature* nearb = NULL; for (std::list<Creature*>::const_iterator iter = lUnitList.begin(); iter != lUnitList.end(); ++iter) { - Creature *c = *iter; + Creature* c = *iter; if (c) { if (c->isDead()) @@ -344,7 +344,7 @@ struct boss_twinemperorsAI : public ScriptedAI { if (BugsTimer < diff || Abuse_Bug_Timer <= diff) { - Creature *c = RespawnNearbyBugsAndGetOne(); + Creature* c = RespawnNearbyBugsAndGetOne(); if (Abuse_Bug_Timer <= diff) { if (c) @@ -396,7 +396,7 @@ public: struct boss_veknilashAI : public boss_twinemperorsAI { bool IAmVeklor() {return false;} - boss_veknilashAI(Creature *c) : boss_twinemperorsAI(c) {} + boss_veknilashAI(Creature* c) : boss_twinemperorsAI(c) {} uint32 UpperCut_Timer; uint32 UnbalancingStrike_Timer; @@ -418,7 +418,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void CastSpellOnBug(Creature *pTarget) + void CastSpellOnBug(Creature* pTarget) { pTarget->setFaction(14); pTarget->AI()->AttackStart(me->getThreatManager().getHostilTarget()); @@ -482,7 +482,7 @@ public: struct boss_veklorAI : public boss_twinemperorsAI { bool IAmVeklor() {return true;} - boss_veklorAI(Creature *c) : boss_twinemperorsAI(c) {} + boss_veklorAI(Creature* c) : boss_twinemperorsAI(c) {} uint32 ShadowBolt_Timer; uint32 Blizzard_Timer; @@ -508,7 +508,7 @@ public: me->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, 0); } - void CastSpellOnBug(Creature *pTarget) + void CastSpellOnBug(Creature* pTarget) { pTarget->setFaction(14); pTarget->AddAura(SPELL_EXPLODEBUG, pTarget); @@ -542,7 +542,7 @@ public: //Blizzard_Timer if (Blizzard_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true); if (pTarget) DoCast(pTarget, SPELL_BLIZZARD); @@ -551,7 +551,7 @@ public: if (ArcaneBurst_Timer <= diff) { - Unit *mvic; + Unit* mvic; if ((mvic=SelectTarget(SELECT_TARGET_NEAREST, 0, NOMINAL_MELEE_RANGE, true)) != NULL) { DoCast(mvic, SPELL_ARCANEBURST); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 0803e0ca70f..449c04b27c6 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -86,7 +86,7 @@ public: } } - aqsentinelAI(Creature *c) : ScriptedAI(c) + aqsentinelAI(Creature* c) : ScriptedAI(c) { ClearBuddyList(); abselected = 0; // just initialization of variable @@ -116,7 +116,7 @@ public: } } - void GiveBuddyMyList(Creature *c) + void GiveBuddyMyList(Creature* c) { aqsentinelAI *cai = CAST_AI(aqsentinelAI, (c)->AI()); for (int i=0; i<3; ++i) @@ -128,15 +128,15 @@ public: void SendMyListToBuddies() { for (int i=0; i<3; ++i) - if (Creature *pNearby = Unit::GetCreature(*me, NearbyGUID[i])) + if (Creature* pNearby = Unit::GetCreature(*me, NearbyGUID[i])) GiveBuddyMyList(pNearby); } - void CallBuddiesToAttack(Unit *who) + void CallBuddiesToAttack(Unit* who) { for (int i=0; i<3; ++i) { - Creature *c = Unit::GetCreature(*me, NearbyGUID[i]); + Creature* c = Unit::GetCreature(*me, NearbyGUID[i]); if (c) { if (!c->isInCombat()) @@ -177,7 +177,7 @@ public: return 0; // should never happen } - void GetOtherSentinels(Unit *who) + void GetOtherSentinels(Unit* who) { bool *chosenAbilities = new bool[9]; memset(chosenAbilities, 0, 9*sizeof(bool)); @@ -191,7 +191,7 @@ public: if (!NearbyGUID[bli]) break; - Creature *pNearby = Unit::GetCreature(*me, NearbyGUID[bli]); + Creature* pNearby = Unit::GetCreature(*me, NearbyGUID[bli]); if (!pNearby) break; @@ -217,7 +217,7 @@ public: { if (!NearbyGUID[i]) continue; - if (Creature *pNearby = Unit::GetCreature(*me, NearbyGUID[i])) + if (Creature* pNearby = Unit::GetCreature(*me, NearbyGUID[i])) { if (pNearby->isDead()) pNearby->Respawn(); @@ -246,7 +246,7 @@ public: { for (int ni=0; ni<3; ++ni) { - Creature *sent = Unit::GetCreature(*me, NearbyGUID[ni]); + Creature* sent = Unit::GetCreature(*me, NearbyGUID[ni]); if (!sent) continue; if (sent->isDead()) diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 019ee2fb8ae..f0d0a709514 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -136,7 +136,7 @@ public: struct npc_disciple_of_naralexAI : public npc_escortAI { - npc_disciple_of_naralexAI(Creature *c) : npc_escortAI(c) + npc_disciple_of_naralexAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); eventTimer = 0; diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 0b4428964eb..a733bbea4c6 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -62,7 +62,7 @@ class npc_torek : public CreatureScript struct npc_torekAI : public npc_escortAI { - npc_torekAI(Creature *c) : npc_escortAI(c) {} + npc_torekAI(Creature* c) : npc_escortAI(c) {} uint32 Rend_Timer; uint32 Thunderclap_Timer; @@ -177,7 +177,7 @@ class npc_ruul_snowhoof : public CreatureScript struct npc_ruul_snowhoofAI : public npc_escortAI { - npc_ruul_snowhoofAI(Creature *c) : npc_escortAI(c) {} + npc_ruul_snowhoofAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp index 357f1dce8c8..4a623625859 100644 --- a/src/server/scripts/Kalimdor/azshara.cpp +++ b/src/server/scripts/Kalimdor/azshara.cpp @@ -50,7 +50,7 @@ public: struct mobs_spitelashesAI : public ScriptedAI { - mobs_spitelashesAI(Creature *c) : ScriptedAI(c) {} + mobs_spitelashesAI(Creature* c) : ScriptedAI(c) {} uint32 morphtimer; bool spellhit; @@ -63,7 +63,7 @@ public: void EnterCombat(Unit* /*who*/) { } - void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) + void SpellHit(Unit* Hitter, const SpellEntry *Spellkind) { if (!spellhit && Hitter->GetTypeId() == TYPEID_PLAYER && @@ -296,7 +296,7 @@ public: struct mob_rizzle_sprysprocketAI : public ScriptedAI { - mob_rizzle_sprysprocketAI(Creature *c) : ScriptedAI(c) {} + mob_rizzle_sprysprocketAI(Creature* c) : ScriptedAI(c) {} uint32 spellEscape_Timer; uint32 Teleport_Timer; @@ -422,7 +422,7 @@ public: sWorld->SendServerMessage(SERVER_MSG_STRING, text, pPlayer); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!who || PlayerGUID) return; @@ -470,7 +470,7 @@ public: struct mob_depth_chargeAI : public ScriptedAI { - mob_depth_chargeAI(Creature *c) : ScriptedAI(c) {} + mob_depth_chargeAI(Creature* c) : ScriptedAI(c) {} bool we_must_die; uint32 must_die_timer; @@ -495,7 +495,7 @@ public: return; } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who) return; diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index 4540f5296bd..0f4eb46dce4 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -69,7 +69,7 @@ public: struct npc_draenei_survivorAI : public ScriptedAI { - npc_draenei_survivorAI(Creature *c) : ScriptedAI(c) {} + npc_draenei_survivorAI(Creature* c) : ScriptedAI(c) {} uint64 pCaster; @@ -99,7 +99,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (CanSayHelp && who->GetTypeId() == TYPEID_PLAYER && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) { @@ -111,7 +111,7 @@ public: } } - void SpellHit(Unit *Caster, const SpellEntry *Spell) + void SpellHit(Unit* Caster, const SpellEntry *Spell) { if (Spell->SpellFamilyFlags[2] & 0x080000000) { @@ -223,7 +223,7 @@ public: struct npc_engineer_spark_overgrindAI : public ScriptedAI { - npc_engineer_spark_overgrindAI(Creature *c) : ScriptedAI(c) + npc_engineer_spark_overgrindAI(Creature* c) : ScriptedAI(c) { NormFaction = c->getFaction(); NpcFlags = c->GetUInt32Value(UNIT_NPC_FLAGS); @@ -301,7 +301,7 @@ public: struct npc_injured_draeneiAI : public ScriptedAI { - npc_injured_draeneiAI(Creature *c) : ScriptedAI(c) {} + npc_injured_draeneiAI(Creature* c) : ScriptedAI(c) {} void Reset() { @@ -367,7 +367,7 @@ public: struct npc_magwinAI : public npc_escortAI { - npc_magwinAI(Creature *c) : npc_escortAI(c) {} + npc_magwinAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -443,7 +443,7 @@ public: struct npc_geezleAI : public ScriptedAI { - npc_geezleAI(Creature *c) : ScriptedAI(c) {} + npc_geezleAI(Creature* c) : ScriptedAI(c) {} uint64 SparkGUID; @@ -613,7 +613,7 @@ public: struct npc_death_ravagerAI : public ScriptedAI { - npc_death_ravagerAI(Creature *c) : ScriptedAI(c){} + npc_death_ravagerAI(Creature* c) : ScriptedAI(c){} uint32 RendTimer; uint32 EnragingBiteTimer; diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp index 4b00da28629..9e52aa5d23f 100644 --- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp @@ -49,7 +49,7 @@ public: struct mob_webbed_creatureAI : public ScriptedAI { - mob_webbed_creatureAI(Creature *c) : ScriptedAI(c) {} + mob_webbed_creatureAI(Creature* c) : ScriptedAI(c) {} void Reset() { diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 60c79998bb3..fd720ca86ea 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -47,7 +47,7 @@ public: struct boss_azuregosAI : public ScriptedAI { - boss_azuregosAI(Creature *c) : ScriptedAI(c) {} + boss_azuregosAI(Creature* c) : ScriptedAI(c) {} uint32 MarkOfFrost_Timer; uint32 ManaStorm_Timer; @@ -122,7 +122,7 @@ public: //ManaStorm_Timer if (ManaStorm_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MANASTORM); ManaStorm_Timer = 7500 + rand()%5000; } else ManaStorm_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index babc745af58..922cf018ac3 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -101,7 +101,7 @@ public: m_uiFallAsleepTimer = urand(10000, 45000); } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit* pWho) { FollowerAI::MoveInLineOfSight(pWho); diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp index a925090a16b..8c5231f8e8a 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/desolace.cpp @@ -72,7 +72,7 @@ public: return true; } - bool EffectDummyCreature(Unit *pCaster, uint32 spellId, uint32 effIndex, Creature *pCreatureTarget) + bool EffectDummyCreature(Unit* pCaster, uint32 spellId, uint32 effIndex, Creature* pCreatureTarget) { //always check spellid and effectindex if (spellId == SPELL_KODO_KOMBO_ITEM && effIndex == 0) @@ -176,7 +176,7 @@ class go_iruxos : public GameObjectScript public: go_iruxos() : GameObjectScript("go_iruxos") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE) pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(), pPlayer->GetInnPosY(), pPlayer->GetInnPosZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp index ff3be7ca8c0..7b86288d175 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/durotar.cpp @@ -47,7 +47,7 @@ public: struct npc_lazy_peonAI : public ScriptedAI { - npc_lazy_peonAI(Creature *c) : ScriptedAI(c) {} + npc_lazy_peonAI(Creature* c) : ScriptedAI(c) {} uint64 uiPlayerGUID; diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index ac29aec35e4..0ab87211957 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -273,14 +273,14 @@ public: return true; } - CreatureAI *GetAI(Creature *pCreature) const + CreatureAI *GetAI(Creature* pCreature) const { return new npc_theramore_guardAI(pCreature); } struct npc_theramore_guardAI : public ScriptedAI { - npc_theramore_guardAI(Creature *pCreature) : ScriptedAI(pCreature) { } + npc_theramore_guardAI(Creature* pCreature) : ScriptedAI(pCreature) { } uint32 uiYellTimer; uint32 uiStep; diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index 82c705c3efa..ba19ad20691 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -296,7 +296,7 @@ public: struct npc_clintar_spiritAI : public npc_escortAI { public: - npc_clintar_spiritAI(Creature *c) : npc_escortAI(c) {} + npc_clintar_spiritAI(Creature* c) : npc_escortAI(c) {} uint32 Step; uint32 CurrWP; @@ -464,7 +464,7 @@ public: { case 0: { - Creature *mob = me->SummonCreature(ASPECT_RAVEN, ASPECT_RAVEN_SUMMON_X, ASPECT_RAVEN_SUMMON_Y, ASPECT_RAVEN_SUMMON_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000); + Creature* mob = me->SummonCreature(ASPECT_RAVEN, ASPECT_RAVEN_SUMMON_X, ASPECT_RAVEN_SUMMON_Y, ASPECT_RAVEN_SUMMON_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000); if (mob) { mob->AddThreat(me, 10000.0f); @@ -563,7 +563,7 @@ public: { if (quest->GetQuestId() == 10965) { - Creature *clintar_spirit = pCreature->SummonCreature(CLINTAR_SPIRIT, CLINTAR_SPIRIT_SUMMON_X, CLINTAR_SPIRIT_SUMMON_Y, CLINTAR_SPIRIT_SUMMON_Z, CLINTAR_SPIRIT_SUMMON_O, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000); + Creature* clintar_spirit = pCreature->SummonCreature(CLINTAR_SPIRIT, CLINTAR_SPIRIT_SUMMON_X, CLINTAR_SPIRIT_SUMMON_Y, CLINTAR_SPIRIT_SUMMON_Z, CLINTAR_SPIRIT_SUMMON_O, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000); if (clintar_spirit) CAST_AI(npc_clintar_spirit::npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(pPlayer); } diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index 6e1f4064413..90d47180ace 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -96,7 +96,7 @@ public: struct npc_kyle_frenziedAI : public ScriptedAI { - npc_kyle_frenziedAI(Creature *c) : ScriptedAI(c) {} + npc_kyle_frenziedAI(Creature* c) : ScriptedAI(c) {} bool bEvent; bool m_bIsMovingToLunch; @@ -269,7 +269,7 @@ public: struct npc_plains_visionAI : public ScriptedAI { - npc_plains_visionAI(Creature *c) : ScriptedAI(c) {} + npc_plains_visionAI(Creature* c) : ScriptedAI(c) {} bool newWaypoint; uint8 WayPointId; diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 1c82ad46e0e..76ee96d5ad7 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -841,7 +841,7 @@ public: void UpdateAI(const uint32 diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; //Player* plr = me->GetPlayer(PlayerGUID); if (!Timers) @@ -1091,11 +1091,11 @@ public: if (Unit* Anachronos_Quest_Trigger = go->FindNearestCreature(15454, 100, plr)) { - Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378, -8034.535f, 1535.14f, 2.61f, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); - Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379, -8032.767f, 1533.148f, 2.61f, 1.5f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); - Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380, -8034.52f, 1537.843f, 2.61f, 5.7f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); - /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382, -8028.462f, 1535.843f, 2.61f, 3.141592f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); - Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381, -8028.75f, 1538.795f, 2.61f, 4, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit* Merithra = Anachronos_Quest_Trigger->SummonCreature(15378, -8034.535f, 1535.14f, 2.61f, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit* Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379, -8032.767f, 1533.148f, 2.61f, 1.5f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit* Arygos = Anachronos_Quest_Trigger->SummonCreature(15380, -8034.52f, 1537.843f, 2.61f, 5.7f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + /* Unit* Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382, -8028.462f, 1535.843f, 2.61f, 3.141592f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Creature* Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381, -8028.75f, 1538.795f, 2.61f, 4, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); if (Merithra) { diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 8671b51c9e8..430a2dcf643 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -58,7 +58,7 @@ public: struct mob_aquementasAI : public ScriptedAI { - mob_aquementasAI(Creature *c) : ScriptedAI(c) {} + mob_aquementasAI(Creature* c) : ScriptedAI(c) {} uint32 SendItem_Timer; uint32 SwitchFaction_Timer; @@ -86,7 +86,7 @@ public: !CAST_PLR(receiver)->HasItemCount(11522, 1, true)) { ItemPosCountVec dest; - uint8 msg = CAST_PLR(receiver)->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 11522, 1, false); + uint8 msg = CAST_PLR(receiver)->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 11522, 1, NULL); if (msg == EQUIP_ERR_OK) CAST_PLR(receiver)->StoreNewItem(dest, 11522, 1, true); } @@ -170,11 +170,11 @@ public: struct npc_custodian_of_timeAI : public npc_escortAI { - npc_custodian_of_timeAI(Creature *c) : npc_escortAI(c) {} + npc_custodian_of_timeAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { - Player *pPlayer = GetPlayerForEscort(); + Player* pPlayer = GetPlayerForEscort(); if (!pPlayer) return; @@ -206,7 +206,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -426,7 +426,7 @@ public: struct npc_OOX17AI : public npc_escortAI { - npc_OOX17AI(Creature *c) : npc_escortAI(c) {} + npc_OOX17AI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -541,7 +541,7 @@ public: TortaGUID = 0; } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit* pWho) { FollowerAI::MoveInLineOfSight(pWho); @@ -583,7 +583,7 @@ public: { m_uiPostEventTimer = 5000; - Unit *pTorta = Unit::GetUnit(*me, TortaGUID); + Unit* pTorta = Unit::GetUnit(*me, TortaGUID); if (!pTorta || !pTorta->isAlive()) { //something happened, so just complete diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp index a2186f4dee8..dc53fbebb70 100644 --- a/src/server/scripts/Kalimdor/teldrassil.cpp +++ b/src/server/scripts/Kalimdor/teldrassil.cpp @@ -70,7 +70,7 @@ public: void Reset() { } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit* pWho) { FollowerAI::MoveInLineOfSight(pWho); diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index b721d9106af..7fea778a055 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -350,7 +350,7 @@ public: struct npc_twiggy_flatheadAI : public ScriptedAI { - npc_twiggy_flatheadAI(Creature *c) : ScriptedAI(c) {} + npc_twiggy_flatheadAI(Creature* c) : ScriptedAI(c) {} bool EventInProgress; bool EventGrate; @@ -383,7 +383,7 @@ public: void EnterCombat(Unit* /*who*/) { } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || (!who->isAlive())) return; diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index 57c26381c0c..5a4380e0f70 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -328,7 +328,7 @@ public: struct npc_pluckyAI : public ScriptedAI { - npc_pluckyAI(Creature *c) : ScriptedAI(c) { m_uiNormFaction = c->getFaction(); } + npc_pluckyAI(Creature* c) : ScriptedAI(c) { m_uiNormFaction = c->getFaction(); } uint32 m_uiNormFaction; uint32 m_uiResetTimer; @@ -437,7 +437,7 @@ public: struct npc_enraged_pantherAI : public ScriptedAI { - npc_enraged_pantherAI(Creature *c) : ScriptedAI(c) {} + npc_enraged_pantherAI(Creature* c) : ScriptedAI(c) {} void Reset() { diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp index db326f7657f..23ceb40313e 100644 --- a/src/server/scripts/Kalimdor/thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp @@ -99,7 +99,7 @@ public: if (BerserkerCharge_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_BERSERKER_CHARGE); BerserkerCharge_Timer = 25000; diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index 35d70c64a6e..3abbf92e77e 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -74,7 +74,7 @@ public: struct npc_ameAI : public npc_escortAI { - npc_ameAI(Creature *c) : npc_escortAI(c) {} + npc_ameAI(Creature* c) : npc_escortAI(c) {} uint32 DEMORALIZINGSHOUT_Timer; @@ -217,7 +217,7 @@ public: SpraggleGUID = 0; } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit* pWho) { FollowerAI::MoveInLineOfSight(pWho); @@ -276,7 +276,7 @@ public: { if (m_uiEndEventTimer <= uiDiff) { - Unit *pSpraggle = Unit::GetUnit(*me, SpraggleGUID); + Unit* pSpraggle = Unit::GetUnit(*me, SpraggleGUID); if (!pSpraggle || !pSpraggle->isAlive()) { SetFollowComplete(); |