diff options
Diffstat (limited to 'src')
372 files changed, 1974 insertions, 1968 deletions
diff --git a/src/server/scripts/Commands/CMakeLists.txt b/src/server/scripts/Commands/CMakeLists.txt index eec02c0e106..19c42ba92ad 100644 --- a/src/server/scripts/Commands/CMakeLists.txt +++ b/src/server/scripts/Commands/CMakeLists.txt @@ -12,21 +12,22 @@ set(scripts_STAT_SRCS ${scripts_STAT_SRCS} Commands/cs_account.cpp Commands/cs_achievement.cpp - Commands/cs_gm.cpp - Commands/cs_npc.cpp - Commands/cs_go.cpp - Commands/cs_learn.cpp - Commands/cs_modify.cpp Commands/cs_debug.cpp - Commands/cs_tele.cpp -# Commands/cs_character.cpp Commands/cs_event.cpp + Commands/cs_gm.cpp + Commands/cs_go.cpp Commands/cs_gobject.cpp + Commands/cs_gps.cpp Commands/cs_honor.cpp - Commands/cs_wp.cpp - Commands/cs_titles.cpp + Commands/cs_learn.cpp + Commands/cs_modify.cpp + Commands/cs_npc.cpp Commands/cs_quest.cpp Commands/cs_reload.cpp + Commands/cs_tele.cpp + Commands/cs_titles.cpp + Commands/cs_wp.cpp +# Commands/cs_character.cpp # Commands/cs_list.cpp # Commands/cs_lookup.cpp # Commands/cs_pdump.cpp @@ -54,7 +55,6 @@ set(scripts_STAT_SRCS # Commands/cs_die.cpp # Commands/cs_revive.cpp # Commands/cs_dismount.cpp - Commands/cs_gps.cpp # Commands/cs_guid.cpp # Commands/cs_help.cpp # Commands/cs_itemmove.cpp diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 4c192ec1d90..41e456289e0 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -249,7 +249,7 @@ public: static bool HandleDebugSendOpcodeCommand(ChatHandler* handler, const char* /*args*/) { - Unit *unit = handler->getSelectedUnit(); + Unit* unit = handler->getSelectedUnit(); Player* player = NULL; if (!unit || (unit->GetTypeId() != TYPEID_PLAYER)) player = handler->GetSession()->GetPlayer(); @@ -320,7 +320,7 @@ public: } else if (type == "appgoguid") { - GameObject *obj = handler->GetNearbyGameObject(); + GameObject* obj = handler->GetNearbyGameObject(); if (!obj) { handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, 0); @@ -332,7 +332,7 @@ public: } else if (type == "goguid") { - GameObject *obj = handler->GetNearbyGameObject(); + GameObject* obj = handler->GetNearbyGameObject(); if (!obj) { handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, 0); @@ -489,7 +489,7 @@ public: if (i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) continue; - if (Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i)) + if (Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i)) { if (Bag* bag = item->ToBag()) { @@ -509,7 +509,7 @@ public: std::vector<Item *> &updateQueue = player->GetItemUpdateQueue(); for (size_t i = 0; i < updateQueue.size(); ++i) { - Item *item = updateQueue[i]; + Item* item = updateQueue[i]; if (!item) continue; Bag *container = item->GetContainer(); @@ -539,7 +539,7 @@ public: if (i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) continue; - Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i); + Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i); if (!item) continue; if (item->GetSlot() != i) @@ -651,7 +651,7 @@ public: for (size_t i = 0; i < updateQueue.size(); ++i) { - Item *item = updateQueue[i]; + Item* item = updateQueue[i]; if (!item) continue; if (item->GetOwnerGUID() != player->GetGUID()) @@ -667,7 +667,7 @@ public: } if (item->GetState() == ITEM_REMOVED) continue; - Item *test = player->GetItemByPos(item->GetBagSlot(), item->GetSlot()); + Item* test = player->GetItemByPos(item->GetBagSlot(), item->GetSlot()); if (test == NULL) { @@ -784,7 +784,7 @@ public: handler->GetSession()->GetPlayer()->EnterVehicle(target, seatId); else { - Creature *passenger = NULL; + Creature* passenger = NULL; Trinity::AllCreaturesOfEntryInRange check(handler->GetSession()->GetPlayer(), entry, 20.0f); Trinity::CreatureSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(handler->GetSession()->GetPlayer(), passenger, check); handler->GetSession()->GetPlayer()->VisitNearbyObject(30.0f, searcher); @@ -828,7 +828,7 @@ public: if (!ve) return false; - Creature *v = new Creature; + Creature* v = new Creature; Map *map = handler->GetSession()->GetPlayer()->GetMap(); @@ -877,7 +877,7 @@ public: uint32 guid = (uint32)atoi(e); uint32 index = (uint32)atoi(f); - Item *i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM)); + Item* i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM)); if (!i) return false; @@ -908,7 +908,7 @@ public: uint32 index = (uint32)atoi(f); uint32 value = (uint32)atoi(g); - Item *i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM)); + Item* i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM)); if (!i) return false; @@ -932,7 +932,7 @@ public: uint32 guid = (uint32)atoi(e); - Item *i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM)); + Item* i = handler->GetSession()->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM)); if (!i) return false; diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index 90fbe1d1549..a520eac1ee7 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -89,7 +89,7 @@ public: if (!*args) return false; - Player *target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) target = handler->GetSession()->GetPlayer(); diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 44d87729719..3197595812f 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -139,7 +139,7 @@ public: return false; } - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); float x = float(chr->GetPositionX()); float y = float(chr->GetPositionY()); float z = float(chr->GetPositionZ()); @@ -190,7 +190,7 @@ public: if (!charID) return false; - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); char* spawntime = strtok(NULL, " "); uint32 spawntm = 300; @@ -411,7 +411,7 @@ public: } else { - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); o = chr->GetOrientation(); } @@ -459,7 +459,7 @@ public: if (!px) { - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); obj->Relocate(chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), obj->GetOrientation()); obj->DestroyForNearbyPlayers(); obj->UpdateObjectVisibility(); diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index b2ba23c0186..6f44000017d 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -57,7 +57,7 @@ public: if (!*args) return false; - Player *target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) { handler->SendSysMessage(LANG_PLAYER_NOT_FOUND); @@ -92,7 +92,7 @@ public: } static bool HandleHonorUpdateCommand(ChatHandler* handler, const char* /*args*/) { - Player *target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) { handler->SendSysMessage(LANG_PLAYER_NOT_FOUND); diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index b865574cd43..b54e9519da5 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -440,7 +440,7 @@ public: } else if (target->ToCreature()->isPet()) { - Unit *owner = target->GetOwner(); + Unit* owner = target->GetOwner(); if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet *)target)->IsPermanentPetFor(owner->ToPlayer())) { // check online security @@ -698,15 +698,15 @@ public: return false; } - if (target->GetTypeId()==TYPEID_PLAYER) + if (Player* plr = target->ToPlayer()) { // check online security - if (handler->HasLowerSecurity((Player*)target, 0)) + if (handler->HasLowerSecurity(plr, 0)) return false; - handler->PSendSysMessage(LANG_YOU_CHANGE_SIZE, Scale, handler->GetNameLink((Player*)target).c_str()); - if (handler->needReportToTarget((Player*)target)) - (ChatHandler((Player*)target)).PSendSysMessage(LANG_YOURS_SIZE_CHANGED, handler->GetNameLink().c_str(), Scale); + handler->PSendSysMessage(LANG_YOU_CHANGE_SIZE, Scale, handler->GetNameLink(plr).c_str()); + if (handler->needReportToTarget(plr)) + (ChatHandler(plr)).PSendSysMessage(LANG_YOURS_SIZE_CHANGED, handler->GetNameLink().c_str(), Scale); } target->SetFloatValue(OBJECT_FIELD_SCALE_X, Scale); diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index dd526162e66..48f91d9ec30 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -119,7 +119,7 @@ public: uint32 id = atoi(charID); - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); float x = chr->GetPositionX(); float y = chr->GetPositionY(); float z = chr->GetPositionZ(); @@ -495,7 +495,7 @@ public: static bool HandleNpcFollowCommand(ChatHandler* handler, const char* /*args*/) { Player* player = handler->GetSession()->GetPlayer(); - Creature *creature = handler->getSelectedCreature(); + Creature* creature = handler->getSelectedCreature(); if (!creature) { @@ -667,7 +667,7 @@ public: uint32 displayId = (uint32) atoi((char*)args); - Creature *pCreature = handler->getSelectedCreature(); + Creature* pCreature = handler->getSelectedCreature(); if (!pCreature || pCreature->isPet()) { @@ -878,7 +878,7 @@ public: if (option >0.0f) mtype = RANDOM_MOTION_TYPE; - Creature *pCreature = handler->getSelectedCreature(); + Creature* pCreature = handler->getSelectedCreature(); uint32 u_guidlow = 0; if (pCreature) @@ -920,7 +920,7 @@ public: return false; } - Creature *pCreature = handler->getSelectedCreature(); + Creature* pCreature = handler->getSelectedCreature(); uint32 u_guidlow = 0; if (pCreature) @@ -986,7 +986,7 @@ public: static bool HandleNpcUnFollowCommand(ChatHandler* handler, const char* /*args*/) { Player* player = handler->GetSession()->GetPlayer(); - Creature *creature = handler->getSelectedCreature(); + Creature* creature = handler->getSelectedCreature(); if (!creature) { @@ -1078,7 +1078,7 @@ public: if (!charID) return false; - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); uint32 id = atoi(charID); if (!id) @@ -1092,7 +1092,7 @@ public: //npc tame handling static bool HandleNpcTameCommand(ChatHandler* handler, const char* /*args*/) { - Creature *creatureTarget = handler->getSelectedCreature (); + Creature* creatureTarget = handler->getSelectedCreature (); if (!creatureTarget || creatureTarget->isPet ()) { handler->PSendSysMessage (LANG_SELECT_CREATURE); @@ -1162,7 +1162,7 @@ public: return false; uint32 leaderGUID = (uint32) atoi((char*)args); - Creature *pCreature = handler->getSelectedCreature(); + Creature* pCreature = handler->getSelectedCreature(); if (!pCreature || !pCreature->GetDBTableGUIDLow()) { @@ -1181,7 +1181,7 @@ public: if (!lowguid) return false; - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); FormationInfo *group_member; group_member = new FormationInfo; @@ -1248,7 +1248,7 @@ public: return true; } - Creature *pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), guid); + Creature* pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), guid); if (!pCreature) { diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 501cfcdb6c3..2bc777afe85 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -228,7 +228,7 @@ public: for (GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player *pl = itr->getSource(); + Player* pl = itr->getSource(); if (!pl || !pl->GetSession()) continue; diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index fc268afe75a..2fb22e0090d 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -210,7 +210,7 @@ public: sscanf((char*)args, UI64FMTD, &titles); - Player *target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) { handler->SendSysMessage(LANG_NO_CHAR_SELECTED); diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 4701591bbcf..4addf788183 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -569,7 +569,7 @@ public: { handler->PSendSysMessage("|cff00ff00DEBUG: wp move, PathID: |r|cff00ffff%u|r", pathid); - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); Map *map = chr->GetMap(); { // wpCreature @@ -776,7 +776,7 @@ public: uint32 id = VISUAL_WAYPOINT; - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); Map *map = chr->GetMap(); float o = chr->GetOrientation(); @@ -827,7 +827,7 @@ public: float z = fields[2].GetFloat(); uint32 id = VISUAL_WAYPOINT; - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); float o = chr->GetOrientation(); Map *map = chr->GetMap(); @@ -875,7 +875,7 @@ public: float z = fields[2].GetFloat(); uint32 id = VISUAL_WAYPOINT; - Player *chr = handler->GetSession()->GetPlayer(); + Player* chr = handler->GetSession()->GetPlayer(); float o = chr->GetOrientation(); Map *map = chr->GetMap(); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index 261c15d3cca..dea747b97b8 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -58,7 +58,7 @@ class mob_av_marshal_or_warmaster : public CreatureScript struct mob_av_marshal_or_warmasterAI : public ScriptedAI { - mob_av_marshal_or_warmasterAI(Creature *c) : ScriptedAI(c) {} + mob_av_marshal_or_warmasterAI(Creature* c) : ScriptedAI(c) {} uint32 uiChargeTimer; uint32 uiCleaveTimer; diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index fc3c469771a..d78fefa1592 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -48,7 +48,7 @@ public: struct mob_water_elementalAI : public ScriptedAI { - mob_water_elementalAI(Creature *c) : ScriptedAI(c) {} + mob_water_elementalAI(Creature* c) : ScriptedAI(c) {} uint32 uiWaterBoltTimer; uint64 uiBalindaGUID; @@ -74,7 +74,7 @@ public: // check if creature is not outside of building if (uiResetTimer < diff) { - if (Creature *pBalinda = Unit::GetCreature(*me, uiBalindaGUID)) + if (Creature* pBalinda = Unit::GetCreature(*me, uiBalindaGUID)) if (me->GetDistance2d(pBalinda->GetHomePosition().GetPositionX(), pBalinda->GetHomePosition().GetPositionY()) > 50) EnterEvadeMode(); uiResetTimer = 5*IN_MILLISECONDS; @@ -84,7 +84,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_water_elementalAI(creature); } @@ -97,7 +97,7 @@ public: struct boss_balindaAI : public ScriptedAI { - boss_balindaAI(Creature *c) : ScriptedAI(c), Summons(me) {} + boss_balindaAI(Creature* c) : ScriptedAI(c), Summons(me) {} uint32 uiArcaneExplosionTimer; uint32 uiConeOfColdTimer; @@ -194,7 +194,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_balindaAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 2e162dde5b8..7e4e6f15384 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -48,7 +48,7 @@ public: struct boss_drektharAI : public ScriptedAI { - boss_drektharAI(Creature *c) : ScriptedAI(c) {} + boss_drektharAI(Creature* c) : ScriptedAI(c) {} uint32 uiWhirlwindTimer; uint32 uiWhirlwind2Timer; @@ -128,7 +128,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_drektharAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index e25df98863b..783be5bf7a3 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -39,7 +39,7 @@ public: struct boss_galvangarAI : public ScriptedAI { - boss_galvangarAI(Creature *c) : ScriptedAI(c) {} + boss_galvangarAI(Creature* c) : ScriptedAI(c) {} uint32 uiCleaveTimer; uint32 uiFrighteningShoutTimer; @@ -118,7 +118,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_galvangarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index dbaf7a77fa0..c5b600c8807 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -46,7 +46,7 @@ public: struct boss_vanndarAI : public ScriptedAI { - boss_vanndarAI(Creature *c) : ScriptedAI(c) {} + boss_vanndarAI(Creature* c) : ScriptedAI(c) {} uint32 uiAvatarTimer; uint32 uiThunderclapTimer; @@ -118,7 +118,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_vanndarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 78db15f0441..9cfd1e60b2b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -150,7 +150,7 @@ public: struct npc_grimstoneAI : public npc_escortAI { - npc_grimstoneAI(Creature *c) : npc_escortAI(c) + npc_grimstoneAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); MobSpawnId = rand()%6; @@ -263,7 +263,7 @@ public: if (RingBossGUID) { - Creature *boss = Unit::GetCreature(*me, RingBossGUID); + Creature* boss = Unit::GetCreature(*me, RingBossGUID); if (boss && !boss->isAlive() && boss->isDead()) { RingBossGUID = 0; @@ -276,7 +276,7 @@ public: for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i) { - Creature *mob = Unit::GetCreature(*me, RingMobGUID[i]); + Creature* mob = Unit::GetCreature(*me, RingMobGUID[i]); if (mob && !mob->isAlive() && mob->isDead()) { RingMobGUID[i] = 0; @@ -391,7 +391,7 @@ public: struct mob_phalanxAI : public ScriptedAI { - mob_phalanxAI(Creature *c) : ScriptedAI(c) {} + mob_phalanxAI(Creature* c) : ScriptedAI(c) {} uint32 ThunderClap_Timer; uint32 FireballVolley_Timer; @@ -658,7 +658,7 @@ public: struct npc_dughal_stormwingAI : public npc_escortAI { - npc_dughal_stormwingAI(Creature *c) : npc_escortAI(c) {} + npc_dughal_stormwingAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -778,7 +778,7 @@ public: struct npc_marshal_windsorAI : public npc_escortAI { - npc_marshal_windsorAI(Creature *c) : npc_escortAI(c) + npc_marshal_windsorAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); } @@ -840,7 +840,7 @@ public: void Reset() {} - void JustDied(Unit *slayer) + void JustDied(Unit* slayer) { pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } @@ -952,7 +952,7 @@ public: struct npc_marshal_reginald_windsorAI : public npc_escortAI { - npc_marshal_reginald_windsorAI(Creature *c) : npc_escortAI(c) + npc_marshal_reginald_windsorAI(Creature* c) : npc_escortAI(c) { } @@ -1014,7 +1014,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -1044,7 +1044,7 @@ public: } void Reset() {} - void JustDied(Unit *slayer) + void JustDied(Unit* slayer) { pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } @@ -1148,7 +1148,7 @@ public: struct npc_tobias_seecherAI : public npc_escortAI { - npc_tobias_seecherAI(Creature *c) :npc_escortAI(c) {} + npc_tobias_seecherAI(Creature* c) :npc_escortAI(c) {} void EnterCombat(Unit* who) {} void Reset() {} @@ -1263,7 +1263,7 @@ public: struct npc_rocknotAI : public npc_escortAI { - npc_rocknotAI(Creature *c) : npc_escortAI(c) + npc_rocknotAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); } @@ -1337,7 +1337,7 @@ public: DoGo(DATA_GO_BAR_KEG_TRAP, 0); //doesn't work very well, leaving code here for future //spell by trap has effect61, this indicate the bar go hostile - if (Unit *tmp = Unit::GetUnit(*me, pInstance->GetData64(DATA_PHALANX))) + if (Unit* tmp = Unit::GetUnit(*me, pInstance->GetData64(DATA_PHALANX))) tmp->setFaction(14); //for later, this event(s) has alot more to it. diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp index 238e72474b7..faaf94dbc65 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -42,7 +42,7 @@ public: struct boss_ambassador_flamelashAI : public ScriptedAI { - boss_ambassador_flamelashAI(Creature *c) : ScriptedAI(c) {} + boss_ambassador_flamelashAI(Creature* c) : ScriptedAI(c) {} uint32 FireBlast_Timer; uint32 Spirit_Timer; @@ -57,7 +57,7 @@ public: void SummonSpirits(Unit* victim) { - if (Creature *Spirit = DoSpawnCreature(9178, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + if (Creature* Spirit = DoSpawnCreature(9178, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) Spirit->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp index db6e2547381..0186abdf600 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp @@ -46,7 +46,7 @@ public: struct boss_anubshiahAI : public ScriptedAI { - boss_anubshiahAI(Creature *c) : ScriptedAI(c) {} + boss_anubshiahAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowBolt_Timer; uint32 CurseOfTongues_Timer; @@ -83,7 +83,7 @@ public: //CurseOfTongues_Timer if (CurseOfTongues_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CURSEOFTONGUES); CurseOfTongues_Timer = 18000; } else CurseOfTongues_Timer -= diff; @@ -105,7 +105,7 @@ public: //EnvelopingWeb_Timer if (EnvelopingWeb_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ENVELOPINGWEB); EnvelopingWeb_Timer = 12000; } else EnvelopingWeb_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 7a662d8e99b..fed30b98056 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -49,7 +49,7 @@ public: struct boss_draganthaurissanAI : public ScriptedAI { - boss_draganthaurissanAI(Creature *c) : ScriptedAI(c) {} + boss_draganthaurissanAI(Creature* c) : ScriptedAI(c) {} uint32 HandOfThaurissan_Timer; uint32 AvatarOfFlame_Timer; @@ -81,7 +81,7 @@ public: if (HandOfThaurissan_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HANDOFTHAURISSAN); //3 Hands of Thaurissan will be casted diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp index 33f72025dfc..65d1d78b30e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp @@ -44,7 +44,7 @@ public: struct boss_general_angerforgeAI : public ScriptedAI { - boss_general_angerforgeAI(Creature *c) : ScriptedAI(c) {} + boss_general_angerforgeAI(Creature* c) : ScriptedAI(c) {} uint32 MightyBlow_Timer; uint32 HamString_Timer; @@ -67,13 +67,13 @@ public: void SummonAdds(Unit* victim) { - if (Creature *SummonedAdd = DoSpawnCreature(8901, float(irand(-14, 14)), float(irand(-14, 14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature* SummonedAdd = DoSpawnCreature(8901, float(irand(-14, 14)), float(irand(-14, 14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedAdd->AI()->AttackStart(victim); } void SummonMedics(Unit* victim) { - if (Creature *SummonedMedic = DoSpawnCreature(8894, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature* SummonedMedic = DoSpawnCreature(8894, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMedic->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp index 414748bccca..6e5f597ce45 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -43,7 +43,7 @@ public: struct boss_gorosh_the_dervishAI : public ScriptedAI { - boss_gorosh_the_dervishAI(Creature *c) : ScriptedAI(c) {} + boss_gorosh_the_dervishAI(Creature* c) : ScriptedAI(c) {} uint32 WhirlWind_Timer; uint32 MortalStrike_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp index 9303475328b..60d6b017ac8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp @@ -43,7 +43,7 @@ public: struct boss_grizzleAI : public ScriptedAI { - boss_grizzleAI(Creature *c) : ScriptedAI(c) {} + boss_grizzleAI(Creature* c) : ScriptedAI(c) {} uint32 GroundTremor_Timer; uint32 Frenzy_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index 1403c0e44d9..7909d9e6e39 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -45,7 +45,7 @@ public: struct boss_high_interrogator_gerstahnAI : public ScriptedAI { - boss_high_interrogator_gerstahnAI(Creature *c) : ScriptedAI(c) {} + boss_high_interrogator_gerstahnAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowWordPain_Timer; uint32 ManaBurn_Timer; @@ -73,7 +73,7 @@ public: //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 7000; } else ShadowWordPain_Timer -= diff; @@ -81,7 +81,7 @@ public: //ManaBurn_Timer if (ManaBurn_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_MANABURN); ManaBurn_Timer = 10000; } else ManaBurn_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index 0ff398193d1..ce1cee169d7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -48,7 +48,7 @@ public: struct boss_magmusAI : public ScriptedAI { - boss_magmusAI(Creature *c) : ScriptedAI(c) {} + boss_magmusAI(Creature* c) : ScriptedAI(c) {} uint32 FieryBurst_Timer; uint32 WarStomp_Timer; @@ -89,7 +89,7 @@ public: DoMeleeAttackIfReady(); } // When he die open door to last chamber - void JustDied(Unit *who) + void JustDied(Unit* who) { if (InstanceScript* pInstance = who->GetInstanceScript()) pInstance->HandleGameObject(pInstance->GetData64(DATA_THRONE_DOOR), true); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp index 4247a7d3ea4..79fc21e6164 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -47,7 +47,7 @@ public: struct boss_moira_bronzebeardAI : public ScriptedAI { - boss_moira_bronzebeardAI(Creature *c) : ScriptedAI(c) {} + boss_moira_bronzebeardAI(Creature* c) : ScriptedAI(c) {} uint32 Heal_Timer; uint32 MindBlast_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 684002acfd3..a29156785e0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -150,7 +150,7 @@ public: struct boss_doomrelAI : public ScriptedAI { - boss_doomrelAI(Creature *c) : ScriptedAI(c) + boss_doomrelAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -222,7 +222,7 @@ public: //Immolate_Timer if (Immolate_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_IMMOLATE); Immolate_Timer = 25000; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 92b0f216fff..f93775a006e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -378,7 +378,7 @@ public: { boss->setFaction(FACTION_HOSTILE); boss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - if (Unit *pTarget = boss->SelectNearestTarget(500)) + if (Unit* pTarget = boss->SelectNearestTarget(500)) boss->AI()->AttackStart(pTarget); } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index be6aa718a98..922fb5cd5c1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -86,7 +86,7 @@ public: events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 45*IN_MILLISECONDS); break; case EVENT_HEX: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HEX); events.ScheduleEvent(EVENT_HEX, 15*IN_MILLISECONDS); break; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp index fd870eb0f2f..4e69f1a7e42 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -45,7 +45,7 @@ public: struct boss_broodlordAI : public ScriptedAI { - boss_broodlordAI(Creature *c) : ScriptedAI(c) {} + boss_broodlordAI(Creature* c) : ScriptedAI(c) {} uint32 Cleave_Timer; uint32 BlastWave_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index 766c74563cf..8d95df9c949 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -71,7 +71,7 @@ public: struct boss_chromaggusAI : public ScriptedAI { - boss_chromaggusAI(Creature *c) : ScriptedAI(c) + boss_chromaggusAI(Creature* c) : ScriptedAI(c) { //Select the 2 breaths that we are going to use until despawned //5 possiblities for the first breath, 4 for the second, 20 total possiblites diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp index 019db29a508..653da086b68 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp @@ -42,7 +42,7 @@ public: struct boss_ebonrocAI : public ScriptedAI { - boss_ebonrocAI(Creature *c) : ScriptedAI(c) {} + boss_ebonrocAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 WingBuffet_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp index 7a300e9a368..f27d190b7a0 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -41,7 +41,7 @@ public: struct boss_firemawAI : public ScriptedAI { - boss_firemawAI(Creature *c) : ScriptedAI(c) {} + boss_firemawAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 WingBuffet_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp index 848e95f6e1c..279b99c1163 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp @@ -43,7 +43,7 @@ public: struct boss_flamegorAI : public ScriptedAI { - boss_flamegorAI(Creature *c) : ScriptedAI(c) {} + boss_flamegorAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 WingBuffet_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index e92483ff734..bb122b173fe 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -72,7 +72,7 @@ public: struct boss_nefarianAI : public ScriptedAI { - boss_nefarianAI(Creature *c) : ScriptedAI(c) {} + boss_nefarianAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowFlame_Timer; uint32 BellowingRoar_Timer; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index 424d8b723dc..4303e53199a 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -49,7 +49,7 @@ public: struct boss_razorgoreAI : public ScriptedAI { - boss_razorgoreAI(Creature *c) : ScriptedAI(c) {} + boss_razorgoreAI(Creature* c) : ScriptedAI(c) {} uint32 Cleave_Timer; uint32 WarStomp_Timer; @@ -114,7 +114,7 @@ public: // Aura Check. If the gamer is affected by confliguration we attack a random gamer. if (me->getVictim() && me->getVictim()->HasAura(SPELL_CONFLAGRATION)) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) me->TauntApply(pTarget); DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index dd10305638f..0f34e0b2b34 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -81,7 +81,7 @@ public: struct boss_vaelAI : public ScriptedAI { - boss_vaelAI(Creature *c) : ScriptedAI(c) + boss_vaelAI(Creature* c) : ScriptedAI(c) { c->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); c->setFaction(35); @@ -115,7 +115,7 @@ public: DoingSpeech = false; } - void BeginSpeech(Unit *pTarget) + void BeginSpeech(Unit* pTarget) { //Stand up and begin speach PlayerGUID = pTarget->GetGUID(); @@ -208,7 +208,7 @@ public: //BurningAdrenalineCaster_Timer if (BurningAdrenalineCaster_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; uint8 i = 0; while (i < 3) // max 3 tries to get a random target with power_mana diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 57a34de3804..d13e5db8238 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -110,7 +110,7 @@ public: struct boss_victor_nefariusAI : public ScriptedAI { - boss_victor_nefariusAI(Creature *c) : ScriptedAI(c) + boss_victor_nefariusAI(Creature* c) : ScriptedAI(c) { NefarianGUID = 0; switch (urand(0, 19)) @@ -224,7 +224,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void BeginEvent(Player *pTarget) + void BeginEvent(Player* pTarget) { DoScriptText(SAY_GAMESBEGIN_2, me); @@ -247,7 +247,7 @@ public: { } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { //We simply use this function to find players until we can use pMap->GetPlayers() @@ -269,7 +269,7 @@ public: //ShadowBoltTimer if (ShadowBoltTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SHADOWBOLT); ShadowBoltTimer = urand(3000, 10000); @@ -278,7 +278,7 @@ public: //FearTimer if (FearTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_FEAR); FearTimer = 10000 + (rand()%10000); @@ -290,7 +290,7 @@ public: //Spawn 2 random types of creatures at the 2 locations uint32 CreatureID; Creature* Spawned = NULL; - Unit *pTarget = NULL; + Unit* pTarget = NULL; //1 in 3 chance it will be a chromatic if (urand(0, 2) == 0) diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index 1ad7e927309..9b43dc457a9 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -174,9 +174,9 @@ public: { if (pGo) { - if (Creature *trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 1)) + if (Creature* trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 1)) { - //visual effects are not working! ¬¬ + //visual effects are not working! trigger->CastSpell(trigger, 11542, true); trigger->CastSpell(trigger, 35470, true); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 858374a8399..56e28dbdcc2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -55,7 +55,7 @@ public: struct boss_curatorAI : public ScriptedAI { - boss_curatorAI(Creature *c) : ScriptedAI(c) {} + boss_curatorAI(Creature* c) : ScriptedAI(c) {} uint32 AddTimer; uint32 HatefulBoltTimer; @@ -132,7 +132,7 @@ public: { //Summon Astral Flare Creature* AstralFlare = DoSpawnCreature(17096, float(rand()%37), float(rand()%37), 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (AstralFlare && pTarget) @@ -184,7 +184,7 @@ public: else HatefulBoltTimer = 15000; - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) DoCast(pTarget, SPELL_HATEFUL_BOLT); } else HatefulBoltTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index d06e68ddf37..39c210e7395 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -51,7 +51,7 @@ public: struct boss_maiden_of_virtueAI : public ScriptedAI { - boss_maiden_of_virtueAI(Creature *c) : ScriptedAI(c) {} + boss_maiden_of_virtueAI(Creature* c) : ScriptedAI(c) {} uint32 Repentance_Timer; uint32 Holyfire_Timer; @@ -115,7 +115,7 @@ public: if (Holyfire_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HOLYFIRE); Holyfire_Timer = urand(8000, 23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row! @@ -123,7 +123,7 @@ public: if (Holywrath_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HOLYWRATH); Holywrath_Timer = urand(20000, 25000); //20-30 secs sounds nice diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 1ccb913d8ba..b380d559ae0 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -58,7 +58,7 @@ public: struct boss_attumenAI : public ScriptedAI { - boss_attumenAI(Creature *c) : ScriptedAI(c) + boss_attumenAI(Creature* c) : ScriptedAI(c) { Phase = 1; @@ -92,7 +92,7 @@ public: void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); - if (Unit *pMidnight = Unit::GetUnit(*me, Midnight)) + if (Unit* pMidnight = Unit::GetUnit(*me, Midnight)) pMidnight->Kill(pMidnight); } @@ -119,7 +119,7 @@ public: struct boss_midnightAI : public ScriptedAI { - boss_midnightAI(Creature *c) : ScriptedAI(c) {} + boss_midnightAI(Creature* c) : ScriptedAI(c) {} uint64 Attumen; uint8 Phase; @@ -141,7 +141,7 @@ public: { if (Phase == 2) { - if (Unit *pUnit = Unit::GetUnit(*me, Attumen)) + if (Unit* pUnit = Unit::GetUnit(*me, Attumen)) DoScriptText(SAY_MIDNIGHT_KILL, pUnit); } } @@ -164,7 +164,7 @@ public: } else if (Phase == 2 && HealthBelowPct(25)) { - if (Unit *pAttumen = Unit::GetUnit(*me, Attumen)) + if (Unit* pAttumen = Unit::GetUnit(*me, Attumen)) Mount(pAttumen); } else if (Phase == 3) @@ -176,7 +176,7 @@ public: Mount_Timer = 0; me->SetVisible(false); me->GetMotionMaster()->MoveIdle(); - if (Unit *pAttumen = Unit::GetUnit(*me, Attumen)) + if (Unit* pAttumen = Unit::GetUnit(*me, Attumen)) { pAttumen->SetDisplayId(MOUNTED_DISPLAYID); pAttumen->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -195,7 +195,7 @@ public: DoMeleeAttackIfReady(); } - void Mount(Unit *pAttumen) + void Mount(Unit* pAttumen) { DoScriptText(SAY_MOUNT, pAttumen); Phase = 3; @@ -220,7 +220,7 @@ public: Mount_Timer = 1000; } - void SetMidnight(Creature *pAttumen, uint64 value) + void SetMidnight(Creature* pAttumen, uint64 value) { CAST_AI(boss_attumen::boss_attumenAI, pAttumen->AI())->Midnight = value; } @@ -235,7 +235,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) if (ResetTimer <= diff) { ResetTimer = 0; - Unit *pMidnight = Unit::GetUnit(*me, Midnight); + Unit* pMidnight = Unit::GetUnit(*me, Midnight); if (pMidnight) { pMidnight->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -276,9 +276,9 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) { if (ChargeTimer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); - std::vector<Unit *> target_list; + std::vector<Unit* > target_list; for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); @@ -297,7 +297,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) { if (HealthBelowPct(25)) { - Creature *pMidnight = Unit::GetCreature(*me, Midnight); + Creature* pMidnight = Unit::GetCreature(*me, Midnight); if (pMidnight && pMidnight->GetTypeId() == TYPEID_UNIT) { CAST_AI(boss_midnight::boss_midnightAI, (pMidnight->AI()))->Mount(me); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 80a86c62318..4fbf14be475 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -72,7 +72,7 @@ public: struct boss_moroesAI : public ScriptedAI { - boss_moroesAI(Creature *c) : ScriptedAI(c) + boss_moroesAI(Creature* c) : ScriptedAI(c) { for (uint8 i = 0; i < 4; ++i) { @@ -155,7 +155,7 @@ public: DeSpawnAdds(); if (isAddlistEmpty()) { - Creature *pCreature = NULL; + Creature* pCreature = NULL; std::vector<uint32> AddList; for (uint8 i = 0; i < 6; ++i) @@ -181,7 +181,7 @@ public: { for (uint8 i = 0; i < 4; ++i) { - Creature *pCreature = me->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + Creature* pCreature = me->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); if (pCreature) { AddGUID[i] = pCreature->GetGUID(); @@ -302,7 +302,7 @@ public: { DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) pTarget->CastSpell(pTarget, SPELL_GARROTE, true); InVanish = false; @@ -417,7 +417,7 @@ public: struct boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI { //Shadow Priest - boss_baroness_dorothea_millstipeAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_baroness_dorothea_millstipeAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 ManaBurn_Timer; uint32 MindFlay_Timer; @@ -449,7 +449,7 @@ public: if (ManaBurn_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (pTarget->getPowerType() == POWER_MANA) DoCast(pTarget, SPELL_MANABURN); ManaBurn_Timer = 5000; // 3 sec cast @@ -457,7 +457,7 @@ public: if (ShadowWordPain_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoCast(pTarget, SPELL_SWPAIN); ShadowWordPain_Timer = 7000; @@ -481,7 +481,7 @@ public: struct boss_baron_rafe_dreugerAI : public boss_moroes_guestAI { //Retr Pally - boss_baron_rafe_dreugerAI(Creature *c) : boss_moroes_guestAI(c){} + boss_baron_rafe_dreugerAI(Creature* c) : boss_moroes_guestAI(c){} uint32 HammerOfJustice_Timer; uint32 SealOfCommand_Timer; @@ -539,7 +539,7 @@ public: struct boss_lady_catriona_von_indiAI : public boss_moroes_guestAI { //Holy Priest - boss_lady_catriona_von_indiAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_lady_catriona_von_indiAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 DispelMagic_Timer; uint32 GreaterHeal_Timer; @@ -573,7 +573,7 @@ public: if (GreaterHeal_Timer <= diff) { - Unit *pTarget = SelectGuestTarget(); + Unit* pTarget = SelectGuestTarget(); DoCast(pTarget, SPELL_GREATERHEAL); GreaterHeal_Timer = 17000; @@ -587,7 +587,7 @@ public: if (DispelMagic_Timer <= diff) { - if (Unit *pTarget = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) + if (Unit* pTarget = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) DoCast(pTarget, SPELL_DISPELMAGIC); DispelMagic_Timer = 25000; @@ -610,7 +610,7 @@ public: struct boss_lady_keira_berrybuckAI : public boss_moroes_guestAI { //Holy Pally - boss_lady_keira_berrybuckAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_lady_keira_berrybuckAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 Cleanse_Timer; uint32 GreaterBless_Timer; @@ -644,7 +644,7 @@ public: if (HolyLight_Timer <= diff) { - Unit *pTarget = SelectGuestTarget(); + Unit* pTarget = SelectGuestTarget(); DoCast(pTarget, SPELL_HOLYLIGHT); HolyLight_Timer = 10000; @@ -652,7 +652,7 @@ public: if (GreaterBless_Timer <= diff) { - Unit *pTarget = SelectGuestTarget(); + Unit* pTarget = SelectGuestTarget(); DoCast(pTarget, SPELL_GREATERBLESSOFMIGHT); @@ -661,7 +661,7 @@ public: if (Cleanse_Timer <= diff) { - Unit *pTarget = SelectGuestTarget(); + Unit* pTarget = SelectGuestTarget(); DoCast(pTarget, SPELL_CLEANSE); @@ -685,7 +685,7 @@ public: struct boss_lord_robin_darisAI : public boss_moroes_guestAI { //Arms Warr - boss_lord_robin_darisAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_lord_robin_darisAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 Hamstring_Timer; uint32 MortalStrike_Timer; @@ -742,7 +742,7 @@ public: struct boss_lord_crispin_ferenceAI : public boss_moroes_guestAI { //Arms Warr - boss_lord_crispin_ferenceAI(Creature *c) : boss_moroes_guestAI(c) {} + boss_lord_crispin_ferenceAI(Creature* c) : boss_moroes_guestAI(c) {} uint32 Disarm_Timer; uint32 HeroicStrike_Timer; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 1e17b720220..efc4a2d3442 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -63,7 +63,7 @@ class boss_netherspite : public CreatureScript public: boss_netherspite() : CreatureScript("boss_netherspite") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new boss_netherspiteAI(pCreature); } @@ -141,7 +141,7 @@ public: pos[BLUE_PORTAL] = (r>1 ? 1: 2); // Blue Portal not on the left side (0) for (int i=0; i<3; ++i) - if (Creature *portal = me->SummonCreature(PortalID[i], PortalCoord[pos[i]][0], PortalCoord[pos[i]][1], PortalCoord[pos[i]][2], 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* portal = me->SummonCreature(PortalID[i], PortalCoord[pos[i]][0], PortalCoord[pos[i]][1], PortalCoord[pos[i]][2], 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) { PortalGUID[i] = portal->GetGUID(); portal->AddAura(PortalVisual[i], portal); @@ -152,9 +152,9 @@ public: { for (int i=0; i<3; ++i) { - if (Creature *portal = Unit::GetCreature(*me, PortalGUID[i])) + if (Creature* portal = Unit::GetCreature(*me, PortalGUID[i])) portal->DisappearAndDie(); - if (Creature *portal = Unit::GetCreature(*me, BeamerGUID[i])) + if (Creature* portal = Unit::GetCreature(*me, BeamerGUID[i])) portal->DisappearAndDie(); PortalGUID[i] = 0; BeamTarget[i] = 0; @@ -164,12 +164,12 @@ public: void UpdatePortals() // Here we handle the beams' behavior { for (int j=0; j<3; ++j) // j = color - if (Creature *portal = Unit::GetCreature(*me, PortalGUID[j])) + if (Creature* portal = Unit::GetCreature(*me, PortalGUID[j])) { // the one who's been casted upon before - Unit *current = Unit::GetUnit(*portal, BeamTarget[j]); + Unit* current = Unit::GetUnit(*portal, BeamTarget[j]); // temporary store for the best suitable beam reciever - Unit *pTarget = me; + Unit* pTarget = me; if (Map* map = me->GetMap()) { @@ -199,14 +199,14 @@ public: { BeamTarget[j] = pTarget->GetGUID(); // remove currently beaming portal - if (Creature *beamer = Unit::GetCreature(*portal, BeamerGUID[j])) + if (Creature* beamer = Unit::GetCreature(*portal, BeamerGUID[j])) { beamer->CastSpell(pTarget, PortalBeam[j], false); beamer->DisappearAndDie(); BeamerGUID[j] = 0; } // create new one and start beaming on the target - if (Creature *beamer = portal->SummonCreature(PortalID[j], portal->GetPositionX(), portal->GetPositionY(), portal->GetPositionZ(), portal->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* beamer = portal->SummonCreature(PortalID[j], portal->GetPositionX(), portal->GetPositionY(), portal->GetPositionZ(), portal->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 60000)) { beamer->CastSpell(pTarget, PortalBeam[j], false); BeamerGUID[j] = beamer->GetGUID(); @@ -247,7 +247,7 @@ public: void HandleDoors(bool open) // Massive Door switcher { - if (GameObject *Door = GameObject::GetGameObject(*me, pInstance ? pInstance->GetData64(DATA_GO_MASSIVE_DOOR) : 0)) + if (GameObject* Door = GameObject::GetGameObject(*me, pInstance ? pInstance->GetData64(DATA_GO_MASSIVE_DOOR) : 0)) Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } @@ -314,7 +314,7 @@ public: // Netherbreath if (NetherbreathTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) DoCast(pTarget, SPELL_NETHERBREATH); NetherbreathTimer = urand(5000, 7000); } else NetherbreathTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 6beaf3a906b..3e4d92f0e97 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -177,7 +177,7 @@ public: HandleTerraceDoors(true); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!Intro && !Flying) ScriptedAI::MoveInLineOfSight(who); @@ -229,7 +229,7 @@ public: } } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->AI()->AttackStart(me->getVictim()); } @@ -321,14 +321,14 @@ public: if (CharredEarthTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CHARRED_EARTH); CharredEarthTimer = 20000; } else CharredEarthTimer -= diff; if (TailSweepTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (!me->HasInArc(M_PI, pTarget)) DoCast(pTarget, SPELL_TAIL_SWEEP); TailSweepTimer = 15000; @@ -336,7 +336,7 @@ public: if (SearingCindersTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SEARING_CINDERS); SearingCindersTimer = 10000; } else SearingCindersTimer -= diff; @@ -378,7 +378,7 @@ public: if (DistractingAshTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_DISTRACTING_ASH); DistractingAshTimer = 2000; //timer wrong } else DistractingAshTimer -= diff; @@ -395,7 +395,7 @@ public: if (FireballBarrageTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0)) DoCast(pTarget, SPELL_FIREBALL_BARRAGE); FireballBarrageTimer = 20000; } else FireballBarrageTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index f0c38af0ab6..788c9fb171a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -108,7 +108,7 @@ public: struct netherspite_infernalAI : public ScriptedAI { - netherspite_infernalAI(Creature *c) : ScriptedAI(c) , + netherspite_infernalAI(Creature* c) : ScriptedAI(c) , HellfireTimer(0), CleanupTimer(0), malchezaar(0), point(NULL) {} uint32 HellfireTimer; @@ -142,9 +142,9 @@ public: } } - void KilledUnit(Unit *who) + void KilledUnit(Unit* who) { - Unit *pMalchezaar = Unit::GetUnit(*me, malchezaar); + Unit* pMalchezaar = Unit::GetUnit(*me, malchezaar); if (pMalchezaar) CAST_CRE(pMalchezaar)->AI()->KilledUnit(who); } @@ -160,7 +160,7 @@ public: } } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetGUID() != malchezaar) damage = 0; @@ -183,7 +183,7 @@ public: struct boss_malchezaarAI : public ScriptedAI { - boss_malchezaarAI(Creature *c) : ScriptedAI(c) + boss_malchezaarAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -271,7 +271,7 @@ public: { //Infernal Cleanup for (std::vector<uint64>::const_iterator itr = infernals.begin(); itr != infernals.end(); ++itr) - if (Unit *pInfernal = Unit::GetUnit(*me, *itr)) + if (Unit* pInfernal = Unit::GetUnit(*me, *itr)) if (pInfernal->isAlive()) { pInfernal->SetVisible(false); @@ -285,7 +285,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - Unit *axe = Unit::GetUnit(*me, axes[i]); + Unit* axe = Unit::GetUnit(*me, axes[i]); if (axe && axe->isAlive()) axe->Kill(axe); axes[i] = 0; @@ -310,7 +310,7 @@ public: return; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); - std::vector<Unit *> targets; + std::vector<Unit* > targets; if (!t_list.size()) return; @@ -319,7 +319,7 @@ public: std::list<HostileReference *>::const_iterator itr = t_list.begin(); std::advance(itr, 1); for (; itr != t_list.end(); ++itr) //store the threat list in a different container - if (Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) if (pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) targets.push_back(pTarget); @@ -328,8 +328,8 @@ public: targets.erase(targets.begin()+rand()%targets.size()); uint32 i = 0; - for (std::vector<Unit *>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter, ++i) - if (Unit *pTarget = *iter) + for (std::vector<Unit* >::const_iterator iter = targets.begin(); iter != targets.end(); ++iter, ++i) + if (Unit* pTarget = *iter) { enfeeble_targets[i] = pTarget->GetGUID(); enfeeble_health[i] = pTarget->GetHealth(); @@ -343,7 +343,7 @@ public: { for (uint8 i = 0; i < 5; ++i) { - Unit *pTarget = Unit::GetUnit(*me, enfeeble_targets[i]); + Unit* pTarget = Unit::GetUnit(*me, enfeeble_targets[i]); if (pTarget && pTarget->isAlive()) pTarget->SetHealth(enfeeble_health[i]); enfeeble_targets[i] = 0; @@ -365,7 +365,7 @@ public: pos.Relocate(point->x, point->y, INFERNAL_Z); } - Creature *Infernal = me->SummonCreature(NETHERSPITE_INFERNAL, pos, TEMPSUMMON_TIMED_DESPAWN, 180000); + Creature* Infernal = me->SummonCreature(NETHERSPITE_INFERNAL, pos, TEMPSUMMON_TIMED_DESPAWN, 180000); if (Infernal) { @@ -449,10 +449,10 @@ public: DoScriptText(SAY_AXE_TOSS2, me); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); for (uint8 i = 0; i < 2; ++i) { - Creature *axe = me->SummonCreature(MALCHEZARS_AXE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); + Creature* axe = me->SummonCreature(MALCHEZARS_AXE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); if (axe) { axe->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -494,11 +494,11 @@ public: { AxesTargetSwitchTimer = urand(7500, 20000); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { for (uint8 i = 0; i < 2; ++i) { - if (Unit *axe = Unit::GetUnit(*me, axes[i])) + if (Unit* axe = Unit::GetUnit(*me, axes[i])) { if (axe->getVictim()) DoModifyThreatPercent(axe->getVictim(), -100); @@ -513,7 +513,7 @@ public: if (AmplifyDamageTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_AMPLIFY_DAMAGE); AmplifyDamageTimer = urand(20000, 30000); } else AmplifyDamageTimer -= diff; @@ -536,7 +536,7 @@ public: { if (SWPainTimer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; if (phase == 1) pTarget = me->getVictim(); // the tank else // anyone but the tank @@ -585,7 +585,7 @@ public: } } - void Cleanup(Creature *infernal, InfernalPoint *point) + void Cleanup(Creature* infernal, InfernalPoint *point) { for (std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr) if (*itr == infernal->GetGUID()) @@ -602,7 +602,7 @@ public: void netherspite_infernal::netherspite_infernalAI::Cleanup() { - Unit *pMalchezaar = Unit::GetUnit(*me, malchezaar); + Unit* pMalchezaar = Unit::GetUnit(*me, malchezaar); if (pMalchezaar && pMalchezaar->isAlive()) CAST_AI(boss_malchezaar::boss_malchezaarAI, CAST_CRE(pMalchezaar)->AI())->Cleanup(me, point); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index d30494333a2..537af931b08 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -93,7 +93,7 @@ public: struct boss_aranAI : public ScriptedAI { - boss_aranAI(Creature *c) : ScriptedAI(c) + boss_aranAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -195,7 +195,7 @@ public: //store the threat list in a different container 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()); //only on alive players if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) targets.push_back(pTarget); @@ -309,7 +309,7 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (!pTarget) return; @@ -523,7 +523,7 @@ public: struct water_elementalAI : public ScriptedAI { - water_elementalAI(Creature *c) : ScriptedAI(c) {} + water_elementalAI(Creature* c) : ScriptedAI(c) {} uint32 CastTimer; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index e11f85c02ca..93eaf7098c2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -68,7 +68,7 @@ public: struct mob_kilrekAI : public ScriptedAI { - mob_kilrekAI(Creature *c) : ScriptedAI(c) + mob_kilrekAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -140,7 +140,7 @@ public: struct mob_demon_chainAI : public ScriptedAI { - mob_demon_chainAI(Creature *c) : ScriptedAI(c) {} + mob_demon_chainAI(Creature* c) : ScriptedAI(c) {} uint64 SacrificeGUID; @@ -178,7 +178,7 @@ public: struct mob_fiendish_portalAI : public PassiveAI { - mob_fiendish_portalAI(Creature *c) : PassiveAI(c), summons(me){} + mob_fiendish_portalAI(Creature* c) : PassiveAI(c), summons(me){} SummonList summons; @@ -215,7 +215,7 @@ public: struct mob_fiendish_impAI : public ScriptedAI { - mob_fiendish_impAI(Creature *c) : ScriptedAI(c) {} + mob_fiendish_impAI(Creature* c) : ScriptedAI(c) {} uint32 FireboltTimer; @@ -258,7 +258,7 @@ public: struct boss_terestianAI : public ScriptedAI { - boss_terestianAI(Creature *c) : ScriptedAI(c) + boss_terestianAI(Creature* c) : ScriptedAI(c) { for (uint8 i = 0; i < 2; ++i) PortalGUID[i] = 0; @@ -370,7 +370,7 @@ public: if (SacrificeTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); if (pTarget && pTarget->isAlive()) { DoCast(pTarget, SPELL_SACRIFICE, true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index ddb5970d155..5feb1ff924e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -388,7 +388,7 @@ public: if (BrainWipeTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_BRAIN_WIPE); BrainWipeTimer = 20000; } else BrainWipeTimer -= diff; @@ -869,7 +869,7 @@ public: { if (!IsChasing) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoScriptText(SAY_WOLF_HOOD, me); DoCast(pTarget, SPELL_LITTLE_RED_RIDING_HOOD, true); @@ -886,7 +886,7 @@ public: { IsChasing = false; - if (Unit *pTarget = Unit::GetUnit((*me), HoodGUID)) + if (Unit* pTarget = Unit::GetUnit((*me), HoodGUID)) { HoodGUID = 0; if (DoGetThreat(pTarget)) @@ -977,7 +977,7 @@ void PretendToDie(Creature* pCreature) pCreature->SetStandState(UNIT_STAND_STATE_DEAD); }; -void Resurrect(Creature *pTarget) +void Resurrect(Creature* pTarget) { pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); pTarget->SetFullHealth(); @@ -1289,7 +1289,7 @@ public: if (BackwardLungeTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); if (pTarget && !me->HasInArc(M_PI, pTarget)) { DoCast(pTarget, SPELL_BACKWARD_LUNGE); @@ -1305,7 +1305,7 @@ public: if (DeadlySwatheTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_DEADLY_SWATHE); DeadlySwatheTimer = urand(15000, 25000); } else DeadlySwatheTimer -= diff; @@ -1410,7 +1410,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(const uint32 diff) if (BlindingPassionTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_BLINDING_PASSION); BlindingPassionTimer = urand(30000, 45000); } else BlindingPassionTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 253878eefe7..8b9bc02e364 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -173,7 +173,7 @@ public: //Close the encounter door, open it in JustDied/Reset } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!HasTaunted && me->IsWithinDistInMap(who, 40.0f)) { @@ -302,7 +302,7 @@ public: if (PhoenixTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); uint8 random = urand(1, 2); float x = KaelLocations[random][0]; @@ -323,7 +323,7 @@ public: if (FlameStrikeTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { me->InterruptSpell(CURRENT_CHANNELED_SPELL); me->InterruptSpell(CURRENT_GENERIC_SPELL); @@ -395,7 +395,7 @@ public: for (uint8 i = 0; i < 3; ++i) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Orb = DoSpawnCreature(CREATURE_ARCANE_SPHERE, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); @@ -441,7 +441,7 @@ public: struct mob_felkael_flamestrikeAI : public ScriptedAI { - mob_felkael_flamestrikeAI(Creature *c) : ScriptedAI(c) + mob_felkael_flamestrikeAI(Creature* c) : ScriptedAI(c) { } @@ -603,7 +603,7 @@ public: struct mob_felkael_phoenix_eggAI : public ScriptedAI { - mob_felkael_phoenix_eggAI(Creature *c) : ScriptedAI(c) {} + mob_felkael_phoenix_eggAI(Creature* c) : ScriptedAI(c) {} uint32 HatchTimer; @@ -640,7 +640,7 @@ public: struct mob_arcane_sphereAI : public ScriptedAI { - mob_arcane_sphereAI(Creature *c) : ScriptedAI(c) { Reset(); } + mob_arcane_sphereAI(Creature* c) : ScriptedAI(c) { Reset(); } uint32 DespawnTimer; uint32 ChangeTargetTimer; @@ -671,7 +671,7 @@ public: if (ChangeTargetTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index cc17f4b15af..1e2177cab74 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -256,7 +256,7 @@ public: if (HealTimer <= diff) { uint32 health = me->GetHealth(); - Unit *pTarget = me; + Unit* pTarget = me; for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i) { if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[i])) @@ -272,7 +272,7 @@ public: if (RenewTimer <= diff) { - Unit *pTarget = me; + Unit* pTarget = me; if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) @@ -285,7 +285,7 @@ public: if (ShieldTimer <= diff) { - Unit *pTarget = me; + Unit* pTarget = me; if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) @@ -298,7 +298,7 @@ public: if (DispelTimer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; if (urand(0, 1)) pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); @@ -494,7 +494,7 @@ public: struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI { //Rogue - boss_kagani_nightstrikeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_kagani_nightstrikeAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Gouge_Timer; uint32 Kick_Timer; @@ -599,7 +599,7 @@ public: struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI { //Warlock - boss_ellris_duskhallowAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_ellris_duskhallowAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Immolate_Timer; uint32 Shadow_Bolt_Timer; @@ -691,7 +691,7 @@ public: struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI { //Monk - boss_eramas_brightblazeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_eramas_brightblazeAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Knockdown_Timer; uint32 Snap_Kick_Timer; @@ -753,7 +753,7 @@ public: struct boss_yazzaiAI : public boss_priestess_lackey_commonAI { //Mage - boss_yazzaiAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_yazzaiAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} bool HasIceBlocked; @@ -791,7 +791,7 @@ public: if (Polymorph_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_POLYMORPH); Polymorph_Timer = 20000; @@ -836,7 +836,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) { - if (Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { //if in melee range if (pTarget->IsWithinDistInMap(me, 5)) @@ -884,7 +884,7 @@ public: struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI { //Warrior - boss_warlord_salarisAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_warlord_salarisAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Intercept_Stun_Timer; uint32 Disarm_Timer; @@ -923,7 +923,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) { - if (Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { //if in melee range if (pTarget->IsWithinDistInMap(me, ATTACK_DISTANCE)) @@ -1005,7 +1005,7 @@ public: struct boss_garaxxasAI : public boss_priestess_lackey_commonAI { //Hunter - boss_garaxxasAI(Creature *c) : boss_priestess_lackey_commonAI(c) { m_uiPetGUID = 0; } + boss_garaxxasAI(Creature* c) : boss_priestess_lackey_commonAI(c) { m_uiPetGUID = 0; } uint64 m_uiPetGUID; @@ -1125,7 +1125,7 @@ public: struct boss_apokoAI : public boss_priestess_lackey_commonAI { //Shaman - boss_apokoAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_apokoAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Totem_Timer; uint8 Totem_Amount; @@ -1224,7 +1224,7 @@ public: struct boss_zelfanAI : public boss_priestess_lackey_commonAI { //Engineer - boss_zelfanAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} + boss_zelfanAI(Creature* c) : boss_priestess_lackey_commonAI(c) {} uint32 Goblin_Dragon_Gun_Timer; uint32 Rocket_Launch_Timer; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 384b4f6e664..025c121a178 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -333,7 +333,7 @@ public: struct mob_fel_crystalAI : public ScriptedAI { - mob_fel_crystalAI(Creature *c) : ScriptedAI(c) {} + mob_fel_crystalAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 0bf0b8f0129..ad3b6896968 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -71,7 +71,7 @@ public: struct boss_vexallusAI : public ScriptedAI { - boss_vexallusAI(Creature *c) : ScriptedAI(c) + boss_vexallusAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -115,9 +115,9 @@ public: pInstance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { - if (Unit *temp = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->GetMotionMaster()->MoveFollow(temp, 0, 0); //spells are SUMMON_TYPE_GUARDIAN, so using setOwner should be ok @@ -163,7 +163,7 @@ public: if (ChainLightningTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAIN_LIGHTNING); ChainLightningTimer = 8000; @@ -171,7 +171,7 @@ public: if (ArcaneShockTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (pTarget) DoCast(pTarget, SPELL_ARCANE_SHOCK); @@ -206,13 +206,13 @@ public: struct mob_pure_energyAI : public ScriptedAI { - mob_pure_energyAI(Creature *c) : ScriptedAI(c) {} + mob_pure_energyAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void JustDied(Unit* slayer) { - if (Unit *temp = me->GetOwner()) + if (Unit* temp = me->GetOwner()) { if (temp && temp->isAlive()) slayer->CastSpell(slayer, SPELL_ENERGY_FEEDBACK, true, 0, 0, temp->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp index 19ce6288c78..6c3e7f7d4f6 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp @@ -52,7 +52,7 @@ class boss_baron_geddon : public CreatureScript struct boss_baron_geddonAI : public BossAI { - boss_baron_geddonAI(Creature *pCreature) : BossAI(pCreature, BOSS_BARON_GEDDON) + boss_baron_geddonAI(Creature* pCreature) : BossAI(pCreature, BOSS_BARON_GEDDON) { } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp index 6f17c9e8079..384599041da 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp @@ -55,7 +55,7 @@ class boss_magmadar : public CreatureScript struct boss_magmadarAI : public BossAI { - boss_magmadarAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAGMADAR) + boss_magmadarAI(Creature* pCreature) : BossAI(pCreature, BOSS_MAGMADAR) { } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp index ad2f02ca77b..c7c80015f63 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp @@ -76,7 +76,7 @@ class boss_majordomo : public CreatureScript struct boss_majordomoAI : public BossAI { - boss_majordomoAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAJORDOMO_EXECUTUS) + boss_majordomoAI(Creature* pCreature) : BossAI(pCreature, BOSS_MAJORDOMO_EXECUTUS) { } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index a1f6e47c755..9180edde7a0 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -79,7 +79,7 @@ class boss_ragnaros : public CreatureScript struct boss_ragnarosAI : public BossAI { - boss_ragnarosAI(Creature *pCreature) : BossAI(pCreature, BOSS_RAGNAROS) + boss_ragnarosAI(Creature* pCreature) : BossAI(pCreature, BOSS_RAGNAROS) { _introState = 0; me->SetReactState(REACT_PASSIVE); @@ -316,7 +316,7 @@ class mob_son_of_flame : public CreatureScript struct mob_son_of_flameAI : public ScriptedAI //didnt work correctly in EAI for me... { - mob_son_of_flameAI(Creature *c) : ScriptedAI(c) + mob_son_of_flameAI(Creature* c) : ScriptedAI(c) { instance = me->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 4ef1ad7ee2e..bc25fe7a753 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -102,7 +102,7 @@ public: struct npc_unworthy_initiateAI : public ScriptedAI { - npc_unworthy_initiateAI(Creature *c) : ScriptedAI(c) + npc_unworthy_initiateAI(Creature* c) : ScriptedAI(c) { me->SetReactState(REACT_PASSIVE); if (!me->GetEquipmentId()) @@ -155,7 +155,7 @@ public: } } - void EventStart(Creature* anchor, Player *pTarget) + void EventStart(Creature* anchor, Player* pTarget) { wait_timer = 5000; phase = PHASE_TO_EQUIP; @@ -178,7 +178,7 @@ public: case PHASE_CHAINED: if (!anchorGUID) { - if (Creature *anchor = me->FindNearestCreature(29521, 30)) + if (Creature* anchor = me->FindNearestCreature(29521, 30)) { anchor->AI()->SetGUID(me->GetGUID()); anchor->CastSpell(me, SPELL_SOUL_PRISON_CHAIN, true); @@ -188,7 +188,7 @@ public: sLog->outError("npc_unworthy_initiateAI: unable to find anchor!"); float dist = 99.0f; - GameObject *prison = NULL; + GameObject* prison = NULL; for (uint8 i = 0; i < 12; ++i) { @@ -233,7 +233,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); phase = PHASE_ATTACKING; - if (Player *pTarget = Unit::GetPlayer(*me, playerGUID)) + if (Player* pTarget = Unit::GetPlayer(*me, playerGUID)) me->AI()->AttackStart(pTarget); wait_timer = 0; } @@ -293,7 +293,7 @@ public: struct npc_unworthy_initiate_anchorAI : public PassiveAI { - npc_unworthy_initiate_anchorAI(Creature *c) : PassiveAI(c), prisonerGUID(0) {} + npc_unworthy_initiate_anchorAI(Creature* c) : PassiveAI(c), prisonerGUID(0) {} uint64 prisonerGUID; @@ -315,7 +315,7 @@ public: bool OnGossipHello(Player* pPlayer, GameObject* pGo) { - if (Creature *anchor = pGo->FindNearestCreature(29521, 15)) + if (Creature* anchor = pGo->FindNearestCreature(29521, 15)) if (uint64 prisonerGUID = anchor->AI()->GetGUID()) if (Creature* prisoner = Creature::GetCreature(*pPlayer, prisonerGUID)) CAST_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, pPlayer); @@ -531,7 +531,7 @@ public: struct npc_dark_rider_of_acherusAI : public ScriptedAI { - npc_dark_rider_of_acherusAI(Creature *c) : ScriptedAI(c) {} + npc_dark_rider_of_acherusAI(Creature* c) : ScriptedAI(c) {} uint32 PhaseTimer; uint32 Phase; @@ -561,7 +561,7 @@ public: Phase = 1; break; case 1: - if (Unit *pTarget = Unit::GetUnit(*me, TargetGUID)) + if (Unit* pTarget = Unit::GetUnit(*me, TargetGUID)) DoCast(pTarget, DESPAWN_HORSE, true); PhaseTimer = 3000; Phase = 2; @@ -581,7 +581,7 @@ public: } - void InitDespawnHorse(Unit *who) + void InitDespawnHorse(Unit* who) { if (!who) return; @@ -623,15 +623,15 @@ public: struct npc_salanar_the_horsemanAI : public ScriptedAI { - npc_salanar_the_horsemanAI(Creature *c) : ScriptedAI(c) {} + npc_salanar_the_horsemanAI(Creature* c) : ScriptedAI(c) {} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == DELIVER_STOLEN_HORSE) { if (caster->GetTypeId() == TYPEID_UNIT && caster->IsVehicle()) { - if (Unit *charmer = caster->GetCharmer()) + if (Unit* charmer = caster->GetCharmer()) { if (charmer->HasAura(EFFECT_STOLEN_HORSE)) { @@ -647,13 +647,13 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { ScriptedAI::MoveInLineOfSight(who); if (who->GetTypeId() == TYPEID_UNIT && who->IsVehicle() && me->IsWithinDistInMap(who, 5.0f)) { - if (Unit *charmer = who->GetCharmer()) + if (Unit* charmer = who->GetCharmer()) { if (charmer->GetTypeId() == TYPEID_PLAYER) { @@ -692,7 +692,7 @@ public: struct npc_ros_dark_riderAI : public ScriptedAI { - npc_ros_dark_riderAI(Creature *c) : ScriptedAI(c) {} + npc_ros_dark_riderAI(Creature* c) : ScriptedAI(c) {} void EnterCombat(Unit* /*who*/) { @@ -743,15 +743,15 @@ public: struct npc_dkc1_gothikAI : public ScriptedAI { - npc_dkc1_gothikAI(Creature *c) : ScriptedAI(c) {} + npc_dkc1_gothikAI(Creature* c) : ScriptedAI(c) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { ScriptedAI::MoveInLineOfSight(who); if (who->GetEntry() == GHOULS && me->IsWithinDistInMap(who, 10.0f)) { - if (Unit *owner = who->GetOwner()) + if (Unit* owner = who->GetOwner()) { if (owner->GetTypeId() == TYPEID_PLAYER) { @@ -785,7 +785,7 @@ public: struct npc_scarlet_ghoulAI : public ScriptedAI { - npc_scarlet_ghoulAI(Creature *c) : ScriptedAI(c) + npc_scarlet_ghoulAI(Creature* c) : ScriptedAI(c) { // Ghouls should display their Birth Animation // Crawling out of the ground @@ -794,7 +794,7 @@ public: me->SetReactState(REACT_DEFENSIVE); } - void FindMinions(Unit *owner) + void FindMinions(Unit* owner) { std::list<Creature*> MinionList; owner->GetAllMinionsByEntry(MinionList, GHOULS); @@ -818,7 +818,7 @@ public: { if (!me->isInCombat()) { - if (Unit *owner = me->GetOwner()) + if (Unit* owner = me->GetOwner()) { if (owner->GetTypeId() == TYPEID_PLAYER && CAST_PLR(owner)->isInCombat()) { @@ -868,14 +868,14 @@ class npc_scarlet_miner_cart : public CreatureScript public: npc_scarlet_miner_cart() : CreatureScript("npc_scarlet_miner_cart") { } - CreatureAI* GetAI(Creature *_Creature) const + CreatureAI* GetAI(Creature* _Creature) const { return new npc_scarlet_miner_cartAI(_Creature); } struct npc_scarlet_miner_cartAI : public PassiveAI { - npc_scarlet_miner_cartAI(Creature *c) : PassiveAI(c), minerGUID(0) + npc_scarlet_miner_cartAI(Creature* c) : PassiveAI(c), minerGUID(0) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetDisplayId(me->GetCreatureInfo()->Modelid1); // Modelid2 is a horse. @@ -890,7 +890,7 @@ public: void DoAction(const int32 /*param*/) { - if (Creature *miner = Unit::GetCreature(*me, minerGUID)) + if (Creature* miner = Unit::GetCreature(*me, minerGUID)) { me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -905,7 +905,7 @@ public: void PassengerBoarded(Unit* /*who*/, int8 /*seatId*/, bool apply) { if (!apply) - if (Creature *miner = Unit::GetCreature(*me, minerGUID)) + if (Creature* miner = Unit::GetCreature(*me, minerGUID)) miner->DisappearAndDie(); } }; @@ -924,14 +924,14 @@ class npc_scarlet_miner : public CreatureScript public: npc_scarlet_miner() : CreatureScript("npc_scarlet_miner") { } - CreatureAI* GetAI(Creature *_Creature) const + CreatureAI* GetAI(Creature* _Creature) const { return new npc_scarlet_minerAI(_Creature); } struct npc_scarlet_minerAI : public npc_escortAI { - npc_scarlet_minerAI(Creature *c) : npc_escortAI(c) + npc_scarlet_minerAI(Creature* c) : npc_escortAI(c) { me->SetReactState(REACT_PASSIVE); } @@ -980,7 +980,7 @@ public: } } - void InitCartQuest(Player *who) + void InitCartQuest(Player* who) { carGUID = who->GetVehicleBase()->GetGUID(); InitWaypoint(); @@ -993,7 +993,7 @@ public: switch (i) { case 1: - if (Unit *car = Unit::GetCreature(*me, carGUID)) + if (Unit* car = Unit::GetCreature(*me, carGUID)) { me->SetInFront(car); me->SendMovementFlagUpdate(); @@ -1004,7 +1004,7 @@ public: IntroPhase = 1; break; case 17: - if (Unit *car = Unit::GetCreature(*me, carGUID)) + if (Unit* car = Unit::GetCreature(*me, carGUID)) { me->SetInFront(car); me->SendMovementFlagUpdate(); @@ -1027,14 +1027,14 @@ public: { if (IntroPhase == 1) { - if (Creature *car = Unit::GetCreature(*me, carGUID)) + if (Creature* car = Unit::GetCreature(*me, carGUID)) DoCast(car, SPELL_CART_DRAG); IntroTimer = 800; IntroPhase = 2; } else { - if (Creature *car = Unit::GetCreature(*me, carGUID)) + if (Creature* car = Unit::GetCreature(*me, carGUID)) car->AI()->DoAction(0); IntroPhase = 0; } @@ -1062,10 +1062,10 @@ public: if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE) { // Hack Why Trinity Dont Support Custom Summon Location - if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1)) + if (Creature* miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1)) { pPlayer->CastSpell(pPlayer, SPELL_CART_SUMM, true); - if (Creature *car = pPlayer->GetVehicleCreatureBase()) + if (Creature* car = pPlayer->GetVehicleCreatureBase()) { if (car->GetEntry() == 28817) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 3f22aee29cd..50f761b4fa7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -56,7 +56,7 @@ public: struct npc_crusade_persuadedAI : public ScriptedAI { - npc_crusade_persuadedAI(Creature *pCreature) : ScriptedAI(pCreature) {} + npc_crusade_persuadedAI(Creature* pCreature) : ScriptedAI(pCreature) {} uint32 uiSpeech_timer; uint32 uiSpeech_counter; @@ -71,7 +71,7 @@ public: me->RestoreFaction(); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->isAlive() && !uiSpeech_counter) { @@ -196,7 +196,7 @@ public: struct npc_koltira_deathweaverAI : public npc_escortAI { - npc_koltira_deathweaverAI(Creature *pCreature) : npc_escortAI(pCreature) + npc_koltira_deathweaverAI(Creature* pCreature) : npc_escortAI(pCreature) { me->SetReactState(REACT_DEFENSIVE); } @@ -363,7 +363,7 @@ public: struct mob_scarlet_courierAI : public ScriptedAI { - mob_scarlet_courierAI(Creature *pCreature) : ScriptedAI(pCreature) {} + mob_scarlet_courierAI(Creature* pCreature) : ScriptedAI(pCreature) {} uint32 uiStage; uint32 uiStage_timer; @@ -411,7 +411,7 @@ public: break; case 2: if (GameObject* tree = me->FindNearestGameObject(GO_INCONSPICUOUS_TREE, 40.0f)) - if (Unit *unit = tree->GetOwner()) + if (Unit* unit = tree->GetOwner()) AttackStart(unit); break; } @@ -457,7 +457,7 @@ public: struct mob_high_inquisitor_valrothAI : public ScriptedAI { - mob_high_inquisitor_valrothAI(Creature *pCreature) : ScriptedAI(pCreature) {} + mob_high_inquisitor_valrothAI(Creature* pCreature) : ScriptedAI(pCreature) {} uint32 uiRenew_timer; uint32 uiInquisitor_Penance_timer; @@ -593,7 +593,7 @@ public: struct npc_a_special_surpriseAI : public ScriptedAI { - npc_a_special_surpriseAI(Creature *pCreature) : ScriptedAI(pCreature) {} + npc_a_special_surpriseAI(Creature* pCreature) : ScriptedAI(pCreature) {} uint32 ExecuteSpeech_Timer; uint32 ExecuteSpeech_Counter; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index d5965aa2dbf..04d8244ffc7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -321,7 +321,7 @@ public: struct npc_highlord_darion_mograineAI : public npc_escortAI { - npc_highlord_darion_mograineAI(Creature *pCreature) : npc_escortAI(pCreature) + npc_highlord_darion_mograineAI(Creature* pCreature) : npc_escortAI(pCreature) { Reset(); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index 1d6f8014ec7..487ec83e682 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -35,7 +35,7 @@ public: struct npc_valkyr_battle_maidenAI : public PassiveAI { - npc_valkyr_battle_maidenAI(Creature *c) : PassiveAI(c) {} + npc_valkyr_battle_maidenAI(Creature* c) : PassiveAI(c) {} uint32 FlyBackTimer; float x, y, z; @@ -60,9 +60,9 @@ public: { if (FlyBackTimer <= diff) { - Player *plr = NULL; + Player* plr = NULL; if (me->isSummon()) - if (Unit *summoner = me->ToTempSummon()->GetSummoner()) + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (summoner->GetTypeId() == TYPEID_PLAYER) plr = CAST_PLR(summoner); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 3aba9f3ffca..3ac8928f7b8 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -49,7 +49,7 @@ public: struct boss_arcanist_doanAI : public ScriptedAI { - boss_arcanist_doanAI(Creature *c) : ScriptedAI(c) {} + boss_arcanist_doanAI(Creature* c) : ScriptedAI(c) {} uint32 Polymorph_Timer; uint32 AoESilence_Timer; @@ -101,7 +101,7 @@ public: if (Polymorph_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_POLYMORPH); Polymorph_Timer = 20000; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index d0dcc4c9d83..04e525a3985 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -41,7 +41,7 @@ public: struct boss_azshir_the_sleeplessAI : public ScriptedAI { - boss_azshir_the_sleeplessAI(Creature *c) : ScriptedAI(c) {} + boss_azshir_the_sleeplessAI(Creature* c) : ScriptedAI(c) {} uint32 SoulSiphon_Timer; uint32 CallOftheGrave_Timer; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index f5a8479faa3..852b21de423 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -49,7 +49,7 @@ public: struct boss_bloodmage_thalnosAI : public ScriptedAI { - boss_bloodmage_thalnosAI(Creature *c) : ScriptedAI(c) {} + boss_bloodmage_thalnosAI(Creature* c) : ScriptedAI(c) {} bool HpYell; uint32 FlameShock_Timer; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index dd877a2d257..f897f6fc90c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -140,7 +140,7 @@ public: struct mob_wisp_invisAI : public ScriptedAI { - mob_wisp_invisAI(Creature *c) : ScriptedAI(c) + mob_wisp_invisAI(Creature* c) : ScriptedAI(c) { Creaturetype = delay = spell = spell2 = 0; //that's hack but there are no info about range of this spells in dbc @@ -189,7 +189,7 @@ public: me->SetDisplayId(2027); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || Creaturetype != 1 || !who->isTargetableForAttack()) return; @@ -227,7 +227,7 @@ public: struct mob_headAI : public ScriptedAI { - mob_headAI(Creature *c) : ScriptedAI(c) {} + mob_headAI(Creature* c) : ScriptedAI(c) {} uint64 bodyGUID; @@ -249,11 +249,11 @@ public: } void EnterCombat(Unit* /*who*/) {} - void SaySound(int32 textEntry, Unit *pTarget = 0) + void SaySound(int32 textEntry, Unit* pTarget = 0) { DoScriptText(textEntry, me, pTarget); //DoCast(me, SPELL_HEAD_SPEAKS, true); - Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); + Creature* speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); laugh += 3000; @@ -290,7 +290,7 @@ public: } } - void SpellHit(Unit *caster, const SpellEntry* spell) + void SpellHit(Unit* caster, const SpellEntry* spell) { if (!withbody) return; @@ -330,7 +330,7 @@ public: laugh = urand(15000, 30000); DoPlaySoundToSet(me, RandomLaugh[urand(0, 2)]); //DoCast(me, SPELL_HEAD_SPEAKS, true); //this spell remove buff "head" - Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); + Creature* speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); me->MonsterTextEmote(EMOTE_LAUGHS, 0); @@ -343,7 +343,7 @@ public: if (wait <= diff) { die = false; - if (Unit *body = Unit::GetUnit((*me), bodyGUID)) + if (Unit* body = Unit::GetUnit((*me), bodyGUID)) body->Kill(body); me->Kill(me); } else wait -= diff; @@ -366,7 +366,7 @@ public: struct boss_headless_horsemanAI : public ScriptedAI { - boss_headless_horsemanAI(Creature *c) : ScriptedAI(c) + boss_headless_horsemanAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -451,7 +451,7 @@ public: break; case 1: { - if (Creature *smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) + if (Creature* smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, smoke->AI())->SetType(3); DoCast(me, SPELL_RHYME_BIG); break; @@ -470,7 +470,7 @@ public: wp_reached = false; me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); SaySound(SAY_ENTRANCE); - if (Unit *plr = Unit::GetUnit((*me), PlayerGUID)) + if (Unit* plr = Unit::GetUnit((*me), PlayerGUID)) DoStartMovement(plr); break; } @@ -485,24 +485,24 @@ public: DoZoneInCombat(); } void AttackStart(Unit* who) {ScriptedAI::AttackStart(who);} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (withhead && Phase != 0) ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit *plr) + void KilledUnit(Unit* plr) { if (plr->GetTypeId() == TYPEID_PLAYER) { if (withhead) SaySound(SAY_PLAYER_DEATH); //maybe possible when player dies from conflagration - else if (Creature *Head = Unit::GetCreature((*me), headGUID)) + else if (Creature* Head = Unit::GetCreature((*me), headGUID)) CAST_AI(mob_head::mob_headAI, Head->AI())->SaySound(SAY_PLAYER_DEATH); } } - void SaySound(int32 textEntry, Unit *pTarget = 0) + void SaySound(int32 textEntry, Unit* pTarget = 0) { DoScriptText(textEntry, me, pTarget); laugh += 4000; @@ -545,15 +545,15 @@ public: me->StopMoving(); //me->GetMotionMaster()->MoveIdle(); SaySound(SAY_DEATH); - if (Creature *flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) flame->CastSpell(flame, SPELL_BODY_FLAME, false); - if (Creature *wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, wisp->AI())->SetType(4); if (pInstance) pInstance->SetData(DATA_HORSEMAN_EVENT, DONE); } - void SpellHit(Unit *caster, const SpellEntry* spell) + void SpellHit(Unit* caster, const SpellEntry* spell) { if (withhead) return; @@ -583,7 +583,7 @@ public: } } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (damage >= me->GetHealth() && withhead) { @@ -625,7 +625,7 @@ public: if (say_timer <= diff) { say_timer = 3000; - Player *plr = SelectRandomPlayer(100.0f, false); + Player* plr = SelectRandomPlayer(100.0f, false); if (count < 3) { if (plr) @@ -663,7 +663,7 @@ public: break; if (burn <= diff) { - if (Creature *flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000)) + if (Creature* flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2); burned = true; } else burn -= diff; @@ -671,7 +671,7 @@ public: case 2: if (conflagrate <= diff) { - if (Unit *plr = SelectRandomPlayer(30.0f)) + if (Unit* plr = SelectRandomPlayer(30.0f)) DoCast(plr, SPELL_CONFLAGRATION, false); conflagrate = urand(10000, 16000); } else conflagrate -= diff; @@ -755,7 +755,7 @@ public: struct mob_pulsing_pumpkinAI : public ScriptedAI { - mob_pulsing_pumpkinAI(Creature *c) : ScriptedAI(c) {} + mob_pulsing_pumpkinAI(Creature* c) : ScriptedAI(c) {} bool sprouted; uint64 debuffGUID; @@ -766,7 +766,7 @@ public: me->GetPosition(x, y, z); //this visual aura some under ground me->GetMap()->CreatureRelocation(me, x, y, z + 0.35f, 0.0f); Despawn(); - Creature *debuff = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 14500); + Creature* debuff = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 14500); if (debuff) { debuff->SetDisplayId(me->GetDisplayId()); @@ -798,7 +798,7 @@ public: void Despawn() { if (!debuffGUID) return; - Unit *debuff = Unit::GetUnit((*me), debuffGUID); + Unit* debuff = Unit::GetUnit((*me), debuffGUID); if (debuff) debuff->SetVisible(false); debuffGUID = 0; @@ -806,7 +806,7 @@ public: void JustDied(Unit* /*killer*/) { if (!sprouted) Despawn(); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || !who->isTargetableForAttack() || !me->IsHostileTo(who) || me->getVictim()) return; @@ -847,7 +847,7 @@ public: if (plr->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && plr->getLevel() > 64) { */ pPlayer->AreaExploredOrEventHappens(11405); - if (Creature *horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0)) + if (Creature* horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0)) { CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = pPlayer->GetGUID(); CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode(); @@ -864,7 +864,7 @@ void mob_head::mob_headAI::Disappear() return; if (bodyGUID) { - Creature *body = Unit::GetCreature((*me), bodyGUID); + Creature* body = Unit::GetCreature((*me), bodyGUID); if (body && body->isAlive()) { withbody = true; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 3ec4d9c91fa..6950f312f90 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -52,7 +52,7 @@ public: struct boss_herodAI : public ScriptedAI { - boss_herodAI(Creature *c) : ScriptedAI(c) {} + boss_herodAI(Creature* c) : ScriptedAI(c) {} bool Enrage; @@ -130,7 +130,7 @@ public: struct mob_scarlet_traineeAI : public npc_escortAI { - mob_scarlet_traineeAI(Creature *c) : npc_escortAI(c) + mob_scarlet_traineeAI(Creature* c) : npc_escortAI(c) { Start_Timer = urand(1000, 6000); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 664521dd7a2..ddbbd43b1d0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -47,7 +47,7 @@ public: struct boss_high_inquisitor_fairbanksAI : public ScriptedAI { - boss_high_inquisitor_fairbanksAI(Creature *c) : ScriptedAI(c) {} + boss_high_inquisitor_fairbanksAI(Creature* c) : ScriptedAI(c) {} uint32 CurseOfBlood_Timer; uint32 DispelMagic_Timer; @@ -87,7 +87,7 @@ public: //Fear_Timer if (Fear_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_FEAR); Fear_Timer = 40000; @@ -96,7 +96,7 @@ public: //Sleep_Timer if (Sleep_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) DoCast(pTarget, SPELL_SLEEP); Sleep_Timer = 30000; @@ -112,7 +112,7 @@ public: //Dispel_Timer if (Dispel_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_DISPELMAGIC); DispelMagic_Timer = 30000; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 4aa6b74681a..351b0681423 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -44,7 +44,7 @@ public: struct boss_houndmaster_lokseyAI : public ScriptedAI { - boss_houndmaster_lokseyAI(Creature *c) : ScriptedAI(c) {} + boss_houndmaster_lokseyAI(Creature* c) : ScriptedAI(c) {} uint32 BloodLust_Timer; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index 6168b5d8939..d369cd8b247 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -49,7 +49,7 @@ public: struct boss_interrogator_vishasAI : public ScriptedAI { - boss_interrogator_vishasAI(Creature *c) : ScriptedAI(c) + boss_interrogator_vishasAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -81,7 +81,7 @@ public: return; //Any other actions to do with vorrel? setStandState? - if (Unit *vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL))) + if (Unit* vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL))) DoScriptText(SAY_TRIGGER_VORREL, vorrel); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index de190f9d260..5b025a7c579 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -42,7 +42,7 @@ public: struct boss_scornAI : public ScriptedAI { - boss_scornAI(Creature *c) : ScriptedAI(c) {} + boss_scornAI(Creature* c) : ScriptedAI(c) {} uint32 LichSlap_Timer; uint32 FrostboltVolley_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index a303761e500..96ebeef1a0e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -62,7 +62,7 @@ public: struct boss_darkmaster_gandlingAI : public ScriptedAI { - boss_darkmaster_gandlingAI(Creature *c) : ScriptedAI(c) + boss_darkmaster_gandlingAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -124,14 +124,14 @@ public: { if (Teleport_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { if (DoGetThreat(pTarget)) DoModifyThreatPercent(pTarget, -100); - Creature *Summoned = NULL; + Creature* Summoned = NULL; switch(rand()%6) { case 0: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp index ea07e6d5da9..e11ed41024b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp @@ -37,7 +37,7 @@ public: struct boss_death_knight_darkreaverAI : public ScriptedAI { - boss_death_knight_darkreaverAI(Creature *c) : ScriptedAI(c) {} + boss_death_knight_darkreaverAI(Creature* c) : ScriptedAI(c) {} void Reset() { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index 3591431e0db..a11e37d4321 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -45,7 +45,7 @@ public: struct boss_theolenkrastinovAI : public ScriptedAI { - boss_theolenkrastinovAI(Creature *c) : ScriptedAI(c) {} + boss_theolenkrastinovAI(Creature* c) : ScriptedAI(c) {} uint32 m_uiRend_Timer; uint32 m_uiBackhand_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 80e35195bd2..858a829854b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -43,7 +43,7 @@ public: struct boss_illuciabarovAI : public ScriptedAI { - boss_illuciabarovAI(Creature *c) : ScriptedAI(c) {} + boss_illuciabarovAI(Creature* c) : ScriptedAI(c) {} uint32 CurseOfAgony_Timer; uint32 ShadowShock_Timer; @@ -89,7 +89,7 @@ public: //ShadowShock_Timer if (ShadowShock_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_SHADOWSHOCK); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 74d6c994464..24e064a5752 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -44,7 +44,7 @@ public: struct boss_instructormaliciaAI : public ScriptedAI { - boss_instructormaliciaAI(Creature *c) : ScriptedAI(c) {} + boss_instructormaliciaAI(Creature* c) : ScriptedAI(c) {} uint32 CallOfGraves_Timer; uint32 Corruption_Timer; @@ -96,7 +96,7 @@ public: //Corruption_Timer if (Corruption_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CORRUPTION); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index f75042b5d8e..26b944fc7a5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -43,7 +43,7 @@ public: struct boss_jandicebarovAI : public ScriptedAI { - boss_jandicebarovAI(Creature *c) : ScriptedAI(c) {} + boss_jandicebarovAI(Creature* c) : ScriptedAI(c) {} uint32 CurseOfBlood_Timer; uint32 Illusion_Timer; @@ -65,7 +65,7 @@ public: void SummonIllusions(Unit* victim) { - if (Creature *Illusion = DoSpawnCreature(11439, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + if (Creature* Illusion = DoSpawnCreature(11439, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) Illusion->AI()->AttackStart(victim); } @@ -111,7 +111,7 @@ public: DoModifyThreatPercent(me->getVictim(), -99); //Summon 10 Illusions attacking random gamers - Unit *pTarget = NULL; + Unit* pTarget = NULL; for (uint8 i = 0; i < 10; ++i) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); @@ -165,7 +165,7 @@ public: struct mob_illusionofjandicebarovAI : public ScriptedAI { - mob_illusionofjandicebarovAI(Creature *c) : ScriptedAI(c) {} + mob_illusionofjandicebarovAI(Creature* c) : ScriptedAI(c) {} uint32 Cleave_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index 25a2b9ed10d..311a32d9a54 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -40,7 +40,7 @@ public: struct boss_kormokAI : public ScriptedAI { - boss_kormokAI(Creature *c) : ScriptedAI(c) {} + boss_kormokAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowVolley_Timer; uint32 BoneShield_Timer; @@ -63,13 +63,13 @@ public: void SummonMinions(Unit* victim) { - if (Creature *SummonedMinion = DoSpawnCreature(16119, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature* SummonedMinion = DoSpawnCreature(16119, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMinion->AI()->AttackStart(victim); } void SummonMages(Unit* victim) { - if (Creature *SummonedMage = DoSpawnCreature(16120, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature* SummonedMage = DoSpawnCreature(16120, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMage->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index 269364bca1a..c2875fbedc5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -41,7 +41,7 @@ public: struct boss_lordalexeibarovAI : public ScriptedAI { - boss_lordalexeibarovAI(Creature *c) : ScriptedAI(c) {} + boss_lordalexeibarovAI(Creature* c) : ScriptedAI(c) {} uint32 Immolate_Timer; uint32 VeilofShadow_Timer; @@ -78,7 +78,7 @@ public: //Immolate_Timer if (Immolate_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_IMMOLATE); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index 149b51ab397..6f7814e3481 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -43,7 +43,7 @@ public: struct boss_lorekeeperpolkeltAI : public ScriptedAI { - boss_lorekeeperpolkeltAI(Creature *c) : ScriptedAI(c) {} + boss_lorekeeperpolkeltAI(Creature* c) : ScriptedAI(c) {} uint32 VolatileInfection_Timer; uint32 Darkplague_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 8444a426ebc..75ac2ac8e6b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -44,7 +44,7 @@ public: struct boss_rasfrostAI : public ScriptedAI { - boss_rasfrostAI(Creature *c) : ScriptedAI(c) {} + boss_rasfrostAI(Creature* c) : ScriptedAI(c) {} uint32 IceArmor_Timer; uint32 Frostbolt_Timer; @@ -82,7 +82,7 @@ public: //Frostbolt_Timer if (Frostbolt_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_FROSTBOLT); Frostbolt_Timer = 8000; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 19a3183c91d..3afe86dc9c9 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -43,7 +43,7 @@ public: struct boss_theravenianAI : public ScriptedAI { - boss_theravenianAI(Creature *c) : ScriptedAI(c) {} + boss_theravenianAI(Creature* c) : ScriptedAI(c) {} uint32 Trample_Timer; uint32 Cleave_Timer; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index 3ae6a763afb..5c8bd795669 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -45,7 +45,7 @@ public: struct boss_vectusAI : public ScriptedAI { - boss_vectusAI(Creature *c) : ScriptedAI(c) {} + boss_vectusAI(Creature* c) : ScriptedAI(c) {} uint32 m_uiFireShield_Timer; uint32 m_uiBlastWave_Timer; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index e1f8ee39ae1..0a003e39fdb 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -90,7 +90,7 @@ public: struct npc_shadowfang_prisonerAI : public npc_escortAI { - npc_shadowfang_prisonerAI(Creature *c) : npc_escortAI(c) + npc_shadowfang_prisonerAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); uiNpcEntry = c->GetEntry(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 004996845e3..5165291ce4c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -89,7 +89,7 @@ public: struct boss_baron_rivendareAI : public ScriptedAI { - boss_baron_rivendareAI(Creature *c) : ScriptedAI(c) + boss_baron_rivendareAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -122,7 +122,7 @@ public: void JustSummoned(Creature* summoned) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index d27990be43b..85818ecbe69 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -43,7 +43,7 @@ public: struct boss_baroness_anastariAI : public ScriptedAI { - boss_baroness_anastariAI(Creature *c) : ScriptedAI(c) + boss_baroness_anastariAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -111,7 +111,7 @@ public: //Cast if (rand()%100 < 65) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); if (pTarget)DoCast(pTarget, SPELL_POSSESS); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index e86521225ba..57293f18641 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -88,7 +88,7 @@ public: struct boss_cannon_master_willeyAI : public ScriptedAI { - boss_cannon_master_willeyAI(Creature *c) : ScriptedAI(c) {} + boss_cannon_master_willeyAI(Creature* c) : ScriptedAI(c) {} uint32 KnockAway_Timer; uint32 Pummel_Timer; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 5f8a91c65a6..f6a6639264b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -77,7 +77,7 @@ public: struct boss_dathrohan_balnazzarAI : public ScriptedAI { - boss_dathrohan_balnazzarAI(Creature *c) : ScriptedAI(c) {} + boss_dathrohan_balnazzarAI(Creature* c) : ScriptedAI(c) {} uint32 m_uiCrusadersHammer_Timer; uint32 m_uiCrusaderStrike_Timer; @@ -195,7 +195,7 @@ public: //DeepSleep if (m_uiDeepSleep_Timer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SLEEP); m_uiDeepSleep_Timer = 15000; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index dada1176cf0..1388547c26b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -46,7 +46,7 @@ public: struct boss_magistrate_barthilasAI : public ScriptedAI { - boss_magistrate_barthilasAI(Creature *c) : ScriptedAI(c) {} + boss_magistrate_barthilasAI(Creature* c) : ScriptedAI(c) {} uint32 DrainingBlow_Timer; uint32 CrowdPummel_Timer; @@ -68,7 +68,7 @@ public: me->SetDisplayId(MODEL_HUMAN); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { //nothing to see here yet diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index ac4ad7f63a7..8056a1d13bd 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -43,7 +43,7 @@ public: struct boss_maleki_the_pallidAI : public ScriptedAI { - boss_maleki_the_pallidAI(Creature *c) : ScriptedAI(c) + boss_maleki_the_pallidAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 6413a953bd2..6e18eda0768 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -43,7 +43,7 @@ public: struct boss_nerubenkanAI : public ScriptedAI { - boss_nerubenkanAI(Creature *c) : ScriptedAI(c) + boss_nerubenkanAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index 04a9e4690aa..43aaccbeda6 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -48,7 +48,7 @@ public: struct boss_postmaster_malownAI : public ScriptedAI { - boss_postmaster_malownAI(Creature *c) : ScriptedAI(c) {} + boss_postmaster_malownAI(Creature* c) : ScriptedAI(c) {} uint32 WailingDead_Timer; uint32 Backhand_Timer; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 54cdcf2ae04..b53c77acac5 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -43,7 +43,7 @@ public: struct boss_ramstein_the_gorgerAI : public ScriptedAI { - boss_ramstein_the_gorgerAI(Creature *c) : ScriptedAI(c) + boss_ramstein_the_gorgerAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index 129d9ead38e..7637d9bf60b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -41,7 +41,7 @@ public: struct boss_timmy_the_cruelAI : public ScriptedAI { - boss_timmy_the_cruelAI(Creature *c) : ScriptedAI(c) {} + boss_timmy_the_cruelAI(Creature* c) : ScriptedAI(c) {} uint32 RavenousClaw_Timer; bool HasYelled; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index d8b33bbae93..01535bbae55 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -99,7 +99,7 @@ public: struct mob_freed_soulAI : public ScriptedAI { - mob_freed_soulAI(Creature *c) : ScriptedAI(c) {} + mob_freed_soulAI(Creature* c) : ScriptedAI(c) {} void Reset() { @@ -133,7 +133,7 @@ public: struct mob_restless_soulAI : public ScriptedAI { - mob_restless_soulAI(Creature *c) : ScriptedAI(c) {} + mob_restless_soulAI(Creature* c) : ScriptedAI(c) {} uint64 Tagger; uint32 Die_Timer; @@ -148,7 +148,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (caster->GetTypeId() == TYPEID_PLAYER) { @@ -160,7 +160,7 @@ public: } } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->CastSpell(summoned, SPELL_SOUL_FREED, false); } @@ -211,7 +211,7 @@ public: struct mobs_spectral_ghostly_citizenAI : public ScriptedAI { - mobs_spectral_ghostly_citizenAI(Creature *c) : ScriptedAI(c) {} + mobs_spectral_ghostly_citizenAI(Creature* c) : ScriptedAI(c) {} uint32 Die_Timer; bool Tagged; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index b0c6c42876d..2903fb34c53 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -78,7 +78,7 @@ public: struct boss_brutallusAI : public ScriptedAI { - boss_brutallusAI(Creature *c) : ScriptedAI(c) + boss_brutallusAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); Intro = true; @@ -155,7 +155,7 @@ public: { if (!Intro || IsIntro) return; - Creature *Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); + Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); if (Madrigosa) { Madrigosa->Respawn(); @@ -191,7 +191,7 @@ public: void DoIntro() { - Creature *Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); + Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); if (!Madrigosa) return; @@ -267,7 +267,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who->isTargetableForAttack() || !me->IsHostileTo(who)) return; @@ -292,7 +292,7 @@ public: { if (IntroFrostBoltTimer <= diff) { - if (Creature *Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0)) + if (Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0)) { Madrigosa->CastSpell(me, SPELL_INTRO_FROSTBOLT, true); IntroFrostBoltTimer = 2000; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 2f03d57af91..e1b2f087462 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -97,7 +97,7 @@ public: struct boss_sacrolashAI : public ScriptedAI { - boss_sacrolashAI(Creature *c) : ScriptedAI(c) + boss_sacrolashAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -181,7 +181,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -197,7 +197,7 @@ public: } } - void HandleTouchedSpells(Unit *pTarget, uint32 TouchedType) + void HandleTouchedSpells(Unit* pTarget, uint32 TouchedType) { switch(TouchedType) { @@ -252,7 +252,7 @@ public: if (!me->IsNonMeleeSpellCasted(false)) { me->InterruptSpell(CURRENT_GENERIC_SPELL); - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CONFLAGRATION); @@ -266,7 +266,7 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_SHADOW_NOVA); @@ -286,7 +286,7 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CONFOUNDING_BLOW); @@ -296,7 +296,7 @@ public: if (ShadowimageTimer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; Creature* temp = NULL; for (uint8 i = 0; i<3; ++i) { @@ -355,7 +355,7 @@ public: struct boss_alythessAI : public Scripted_NoMovementAI { - boss_alythessAI(Creature *c) : Scripted_NoMovementAI(c) + boss_alythessAI(Creature* c) : Scripted_NoMovementAI(c) { pInstance = c->GetInstanceScript(); IntroStepCounter = 10; @@ -424,7 +424,7 @@ public: pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!me->isInCombat()) { @@ -432,7 +432,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || me->getVictim()) return; @@ -476,7 +476,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -493,7 +493,7 @@ public: } } - void HandleTouchedSpells(Unit *pTarget, uint32 TouchedType) + void HandleTouchedSpells(Unit* pTarget, uint32 TouchedType) { switch(TouchedType) { @@ -601,7 +601,7 @@ public: { if (!me->IsNonMeleeSpellCasted(false)) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_SHADOW_NOVA); @@ -616,7 +616,7 @@ public: if (!me->IsNonMeleeSpellCasted(false)) { me->InterruptSpell(CURRENT_GENERIC_SPELL); - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CONFLAGRATION); @@ -685,7 +685,7 @@ public: struct mob_shadow_imageAI : public ScriptedAI { - mob_shadow_imageAI(Creature *c) : ScriptedAI(c) {} + mob_shadow_imageAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowfuryTimer; uint32 KillTimer; @@ -701,7 +701,7 @@ public: void EnterCombat(Unit* /*who*/){} - void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* spell) { switch(spell->Id) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 3d8673d712c..e7e9d95e19a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -115,7 +115,7 @@ public: struct boss_felmystAI : public ScriptedAI { - boss_felmystAI(Creature *c) : ScriptedAI(c) + boss_felmystAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); @@ -173,13 +173,13 @@ public: pInstance->SetData(DATA_FELMYST_EVENT, IN_PROGRESS); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (phase != PHASE_FLIGHT) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (phase != PHASE_FLIGHT) ScriptedAI::MoveInLineOfSight(who); @@ -203,7 +203,7 @@ public: pInstance->SetData(DATA_FELMYST_EVENT, DONE); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { // workaround for linked aura /*if (spell->Id == SPELL_VAPOR_FORCE) @@ -226,7 +226,7 @@ public: } } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon->GetEntry() == MOB_DEAD) { @@ -293,7 +293,7 @@ public: break; case 2: { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!pTarget) pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); @@ -320,7 +320,7 @@ public: DespawnSummons(MOB_VAPOR_TRAIL); //DoCast(me, SPELL_VAPOR_SELECT); need core support - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!pTarget) pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); @@ -350,7 +350,7 @@ public: break; case 5: { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!pTarget) pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); @@ -393,7 +393,7 @@ public: uiFlightCount = 4; break; case 9: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO)) DoStartMovement(pTarget); else { @@ -447,7 +447,7 @@ public: events.ScheduleEvent(EVENT_GAS_NOVA, urand(20000, 25000)); break; case EVENT_ENCAPSULATE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) DoCast(pTarget, SPELL_ENCAPSULATE_CHANNEL, false); events.ScheduleEvent(EVENT_ENCAPSULATE, urand(25000, 30000)); break; @@ -476,7 +476,7 @@ public: float x, y, z; me->GetPosition(x, y, z); me->UpdateGroundPositionZ(x, y, z); - if (Creature *Fog = me->SummonCreature(MOB_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000)) + if (Creature* Fog = me->SummonCreature(MOB_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000)) { Fog->RemoveAurasDueToSpell(SPELL_TRAIL_TRIGGER); Fog->CastSpell(Fog, SPELL_FOG_TRIGGER, true); @@ -534,7 +534,7 @@ public: struct mob_felmyst_vaporAI : public ScriptedAI { - mob_felmyst_vaporAI(Creature *c) : ScriptedAI(c) + mob_felmyst_vaporAI(Creature* c) : ScriptedAI(c) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetSpeed(MOVE_RUN, 0.8f); @@ -548,7 +548,7 @@ public: void UpdateAI(const uint32 /*diff*/) { if (!me->getVictim()) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) AttackStart(pTarget); } }; @@ -567,7 +567,7 @@ public: struct mob_felmyst_trailAI : public ScriptedAI { - mob_felmyst_trailAI(Creature *c) : ScriptedAI(c) + mob_felmyst_trailAI(Creature* c) : ScriptedAI(c) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoCast(me, SPELL_TRAIL_TRIGGER, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index bdce8d1dd15..7bea5943981 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -115,7 +115,7 @@ public: struct boss_kalecgosAI : public ScriptedAI { - boss_kalecgosAI(Creature *c) : ScriptedAI(c) + boss_kalecgosAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); SathGUID = 0; @@ -155,7 +155,7 @@ public: pInstance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED); } - if (Creature *Sath = Unit::GetCreature(*me, SathGUID)) + if (Creature* Sath = Unit::GetCreature(*me, SathGUID)) Sath->AI()->EnterEvadeMode(); me->setFaction(14); @@ -329,7 +329,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (bJustReset)//boss is invisible, don't attack return; @@ -342,7 +342,7 @@ public: } } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (damage >= me->GetHealth() && done_by != me) damage = 0; @@ -459,7 +459,7 @@ public: bool isEnraged; // if demon is enraged - boss_kalecAI(Creature *c) : ScriptedAI(c) + boss_kalecAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -477,7 +477,7 @@ public: isEnraged = false; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetGUID() != SathGUID) damage = 0; @@ -578,7 +578,7 @@ public: struct boss_sathrovarrAI : public ScriptedAI { - boss_sathrovarrAI(Creature *c) : ScriptedAI(c) + boss_sathrovarrAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); KalecGUID = 0; @@ -629,7 +629,7 @@ public: void EnterCombat(Unit* /*who*/) { - if (Creature *Kalec = me->SummonCreature(MOB_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) + if (Creature* Kalec = me->SummonCreature(MOB_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) { KalecGUID = Kalec->GetGUID(); me->CombatStart(Kalec); @@ -639,18 +639,18 @@ public: DoScriptText(SAY_SATH_AGGRO, me); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (damage >= me->GetHealth() && done_by != me) damage = 0; } - void KilledUnit(Unit *pTarget) + void KilledUnit(Unit* pTarget) { if (pTarget->GetGUID() == KalecGUID) { TeleportAllPlayersBack(); - if (Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) + if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) { CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->TalkTimer = 1; CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->isFriendly = false; @@ -666,7 +666,7 @@ public: DoScriptText(SAY_SATH_DEATH, me); me->GetMap()->CreatureRelocation(me, me->GetPositionX(), me->GetPositionY(), DRAGON_REALM_Z, me->GetOrientation()); TeleportAllPlayersBack(); - if (Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) + if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) { CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->TalkTimer = 1; CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->isFriendly = true; @@ -715,10 +715,10 @@ public: if (CheckTimer <= diff) { - Creature *Kalec = Unit::GetCreature(*me, KalecGUID); + Creature* Kalec = Unit::GetCreature(*me, KalecGUID); if (!Kalec || (Kalec && !Kalec->isAlive())) { - if (Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) + if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) Kalecgos->AI()->EnterEvadeMode(); return; } @@ -728,7 +728,7 @@ public: Kalecgos->AI()->DoAction(DO_ENRAGE); DoAction(DO_ENRAGE); } - Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID); + Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID); if (Kalecgos) { if (!Kalecgos->isInCombat()) @@ -783,7 +783,7 @@ public: if (AgonyCurseTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) pTarget = me->getVictim(); DoCast(pTarget, SPELL_AGONY_CURSE); AgonyCurseTimer = 20000; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index a9fbc693bd5..8588c81ecd6 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -661,7 +661,7 @@ public: for (uint8 i = 0; i < 4; ++i) { float x, y, z; - Unit *pTarget = NULL; + Unit* pTarget = NULL; for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); @@ -842,7 +842,7 @@ public: TimerIsDeactivated[TIMER_ORBS_EMPOWER] = true; break; case TIMER_ARMAGEDDON: //Phase 4 - Unit *pTarget = NULL; + Unit* pTarget = NULL; for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 83ea67c33e3..5f95128b64a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -113,7 +113,7 @@ public: struct boss_entropiusAI : public ScriptedAI { - boss_entropiusAI(Creature *c) : ScriptedAI(c), Summons(me) + boss_entropiusAI(Creature* c) : ScriptedAI(c), Summons(me) { pInstance = c->GetInstanceScript(); } @@ -213,7 +213,7 @@ public: struct boss_muruAI : public Scripted_NoMovementAI { - boss_muruAI(Creature *c) : Scripted_NoMovementAI(c), Summons(me) + boss_muruAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me) { pInstance = c->GetInstanceScript(); } @@ -378,7 +378,7 @@ public: struct npc_muru_portalAI : public Scripted_NoMovementAI { - npc_muru_portalAI(Creature *c) : Scripted_NoMovementAI(c), Summons(me) + npc_muru_portalAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me) { pInstance = c->GetInstanceScript(); } @@ -462,7 +462,7 @@ public: struct npc_dark_fiendAI : public ScriptedAI { - npc_dark_fiendAI(Creature *c) : ScriptedAI(c) {} + npc_dark_fiendAI(Creature* c) : ScriptedAI(c) {} uint32 WaitTimer; bool InAction; @@ -525,7 +525,7 @@ public: struct npc_void_sentinelAI : public ScriptedAI { - npc_void_sentinelAI(Creature *c) : ScriptedAI(c){} + npc_void_sentinelAI(Creature* c) : ScriptedAI(c){} uint32 PulseTimer; uint32 VoidBlastTimer; @@ -581,7 +581,7 @@ public: struct npc_blackholeAI : public ScriptedAI { - npc_blackholeAI(Creature *c) : ScriptedAI(c) + npc_blackholeAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index ae3db51890a..16eabd71512 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -232,7 +232,7 @@ class mob_archaedas_minions : public CreatureScript struct mob_archaedas_minionsAI : public ScriptedAI { - mob_archaedas_minionsAI(Creature *c) : ScriptedAI(c) + mob_archaedas_minionsAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -276,7 +276,7 @@ class mob_archaedas_minions : public CreatureScript } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (bAmIAwake) ScriptedAI::MoveInLineOfSight(who); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index bdca5ad1fa3..495365067e9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -73,7 +73,7 @@ class boss_akilzon : public CreatureScript struct boss_akilzonAI : public ScriptedAI { - boss_akilzonAI(Creature *c) : ScriptedAI(c) + boss_akilzonAI(Creature* c) : ScriptedAI(c) { SpellEntry *TempSpell = GET_SPELL(SPELL_ELECTRICAL_DAMAGE); if (TempSpell) @@ -184,7 +184,7 @@ class boss_akilzon : public CreatureScript pMap->SendToPlayers(&data); } - void HandleStormSequence(Unit *Cloud) // 1: begin, 2-9: tick, 10: end + void HandleStormSequence(Unit* Cloud) // 1: begin, 2-9: tick, 10: end { if (StormCount < 10 && StormCount > 1) { @@ -198,7 +198,7 @@ class boss_akilzon : public CreatureScript cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - std::list<Unit *> tempUnitMap; + std::list<Unit* > tempUnitMap; { Trinity::AnyAoETargetUnitInObjectRangeCheck u_check(me, me, 999); @@ -225,7 +225,7 @@ class boss_akilzon : public CreatureScript { x = 343.0f+rand()%60; y = 1380.0f+rand()%60; - if (Unit *trigger = me->SummonTrigger(x, y, z, 0, 2000)) + if (Unit* trigger = me->SummonTrigger(x, y, z, 0, 2000)) { trigger->setFaction(35); trigger->SetMaxHealth(100000); @@ -258,7 +258,7 @@ class boss_akilzon : public CreatureScript if (StormCount) { - Unit *pTarget = Unit::GetUnit(*me, CloudGUID); + Unit* pTarget = Unit::GetUnit(*me, CloudGUID); if (!pTarget || !pTarget->isAlive()) { EnterEvadeMode(); @@ -285,7 +285,7 @@ class boss_akilzon : public CreatureScript if (StaticDisruption_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); TargetGUID = pTarget->GetGUID(); DoCast(pTarget, SPELL_STATIC_DISRUPTION, false); @@ -298,7 +298,7 @@ class boss_akilzon : public CreatureScript if (GustOfWind_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); DoCast(pTarget, SPELL_GUST_OF_WIND); GustOfWind_Timer = (20+rand()%10)*1000; //20 to 30 seconds(bosskillers) @@ -317,7 +317,7 @@ class boss_akilzon : public CreatureScript } if (ElectricalStorm_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); if (!pTarget) { EnterEvadeMode(); @@ -332,7 +332,7 @@ class boss_akilzon : public CreatureScript pTarget->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); pTarget->SendMonsterMove(x, y, me->GetPositionZ()+15, 0); } - Unit *Cloud = me->SummonTrigger(x, y, me->GetPositionZ()+16, 0, 15000); + Unit* Cloud = me->SummonTrigger(x, y, me->GetPositionZ()+16, 0, 15000); if (Cloud) { CloudGUID = Cloud->GetGUID(); @@ -362,7 +362,7 @@ class boss_akilzon : public CreatureScript Unit* bird = Unit::GetUnit(*me, BirdGUIDs[i]); if (!bird) //they despawned on die { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { x = pTarget->GetPositionX() + irand(-10, 10); y = pTarget->GetPositionY() + irand(-10, 10); @@ -370,7 +370,7 @@ class boss_akilzon : public CreatureScript if (z > 95) z = 95.0f - urand(0, 5); } - Creature *pCreature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + Creature* pCreature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (pCreature) { pCreature->AddThreat(me->getVictim(), 1.0f); @@ -403,7 +403,7 @@ class mob_akilzon_eagle : public CreatureScript struct mob_akilzon_eagleAI : public ScriptedAI { - mob_akilzon_eagleAI(Creature *c) : ScriptedAI(c) {} + mob_akilzon_eagleAI(Creature* c) : ScriptedAI(c) {} uint32 EagleSwoop_Timer; bool arrived; @@ -426,7 +426,7 @@ class mob_akilzon_eagle : public CreatureScript arrived = true; if (TargetGUID) { - if (Unit *pTarget = Unit::GetUnit(*me, TargetGUID)) + if (Unit* pTarget = Unit::GetUnit(*me, TargetGUID)) DoCast(pTarget, SPELL_EAGLE_SWOOP, true); TargetGUID = 0; me->SetSpeed(MOVE_RUN, 1.2f); @@ -443,7 +443,7 @@ class mob_akilzon_eagle : public CreatureScript if (arrived) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { float x, y, z; if (EagleSwoop_Timer) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index f38ffe564b5..8b8a24226af 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -84,7 +84,7 @@ class boss_halazzi : public CreatureScript struct boss_halazziAI : public ScriptedAI { - boss_halazziAI(Creature *c) : ScriptedAI(c) + boss_halazziAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); // need to find out what controls totem's spell cooldown @@ -153,7 +153,7 @@ class boss_halazzi : public CreatureScript EnterPhase(PHASE_HUMAN); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (Phase != PHASE_MERGE) ScriptedAI::AttackStart(who); } @@ -170,7 +170,7 @@ class boss_halazzi : public CreatureScript me->Attack(me->getVictim(), true); me->GetMotionMaster()->MoveChase(me->getVictim()); } - if (Creature *Lynx = Unit::GetCreature(*me, LynxGUID)) + if (Creature* Lynx = Unit::GetCreature(*me, LynxGUID)) Lynx->DisappearAndDie(); me->SetMaxHealth(600000); me->SetHealth(600000 - 150000 * TransformCount); @@ -193,7 +193,7 @@ class boss_halazzi : public CreatureScript TotemTimer = 12000; break; case PHASE_MERGE: - if (Unit *pLynx = Unit::GetUnit(*me, LynxGUID)) + if (Unit* pLynx = Unit::GetUnit(*me, LynxGUID)) { me->MonsterYell(YELL_MERGE, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_MERGE); @@ -262,7 +262,7 @@ class boss_halazzi : public CreatureScript if (ShockTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->IsNonMeleeSpellCasted(false)) DoCast(pTarget, SPELL_EARTHSHOCK); @@ -280,7 +280,7 @@ class boss_halazzi : public CreatureScript EnterPhase(PHASE_MERGE); else { - Unit *Lynx = Unit::GetUnit(*me, LynxGUID); + Unit* Lynx = Unit::GetUnit(*me, LynxGUID); if (Lynx && !Lynx->HealthAbovePct(20) /*Lynx->HealthBelowPct(10)*/) EnterPhase(PHASE_MERGE); } @@ -293,7 +293,7 @@ class boss_halazzi : public CreatureScript { if (CheckTimer <= diff) { - Unit *Lynx = Unit::GetUnit(*me, LynxGUID); + Unit* Lynx = Unit::GetUnit(*me, LynxGUID); if (Lynx) { Lynx->GetMotionMaster()->MoveFollow(me, 0, 0); @@ -357,7 +357,7 @@ class mob_halazzi_lynx : public CreatureScript struct mob_halazzi_lynxAI : public ScriptedAI { - mob_halazzi_lynxAI(Creature *c) : ScriptedAI(c) {} + mob_halazzi_lynxAI(Creature* c) : ScriptedAI(c) {} uint32 FrenzyTimer; uint32 shredder_timer; @@ -374,7 +374,7 @@ class mob_halazzi_lynx : public CreatureScript damage = 0; } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) ScriptedAI::AttackStart(who); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 4a7f4eaa9c8..3f574f5da43 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -211,7 +211,7 @@ class boss_hexlord_malacrass : public CreatureScript struct boss_hex_lord_malacrassAI : public ScriptedAI { - boss_hex_lord_malacrassAI(Creature *c) : ScriptedAI(c) + boss_hex_lord_malacrassAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); SelectAddEntry(); @@ -325,7 +325,7 @@ class boss_hexlord_malacrass : public CreatureScript { for (uint8 i = 0; i < 4; ++i) { - Creature *pCreature = (Unit::GetCreature((*me), AddGUID[i])); + Creature* pCreature = (Unit::GetCreature((*me), AddGUID[i])); if (!pCreature || !pCreature->isAlive()) { if (pCreature) pCreature->setDeathState(DEAD); @@ -359,7 +359,7 @@ class boss_hexlord_malacrass : public CreatureScript if (CheckAddState_Timer <= diff) { for (uint8 i = 0; i < 4; ++i) - if (Creature *pTemp = Unit::GetCreature(*me, AddGUID[i])) + if (Creature* pTemp = Unit::GetCreature(*me, AddGUID[i])) if (pTemp->isAlive() && !pTemp->getVictim()) pTemp->AI()->AttackStart(me->getVictim()); @@ -391,8 +391,8 @@ class boss_hexlord_malacrass : public CreatureScript if (SiphonSoul_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); - Unit *trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); + Unit* trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); if (!pTarget || !trigger) { EnterEvadeMode(); @@ -424,7 +424,7 @@ class boss_hexlord_malacrass : public CreatureScript if (PlayerAbility_Timer <= diff) { - //Unit *pTarget = Unit::GetUnit(*me, PlayerGUID); + //Unit* pTarget = Unit::GetUnit(*me, PlayerGUID); //if (pTarget && pTarget->isAlive()) //{ UseAbility(); @@ -438,7 +438,7 @@ class boss_hexlord_malacrass : public CreatureScript void UseAbility() { uint8 random = urand(0, 2); - Unit *pTarget = NULL; + Unit* pTarget = NULL; switch(PlayerAbility[PlayerClass][random].target) { case ABILITY_TARGET_SELF: @@ -488,7 +488,7 @@ class boss_thurg : public CreatureScript struct boss_thurgAI : public boss_hexlord_addAI { - boss_thurgAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_thurgAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 bloodlust_timer; uint32 cleave_timer; @@ -511,7 +511,7 @@ class boss_thurg : public CreatureScript std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, SPELL_BLOODLUST); if (!templist.empty()) { - if (Unit *pTarget = *(templist.begin())) + if (Unit* pTarget = *(templist.begin())) DoCast(pTarget, SPELL_BLOODLUST, false); } bloodlust_timer = 12000; @@ -548,7 +548,7 @@ class boss_alyson_antille : public CreatureScript struct boss_alyson_antilleAI : public boss_hexlord_addAI { //Holy Priest - boss_alyson_antilleAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_alyson_antilleAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 flashheal_timer; uint32 dispelmagic_timer; @@ -585,7 +585,7 @@ class boss_alyson_antille : public CreatureScript if (flashheal_timer <= diff) { - Unit *pTarget = DoSelectLowestHpFriendly(99, 30000); + Unit* pTarget = DoSelectLowestHpFriendly(99, 30000); if (pTarget) { if (pTarget->IsWithinDistInMap(me, 50)) @@ -613,7 +613,7 @@ class boss_alyson_antille : public CreatureScript { if (urand(0, 1)) { - Unit *pTarget = SelectTarget(); + Unit* pTarget = SelectTarget(); DoCast(pTarget, SPELL_DISPEL_MAGIC, false); } @@ -637,7 +637,7 @@ class boss_alyson_antille : public CreatureScript struct boss_gazakrothAI : public boss_hexlord_addAI { - boss_gazakrothAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_gazakrothAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 firebolt_timer; @@ -691,7 +691,7 @@ class boss_lord_raadan : public CreatureScript struct boss_lord_raadanAI : public boss_hexlord_addAI { - boss_lord_raadanAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_lord_raadanAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 flamebreath_timer; uint32 thunderclap_timer; @@ -744,7 +744,7 @@ class boss_darkheart : public CreatureScript struct boss_darkheartAI : public boss_hexlord_addAI { - boss_darkheartAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_darkheartAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 psychicwail_timer; @@ -787,7 +787,7 @@ class boss_slither : public CreatureScript struct boss_slitherAI : public boss_hexlord_addAI { - boss_slitherAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_slitherAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 venomspit_timer; @@ -847,7 +847,7 @@ class boss_fenstalker : public CreatureScript struct boss_fenstalkerAI : public boss_hexlord_addAI { - boss_fenstalkerAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_fenstalkerAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 volatileinf_timer; @@ -894,7 +894,7 @@ class boss_koragg : public CreatureScript struct boss_koraggAI : public boss_hexlord_addAI { - boss_koraggAI(Creature *c) : boss_hexlord_addAI(c) {} + boss_koraggAI(Creature* c) : boss_hexlord_addAI(c) {} uint32 coldstare_timer; uint32 mightyblow_timer; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index bfe833cbed8..c1f80fb50af 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -113,7 +113,7 @@ class boss_janalai : public CreatureScript struct boss_janalaiAI : public ScriptedAI { - boss_janalaiAI(Creature *c) : ScriptedAI(c) + boss_janalaiAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -181,7 +181,7 @@ class boss_janalai : public CreatureScript // DoZoneInCombat(); } - void DamageDealt(Unit *pTarget, uint32 &damage, DamageEffectType /*damagetype*/) + void DamageDealt(Unit* pTarget, uint32 &damage, DamageEffectType /*damagetype*/) { if (isFlameBreathing) { @@ -290,7 +290,7 @@ class boss_janalai : public CreatureScript { if (BombCount < 40) { - if (Unit *FireBomb = Unit::GetUnit((*me), FireBombGUIDs[BombCount])) + if (Unit* FireBomb = Unit::GetUnit((*me), FireBombGUIDs[BombCount])) { FireBomb->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoCast(FireBomb, SPELL_FIRE_BOMB_THROW, true); @@ -420,7 +420,7 @@ class boss_janalai : public CreatureScript if (FireBreathTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->AttackStop(); me->GetMotionMaster()->Clear(); @@ -450,7 +450,7 @@ class mob_janalai_firebomb : public CreatureScript struct mob_janalai_firebombAI : public ScriptedAI { - mob_janalai_firebombAI(Creature *c) : ScriptedAI(c){} + mob_janalai_firebombAI(Creature* c) : ScriptedAI(c){} void Reset() {} @@ -486,7 +486,7 @@ class mob_janalai_hatcher : public CreatureScript struct mob_janalai_hatcherAI : public ScriptedAI { - mob_janalai_hatcherAI(Creature *c) : ScriptedAI(c) + mob_janalai_hatcherAI(Creature* c) : ScriptedAI(c) { pInstance =c->GetInstanceScript(); } @@ -619,7 +619,7 @@ class mob_janalai_hatchling : public CreatureScript struct mob_janalai_hatchlingAI : public ScriptedAI { - mob_janalai_hatchlingAI(Creature *c) : ScriptedAI(c) + mob_janalai_hatchlingAI(Creature* c) : ScriptedAI(c) { pInstance =c->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 69e051f52f6..3a6ccacf753 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -101,7 +101,7 @@ class boss_nalorakk : public CreatureScript struct boss_nalorakkAI : public ScriptedAI { - boss_nalorakkAI(Creature *c) : ScriptedAI(c) + boss_nalorakkAI(Creature* c) : ScriptedAI(c) { MoveEvent = true; MovePhase = 0; @@ -155,7 +155,7 @@ class boss_nalorakk : public CreatureScript // me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 5122); // TODO: find the correct equipment id } - void SendAttacker(Unit *pTarget) + void SendAttacker(Unit* pTarget) { std::list<Creature*> templist; float x, y, z; @@ -194,7 +194,7 @@ class boss_nalorakk : public CreatureScript ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!MoveEvent) { @@ -414,7 +414,7 @@ class boss_nalorakk : public CreatureScript { me->MonsterYell(YELL_SURGE, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_YELL_SURGE); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); if (pTarget) DoCast(pTarget, SPELL_SURGE); Surge_Timer = 15000 + rand()%5000; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index c301447fa61..b7de5302fd9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -91,7 +91,7 @@ class npc_forest_frog : public CreatureScript } } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && me->GetEntry() == ENTRY_FOREST_FROG) { @@ -128,7 +128,7 @@ class npc_zulaman_hostage : public CreatureScript struct npc_zulaman_hostageAI : public ScriptedAI { - npc_zulaman_hostageAI(Creature *c) : ScriptedAI(c) {IsLoot = false;} + npc_zulaman_hostageAI(Creature* c) : ScriptedAI(c) {IsLoot = false;} bool IsLoot; uint64 PlayerGUID; void Reset() {} diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index dbbe60d7cef..7f506af0525 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -130,7 +130,7 @@ class boss_arlokk : public CreatureScript void DoSummonPhanters() { - if (Unit *pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) + if (Unit* pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) DoScriptText(SAY_FEAST_PANTHER, me, pMarkedTarget); me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.7998f, -1649.6734f, 41.4800f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); @@ -139,7 +139,7 @@ class boss_arlokk : public CreatureScript void JustSummoned(Creature* pSummoned) { - if (Unit *pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) + if (Unit* pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) pSummoned->AI()->AttackStart(pMarkedTarget); ++m_uiSummonCount; @@ -162,7 +162,7 @@ class boss_arlokk : public CreatureScript if (m_uiMark_Timer <= uiDiff) { - Unit *pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pMarkedTarget) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp index 2eac011f8c9..c515b625e6f 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -40,7 +40,7 @@ class boss_gahzranka : public CreatureScript struct boss_gahzrankaAI : public ScriptedAI { - boss_gahzrankaAI(Creature *c) : ScriptedAI(c) {} + boss_gahzrankaAI(Creature* c) : ScriptedAI(c) {} uint32 Frostbreath_Timer; uint32 MassiveGeyser_Timer; uint32 Slam_Timer; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 0fb323982f1..fe5e8a98476 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -40,7 +40,7 @@ class boss_grilek : public CreatureScript struct boss_grilekAI : public ScriptedAI { - boss_grilekAI(Creature *c) : ScriptedAI(c) {} + boss_grilekAI(Creature* c) : ScriptedAI(c) {} uint32 Avartar_Timer; uint32 GroundTremor_Timer; @@ -66,7 +66,7 @@ class boss_grilek : public CreatureScript { DoCast(me, SPELL_AVARTAR); - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index f1f65e4408d..16cd74ba0f3 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -55,7 +55,7 @@ class boss_hakkar : public CreatureScript struct boss_hakkarAI : public ScriptedAI { - boss_hakkarAI(Creature *c) : ScriptedAI(c) + boss_hakkarAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -132,7 +132,7 @@ class boss_hakkar : public CreatureScript //CauseInsanity_Timer /*if (CauseInsanity_Timer <= diff) { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CAUSEINSANITY); CauseInsanity_Timer = 35000 + rand()%8000; @@ -141,7 +141,7 @@ class boss_hakkar : public CreatureScript //WillOfHakkar_Timer if (WillOfHakkar_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WILLOFHAKKAR); WillOfHakkar_Timer = 25000 + rand()%10000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index db8182113ce..1e2b990eb5b 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -40,7 +40,7 @@ class boss_hazzarah : public CreatureScript struct boss_hazzarahAI : public ScriptedAI { - boss_hazzarahAI(Creature *c) : ScriptedAI(c) {} + boss_hazzarahAI(Creature* c) : ScriptedAI(c) {} uint32 ManaBurn_Timer; uint32 Sleep_Timer; @@ -81,14 +81,14 @@ class boss_hazzarah : public CreatureScript { //We will summon 3 illusions that will spawn on a random gamer and attack this gamer //We will just use one model for the beginning - Unit *pTarget = NULL; + Unit* pTarget = NULL; for (uint8 i = 0; i < 3; ++i) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Illusion = me->SummonCreature(15163, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); + Creature* Illusion = me->SummonCreature(15163, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); if (Illusion) Illusion->AI()->AttackStart(pTarget); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 706fc14327e..f64fd167c06 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -54,7 +54,7 @@ class boss_jeklik : public CreatureScript struct boss_jeklikAI : public ScriptedAI { - boss_jeklikAI(Creature *c) : ScriptedAI(c) + boss_jeklikAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -113,7 +113,7 @@ class boss_jeklik : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_CHARGE); AttackStart(pTarget); @@ -136,7 +136,7 @@ class boss_jeklik : public CreatureScript if (SpawnBats_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Bat = NULL; Bat = me->SummonCreature(11368, -12291.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); @@ -165,7 +165,7 @@ class boss_jeklik : public CreatureScript { if (PhaseTwo && ShadowWordPain_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); ShadowWordPain_Timer = 12000 + rand()%6000; @@ -194,7 +194,7 @@ class boss_jeklik : public CreatureScript if (SpawnFlyingBats_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; @@ -236,7 +236,7 @@ class mob_batrider : public CreatureScript struct mob_batriderAI : public ScriptedAI { - mob_batriderAI(Creature *c) : ScriptedAI(c) + mob_batriderAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -264,7 +264,7 @@ class mob_batrider : public CreatureScript //Bomb_Timer if (Bomb_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_BOMB); Bomb_Timer = 5000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index c9ac816ecea..81bd6ba9032 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -52,7 +52,7 @@ class boss_jindo : public CreatureScript struct boss_jindoAI : public ScriptedAI { - boss_jindoAI(Creature *c) : ScriptedAI(c) {} + boss_jindoAI(Creature* c) : ScriptedAI(c) {} uint32 BrainWashTotem_Timer; uint32 HealingWard_Timer; @@ -108,11 +108,11 @@ class boss_jindo : public CreatureScript //Casting the delusion curse with a shade. So shade will attack the same target with the curse. if (Delusions_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_DELUSIONSOFJINDO); - Creature *Shade = me->SummonCreature(14986, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature* Shade = me->SummonCreature(14986, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Shade) Shade->AI()->AttackStart(pTarget); } @@ -123,7 +123,7 @@ class boss_jindo : public CreatureScript //Teleporting a random gamer and spawning 9 skeletons that will attack this gamer if (Teleport_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { @@ -132,7 +132,7 @@ class boss_jindo : public CreatureScript if (DoGetThreat(me->getVictim())) DoModifyThreatPercent(pTarget, -100); - Creature *Skeletons; + Creature* Skeletons; Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()+2, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) Skeletons->AI()->AttackStart(pTarget); @@ -187,7 +187,7 @@ class mob_healing_ward : public CreatureScript struct mob_healing_wardAI : public ScriptedAI { - mob_healing_wardAI(Creature *c) : ScriptedAI(c) + mob_healing_wardAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -212,7 +212,7 @@ class mob_healing_ward : public CreatureScript { if (pInstance) { - Unit *pJindo = Unit::GetUnit((*me), pInstance->GetData64(DATA_JINDO)); + Unit* pJindo = Unit::GetUnit((*me), pInstance->GetData64(DATA_JINDO)); if (pJindo) DoCast(pJindo, SPELL_HEAL); } @@ -241,7 +241,7 @@ class mob_shade_of_jindo : public CreatureScript struct mob_shade_of_jindoAI : public ScriptedAI { - mob_shade_of_jindoAI(Creature *c) : ScriptedAI(c) {} + mob_shade_of_jindoAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowShock_Timer; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 60db1387276..59b305b974a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -55,7 +55,7 @@ class boss_mandokir : public CreatureScript struct boss_mandokirAI : public ScriptedAI { - boss_mandokirAI(Creature *c) : ScriptedAI(c) + boss_mandokirAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -294,7 +294,7 @@ class mob_ohgan : public CreatureScript struct mob_ohganAI : public ScriptedAI { - mob_ohganAI(Creature *c) : ScriptedAI(c) + mob_ohganAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index fa6fe02f5a0..da6f41d4ca0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -51,7 +51,7 @@ class boss_marli : public CreatureScript struct boss_marliAI : public ScriptedAI { - boss_marliAI(Creature *c) : ScriptedAI(c) + boss_marliAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -118,11 +118,11 @@ class boss_marli : public CreatureScript { DoScriptText(SAY_SPIDER_SPAWN, me); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Spider = NULL; + Creature* Spider = NULL; Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) @@ -142,11 +142,11 @@ class boss_marli : public CreatureScript if (SpawnSpider_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature* Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); SpawnSpider_Timer = 12000 + rand()%5000; @@ -173,7 +173,7 @@ class boss_marli : public CreatureScript { if (Charge_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; int i = 0; while (i < 3) // max 3 tries to get a random target with power_mana { @@ -230,7 +230,7 @@ class mob_spawn_of_marli : public CreatureScript struct mob_spawn_of_marliAI : public ScriptedAI { - mob_spawn_of_marliAI(Creature *c) : ScriptedAI(c) {} + mob_spawn_of_marliAI(Creature* c) : ScriptedAI(c) {} uint32 LevelUp_Timer; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index d534c1788eb..c05bc2e6fcb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -42,7 +42,7 @@ class boss_renataki : public CreatureScript struct boss_renatakiAI : public ScriptedAI { - boss_renatakiAI(Creature *c) : ScriptedAI(c) {} + boss_renatakiAI(Creature* c) : ScriptedAI(c) {} uint32 Invisible_Timer; uint32 Ambush_Timer; @@ -92,7 +92,7 @@ class boss_renataki : public CreatureScript { if (Ambush_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { @@ -126,7 +126,7 @@ class boss_renataki : public CreatureScript { if (Aggro_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (DoGetThreat(me->getVictim())) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index efdd095681e..cd6294d1751 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -66,7 +66,7 @@ class boss_thekal : public CreatureScript struct boss_thekalAI : public ScriptedAI { - boss_thekalAI(Creature *c) : ScriptedAI(c) + boss_thekalAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -134,7 +134,7 @@ class boss_thekal : public CreatureScript if (m_pInstance->GetData(TYPE_LORKHAN) == SPECIAL) { //Resurrect LorKhan - if (Unit *pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) + if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) { pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pLorKhan->setFaction(14); @@ -148,7 +148,7 @@ class boss_thekal : public CreatureScript if (m_pInstance->GetData(TYPE_ZATH) == SPECIAL) { //Resurrect Zath - Unit *pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); + Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); if (pZath) { pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); @@ -219,7 +219,7 @@ class boss_thekal : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_CHARGE); DoResetThreat(); @@ -277,7 +277,7 @@ class mob_zealot_lorkhan : public CreatureScript struct mob_zealot_lorkhanAI : public ScriptedAI { - mob_zealot_lorkhanAI(Creature *c) : ScriptedAI(c) + mob_zealot_lorkhanAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -337,8 +337,8 @@ class mob_zealot_lorkhan : public CreatureScript { if (m_pInstance) { - Unit *pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)); - Unit *pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); + Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)); + Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); if (!pThekal || !pZath) return; @@ -374,7 +374,7 @@ class mob_zealot_lorkhan : public CreatureScript if (m_pInstance->GetData(TYPE_THEKAL) == SPECIAL) { //Resurrect Thekal - if (Unit *pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) + if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) { pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -386,7 +386,7 @@ class mob_zealot_lorkhan : public CreatureScript if (m_pInstance->GetData(TYPE_ZATH) == SPECIAL) { //Resurrect Zath - if (Unit *pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH))) + if (Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH))) { pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -437,7 +437,7 @@ class mob_zealot_zath : public CreatureScript struct mob_zealot_zathAI : public ScriptedAI { - mob_zealot_zathAI(Creature *c) : ScriptedAI(c) + mob_zealot_zathAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -527,7 +527,7 @@ class mob_zealot_zath : public CreatureScript if (m_pInstance->GetData(TYPE_LORKHAN) == SPECIAL) { //Resurrect LorKhan - if (Unit *pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) + if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) { pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -539,7 +539,7 @@ class mob_zealot_zath : public CreatureScript if (m_pInstance->GetData(TYPE_THEKAL) == SPECIAL) { //Resurrect Thekal - if (Unit *pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) + if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) { pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 9973dcd8724..a22bc45c753 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -50,7 +50,7 @@ class boss_venoxis : public CreatureScript struct boss_venoxisAI : public ScriptedAI { - boss_venoxisAI(Creature *c) : ScriptedAI(c) + boss_venoxisAI(Creature* c) : ScriptedAI(c) { m_pInstance = c->GetInstanceScript(); } @@ -125,7 +125,7 @@ class boss_venoxis : public CreatureScript TargetInRange = 0; for (uint8 i = 0; i < 10; ++i) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, i)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, i)) if (me->IsWithinMeleeRange(pTarget)) ++TargetInRange; } @@ -144,7 +144,7 @@ class boss_venoxis : public CreatureScript if (HolyFire_Timer < diff && TargetInRange < 3) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HOLY_FIRE); HolyFire_Timer = 8000; @@ -174,7 +174,7 @@ class boss_venoxis : public CreatureScript if (PhaseTwo && VenomSpit_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_VENOMSPIT); VenomSpit_Timer = 15000 + rand()%5000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 9ea2dbdcf91..9857ba68ffc 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -40,7 +40,7 @@ class boss_wushoolay : public CreatureScript struct boss_wushoolayAI : public ScriptedAI { - boss_wushoolayAI(Creature *c) : ScriptedAI(c) {} + boss_wushoolayAI(Creature* c) : ScriptedAI(c) {} uint32 LightningCloud_Timer; uint32 LightningWave_Timer; @@ -70,7 +70,7 @@ class boss_wushoolay : public CreatureScript //LightningWave_Timer if (LightningWave_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_LIGHTNINGWAVE); diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp index 45a8d19b803..adbeebdaf12 100644 --- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp @@ -62,7 +62,7 @@ class npc_professor_phizzlethorpe : public CreatureScript struct npc_professor_phizzlethorpeAI : public npc_escortAI { - npc_professor_phizzlethorpeAI(Creature *c) : npc_escortAI(c) {} + npc_professor_phizzlethorpeAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 uiPointId) { diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp index d1c2220c262..1cc110d3eb7 100644 --- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp +++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp @@ -45,7 +45,7 @@ public: struct boss_kruulAI : public ScriptedAI { - boss_kruulAI(Creature *c) : ScriptedAI(c) {} + boss_kruulAI(Creature* c) : ScriptedAI(c) {} uint32 ShadowVolley_Timer; uint32 Cleave_Timer; @@ -78,7 +78,7 @@ public: void SummonHounds(Unit* pVictim) { - if (Creature *Hound = DoSpawnCreature(19207, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) + if (Creature* Hound = DoSpawnCreature(19207, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) Hound->AI()->AttackStart(pVictim); } diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp index 42435714261..6e517937cb0 100644 --- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp @@ -127,11 +127,11 @@ public: struct npc_ragged_johnAI : public ScriptedAI { - npc_ragged_johnAI(Creature *c) : ScriptedAI(c) {} + npc_ragged_johnAI(Creature* c) : ScriptedAI(c) {} void Reset() {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (who->HasAura(16468)) { diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 6a550d55a0b..9e2fd198df2 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -75,7 +75,7 @@ public: struct boss_twilight_corrupterAI : public ScriptedAI { - boss_twilight_corrupterAI(Creature *c) : ScriptedAI(c) {} + boss_twilight_corrupterAI(Creature* c) : ScriptedAI(c) {} uint32 SoulCorruption_Timer; uint32 CreatureOfNightmare_Timer; @@ -116,6 +116,7 @@ public: DoCast(me->getVictim(), SPELL_SOUL_CORRUPTION); SoulCorruption_Timer = rand()%4000+15000; //gotta confirm Timers } else SoulCorruption_Timer-=diff; + if (CreatureOfNightmare_Timer <= diff) { DoCast(me->getVictim(), SPELL_CREATURE_OF_NIGHTMARE); diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp index 0457c58b2f7..ce07f3bbd7a 100644 --- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp @@ -48,7 +48,7 @@ public: struct mobs_ghoul_flayerAI : public ScriptedAI { - mobs_ghoul_flayerAI(Creature *c) : ScriptedAI(c) {} + mobs_ghoul_flayerAI(Creature* c) : ScriptedAI(c) {} void Reset() {} @@ -120,7 +120,7 @@ public: struct npc_darrowshire_spiritAI : public ScriptedAI { - npc_darrowshire_spiritAI(Creature *c) : ScriptedAI(c) {} + npc_darrowshire_spiritAI(Creature* c) : ScriptedAI(c) {} void Reset() { diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index d720b37f056..aaf226474e1 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -88,7 +88,7 @@ public: struct npc_prospector_anvilwardAI : public npc_escortAI { // CreatureAI functions - npc_prospector_anvilwardAI(Creature *c) : npc_escortAI(c) {} + npc_prospector_anvilwardAI(Creature* c) : npc_escortAI(c) {} // Pure Virtual Functions void WaypointReached(uint32 i) @@ -259,7 +259,7 @@ public: me->setFaction(FACTION_HOSTILE); questPhase = 0; - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { me->AddThreat(pTarget, 5000000.0f); AttackStart(pTarget); @@ -379,7 +379,7 @@ public: struct master_kelerun_bloodmournAI : public ScriptedAI { - master_kelerun_bloodmournAI(Creature *c) : ScriptedAI(c) {} + master_kelerun_bloodmournAI(Creature* c) : ScriptedAI(c) {} uint8 questPhase; uint8 paladinPhase; @@ -456,7 +456,7 @@ public: { // no player check, quest can be finished as group, so no complex PlayerGUID/group search code for (uint8 i = 0; i < 4; ++i) - if (Creature *pSummoned = DoSpawnCreature(PaladinEntry[i], SpawnPosition[i].x, SpawnPosition[i].y, SpawnPosition[i].z, SpawnPosition[i].o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000)) + if (Creature* pSummoned = DoSpawnCreature(PaladinEntry[i], SpawnPosition[i].x, SpawnPosition[i].y, SpawnPosition[i].z, SpawnPosition[i].o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000)) paladinGuid[i] = pSummoned->GetGUID(); timer = OFFSET_NEXT_ATTACK; @@ -485,7 +485,7 @@ void npc_second_trial_paladin::npc_secondTrialAI::JustDied(Unit* Killer) { if (Killer->GetTypeId() == TYPEID_PLAYER) { - if (Creature *pSummoner = Unit::GetCreature((*me), summonerGuid)) + if (Creature* pSummoner = Unit::GetCreature((*me), summonerGuid)) CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, pSummoner->AI())->SecondTrialKill(); // last kill quest complete for group @@ -508,7 +508,7 @@ public: bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { // find spawn :: master_kelerun_bloodmourn - if (Creature *pCreature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) + if (Creature* pCreature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) CAST_AI(npc_second_trial_controller::master_kelerun_bloodmournAI, pCreature->AI())->StartEvent(); return true; @@ -563,7 +563,7 @@ public: void EnterCombat(Unit* /*who*/){} - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->AI()->AttackStart(me); Summons.Summon(summoned); @@ -668,7 +668,7 @@ public: } } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->AI()->AttackStart(me); } diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 6c527275864..290d2f1b5ee 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -50,7 +50,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { ItemPosCountVec dest; - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, false); + uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, NULL); if (msg == EQUIP_ERR_OK) { pPlayer->StoreNewItem(dest, 24226, 1, true); @@ -169,7 +169,7 @@ public: struct npc_ranger_lilathaAI : public npc_escortAI { - npc_ranger_lilathaAI(Creature *c) : npc_escortAI(c) {} + npc_ranger_lilathaAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp index 6c598cb85b6..188959cbd23 100644 --- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp @@ -51,7 +51,7 @@ public: struct npc_converted_sentryAI : public ScriptedAI { - npc_converted_sentryAI(Creature *c) : ScriptedAI(c) {} + npc_converted_sentryAI(Creature* c) : ScriptedAI(c) {} bool Credit; uint32 Timer; diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp index 7fb5a028d41..36f26a957d1 100644 --- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp @@ -53,7 +53,7 @@ public: struct npc_blood_knight_stillbladeAI : public ScriptedAI { - npc_blood_knight_stillbladeAI(Creature *c) : ScriptedAI(c) {} + npc_blood_knight_stillbladeAI(Creature* c) : ScriptedAI(c) {} uint32 lifeTimer; bool spellHit; @@ -85,7 +85,7 @@ public: } } - void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) + void SpellHit(Unit* Hitter, const SpellEntry *Spellkind) { if ((Spellkind->Id == SPELL_SHIMMERING_VESSEL) && !spellHit && (Hitter->GetTypeId() == TYPEID_PLAYER) && (CAST_PLR(Hitter)->IsActiveQuest(QUEST_REDEEMING_THE_DEAD))) diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 6446b8d2dfe..0d02499d9c0 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -80,7 +80,7 @@ public: struct npc_astor_hadrenAI : public ScriptedAI { - npc_astor_hadrenAI(Creature *c) : ScriptedAI(c) {} + npc_astor_hadrenAI(Creature* c) : ScriptedAI(c) {} void Reset() { @@ -132,7 +132,7 @@ public: struct npc_deathstalker_erlandAI : public npc_escortAI { - npc_deathstalker_erlandAI(Creature *c) : npc_escortAI(c) {} + npc_deathstalker_erlandAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -225,7 +225,7 @@ class pyrewood_ambush : public CreatureScript public: pyrewood_ambush() : CreatureScript("pyrewood_ambush") { } - bool OnQuestAccept(Player *pPlayer, Creature *pCreature, const Quest *pQuest) + bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest *pQuest) { if (pQuest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, pCreature->AI())->QuestInProgress) { @@ -238,14 +238,14 @@ public: return true; } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new pyrewood_ambushAI (pCreature); } struct pyrewood_ambushAI : public ScriptedAI { - pyrewood_ambushAI(Creature *c) : ScriptedAI(c), Summons(me) + pyrewood_ambushAI(Creature* c) : ScriptedAI(c), Summons(me) { QuestInProgress = false; } @@ -273,13 +273,13 @@ public: void EnterCombat(Unit* /*who*/){} - void JustSummoned(Creature *pSummoned) + void JustSummoned(Creature* pSummoned) { Summons.Summon(pSummoned); ++KillCount; } - void SummonedCreatureDespawn(Creature *pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { Summons.Despawn(pSummoned); --KillCount; @@ -287,10 +287,10 @@ public: void SummonCreatureWithRandomTarget(uint32 creatureId, int position) { - if (Creature *pSummoned = me->SummonCreature(creatureId, PyrewoodSpawnPoints[position][0], PyrewoodSpawnPoints[position][1], PyrewoodSpawnPoints[position][2], PyrewoodSpawnPoints[position][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000)) + if (Creature* pSummoned = me->SummonCreature(creatureId, PyrewoodSpawnPoints[position][0], PyrewoodSpawnPoints[position][1], PyrewoodSpawnPoints[position][2], PyrewoodSpawnPoints[position][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000)) { - Player *pPlayer = NULL; - Unit *pTarget = NULL; + Player* pPlayer = NULL; + Unit* pTarget = NULL; if (PlayerGUID) { pPlayer = Unit::GetPlayer(*me, PlayerGUID); @@ -311,7 +311,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (PlayerGUID) - if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID)) + if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) if (pPlayer->GetQuestStatus(QUEST_PYREWOOD_AMBUSH) == QUEST_STATUS_INCOMPLETE) pPlayer->FailQuest(QUEST_PYREWOOD_AMBUSH); } @@ -364,7 +364,7 @@ public: case 5: //end if (PlayerGUID) { - if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID)) + if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) { me->MonsterSay(NPCSAY_END, LANG_UNIVERSAL, 0); //not blizzlike pPlayer->GroupEventHappens(QUEST_PYREWOOD_AMBUSH, me); diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index cc395416382..eb52472fafd 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -107,7 +107,7 @@ public: struct npc_bartlebyAI : public ScriptedAI { - npc_bartlebyAI(Creature *c) : ScriptedAI(c) + npc_bartlebyAI(Creature* c) : ScriptedAI(c) { m_uiNormalFaction = c->getFaction(); } @@ -179,7 +179,7 @@ public: struct npc_dashel_stonefistAI : public ScriptedAI { - npc_dashel_stonefistAI(Creature *c) : ScriptedAI(c) + npc_dashel_stonefistAI(Creature* c) : ScriptedAI(c) { m_uiNormalFaction = c->getFaction(); } @@ -328,7 +328,7 @@ public: { me->DisappearAndDie(); - if (Creature *pMarzon = Unit::GetCreature(*me, MarzonGUID)) + if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID)) { if (pMarzon->isAlive()) pMarzon->DisappearAndDie(); @@ -337,7 +337,7 @@ public: void EnterCombat(Unit* pWho) { - if (Creature *pMarzon = Unit::GetCreature(*me, MarzonGUID)) + if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID)) { if (pMarzon->isAlive() && !pMarzon->isInCombat()) pMarzon->AI()->AttackStart(pWho); @@ -356,7 +356,7 @@ public: break; case 16: SetEscortPaused(true); - if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE, -8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + if (Creature* pMarzon = me->SummonCreature(NPC_MARZON_BLADE, -8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) { pMarzon->GetMotionMaster()->MovePoint(0, -8408.000977f, 468.611450f, 123.759903f); MarzonGUID = pMarzon->GetGUID(); @@ -411,7 +411,7 @@ public: uiPhase = 0; break; case 5: - if (Creature *pMarzon = Unit::GetCreature(*me, MarzonGUID)) + if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID)) DoScriptText(SAY_MARZON_1, pMarzon); uiTimer = 3000; uiPhase = 6; @@ -426,7 +426,7 @@ public: case 7: if (Creature* pTyrion = me->FindNearestCreature(NPC_TYRION, 20.0f, true)) DoScriptText(SAY_TYRION_2, pTyrion); - if (Creature *pMarzon = Unit::GetCreature(*me, MarzonGUID)) + if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID)) pMarzon->setFaction(14); me->setFaction(14); uiTimer = 0; @@ -507,10 +507,16 @@ public: if (me->isSummon()) { - if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) + Unit* pSummoner = me->ToTempSummon()->GetSummoner(); + if (pSummoner && pSummoner->GetTypeId() == TYPEID_UNIT && pSummoner->IsAIEnabled) { - CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pSummoner->GetAI())->uiTimer = 2000; - CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pSummoner->GetAI())->uiPhase = 5; + npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI *ai = + CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pSummoner->GetAI()); + if (ai) + { + ai->uiTimer = 2000; + ai->uiPhase = 5; + } //me->ChangeOrient(0.0f, pSummoner); } } diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp index 0908e4e994a..73b24bd81a8 100644 --- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp @@ -45,7 +45,7 @@ public: struct mob_yennikuAI : public ScriptedAI { - mob_yennikuAI(Creature *c) : ScriptedAI(c) + mob_yennikuAI(Creature* c) : ScriptedAI(c) { bReset = false; } @@ -59,7 +59,7 @@ public: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (caster->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index 1e220276a96..8d81fbc3bd8 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -130,7 +130,7 @@ public: ++m_uiPhase; break; case 2: - if (Player *pPlayer = Unit::GetPlayer(*me, m_uiPlayerGUID)) + if (Player* pPlayer = Unit::GetPlayer(*me, m_uiPlayerGUID)) pPlayer->AreaExploredOrEventHappens(QUEST_590); DoCast(me, SPELL_DRINK, true); diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index cbd9c1fe665..78ac16227e3 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -88,7 +88,7 @@ public: struct npc_lady_sylvanas_windrunnerAI : public ScriptedAI { - npc_lady_sylvanas_windrunnerAI(Creature *c) : ScriptedAI(c) {} + npc_lady_sylvanas_windrunnerAI(Creature* c) : ScriptedAI(c) {} uint32 LamentEvent_Timer; bool LamentEvent; @@ -103,11 +103,11 @@ public: void EnterCombat(Unit* /*who*/) {} - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY) { - if (Unit *pTarget = Unit::GetUnit(*summoned, targetGUID)) + if (Unit* pTarget = Unit::GetUnit(*summoned, targetGUID)) { pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0); pTarget->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0.0f); @@ -162,7 +162,7 @@ public: struct npc_highborne_lamenterAI : public ScriptedAI { - npc_highborne_lamenterAI(Creature *c) : ScriptedAI(c) {} + npc_highborne_lamenterAI(Creature* c) : ScriptedAI(c) {} uint32 EventMove_Timer; uint32 EventCast_Timer; diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 76ef5be0561..91fc1ee1076 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -168,7 +168,7 @@ public: struct npc_the_scourge_cauldronAI : public ScriptedAI { - npc_the_scourge_cauldronAI(Creature *c) : ScriptedAI(c) {} + npc_the_scourge_cauldronAI(Creature* c) : ScriptedAI(c) {} void Reset() {} @@ -184,7 +184,7 @@ public: me->SetRespawnDelay(600); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || who->GetTypeId() != TYPEID_PLAYER) return; @@ -253,7 +253,7 @@ public: struct npc_andorhal_towerAI : public Scripted_NoMovementAI { - npc_andorhal_towerAI(Creature *c) : Scripted_NoMovementAI(c) {} + npc_andorhal_towerAI(Creature* c) : Scripted_NoMovementAI(c) {} void MoveInLineOfSight(Unit* pWho) { diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index 424d5427238..35e43abe0be 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -225,7 +225,7 @@ public: struct npc_defias_traitorAI : public npc_escortAI { - npc_defias_traitorAI(Creature *c) : npc_escortAI(c) { Reset(); } + npc_defias_traitorAI(Creature* c) : npc_escortAI(c) { Reset(); } void WaypointReached(uint32 i) { diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index 2a495d6e246..db5034655d8 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -90,7 +90,7 @@ class example_creature : public CreatureScript { // *** HANDLED FUNCTION *** //This is the constructor, called only once when the Creature is first created - example_creatureAI(Creature *c) : ScriptedAI(c) {} + example_creatureAI(Creature* c) : ScriptedAI(c) {} // *** CUSTOM VARIABLES **** //These variables are for use only by this individual script. 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(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 7ee829ab5d9..05a351cc07b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -91,7 +91,7 @@ public: struct boss_anub_arakAI : public ScriptedAI { - boss_anub_arakAI(Creature *c) : ScriptedAI(c), lSummons(me) + boss_anub_arakAI(Creature* c) : ScriptedAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -142,7 +142,7 @@ public: } } - Creature* DoSummonImpaleTarget(Unit *pTarget) + Creature* DoSummonImpaleTarget(Unit* pTarget) { Position targetPos; pTarget->GetPosition(&targetPos); @@ -184,7 +184,7 @@ public: case IMPALE_PHASE_TARGET: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) + if (Creature* pImpaleTarget = DoSummonImpaleTarget(target)) pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SHAKEGROUND, true); uiImpaleTimer = 3*IN_MILLISECONDS; uiImpalePhase = IMPALE_PHASE_ATTACK; @@ -212,7 +212,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN, SpawnPointGuardian[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Creature* Guardian = me->SummonCreature(CREATURE_GUARDIAN, SpawnPointGuardian[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Guardian->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Guardian); @@ -229,7 +229,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Creature* Venomancer = me->SummonCreature(CREATURE_VENOMANCER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Venomancer->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Venomancer); @@ -248,7 +248,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Datter = me->SummonCreature(CREATURE_DATTER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Creature* Datter = me->SummonCreature(CREATURE_DATTER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Datter->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Datter); @@ -314,7 +314,7 @@ public: { if (Unit* target = me->getVictim()) { - if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) + if (Creature* pImpaleTarget = DoSummonImpaleTarget(target)) me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_POUND, SPELL_POUND_H), false); } uiPoundTimer = 16500; @@ -333,7 +333,7 @@ public: pInstance->SetData(DATA_ANUBARAK_EVENT, DONE); } - void KilledUnit(Unit *pVictim) + void KilledUnit(Unit* pVictim) { if (pVictim == me) return; @@ -346,7 +346,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_anub_arakAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 0d2ef4c87be..3350cf58eb3 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -188,7 +188,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_hadronoxAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 39aefd45287..3a499184684 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -94,7 +94,7 @@ public: struct boss_krik_thirAI : public ScriptedAI { - boss_krik_thirAI(Creature *c) : ScriptedAI(c) + boss_krik_thirAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -199,7 +199,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_krik_thirAI(creature); } @@ -212,7 +212,7 @@ public: struct npc_skittering_infectorAI : public ScriptedAI { - npc_skittering_infectorAI(Creature *c) : ScriptedAI(c) {} + npc_skittering_infectorAI(Creature* c) : ScriptedAI(c) {} void JustDied(Unit* /*killer*/) { @@ -221,7 +221,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_skittering_infectorAI(creature); } @@ -234,7 +234,7 @@ public: struct npc_anub_ar_skirmisherAI : public ScriptedAI { - npc_anub_ar_skirmisherAI(Creature *c) : ScriptedAI(c) {} + npc_anub_ar_skirmisherAI(Creature* c) : ScriptedAI(c) {} uint32 uiChargeTimer; uint32 uiBackstabTimer; @@ -272,7 +272,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_anub_ar_skirmisherAI(creature); } @@ -285,7 +285,7 @@ public: struct npc_anub_ar_shadowcasterAI : public ScriptedAI { - npc_anub_ar_shadowcasterAI(Creature *c) : ScriptedAI(c) {} + npc_anub_ar_shadowcasterAI(Creature* c) : ScriptedAI(c) {} uint32 uiShadowBoltTimer; uint32 uiShadowNovaTimer; @@ -303,7 +303,7 @@ public: if (uiShadowBoltTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SHADOW_BOLT, true); uiShadowBoltTimer = 15*IN_MILLISECONDS; } else uiShadowBoltTimer -= diff; @@ -318,7 +318,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_anub_ar_shadowcasterAI(creature); } @@ -331,7 +331,7 @@ public: struct npc_anub_ar_warriorAI : public ScriptedAI { - npc_anub_ar_warriorAI(Creature *c) : ScriptedAI(c){} + npc_anub_ar_warriorAI(Creature* c) : ScriptedAI(c){} uint32 uiCleaveTimer; uint32 uiStrikeTimer; @@ -363,7 +363,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_anub_ar_warriorAI(creature); } @@ -376,7 +376,7 @@ public: struct npc_watcher_gashraAI : public ScriptedAI { - npc_watcher_gashraAI(Creature *c) : ScriptedAI(c) {} + npc_watcher_gashraAI(Creature* c) : ScriptedAI(c) {} uint32 uiWebWrapTimer; uint32 uiInfectedBiteTimer; @@ -399,7 +399,7 @@ public: if (uiWebWrapTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_WEB_WRAP, true); uiWebWrapTimer = 17*IN_MILLISECONDS; } else uiWebWrapTimer -= diff; @@ -414,7 +414,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_watcher_gashraAI(creature); } @@ -427,7 +427,7 @@ public: struct npc_watcher_narjilAI : public ScriptedAI { - npc_watcher_narjilAI(Creature *c) : ScriptedAI(c) {} + npc_watcher_narjilAI(Creature* c) : ScriptedAI(c) {} uint32 uiWebWrapTimer; uint32 uiInfectedBiteTimer; @@ -447,7 +447,7 @@ public: if (uiWebWrapTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_WEB_WRAP, true); uiWebWrapTimer = 15*IN_MILLISECONDS; } else uiWebWrapTimer -= diff; @@ -468,7 +468,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_watcher_narjilAI(creature); } @@ -481,7 +481,7 @@ public: struct npc_watcher_silthikAI : public ScriptedAI { - npc_watcher_silthikAI(Creature *c) : ScriptedAI(c) {} + npc_watcher_silthikAI(Creature* c) : ScriptedAI(c) {} uint32 uiWebWrapTimer; uint32 uiInfectedBiteTimer; @@ -501,7 +501,7 @@ public: if (uiWebWrapTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_WEB_WRAP, true); uiWebWrapTimer = 15*IN_MILLISECONDS; @@ -524,7 +524,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_watcher_silthikAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 0e069e5ba43..7a5faa10c63 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -48,7 +48,7 @@ public: struct boss_amanitarAI : public ScriptedAI { - boss_amanitarAI(Creature *c) : ScriptedAI(c) + boss_amanitarAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); bFirstTime = true; @@ -132,7 +132,7 @@ public: if (uiRootTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ENTANGLING_ROOTS); uiRootTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiRootTimer -= diff; @@ -145,7 +145,7 @@ public: if (uiBoltTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_VENOM_BOLT_VOLLEY); uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; @@ -154,7 +154,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_amanitarAI(creature); } @@ -215,7 +215,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_amanitar_mushroomsAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index 75a0420231c..712bec836bc 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -101,7 +101,7 @@ public: } } - void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) { if (spell->Id == SPELL_INSANITY) { @@ -123,11 +123,11 @@ public: Map::PlayerList const &players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - Player *plr = i->getSource(); + Player* plr = i->getSource(); if (!plr || !plr->isAlive()) continue; // Summon clone - if (Unit *summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Unit* summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) { // clone plr->CastSpell(summon, SPELL_CLONE_PLAYER, true); @@ -184,7 +184,7 @@ public: } } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { Summons.Summon(summon); } @@ -213,7 +213,7 @@ public: return spell; } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { uint32 phase= summon->GetPhaseMask(); uint32 nextPhase = 0; @@ -222,7 +222,7 @@ public: // Check if all summons in this phase killed for (SummonList::const_iterator iter = Summons.begin(); iter != Summons.end(); ++iter) { - if (Creature *visage = Unit::GetCreature(*me, *iter)) + if (Creature* visage = Unit::GetCreature(*me, *iter)) { // Not all are dead if (phase == visage->GetPhaseMask()) @@ -288,7 +288,7 @@ public: if (uiShiverTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHIVER); uiShiverTimer = 15*IN_MILLISECONDS; } else uiShiverTimer -= diff; @@ -313,7 +313,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_volazjAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index a3fd20c830e..08a63b6b118 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -342,7 +342,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_jedoga_shadowseekerAI(creature); } @@ -508,7 +508,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_jedoga_initiandAI(creature); } @@ -591,7 +591,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_jedogas_aufseher_triggerAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index e97bb5cf491..e52d27bb567 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -79,7 +79,7 @@ public: struct boss_taldaramAI : public ScriptedAI { - boss_taldaramAI(Creature *c) : ScriptedAI(c) + boss_taldaramAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); @@ -135,7 +135,7 @@ public: //DoCast(me, SPELL_FLAME_SPHERE_SUMMON_1); pSpheres[0] = DoSpawnCreature(CREATURE_FLAME_SPHERE, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS); - Unit *pSphereTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* pSphereTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pSphereTarget && pSpheres[0]) { float angle, x, y; @@ -169,7 +169,7 @@ public: break; } case JUST_VANISHED: - if (Unit *pEmbraceTarget = GetEmbraceTarget()) + if (Unit* pEmbraceTarget = GetEmbraceTarget()) { me->GetMotionMaster()->Clear(); me->SetSpeed(MOVE_WALK, 2.0f, true); @@ -179,7 +179,7 @@ public: uiPhaseTimer = 1300; break; case VANISHED: - if (Unit *pEmbraceTarget = GetEmbraceTarget()) + if (Unit* pEmbraceTarget = GetEmbraceTarget()) DoCast(pEmbraceTarget, SPELL_EMBRACE_OF_THE_VAMPYR); me->GetMotionMaster()->Clear(); me->SetSpeed(MOVE_WALK, 1.0f, true); @@ -210,9 +210,9 @@ public: if (uiVanishTimer <= diff) { //Count alive players - Unit *pTarget = NULL; + Unit* pTarget = NULL; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); - std::vector<Unit *> target_list; + std::vector<Unit* > target_list; for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); @@ -292,7 +292,7 @@ public: for (uint8 i=0; i < 2; ++i) { - GameObject *pSpheres = pInstance->instance->GetGameObject(uiSphereGuids[i]); + GameObject* pSpheres = pInstance->instance->GetGameObject(uiSphereGuids[i]); if (!pSpheres) return false; if (pSpheres->GetGoState() != GO_STATE_ACTIVE) @@ -325,7 +325,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_taldaramAI(creature); } @@ -338,7 +338,7 @@ public: struct mob_taldaram_flamesphereAI : public ScriptedAI { - mob_taldaram_flamesphereAI(Creature *c) : ScriptedAI(c) + mob_taldaram_flamesphereAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -375,7 +375,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_taldaram_flamesphereAI(creature); } @@ -386,11 +386,11 @@ class prince_taldaram_sphere : public GameObjectScript public: prince_taldaram_sphere() : GameObjectScript("prince_taldaram_sphere") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); - Creature *pPrinceTaldaram = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_PRINCE_TALDARAM) : 0); + Creature* pPrinceTaldaram = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_PRINCE_TALDARAM) : 0); if (pPrinceTaldaram && pPrinceTaldaram->isAlive()) { // maybe these are hacks :( diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 847b5ddb9cc..7ce54792e9b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -472,7 +472,7 @@ public: { if (pInstance) { - if (Creature *pTemp = Unit::GetCreature(*me, pInstance->GetData64(uiDataId))) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(uiDataId))) { if (pTemp->isAlive() && !pTemp->getVictim()) { @@ -590,9 +590,9 @@ public: { case 0: { - Creature *Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature *Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature *Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Right1->GetMotionMaster()->MovePoint(0, FlameRight1Direction.x, FlameRight1Direction.y, FlameRight1Direction.z); Right2->GetMotionMaster()->MovePoint(0, FlameRight2Direction.x, FlameRight2Direction.y, FlameRight2Direction.z); Right3->GetMotionMaster()->MovePoint(0, FlameRight3Direction.x, FlameRight3Direction.y, FlameRight3Direction.z); @@ -600,8 +600,8 @@ public: } case 1: { - Creature *Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature *Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Left1->GetMotionMaster()->MovePoint(0, FlameLeft1Direction.x, FlameLeft1Direction.y, FlameLeft1Direction.z); Left2->GetMotionMaster()->MovePoint(0, FlameLeft2Direction.x, FlameLeft2Direction.y, FlameLeft2Direction.z); break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 3e8ca0a31d2..8ac4fdb899d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -241,7 +241,7 @@ public: bHealth = false; bDone = false; - if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) + if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID)) if (pMemory->isAlive()) pMemory->RemoveFromWorld(); } @@ -323,7 +323,7 @@ public: DoCast(me, SPELL_RENEW); break; case 1: - if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) + if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID)) if (pMemory->isAlive()) DoCast(pMemory, SPELL_RENEW); break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 5157a602a21..b5d0c9504ef 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -195,7 +195,7 @@ public: { if (uiDeathRespiteTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) DoCast(pTarget, SPELL_DEATH_RESPITE); @@ -223,7 +223,7 @@ public: } if (uiDesecration <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) DoCast(pTarget, SPELL_DESECRATION); @@ -293,7 +293,7 @@ public: } }; - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new boss_black_knightAI (pCreature); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index e1e92b1cdd9..3b2ba1294f5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -267,7 +267,7 @@ public: //dosen't work at all if (uiShieldBreakerTimer <= uiDiff) { - Vehicle *pVehicle = me->GetVehicleKit(); + Vehicle* pVehicle = me->GetVehicleKit(); if (!pVehicle) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index b7e38f99022..76150269b4e 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -224,7 +224,7 @@ public: void JustSummoned(Creature* pSummoned) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true); switch (pSummoned->GetEntry()) { case NPC_BURROW: @@ -264,7 +264,7 @@ public: me->SummonCreature(NPC_BURROW, AnubarakLoc[i+2]); //Spawn Frost Spheres for (int i=0; i < 6; i++) - if (Unit *pSummoned = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) + if (Unit* pSummoned = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) m_aSphereGUID[i] = pSummoned->GetGUID(); } @@ -332,7 +332,7 @@ public: uint32 at = urand(0, m_vBurrowGUID.size()-1); for (uint32 k = 0; k < at; k++) ++i; - if (Creature *pBurrow = Unit::GetCreature(*me, *i)) + if (Creature* pBurrow = Unit::GetCreature(*me, *i)) pBurrow->CastSpell(pBurrow, 66340, false); m_uiScarabSummoned++; m_uiSummonScarabTimer = 4*IN_MILLISECONDS; @@ -373,11 +373,11 @@ public: uint8 i = startAt; do { - if (Unit *pSphere = Unit::GetCreature(*me, m_aSphereGUID[i])) + if (Unit* pSphere = Unit::GetCreature(*me, m_aSphereGUID[i])) { if (!pSphere->HasAura(SPELL_FROST_SPHERE)) { - if (Creature *pSummon = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) + if (Creature* pSummon = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) m_aSphereGUID[i] = pSummon->GetGUID(); break; } @@ -434,7 +434,7 @@ public: m_uiDeterminationTimer = urand(5*IN_MILLISECONDS, 60*IN_MILLISECONDS); DoCast(me, SPELL_ACID_MANDIBLE); me->SetInCombatWithZone(); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) me->AddThreat(pTarget, 20000.0f); if (!me->isInCombat()) me->DisappearAndDie(); @@ -513,7 +513,7 @@ public: switch (actionId) { case ACTION_SHADOW_STRIKE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_STRIKE); break; } @@ -660,7 +660,7 @@ public: m_uiTargetGUID = 0; } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit* pWho) { m_uiTargetGUID = pWho->GetGUID(); DoCast(pWho, SPELL_MARK); 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 fb41d7bedbd..e7b633b6dba 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -55,7 +55,7 @@ class boss_toc_champion_controller : public CreatureScript public: boss_toc_champion_controller() : CreatureScript("boss_toc_champion_controller") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new boss_toc_champion_controllerAI (pCreature); } @@ -369,8 +369,8 @@ struct boss_faction_championsAI : public ScriptedAI Creature* SelectRandomFriendlyMissingBuff(uint32 spell) { - std::list<Creature *> lst = DoFindFriendlyMissingBuff(40.0f, spell); - std::list<Creature *>::const_iterator itr = lst.begin(); + std::list<Creature* > lst = DoFindFriendlyMissingBuff(40.0f, spell); + std::list<Creature* >::const_iterator itr = lst.begin(); if (lst.empty()) return NULL; advance(itr, rand()%lst.size()); @@ -468,7 +468,7 @@ class mob_toc_druid : public CreatureScript public: mob_toc_druid() : CreatureScript("mob_toc_druid") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_druidAI (pCreature); } @@ -564,14 +564,14 @@ class mob_toc_shaman : public CreatureScript public: mob_toc_shaman() : CreatureScript("mob_toc_shaman") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_shamanAI (pCreature); } struct mob_toc_shamanAI : public boss_faction_championsAI { - mob_toc_shamanAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_shamanAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} uint32 m_uiHeroismOrBloodlustTimer; uint32 m_uiHexTimer; @@ -605,7 +605,7 @@ public: if (m_uiHexTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HEX); m_uiHexTimer = urand(10*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiHexTimer -= uiDiff; @@ -627,7 +627,7 @@ public: DoCast(me, SPELL_SPIRIT_CLEANSE); break; case 5: - if (Unit *pTarget = SelectRandomFriendlyMissingBuff(SPELL_EARTH_SHIELD)) + if (Unit* pTarget = SelectRandomFriendlyMissingBuff(SPELL_EARTH_SHIELD)) DoCast(pTarget, SPELL_EARTH_SHIELD); break; } @@ -657,14 +657,14 @@ class mob_toc_paladin : public CreatureScript public: mob_toc_paladin() : CreatureScript("mob_toc_paladin") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_paladinAI (pCreature); } struct mob_toc_paladinAI : public boss_faction_championsAI { - mob_toc_paladinAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_paladinAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} uint32 m_uiBubbleTimer; uint32 m_uiHandOfProtectionTimer; @@ -699,7 +699,7 @@ public: if (m_uiHandOfProtectionTimer <= uiDiff) { - if (Unit *pTarget = DoSelectLowestHpFriendly(40.0f)) + if (Unit* pTarget = DoSelectLowestHpFriendly(40.0f)) if (pTarget->HealthBelowPct(15)) DoCast(pTarget, SPELL_HAND_OF_PROTECTION); m_uiHandOfProtectionTimer = urand(0*IN_MILLISECONDS, 360*IN_MILLISECONDS); @@ -707,21 +707,21 @@ public: if (m_uiHolyShockTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HOLY_SHOCK); m_uiHolyShockTimer = urand(6*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiHolyShockTimer -= uiDiff; if (m_uiHandOfFreedomTimer <= uiDiff) { - if (Unit *pTarget = SelectRandomFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM)) + if (Unit* pTarget = SelectRandomFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM)) DoCast(pTarget, SPELL_HAND_OF_FREEDOM); m_uiHandOfFreedomTimer = urand(25*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiHandOfFreedomTimer -= uiDiff; if (m_uiHammerOfJusticeTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HAMMER_OF_JUSTICE); m_uiHammerOfJusticeTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiHammerOfJusticeTimer -= uiDiff; @@ -764,14 +764,14 @@ class mob_toc_priest : public CreatureScript public: mob_toc_priest() : CreatureScript("mob_toc_priest") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_priestAI (pCreature); } struct mob_toc_priestAI : public boss_faction_championsAI { - mob_toc_priestAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} + mob_toc_priestAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} uint32 m_uiPsychicScreamTimer; uint32 m_uiCommonTimer; @@ -809,7 +809,7 @@ public: DoCast(me, SPELL_FLASH_HEAL); break; case 4: - if (Unit *pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) + if (Unit* pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) DoCast(pTarget, SPELL_DISPEL); break; case 5: @@ -845,14 +845,14 @@ class mob_toc_shadow_priest : public CreatureScript public: mob_toc_shadow_priest() : CreatureScript("mob_toc_shadow_priest") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_shadow_priestAI (pCreature); } struct mob_toc_shadow_priestAI : public boss_faction_championsAI { - mob_toc_shadow_priestAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} + mob_toc_shadow_priestAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} uint32 m_uiPsychicScreamTimer; uint32 m_uiDispersionTimer; @@ -872,7 +872,7 @@ public: DoCast(me, SPELL_SHADOWFORM); } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit* pWho) { boss_faction_championsAI::EnterCombat(pWho); } @@ -897,14 +897,14 @@ public: if (m_uiSilenceTimer <= uiDiff) { - if (Unit *pTarget = SelectEnemyCaster(false)) + if (Unit* pTarget = SelectEnemyCaster(false)) DoCast(pTarget, SPELL_SILENCE); m_uiSilenceTimer = urand(8*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiSilenceTimer -= uiDiff; if (m_uiMindBlastTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MIND_BLAST); m_uiMindBlastTimer = urand(3*IN_MILLISECONDS, 8*IN_MILLISECONDS); } else m_uiMindBlastTimer -= uiDiff; @@ -914,19 +914,19 @@ public: switch (urand(0, 4)) { case 0: case 1: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MIND_FLAY); break; case 2: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_VAMPIRIC_TOUCH); break; case 3: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SW_PAIN); break; case 4: - if (Unit *pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) + if (Unit* pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f)) DoCast(pTarget, SPELL_DISPEL); break; } @@ -958,14 +958,14 @@ class mob_toc_warlock : public CreatureScript public: mob_toc_warlock() : CreatureScript("mob_toc_warlock") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_warlockAI (pCreature); } struct mob_toc_warlockAI : public boss_faction_championsAI { - mob_toc_warlockAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} + mob_toc_warlockAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} SummonList Summons; @@ -994,7 +994,7 @@ public: if (m_uiFearTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FEAR); m_uiFearTimer = urand(4*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiFearTimer -= uiDiff; @@ -1008,7 +1008,7 @@ public: if (m_uiUnstableAfflictionTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_UNSTABLE_AFFLICTION); m_uiUnstableAfflictionTimer = urand(2*IN_MILLISECONDS, 10*IN_MILLISECONDS); } else m_uiUnstableAfflictionTimer -= uiDiff; @@ -1035,7 +1035,7 @@ public: DoCastVictim(SPELL_CURSE_OF_AGONY); break; case 5: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CURSE_OF_EXHAUSTION); break; } @@ -1065,14 +1065,14 @@ class mob_toc_mage : public CreatureScript public: mob_toc_mage() : CreatureScript("mob_toc_mage") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_mageAI (pCreature); } struct mob_toc_mageAI : public boss_faction_championsAI { - mob_toc_mageAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} + mob_toc_mageAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} uint32 m_uiCounterspellTimer; uint32 m_uiBlinkTimer; @@ -1097,7 +1097,7 @@ public: if (m_uiCounterspellTimer <= uiDiff) { - if (Unit *pTarget = SelectEnemyCaster(false)) + if (Unit* pTarget = SelectEnemyCaster(false)) DoCast(pTarget, SPELL_COUNTERSPELL); m_uiCounterspellTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiCounterspellTimer -= uiDiff; @@ -1121,7 +1121,7 @@ public: if (m_uiPolymorphTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_POLYMORPH); m_uiPolymorphTimer = urand(15*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiPolymorphTimer -= uiDiff; @@ -1168,14 +1168,14 @@ class mob_toc_hunter : public CreatureScript public: mob_toc_hunter() : CreatureScript("mob_toc_hunter") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_hunterAI (pCreature); } struct mob_toc_hunterAI : public boss_faction_championsAI { - mob_toc_hunterAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} + mob_toc_hunterAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED), Summons(me) {} SummonList Summons; @@ -1284,14 +1284,14 @@ class mob_toc_boomkin : public CreatureScript public: mob_toc_boomkin() : CreatureScript("mob_toc_boomkin") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_boomkinAI (pCreature); } struct mob_toc_boomkinAI : public boss_faction_championsAI { - mob_toc_boomkinAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} + mob_toc_boomkinAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_RANGED) {} uint32 m_uiBarkskinTimer; uint32 m_uiCycloneTimer; @@ -1323,14 +1323,14 @@ public: if (m_uiCycloneTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CYCLONE); m_uiCycloneTimer = urand(5*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiCycloneTimer -= uiDiff; if (m_uiEntanglingRootsTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ENTANGLING_ROOTS); m_uiEntanglingRootsTimer = urand(5*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiEntanglingRootsTimer -= uiDiff; @@ -1388,14 +1388,14 @@ class mob_toc_warrior : public CreatureScript public: mob_toc_warrior() : CreatureScript("mob_toc_warrior") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_warriorAI (pCreature); } struct mob_toc_warriorAI : public boss_faction_championsAI { - mob_toc_warriorAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_warriorAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} uint32 m_uiBladestormTimer; uint32 m_uiIntimidatingShoutTimer; @@ -1502,14 +1502,14 @@ class mob_toc_dk : public CreatureScript public: mob_toc_dk() : CreatureScript("mob_toc_dk") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_dkAI (pCreature); } struct mob_toc_dkAI : public boss_faction_championsAI { - mob_toc_dkAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_dkAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} uint32 m_uiIceboundFortitudeTimer; uint32 m_uiChainsOfIceTimer; @@ -1545,7 +1545,7 @@ public: if (m_uiChainsOfIceTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAINS_OF_ICE); m_uiChainsOfIceTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiChainsOfIceTimer -= uiDiff; @@ -1558,7 +1558,7 @@ public: if (m_uiStrangulateTimer <= uiDiff) { - if (Unit *pTarget = SelectEnemyCaster(false)) + if (Unit* pTarget = SelectEnemyCaster(false)) DoCast(pTarget, SPELL_STRANGULATE); m_uiStrangulateTimer = urand(10*IN_MILLISECONDS, 90*IN_MILLISECONDS); } else m_uiStrangulateTimer -= uiDiff; @@ -1604,14 +1604,14 @@ class mob_toc_rogue : public CreatureScript public: mob_toc_rogue() : CreatureScript("mob_toc_rogue") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_rogueAI (pCreature); } struct mob_toc_rogueAI : public boss_faction_championsAI { - mob_toc_rogueAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_rogueAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} uint32 m_uiFanOfKnivesTimer; uint32 m_uiHemorrhageTimer; @@ -1666,7 +1666,7 @@ public: if (m_uiBlindTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) if (me->IsInRange(pTarget, 0.0f, 15.0f, false)) DoCast(pTarget, SPELL_BLIND); m_uiBlindTimer = urand(7*IN_MILLISECONDS, 8*IN_MILLISECONDS); @@ -1703,14 +1703,14 @@ class mob_toc_enh_shaman : public CreatureScript public: mob_toc_enh_shaman() : CreatureScript("mob_toc_enh_shaman") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_enh_shamanAI (pCreature); } struct mob_toc_enh_shamanAI : public boss_faction_championsAI { - mob_toc_enh_shamanAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE), Summons(me) {} + mob_toc_enh_shamanAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE), Summons(me) {} SummonList Summons; @@ -1765,7 +1765,7 @@ public: */ } - void JustDied(Unit *pKiller) + void JustDied(Unit* pKiller) { boss_faction_championsAI::JustDied(pKiller); Summons.DespawnAll(); @@ -1837,14 +1837,14 @@ class mob_toc_retro_paladin : public CreatureScript public: mob_toc_retro_paladin() : CreatureScript("mob_toc_retro_paladin") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_retro_paladinAI (pCreature); } struct mob_toc_retro_paladinAI : public boss_faction_championsAI { - mob_toc_retro_paladinAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} + mob_toc_retro_paladinAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_MELEE) {} uint32 m_uiRepeteanceTimer; uint32 m_uiCrusaderStrikeTimer; @@ -1865,7 +1865,7 @@ public: SetEquipmentSlots(false, 47519, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit* pWho) { boss_faction_championsAI::EnterCombat(pWho); DoCast(SPELL_SEAL_OF_COMMAND); @@ -1877,7 +1877,7 @@ public: if (m_uiRepeteanceTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_REPENTANCE); m_uiRepeteanceTimer = 60*IN_MILLISECONDS; } else m_uiRepeteanceTimer -= uiDiff; @@ -1930,14 +1930,14 @@ class mob_toc_pet_warlock : public CreatureScript public: mob_toc_pet_warlock() : CreatureScript("mob_toc_pet_warlock") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_pet_warlockAI (pCreature); } struct mob_toc_pet_warlockAI : public boss_faction_championsAI { - mob_toc_pet_warlockAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} + mob_toc_pet_warlockAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} uint32 m_uiDevourMagicTimer; uint32 m_uiSpellLockTimer; @@ -1981,14 +1981,14 @@ class mob_toc_pet_hunter : public CreatureScript public: mob_toc_pet_hunter() : CreatureScript("mob_toc_pet_hunter") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_toc_pet_hunterAI (pCreature); } struct mob_toc_pet_hunterAI : public boss_faction_championsAI { - mob_toc_pet_hunterAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} + mob_toc_pet_hunterAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_PET) {} uint32 m_uiClawTimer; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 5dda6555bf1..6cdca10dde0 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -141,7 +141,7 @@ public: me->SetReactState(REACT_PASSIVE); } - void KilledUnit(Unit *pWho) + void KilledUnit(Unit* pWho) { if (pWho->GetTypeId() == TYPEID_PLAYER) { @@ -202,14 +202,14 @@ public: if (m_uiFelLightningTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_FEL_LIGHTING); m_uiFelLightningTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiFelLightningTimer -= uiDiff; if (m_uiIncinerateFleshTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) { DoScriptText(EMOTE_INCINERATE, me, pTarget); DoScriptText(SAY_INCINERATE, me); @@ -226,7 +226,7 @@ public: if (m_uiLegionFlameTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true)) { DoScriptText(EMOTE_LEGION_FLAME, me, pTarget); DoCast(pTarget, SPELL_LEGION_FLAME); @@ -236,7 +236,7 @@ public: if (GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC && m_uiTouchOfJaraxxusTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_TOUCH_OF_JARAXXUS); m_uiTouchOfJaraxxusTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else m_uiTouchOfJaraxxusTimer -= uiDiff; @@ -382,7 +382,7 @@ public: me->SetInCombatWithZone(); } - /*void SpellHitTarget(Unit *pTarget, const SpellEntry *pSpell) + /*void SpellHitTarget(Unit* pTarget, const SpellEntry *pSpell) { if (pSpell->Id == SPELL_FEL_STREAK) DoCastAOE(SPELL_FEL_INFERNO); //66517 @@ -398,7 +398,7 @@ public: if (m_uiFelStreakTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FEL_STREAK); m_uiFelStreakTimer = 30*IN_MILLISECONDS; } else m_uiFelStreakTimer -= uiDiff; @@ -534,14 +534,14 @@ public: if (m_uiSpinningStrikeTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) DoCast(pTarget, SPELL_SPINNING_STRIKE); m_uiSpinningStrikeTimer = 30*IN_MILLISECONDS; } else m_uiSpinningStrikeTimer -= uiDiff; if (IsHeroic() && m_uiMistressKissTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) DoCast(pTarget, SPELL_MISTRESS_KISS); m_uiMistressKissTimer = 30*IN_MILLISECONDS; } else m_uiMistressKissTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index ba8682d9452..0ff10a55ec9 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -265,7 +265,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit *pWho) + void EnterCombat(Unit* pWho) { m_uiTargetGUID = pWho->GetGUID(); me->TauntApply(pWho); @@ -293,7 +293,7 @@ public: void JustDied(Unit* /*pKiller*/) { - if (Unit *pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) + if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) if (pTarget->isAlive()) pTarget->RemoveAurasDueToSpell(SPELL_SNOBOLLED); if (m_pInstance) @@ -329,7 +329,7 @@ public: if (m_uiFireBombTimer < uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FIRE_BOMB); m_uiFireBombTimer = 20000; } @@ -337,7 +337,7 @@ public: if (m_uiBatterTimer < uiDiff) { - if (Unit *pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) + if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) DoCast(pTarget, SPELL_BATTER); m_uiBatterTimer = 10000; } @@ -345,7 +345,7 @@ public: if (m_uiHeadCrackTimer < uiDiff) { - if (Unit *pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) + if (Unit* pTarget = Unit::GetPlayer(*me, m_uiTargetGUID)) DoCast(pTarget, SPELL_HEAD_CRACK); m_uiHeadCrackTimer = 35000; } @@ -402,7 +402,7 @@ struct boss_jormungarAI : public ScriptedAI me->DespawnOrUnsummon(); } - void KilledUnit(Unit *pWho) + void KilledUnit(Unit* pWho) { if (pWho->GetTypeId() == TYPEID_PLAYER) { @@ -500,7 +500,7 @@ struct boss_jormungarAI : public ScriptedAI case 4: // Stationary if (sprayTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, spraySpell); sprayTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else sprayTimer -= uiDiff; @@ -644,7 +644,7 @@ public: struct mob_slime_poolAI : public ScriptedAI { - mob_slime_poolAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_slime_poolAI(Creature* pCreature) : ScriptedAI(pCreature) { } @@ -756,7 +756,7 @@ public: me->DespawnOrUnsummon(); } - void KilledUnit(Unit *pWho) + void KilledUnit(Unit* pWho) { if (pWho->GetTypeId() == TYPEID_PLAYER) { @@ -800,7 +800,7 @@ public: if (m_uiArticBreathTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCTIC_BREATH); m_uiArticBreathTimer = urand(25*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else m_uiArticBreathTimer -= uiDiff; @@ -825,7 +825,7 @@ public: m_uiStage = 2; break; case 2: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) { m_uiTrampleTargetGUID = pTarget->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, m_uiTrampleTargetGUID); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index daf306a6032..8092715d574 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -390,7 +390,7 @@ struct boss_twin_baseAI : public ScriptedAI if (IsHeroic() && m_uiTouchTimer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true, m_uiOtherEssenceSpellId)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true, m_uiOtherEssenceSpellId)) me->CastCustomSpell(m_uiTouchSpellId, SPELLVALUE_MAX_TARGETS, 1, pTarget, false); m_uiTouchTimer = urand(10, 15)*IN_MILLISECONDS; } @@ -578,7 +578,7 @@ class mob_essence_of_twin : public CreatureScript struct mob_unleashed_ballAI : public ScriptedAI { - mob_unleashed_ballAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_unleashed_ballAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); } @@ -630,20 +630,20 @@ class mob_unleashed_dark : public CreatureScript public: mob_unleashed_dark() : CreatureScript("mob_unleashed_dark") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_unleashed_darkAI(pCreature); } struct mob_unleashed_darkAI : public mob_unleashed_ballAI { - mob_unleashed_darkAI(Creature *pCreature) : mob_unleashed_ballAI(pCreature) {} + mob_unleashed_darkAI(Creature* pCreature) : mob_unleashed_ballAI(pCreature) {} void UpdateAI(const uint32 uiDiff) { if (m_uiRangeCheckTimer < uiDiff) { - if (Unit *pTarget = me->SelectNearestTarget(2.0f)) + if (Unit* pTarget = me->SelectNearestTarget(2.0f)) if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { DoCastAOE(SPELL_UNLEASHED_DARK); @@ -663,20 +663,20 @@ class mob_unleashed_light : public CreatureScript public: mob_unleashed_light() : CreatureScript("mob_unleashed_light") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new mob_unleashed_lightAI(pCreature); } struct mob_unleashed_lightAI : public mob_unleashed_ballAI { - mob_unleashed_lightAI(Creature *pCreature) : mob_unleashed_ballAI(pCreature) {} + mob_unleashed_lightAI(Creature* pCreature) : mob_unleashed_ballAI(pCreature) {} void UpdateAI(const uint32 uiDiff) { if (m_uiRangeCheckTimer < uiDiff) { - if (Unit *pTarget = me->SelectNearestTarget(2.0f)) + if (Unit* pTarget = me->SelectNearestTarget(2.0f)) if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { DoCastAOE(SPELL_UNLEASHED_LIGHT); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 9732c5f2a77..a53f9c340ed 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -114,9 +114,9 @@ class npc_announcer_toc10 : public CreatureScript void Reset() { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Creature *pAlly = GetClosestCreatureWithEntry(me, NPC_THRALL, 300.0f)) + if (Creature* pAlly = GetClosestCreatureWithEntry(me, NPC_THRALL, 300.0f)) pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Creature *pAlly = GetClosestCreatureWithEntry(me, NPC_PROUDMOORE, 300.0f)) + if (Creature* pAlly = GetClosestCreatureWithEntry(me, NPC_PROUDMOORE, 300.0f)) pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } @@ -237,7 +237,7 @@ class boss_lich_king_toc : public CreatureScript struct boss_lich_king_tocAI : public ScriptedAI { - boss_lich_king_tocAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_lich_king_tocAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index a92ed4abdb1..84028c90ba3 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -72,7 +72,7 @@ public: struct boss_novosAI : public Scripted_NoMovementAI { - boss_novosAI(Creature *c) : Scripted_NoMovementAI(c), lSummons(me) + boss_novosAI(Creature* c) : Scripted_NoMovementAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -131,7 +131,7 @@ public: { for (std::list<uint64>::const_iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr) { - if (GameObject *pTemp = pInstance->instance->GetGameObject(*itr)) + if (GameObject* pTemp = pInstance->instance->GetGameObject(*itr)) pTemp->SetGoState(GO_STATE_ACTIVE); } pInstance->SetData(DATA_NOVOS_EVENT, IN_PROGRESS); @@ -148,7 +148,7 @@ public: case PHASE_1: if (uiTimer <= diff) { - Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE, CREATURE_HULKING_CORPSE, CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); + Creature* pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE, CREATURE_HULKING_CORPSE, CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint); //If spell is casted stops casting arcane field so no spell casting //DoCast(me, SPELL_SUMMON_MINIONS); @@ -159,7 +159,7 @@ public: if (uiCrystalHandlerTimer <= diff) { DoScriptText(SAY_NECRO_ADD, me); - Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); + Creature* pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pCrystalHandler->GetMotionMaster()->MovePoint(0, AddDestinyPoint); uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiCrystalHandlerTimer -= diff; @@ -168,7 +168,7 @@ public: case PHASE_2: if (uiTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST, SPELL_BLIZZARD, SPELL_FROSTBOLT, SPELL_WRATH_OF_MISERY), RAND(H_SPELL_ARCANE_BLAST, H_SPELL_BLIZZARD, H_SPELL_FROSTBOLT, H_SPELL_WRATH_OF_MISERY))); uiTimer = urand(1*IN_MILLISECONDS, 3*IN_MILLISECONDS); @@ -193,7 +193,7 @@ public: DoScriptText(SAY_KILL, me); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon->GetEntry() == CREATURE_CRYSTAL_HANDLER) crystalHandlerAmount++; @@ -220,7 +220,7 @@ public: if (!luiCrystals.empty()) { if (pInstance) - if (GameObject *pTemp = pInstance->instance->GetGameObject(luiCrystals.back())) + if (GameObject* pTemp = pInstance->instance->GetGameObject(luiCrystals.back())) pTemp->SetGoState(GO_STATE_READY); luiCrystals.pop_back(); } @@ -241,7 +241,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_novosAI(creature); } @@ -260,7 +260,7 @@ public: struct mob_crystal_handlerAI : public ScriptedAI { - mob_crystal_handlerAI(Creature *c) : ScriptedAI(c) + mob_crystal_handlerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -298,13 +298,13 @@ public: { if (type != POINT_MOTION_TYPE || id != 0) return; - if (Creature *pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) - if (Unit *pTarget = CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->GetRandomTarget()) + if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) + if (Unit* pTarget = CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->GetRandomTarget()) AttackStart(pTarget); } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_crystal_handlerAI(creature); } @@ -317,7 +317,7 @@ public: struct mob_novos_minionAI : public ScriptedAI { - mob_novos_minionAI(Creature *c) : ScriptedAI(c) + mob_novos_minionAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -331,13 +331,13 @@ public: if (Creature* Novos = ObjectAccessor::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) { Novos->AI()->DoAction(ACTION_MINION_REACHED); - if (Unit *pTarget = CAST_AI(boss_novos::boss_novosAI, Novos->AI())->GetRandomTarget()) + if (Unit* pTarget = CAST_AI(boss_novos::boss_novosAI, Novos->AI())->GetRandomTarget()) AttackStart(pTarget); } } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_novos_minionAI(creature); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index f6f8624664b..5270a473771 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -71,7 +71,7 @@ public: struct boss_tharon_jaAI : public ScriptedAI { - boss_tharon_jaAI(Creature *c) : ScriptedAI(c) + boss_tharon_jaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -151,11 +151,11 @@ public: DoScriptText(RAND(SAY_FLESH_1, SAY_FLESH_2), me); me->SetDisplayId(MODEL_FLESH); - std::list<Unit *> playerList; + std::list<Unit* > playerList; SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true); for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { - Unit *pTemp = (*itr); + Unit* pTemp = (*itr); me->AddAura(SPELL_GIFT_OF_THARON_JA, pTemp); pTemp->SetDisplayId(MODEL_SKELETON); } @@ -206,11 +206,11 @@ public: uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); - std::list<Unit *> playerList; + std::list<Unit* > playerList; SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true); for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { - Unit *pTemp = (*itr); + Unit* pTemp = (*itr); if (pTemp->HasAura(SPELL_GIFT_OF_THARON_JA)) pTemp->RemoveAura(SPELL_GIFT_OF_THARON_JA); pTemp->DeMorph(); @@ -235,7 +235,7 @@ public: Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player *pPlayer = i->getSource()) + if (Player* pPlayer = i->getSource()) pPlayer->DeMorph(); pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK); @@ -244,7 +244,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_tharon_jaAI(creature); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 745c092b673..d7bcb04a7f6 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -61,7 +61,7 @@ public: struct boss_trollgoreAI : public ScriptedAI { - boss_trollgoreAI(Creature *c) : ScriptedAI(c), lSummons(me) + boss_trollgoreAI(Creature* c) : ScriptedAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -189,7 +189,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new boss_trollgoreAI(creature); } 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 c7f54e27191..734ee535031 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 @@ -123,7 +123,7 @@ class boss_devourer_of_souls : public CreatureScript struct boss_devourer_of_soulsAI : public BossAI { - boss_devourer_of_soulsAI(Creature *creature) : BossAI(creature, DATA_DEVOURER_EVENT) + boss_devourer_of_soulsAI(Creature* creature) : BossAI(creature, DATA_DEVOURER_EVENT) { } @@ -223,7 +223,7 @@ class boss_devourer_of_souls : public CreatureScript for (int8 i = 0; outroPositions[i].entry[entryIndex] != 0; ++i) { - if (Creature *summon = me->SummonCreature(outroPositions[i].entry[entryIndex], spawnPoint, TEMPSUMMON_DEAD_DESPAWN)) + if (Creature* summon = me->SummonCreature(outroPositions[i].entry[entryIndex], spawnPoint, TEMPSUMMON_DEAD_DESPAWN)) { summon->GetMotionMaster()->MovePoint(0, outroPositions[i].movePosition); if (summon->GetEntry() == NPC_JAINA_PART2) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 2bfdcbc60e2..3622de4cb66 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -57,7 +57,7 @@ public: struct boss_falricAI : public boss_horAI { - boss_falricAI(Creature *pCreature) : boss_horAI(pCreature) {} + boss_falricAI(Creature* pCreature) : boss_horAI(pCreature) {} uint8 uiHopelessnessCount; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 2f0e9f4703e..a4c4dc36e96 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -57,7 +57,7 @@ public: struct boss_marwynAI : public boss_horAI { - boss_marwynAI(Creature *pCreature) : boss_horAI(pCreature) {} + boss_marwynAI(Creature* pCreature) : boss_horAI(pCreature) {} void Reset() { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index ee914e9acb2..adeb289ad3b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -205,7 +205,7 @@ public: // AI of Part1: handle the intro till start of gauntlet event. struct npc_jaina_or_sylvanas_horAI : public ScriptedAI { - npc_jaina_or_sylvanas_horAI(Creature *pCreature) : ScriptedAI(pCreature) + npc_jaina_or_sylvanas_horAI(Creature* pCreature) : ScriptedAI(pCreature) { pInstance = me->GetInstanceScript(); } @@ -633,7 +633,7 @@ public: struct npc_ghostly_priestAI: public ScriptedAI { - npc_ghostly_priestAI(Creature *c) : ScriptedAI(c) + npc_ghostly_priestAI(Creature* c) : ScriptedAI(c) { } @@ -667,23 +667,23 @@ public: switch(eventId) { case EVENT_SHADOW_WORD_PAIN: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 8000); return; case EVENT_CIRCLE_OF_DESTRUCTION: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_CIRCLE_OF_DESTRUCTION); events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); return; case EVENT_COWER_IN_FEAR: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_COWER_IN_FEAR); events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10000); return; case EVENT_DARK_MENDING: // find an ally with missing HP - if (Unit *pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000, 50000))) + if (Unit* pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000, 50000))) { DoCast(pTarget, SPELL_DARK_MENDING); events.ScheduleEvent(EVENT_DARK_MENDING, 20000); @@ -715,7 +715,7 @@ public: struct npc_phantom_mageAI: public ScriptedAI { - npc_phantom_mageAI(Creature *c) : ScriptedAI(c) + npc_phantom_mageAI(Creature* c) : ScriptedAI(c) { } @@ -750,7 +750,7 @@ public: switch(eventId) { case EVENT_FIREBALL: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_FIREBALL); events.ScheduleEvent(EVENT_FIREBALL, 15000); return; @@ -759,12 +759,12 @@ public: events.ScheduleEvent(EVENT_FLAMESTRIKE, 15000); return; case EVENT_FROSTBOLT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_FROSTBOLT); events.ScheduleEvent(EVENT_FROSTBOLT, 15000); return; case EVENT_CHAINS_OF_ICE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_CHAINS_OF_ICE); events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 15000); return; @@ -792,7 +792,7 @@ public: struct npc_phantom_hallucinationAI : public npc_phantom_mage::npc_phantom_mageAI { - npc_phantom_hallucinationAI(Creature *c) : npc_phantom_mage::npc_phantom_mageAI(c) + npc_phantom_hallucinationAI(Creature* c) : npc_phantom_mage::npc_phantom_mageAI(c) { } @@ -816,7 +816,7 @@ public: struct npc_shadowy_mercenaryAI: public ScriptedAI { - npc_shadowy_mercenaryAI(Creature *c) : ScriptedAI(c) + npc_shadowy_mercenaryAI(Creature* c) : ScriptedAI(c) { } @@ -858,7 +858,7 @@ public: events.ScheduleEvent(EVENT_DEADLY_POISON, 10000); return; case EVENT_ENVENOMED_DAGGER_THROW: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_ENVENOMED_DAGGER_THROW); events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); return; @@ -887,7 +887,7 @@ public: struct npc_spectral_footmanAI: public ScriptedAI { - npc_spectral_footmanAI(Creature *c) : ScriptedAI(c) + npc_spectral_footmanAI(Creature* c) : ScriptedAI(c) { } @@ -952,7 +952,7 @@ public: struct npc_tortured_riflemanAI : public ScriptedAI { - npc_tortured_riflemanAI(Creature *c) : ScriptedAI(c) + npc_tortured_riflemanAI(Creature* c) : ScriptedAI(c) { } @@ -986,12 +986,12 @@ public: switch(eventId) { case EVENT_SHOOT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_SHOOT); events.ScheduleEvent(EVENT_SHOOT, 2000); return; case EVENT_CURSED_ARROW: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_CURSED_ARROW); events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); return; @@ -1000,7 +1000,7 @@ public: events.ScheduleEvent(EVENT_FROST_TRAP, 30000); return; case EVENT_ICE_SHOT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_ICE_SHOT); events.ScheduleEvent(EVENT_ICE_SHOT, 15000); return; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index fa31154e86c..c433ec28cfe 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -79,7 +79,7 @@ enum Actions // handled the summonList and the notification events to/from the InstanceScript struct boss_horAI : ScriptedAI { - boss_horAI(Creature *pCreature) : ScriptedAI(pCreature), summons(pCreature) + boss_horAI(Creature* pCreature) : ScriptedAI(pCreature), summons(pCreature) { pInstance = me->GetInstanceScript(); } @@ -114,7 +114,7 @@ struct boss_horAI : ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_AGGRESSIVE); - if (Unit *pUnit = me->SelectNearestTarget()) + if (Unit* pUnit = me->SelectNearestTarget()) AttackStart(pUnit); DoZoneInCombat(); @@ -122,11 +122,11 @@ struct boss_horAI : ScriptedAI } } - void JustSummoned(Creature *pSummoned) + void JustSummoned(Creature* pSummoned) { summons.Summon(pSummoned); - if (Unit *pUnit = pSummoned->SelectNearestTarget()) + if (Unit* pUnit = pSummoned->SelectNearestTarget()) { if (pSummoned->AI()) pSummoned->AI()->AttackStart(pUnit); @@ -141,7 +141,7 @@ struct boss_horAI : ScriptedAI pSummoned->AI()->DoZoneInCombat(); } - void SummonedCreatureDespawn(Creature *pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { summons.Despawn(pSummoned); if (summons.empty()) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index bc51481acc5..1a3a2802327 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -83,7 +83,7 @@ class boss_garfrost : public CreatureScript struct boss_garfrostAI : public BossAI { - boss_garfrostAI(Creature *creature) : BossAI(creature, DATA_GARFROST) + boss_garfrostAI(Creature* creature) : BossAI(creature, DATA_GARFROST) { } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 1c454738484..4b84b3ae9b3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -136,7 +136,7 @@ class boss_ick : public CreatureScript struct boss_ickAI : public BossAI { - boss_ickAI(Creature *creature) : BossAI(creature, DATA_ICK), _vehicle(creature->GetVehicleKit()) + boss_ickAI(Creature* creature) : BossAI(creature, DATA_ICK), _vehicle(creature->GetVehicleKit()) { ASSERT(_vehicle); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 3e0a35cd1ca..663c2b0fcc6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -114,7 +114,7 @@ class mob_iceborn_protodrake : public CreatureScript struct mob_iceborn_protodrakeAI: public ScriptedAI { - mob_iceborn_protodrakeAI(Creature *creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit()) + mob_iceborn_protodrakeAI(Creature* creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit()) { ASSERT(_vehicle); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index b7ecb36e8a6..b4f5b9f8865 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -41,7 +41,7 @@ public: struct boss_eckAI : public ScriptedAI { - boss_eckAI(Creature *c) : ScriptedAI(c) + boss_eckAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -145,7 +145,7 @@ public: struct npc_ruins_dwellerAI : public ScriptedAI { - npc_ruins_dwellerAI(Creature *c) : ScriptedAI(c) + npc_ruins_dwellerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 96f7fb200a5..b20be83b52e 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -75,7 +75,7 @@ public: struct boss_gal_darahAI : public ScriptedAI { - boss_gal_darahAI(Creature *c) : ScriptedAI(c) + boss_gal_darahAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 660cf571c68..eba80c176d3 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -50,7 +50,7 @@ class boss_moorabi : public CreatureScript public: boss_moorabi() : CreatureScript("boss_moorabi") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new boss_moorabiAI(pCreature); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 5fc1f5d5f07..25e13b79dd9 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -77,7 +77,7 @@ public: struct boss_slad_ranAI : public ScriptedAI { - boss_slad_ranAI(Creature *c) : ScriptedAI(c), lSummons(me) + boss_slad_ranAI(Creature* c) : ScriptedAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -202,7 +202,7 @@ public: struct mob_slad_ran_constrictorAI : public ScriptedAI { - mob_slad_ran_constrictorAI(Creature *c) : ScriptedAI(c) {} + mob_slad_ran_constrictorAI(Creature* c) : ScriptedAI(c) {} uint32 uiGripOfSladRanTimer; @@ -239,7 +239,7 @@ public: struct mob_slad_ran_viperAI : public ScriptedAI { - mob_slad_ran_viperAI(Creature *c) : ScriptedAI(c) {} + mob_slad_ran_viperAI(Creature* c) : ScriptedAI(c) {} uint32 uiVenomousBiteTimer; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index e7999b1ec3d..488bd83fb26 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -63,7 +63,7 @@ public: struct boss_anubrekhanAI : public BossAI { - boss_anubrekhanAI(Creature *c) : BossAI(c, BOSS_ANUBREKHAN) {} + boss_anubrekhanAI(Creature* c) : BossAI(c, BOSS_ANUBREKHAN) {} bool hasTaunted; @@ -99,7 +99,7 @@ public: DoScriptText(SAY_SLAY, me); } - void JustDied(Unit *) + void JustDied(Unit* ) { _JustDied(); @@ -119,7 +119,7 @@ public: events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000, 20000)); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!hasTaunted && me->IsWithinDistInMap(who, 60.0f) && who->GetTypeId() == TYPEID_PLAYER) { @@ -129,7 +129,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { BossAI::SummonedCreatureDespawn(summon); @@ -155,7 +155,7 @@ public: //Cast Impale on a random target //Do NOT cast it when we are afflicted by locust swarm if (!me->HasAura(RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25))) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10, SPELL_IMPALE_25)); events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000)); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 2be01e72177..99b4aba247f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -89,7 +89,7 @@ public: struct boss_four_horsemenAI : public BossAI { - boss_four_horsemenAI(Creature *c) : BossAI(c, BOSS_HORSEMEN) + boss_four_horsemenAI(Creature* c) : BossAI(c, BOSS_HORSEMEN) { id = Horsemen(0); for (uint8 i = 0; i < 4; ++i) @@ -131,15 +131,15 @@ public: _Reset(); } - bool DoEncounterAction(Unit *who, bool attack, bool reset, bool checkAllDead) + bool DoEncounterAction(Unit* who, bool attack, bool reset, bool checkAllDead) { if (!instance) return false; - Creature *Thane = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_THANE))); - Creature *Lady = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_LADY))); - Creature *Baron = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_BARON))); - Creature *Sir = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_SIR))); + Creature* Thane = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_THANE))); + Creature* Lady = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_LADY))); + Creature* Baron = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_BARON))); + Creature* Sir = CAST_CRE(Unit::GetUnit(*me, instance->GetData64(DATA_SIR))); if (Thane && Lady && Baron && Sir) { @@ -224,7 +224,7 @@ public: movementCompleted = true; me->SetReactState(REACT_AGGRESSIVE); - Unit *eventStarter = Unit::GetUnit(*me, uiEventStarterGUID); + Unit* eventStarter = Unit::GetUnit(*me, uiEventStarterGUID); if (eventStarter && me->canAttack(eventStarter)) AttackStart(eventStarter); @@ -248,7 +248,7 @@ public: } // switch to "who" if nearer than current target. - void SelectNearestTarget(Unit *who) + void SelectNearestTarget(Unit* who) { if (me->getVictim() && me->GetDistanceOrder(who, me->getVictim()) && me->canAttack(who)) { @@ -257,14 +257,14 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { BossAI::MoveInLineOfSight(who); if (caster) SelectNearestTarget(who); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!movementCompleted && !movementStarted) { @@ -361,7 +361,7 @@ public: if (caster) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) DoCast(pTarget, SPELL_PRIMARY(id)); } else diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 6c7eab3cbbe..cf08338024b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -57,13 +57,13 @@ public: struct boss_gluthAI : public BossAI { - boss_gluthAI(Creature *c) : BossAI(c, BOSS_GLUTH) + boss_gluthAI(Creature* c) : BossAI(c, BOSS_GLUTH) { // Do not let Gluth be affected by zombies' debuff me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_INFECTED_WOUND, true); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (who->GetEntry() == MOB_ZOMBIE && me->IsWithinDistInMap(who, 7)) { @@ -85,7 +85,7 @@ public: events.ScheduleEvent(EVENT_SUMMON, 15000); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon->GetEntry() == MOB_ZOMBIE) summon->AI()->AttackStart(me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 209a0391736..34bedfc2574 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -225,7 +225,7 @@ class boss_gothik : public CreatureScript summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { summons.Despawn(summon); } @@ -357,7 +357,7 @@ class boss_gothik : public CreatureScript if (spellId && me->isInCombat()) { me->HandleEmoteCommand(EMOTE_ONESHOT_SPELLCAST); - if (Creature *pRandomDeadTrigger = Unit::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD])) + if (Creature* pRandomDeadTrigger = Unit::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD])) me->CastSpell(pRandomDeadTrigger, spellId, true); } } @@ -469,7 +469,7 @@ class boss_gothik : public CreatureScript DoTeleportTo(PosGroundLiveSide); me->getThreatManager().resetAggro(NotOnSameSide(me)); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0)) { me->getThreatManager().addThreat(pTarget, 100.0f); AttackStart(pTarget); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index a5ccbd2f6a5..8b1f52dfb31 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -45,7 +45,7 @@ public: struct boss_grobbulusAI : public BossAI { - boss_grobbulusAI(Creature *c) : BossAI(c, BOSS_GROBBULUS) + boss_grobbulusAI(Creature* c) : BossAI(c, BOSS_GROBBULUS) { me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_POISON_CLOUD_ADD, true); } @@ -59,7 +59,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 12*60000); } - void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) { if (spell->Id == uint32(SPELL_SLIME_SPRAY)) { @@ -91,7 +91,7 @@ public: events.ScheduleEvent(EVENT_SPRAY, 15000+rand()%15000); return; case EVENT_INJECT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) if (!pTarget->HasAura(SPELL_MUTATING_INJECTION)) DoCast(pTarget, SPELL_MUTATING_INJECTION); events.ScheduleEvent(EVENT_INJECT, 8000 + uint32(120 * me->GetHealthPct())); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 4fd35ab2cfc..6498e1d5556 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -57,7 +57,7 @@ public: struct boss_heiganAI : public BossAI { - boss_heiganAI(Creature *c) : BossAI(c, BOSS_HEIGAN) {} + boss_heiganAI(Creature* c) : BossAI(c, BOSS_HEIGAN) {} uint32 eruptSection; bool eruptDirection; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index f2e0bf6e503..31ef9460297 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -302,7 +302,7 @@ public: FindGameObjects(); - if (GameObject *pKTTrigger = me->GetMap()->GetGameObject(KTTriggerGUID)) + if (GameObject* pKTTrigger = me->GetMap()->GetGameObject(KTTriggerGUID)) { pKTTrigger->ResetDoorOrButton(); pKTTrigger->SetPhaseMask(1, true); @@ -310,7 +310,7 @@ public: for (uint8 i = 0; i <= 3; ++i) { - if (GameObject *pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) + if (GameObject* pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) { if (!((pPortal->getLootState() == GO_READY) || (pPortal->getLootState() == GO_NOT_READY))) pPortal->ResetDoorOrButton(); @@ -352,7 +352,7 @@ public: FindGameObjects(); for (uint8 i = 0; i <= 3; ++i) { - if (GameObject *pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) + if (GameObject* pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) pPortal->ResetDoorOrButton(); } DoCast(me, SPELL_KELTHUZAD_CHANNEL, false); @@ -415,7 +415,7 @@ public: events.PopEvent(); break; case EVENT_TRIGGER: - if (GameObject *pKTTrigger = me->GetMap()->GetGameObject(KTTriggerGUID)) + if (GameObject* pKTTrigger = me->GetMap()->GetGameObject(KTTriggerGUID)) pKTTrigger->SetPhaseMask(2, true); events.PopEvent(); break; @@ -457,7 +457,7 @@ public: for (uint8 i = 0; i <= 3; ++i) { - if (GameObject *pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) + if (GameObject* pPortal = me->GetMap()->GetGameObject(PortalsGUID[i])) { if (pPortal->getLootState() == GO_READY) pPortal->UseDoorOrButton(); @@ -498,7 +498,7 @@ public: uint32 count = urand(1, 3); for (uint8 i = 1; i <= count; i++) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); if (pTarget && !pTarget->isCharmed() && (chained.find(pTarget->GetGUID()) == chained.end())) { DoCast(pTarget, SPELL_CHAINS_OF_KELTHUZAD); @@ -530,7 +530,7 @@ public: continue; } - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, NotCharmedTargetSelector())) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, NotCharmedTargetSelector())) { switch(player->getClass()) { @@ -616,12 +616,12 @@ public: break; } case EVENT_FISSURE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_FISURE); events.RepeatEvent(urand(10000, 45000)); break; case EVENT_BLAST: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) DoCast(pTarget, SPELL_FROST_BLAST); if (rand()%2) DoScriptText(SAY_FROST_BLAST, me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index de5f3cdd1be..8ee21526b7d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -48,7 +48,7 @@ public: struct boss_loathebAI : public BossAI { - boss_loathebAI(Creature *c) : BossAI(c, BOSS_LOATHEB) {} + boss_loathebAI(Creature* c) : BossAI(c, BOSS_LOATHEB) {} void EnterCombat(Unit* /*who*/) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 4f9d853e9f4..c6a8e45c472 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -68,7 +68,7 @@ public: struct boss_maexxnaAI : public BossAI { - boss_maexxnaAI(Creature *c) : BossAI(c, BOSS_MAEXXNA) {} + boss_maexxnaAI(Creature* c) : BossAI(c, BOSS_MAEXXNA) {} bool enraged; @@ -104,12 +104,12 @@ public: // TODO : Add missing text for (uint8 i = 0; i < RAID_MODE(1, 2); ++i) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) { pTarget->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); uint8 pos = rand()%MAX_POS_WRAP; pTarget->GetMotionMaster()->MoveJump(PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 20, 20); - if (Creature *wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) wrap->AI()->SetGUID(pTarget->GetGUID()); } } @@ -159,7 +159,7 @@ public: struct mob_webwrapAI : public NullCreatureAI { - mob_webwrapAI(Creature *c) : NullCreatureAI(c), victimGUID(0) {} + mob_webwrapAI(Creature* c) : NullCreatureAI(c), victimGUID(0) {} uint64 victimGUID; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 21d8a1af44c..740c477c69a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -75,7 +75,7 @@ public: struct boss_nothAI : public BossAI { - boss_nothAI(Creature *c) : BossAI(c, BOSS_NOTH) {} + boss_nothAI(Creature* c) : BossAI(c, BOSS_NOTH) {} uint32 waveCount, balconyCount; @@ -117,7 +117,7 @@ public: DoScriptText(SAY_SLAY, me); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { summons.Summon(summon); summon->setActive(true); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 3906528a1a0..fadc4171ed9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -62,7 +62,7 @@ public: struct boss_patchwerkAI : public BossAI { - boss_patchwerkAI(Creature *c) : BossAI(c, BOSS_PATCHWERK) {} + boss_patchwerkAI(Creature* c) : BossAI(c, BOSS_PATCHWERK) {} bool Enraged; @@ -118,7 +118,7 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit *pTarget = (*i)->getTarget(); + Unit* pTarget = (*i)->getTarget(); if (pTarget->isAlive() && pTarget != me->getVictim() && pTarget->GetHealth() > MostHP && me->IsWithinMeleeRange(pTarget)) { MostHP = pTarget->GetHealth(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 5b0420cd3bc..c934334604d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -64,7 +64,7 @@ public: struct boss_razuviousAI : public BossAI { - boss_razuviousAI(Creature *c) : BossAI(c, BOSS_RAZUVIOUS) {} + boss_razuviousAI(Creature* c) : BossAI(c, BOSS_RAZUVIOUS) {} void KilledUnit(Unit* /*victim*/) { @@ -118,7 +118,7 @@ public: events.ScheduleEvent(EVENT_SHOUT, 25000); return; case EVENT_KNIFE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) DoCast(pTarget, SPELL_JAGGED_KNIFE); events.ScheduleEvent(EVENT_KNIFE, 10000); return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 916e096be92..825bd74c1e0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -132,14 +132,14 @@ public: CheckPlayersFrostResist(); } - void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) { if (spell->Id == SPELL_ICEBOLT) { IceBlockMap::iterator itr = iceblocks.find(pTarget->GetGUID()); if (itr != iceblocks.end() && !itr->second) { - if (GameObject *iceblock = me->SummonGameObject(GO_ICEBLOCK, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, 0, 0, 0, 0, 25000)) + if (GameObject* iceblock = me->SummonGameObject(GO_ICEBLOCK, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, 0, 0, 0, 0, 25000)) itr->second = iceblock->GetGUID(); } } @@ -265,7 +265,7 @@ public: case EVENT_BLIZZARD: { //DoCastAOE(SPELL_SUMMON_BLIZZARD); - if (Creature *pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) + if (Creature* pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) pSummon->GetMotionMaster()->MoveRandom(40); events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000, 7000), 0, PHASE_GROUND); break; @@ -360,7 +360,7 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit *pTarget = (*i)->getTarget(); + Unit* pTarget = (*i)->getTarget(); if (pTarget->GetTypeId() != TYPEID_PLAYER) continue; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 6d6c824e04b..23de7c4afa4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -106,7 +106,7 @@ public: struct boss_thaddiusAI : public BossAI { - boss_thaddiusAI(Creature *c) : BossAI(c, BOSS_THADDIUS) + boss_thaddiusAI(Creature* c) : BossAI(c, BOSS_THADDIUS) { // init is a bit tricky because thaddius shall track the life of both adds, but not if there was a wipe // and, in particular, if there was a crash after both adds were killed (should not respawn) @@ -114,11 +114,11 @@ public: // Moreover, the adds may not yet be spawn. So just track down the status if mob is spawn // and each mob will send its status at reset (meaning that it is alive) checkFeugenAlive = false; - if (Creature *pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) + if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) checkFeugenAlive = pFeugen->isAlive(); checkStalaggAlive = false; - if (Creature *pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) + if (Creature* pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) checkStalaggAlive = pStalagg->isAlive(); if (!checkFeugenAlive && !checkStalaggAlive) @@ -207,13 +207,13 @@ public: if (!checkStalaggAlive) { if (instance) - if (Creature *pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) + if (Creature* pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) pStalagg->Respawn(); } else { if (instance) - if (Creature *pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) + if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) pFeugen->Respawn(); } } @@ -266,7 +266,7 @@ public: struct mob_stalaggAI : public ScriptedAI { - mob_stalaggAI(Creature *c) : ScriptedAI(c) + mob_stalaggAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -279,7 +279,7 @@ public: void Reset() { if (pInstance) - if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_STALAGG_RESET); powerSurgeTimer = urand(20000, 25000); @@ -294,7 +294,7 @@ public: void JustDied(Unit* /*killer*/) { if (pInstance) - if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_STALAGG_DIED); } @@ -306,7 +306,7 @@ public: if (magneticPullTimer <= uiDiff) { - if (Creature *pFeugen = me->GetCreature(*me, pInstance->GetData64(DATA_FEUGEN))) + if (Creature* pFeugen = me->GetCreature(*me, pInstance->GetData64(DATA_FEUGEN))) { Unit* pStalaggVictim = me->getVictim(); Unit* pFeugenVictim = pFeugen->getVictim(); @@ -352,7 +352,7 @@ public: struct mob_feugenAI : public ScriptedAI { - mob_feugenAI(Creature *c) : ScriptedAI(c) + mob_feugenAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -364,7 +364,7 @@ public: void Reset() { if (pInstance) - if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_FEUGEN_RESET); staticFieldTimer = 5000; @@ -378,7 +378,7 @@ public: void JustDied(Unit* /*killer*/) { if (pInstance) - if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_FEUGEN_DIED); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 98f821eb153..abe4d4ce7be 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -235,7 +235,7 @@ class mob_chaotic_rift : public CreatureScript if (uiSummonCrazedManaWraithTimer <= diff) { if (Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX() + 1, me->GetPositionY() + 1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) Wraith->AI()->AttackStart(pTarget); Creature* Anomalus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ANOMALUS)); if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD)) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index c0949cb03fe..adb8e1d1376 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -61,7 +61,7 @@ public: struct boss_keristraszaAI : public ScriptedAI { - boss_keristraszaAI(Creature *c) : ScriptedAI(c) + boss_keristraszaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -125,7 +125,7 @@ public: auiContainmentSphereGUIDs[1] = pInstance->GetData64(ORMOROKS_CONTAINMET_SPHERE); auiContainmentSphereGUIDs[2] = pInstance->GetData64(TELESTRAS_CONTAINMET_SPHERE); - GameObject *ContainmentSpheres[DATA_CONTAINMENT_SPHERES]; + GameObject* ContainmentSpheres[DATA_CONTAINMENT_SPHERES]; for (uint8 i = 0; i < DATA_CONTAINMENT_SPHERES; ++i) { @@ -192,7 +192,7 @@ public: DoScriptText(SAY_CRYSTAL_NOVA, me); if (IsHeroic()) DoCast(me, SPELL_CRYSTALIZE); - else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + else if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CRYSTAL_CHAINS); uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); } else uiCrystalChainsCrystalizeTimer -= diff; @@ -208,11 +208,11 @@ class containment_sphere : public GameObjectScript public: containment_sphere() : GameObjectScript("containment_sphere") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); - Creature *pKeristrasza = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_KERISTRASZA) : 0); + Creature* pKeristrasza = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_KERISTRASZA) : 0); if (pKeristrasza && pKeristrasza->isAlive()) { // maybe these are hacks :( diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 3440ba0a028..db83efd695e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -184,14 +184,14 @@ public: break; } } - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) Summoned->AI()->AttackStart(pTarget); return Summoned->GetGUID(); } return 0; } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { if (summon->isAlive()) return; @@ -303,7 +303,7 @@ public: if (uiIceNovaTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_ICE_NOVA, false); uiCooldown = 1500; @@ -313,7 +313,7 @@ public: if (uiGravityWellTimer <= diff) { - if (Unit *pTarget = me->getVictim()) + if (Unit* pTarget = me->getVictim()) { DoCast(pTarget, SPELL_GRAVITY_WELL); uiCooldown = 6*IN_MILLISECONDS; @@ -323,7 +323,7 @@ public: if (uiFireBombTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_FIREBOMB, false); uiCooldown = 2*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index aff5f15c923..ef9ccb39a36 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -61,7 +61,7 @@ public: struct boss_ormorokAI : public ScriptedAI { - boss_ormorokAI(Creature *c) : ScriptedAI(c) + boss_ormorokAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -181,7 +181,7 @@ public: Creature* Crystalline_Tangler = me->SummonCreature(MOB_CRYSTALLINE_TANGLER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); if (Crystalline_Tangler) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; uint8 Healer = 0; for (uint8 j = 1; j <= 4; j++) { @@ -234,7 +234,7 @@ public: struct mob_crystal_spikeAI : public Scripted_NoMovementAI { - mob_crystal_spikeAI(Creature *c) : Scripted_NoMovementAI(c) + mob_crystal_spikeAI(Creature* c) : Scripted_NoMovementAI(c) { } @@ -277,7 +277,7 @@ public: struct mob_crystalline_tanglerAI : public ScriptedAI { - mob_crystalline_tanglerAI(Creature *c) : ScriptedAI(c) {} + mob_crystalline_tanglerAI(Creature* c) : ScriptedAI(c) {} uint32 uiRootsTimer; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp index 12bf5dec0fc..0a82eb4d778 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp @@ -49,7 +49,7 @@ public: struct boss_commander_kolurgAI : public ScriptedAI { - boss_commander_kolurgAI(Creature *c) : ScriptedAI(c) {} + boss_commander_kolurgAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp index 4d68eb61cc6..365db104337 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp @@ -49,7 +49,7 @@ public: struct boss_commander_stoutbeardAI : public ScriptedAI { - boss_commander_stoutbeardAI(Creature *c) : ScriptedAI(c) {} + boss_commander_stoutbeardAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 54cdc46245b..36aef9c7100 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -93,7 +93,7 @@ public: struct boss_bjarngrimAI : public ScriptedAI { - boss_bjarngrimAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_bjarngrimAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = pCreature->GetInstanceScript(); m_uiStance = STANCE_DEFENSIVE; @@ -369,7 +369,7 @@ public: struct mob_stormforged_lieutenantAI : public ScriptedAI { - mob_stormforged_lieutenantAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_stormforged_lieutenantAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = pCreature->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index fb2432e6f26..d10d9946e24 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -78,7 +78,7 @@ public: struct boss_ionarAI : public ScriptedAI { - boss_ionarAI(Creature *pCreature) : ScriptedAI(pCreature), lSparkList(pCreature) + boss_ionarAI(Creature* pCreature) : ScriptedAI(pCreature), lSparkList(pCreature) { pInstance = pCreature->GetInstanceScript(); } @@ -209,7 +209,7 @@ public: } } - void SummonedCreatureDespawn(Creature *pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR) lSparkList.Despawn(pSummoned); @@ -308,7 +308,7 @@ public: struct mob_spark_of_ionarAI : public ScriptedAI { - mob_spark_of_ionarAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_spark_of_ionarAI(Creature* pCreature) : ScriptedAI(pCreature) { pInstance = pCreature->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 700df86881f..0021658eb41 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -81,7 +81,7 @@ public: struct boss_volkhanAI : public ScriptedAI { - boss_volkhanAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_volkhanAI(Creature* pCreature) : ScriptedAI(pCreature) { m_pInstance = pCreature->GetInstanceScript(); } @@ -378,7 +378,7 @@ public: struct mob_molten_golemAI : public ScriptedAI { - mob_molten_golemAI(Creature *pCreature) : ScriptedAI(pCreature) { } + mob_molten_golemAI(Creature* pCreature) : ScriptedAI(pCreature) { } bool m_bIsFrozen; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index eaf9f71f6fe..0ab8eff0d58 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -61,7 +61,7 @@ public: struct boss_krystallusAI : public ScriptedAI { - boss_krystallusAI(Creature *c) : ScriptedAI(c) + boss_krystallusAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 235a36e661a..0fb965bde55 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -65,7 +65,7 @@ public: struct boss_maiden_of_griefAI : public ScriptedAI { - boss_maiden_of_griefAI(Creature *c) : ScriptedAI(c) + boss_maiden_of_griefAI(Creature* c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } @@ -97,7 +97,7 @@ public: if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); @@ -119,7 +119,7 @@ public: { if (PartingSorrowTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_PARTING_SORROW); @@ -144,7 +144,7 @@ public: if (PillarOfWoeTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) DoCast(pTarget, SPELL_PILLAR_OF_WOE_N); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 808f0d6a8e0..18d336582b6 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -90,7 +90,7 @@ public: struct boss_sjonnirAI : public ScriptedAI { - boss_sjonnirAI(Creature *c) : ScriptedAI(c), lSummons(me) + boss_sjonnirAI(Creature* c) : ScriptedAI(c), lSummons(me) { pInstance = c->GetInstanceScript(); } @@ -137,7 +137,7 @@ public: if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); @@ -258,7 +258,7 @@ public: struct mob_malformed_oozeAI : public ScriptedAI { - mob_malformed_oozeAI(Creature *c) : ScriptedAI(c) {} + mob_malformed_oozeAI(Creature* c) : ScriptedAI(c) {} uint32 uiMergeTimer; @@ -301,7 +301,7 @@ public: struct mob_iron_sludgeAI : public ScriptedAI { - mob_iron_sludgeAI(Creature *c) : ScriptedAI(c) + mob_iron_sludgeAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 2af26df3829..7c73f1900ff 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -142,7 +142,7 @@ public: struct mob_tribuna_controllerAI : public ScriptedAI { - mob_tribuna_controllerAI(Creature *c) : ScriptedAI(c) + mob_tribuna_controllerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); SetCombatMovement(false); @@ -217,7 +217,7 @@ public: if (!KaddrakGUIDList.empty()) for (std::list<uint64>::const_iterator itr = KaddrakGUIDList.begin(); itr != KaddrakGUIDList.end(); ++itr) { - if (Creature *pKaddrak = Unit::GetCreature(*me, *itr)) + if (Creature* pKaddrak = Unit::GetCreature(*me, *itr)) { if (pKaddrak->isAlive()) pKaddrak->CastSpell(pTarget, DUNGEON_MODE(SPELL_GLARE_OF_THE_TRIBUNAL, H_SPELL_GLARE_OF_THE_TRIBUNAL), true); @@ -298,7 +298,7 @@ public: struct npc_brann_hosAI : public npc_escortAI { - npc_brann_hosAI(Creature *c) : npc_escortAI(c) + npc_brann_hosAI(Creature* c) : npc_escortAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 3003ebc2b7f..878f1213571 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -81,7 +81,7 @@ public: struct boss_algalonAI : public ScriptedAI { - boss_algalonAI(Creature *c) : ScriptedAI(c) + boss_algalonAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); Summon = false; // not in reset. intro speech done only once. @@ -340,7 +340,7 @@ public: struct mob_collapsing_starAI : public ScriptedAI { - mob_collapsing_starAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_collapsing_starAI(Creature* pCreature) : ScriptedAI(pCreature) { pInstance = pCreature->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index 30a1299ae57..d19a44bc2a1 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -204,7 +204,7 @@ class boss_kologarn : public CreatureScript } } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { switch (summon->GetEntry()) { @@ -364,7 +364,7 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader }; // predicate function to select non main tank target -class StoneGripTargetSelector : public std::unary_function<Unit *, bool> +class StoneGripTargetSelector : public std::unary_function<Unit* , bool> { public: StoneGripTargetSelector(Creature* me, Unit const* victim) : _me(me), _victim(victim) {} diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 73ba394e1e2..26f3abbd00b 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -188,7 +188,7 @@ class boss_xt002 : public CreatureScript struct boss_xt002_AI : public BossAI { - boss_xt002_AI(Creature *pCreature) : BossAI(pCreature, BOSS_XT002) + boss_xt002_AI(Creature* pCreature) : BossAI(pCreature, BOSS_XT002) { } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 5938b09e9da..45445d57bf9 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -83,7 +83,7 @@ public: struct boss_ingvar_the_plundererAI : public ScriptedAI { - boss_ingvar_the_plundererAI(Creature *c) : ScriptedAI(c) + boss_ingvar_the_plundererAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -242,7 +242,7 @@ public: if (!me->HasUnitState(UNIT_STAT_CASTING)) { // Spawn target for Axe - Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget) { me->SummonCreature(ENTRY_THROW_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2000); @@ -296,7 +296,7 @@ public: struct mob_annhylde_the_callerAI : public ScriptedAI { - mob_annhylde_the_callerAI(Creature *c) : ScriptedAI(c) + mob_annhylde_the_callerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -409,7 +409,7 @@ public: struct mob_ingvar_throw_dummyAI : public ScriptedAI { - mob_ingvar_throw_dummyAI(Creature *c) : ScriptedAI(c) + mob_ingvar_throw_dummyAI(Creature* c) : ScriptedAI(c) { } @@ -417,7 +417,7 @@ public: void Reset() { - Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET, 50); + Unit* pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET, 50); if (pTarget) { DoCast(me, SPELL_SHADOW_AXE_DAMAGE); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 0e7e5b1700b..e2705969544 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -72,7 +72,7 @@ public: struct mob_frost_tombAI : public ScriptedAI { - mob_frost_tombAI(Creature *c) : ScriptedAI(c) + mob_frost_tombAI(Creature* c) : ScriptedAI(c) { FrostTombGUID = 0; } @@ -124,7 +124,7 @@ public: struct boss_kelesethAI : public ScriptedAI { - boss_kelesethAI(Creature *c) : ScriptedAI(c) + boss_kelesethAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -205,7 +205,7 @@ public: if (ShadowboltTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0); if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) me->CastSpell(pTarget, DUNGEON_MODE(SPELL_SHADOWBOLT, SPELL_SHADOWBOLT_HEROIC), true); ShadowboltTimer = 10000; @@ -234,11 +234,11 @@ public: if (FrostTombTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (pTarget->isAlive()) { //DoCast(pTarget, SPELL_FROST_TOMB_SUMMON, true); - if (Creature *pChains = me->SummonCreature(CREATURE_FROSTTOMB, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) + if (Creature* pChains = me->SummonCreature(CREATURE_FROSTTOMB, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) { CAST_AI(mob_frost_tomb::mob_frost_tombAI, pChains->AI())->SetPrisoner(pTarget); pChains->CastSpell(pTarget, SPELL_FROST_TOMB, true); @@ -267,7 +267,7 @@ public: struct mob_vrykul_skeletonAI : public ScriptedAI { - mob_vrykul_skeletonAI(Creature *c) : ScriptedAI(c) + mob_vrykul_skeletonAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -287,7 +287,7 @@ public: } void EnterCombat(Unit* /*who*/){} - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetGUID() == me->GetGUID()) return; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index b3e5e16e2c7..b5cb5076e5b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -69,7 +69,7 @@ public: struct boss_skarvald_the_constructorAI : public ScriptedAI { - boss_skarvald_the_constructorAI(Creature *c) : ScriptedAI(c) + boss_skarvald_the_constructorAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -221,7 +221,7 @@ public: struct boss_dalronn_the_controllerAI : public ScriptedAI { - boss_dalronn_the_controllerAI(Creature *c) : ScriptedAI(c) + boss_dalronn_the_controllerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index a8ccd970e45..a324fd3eedf 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -37,7 +37,7 @@ public: struct npc_dragonflayer_forge_masterAI : public ScriptedAI { - npc_dragonflayer_forge_masterAI(Creature *c) : ScriptedAI(c) + npc_dragonflayer_forge_masterAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); fm_Type = 0; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index a4385d861c2..edc0de10eeb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -94,7 +94,7 @@ public: struct boss_palehoofAI : public ScriptedAI { - boss_palehoofAI(Creature *c) : ScriptedAI(c) + boss_palehoofAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -256,7 +256,7 @@ public: move = (Phase)(move % 4); } //send orb to summon spot - Creature *pOrb = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); + Creature* pOrb = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); if (pOrb && pOrb->isAlive()) { if (currentPhase == PHASE_NONE) @@ -297,7 +297,7 @@ public: struct mob_ravenous_furbolgAI : public ScriptedAI { - mob_ravenous_furbolgAI(Creature *c) : ScriptedAI(c) + mob_ravenous_furbolgAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -319,7 +319,7 @@ public: if (pInstance) if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -373,7 +373,7 @@ public: { if (pInstance) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -410,7 +410,7 @@ public: struct mob_frenzied_worgenAI : public ScriptedAI { - mob_frenzied_worgenAI(Creature *c) : ScriptedAI(c) + mob_frenzied_worgenAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -432,7 +432,7 @@ public: if (pInstance) if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -488,7 +488,7 @@ public: { if (pInstance) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance->GetData64(DATA_GORTOK_PALEHOOF)); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance->GetData64(DATA_GORTOK_PALEHOOF)); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -526,7 +526,7 @@ public: struct mob_ferocious_rhinoAI : public ScriptedAI { - mob_ferocious_rhinoAI(Creature *c) : ScriptedAI(c) + mob_ferocious_rhinoAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -548,7 +548,7 @@ public: if (pInstance) if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -603,7 +603,7 @@ public: { if (pInstance) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -646,7 +646,7 @@ public: struct mob_massive_jormungarAI : public ScriptedAI { - mob_massive_jormungarAI(Creature *c) : ScriptedAI(c) + mob_massive_jormungarAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -668,7 +668,7 @@ public: if (pInstance) if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -724,7 +724,7 @@ public: { if (pInstance) { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -752,7 +752,7 @@ public: struct mob_palehoof_orbAI : public ScriptedAI { - mob_palehoof_orbAI(Creature *c) : ScriptedAI(c) + mob_palehoof_orbAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -779,7 +779,7 @@ public: { if (currentPhase<5&¤tPhase >= 0) { - Creature *pNext = NULL; + Creature* pNext = NULL; switch(currentPhase) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; @@ -810,7 +810,7 @@ public: return; if (id > 4) return; - Creature *pNext = NULL; + Creature* pNext = NULL; switch(id) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; @@ -834,11 +834,11 @@ class go_palehoof_sphere : public GameObjectScript public: go_palehoof_sphere() : GameObjectScript("go_palehoof_sphere") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); - Creature *pPalehoof = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) { pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 7da067b87cb..589ceb64fcb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -168,7 +168,7 @@ public: struct boss_skadiAI : public ScriptedAI { - boss_skadiAI(Creature *c) : ScriptedAI(c), Summons(me) + boss_skadiAI(Creature* c) : ScriptedAI(c), Summons(me) { m_pInstance = c->GetInstanceScript(); } @@ -461,7 +461,7 @@ class go_harpoon_launcher : public GameObjectScript public: go_harpoon_launcher() : GameObjectScript("go_harpoon_launcher") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { InstanceScript* m_pInstance = pGO->GetInstanceScript(); if (!m_pInstance) return false; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 00cc67cd06f..c7deb9f1a6f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -96,7 +96,7 @@ public: struct boss_svalaAI : public ScriptedAI { - boss_svalaAI(Creature *c) : ScriptedAI(c) + boss_svalaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -133,7 +133,7 @@ public: Phase = INTRO; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Creature *pArthas = me->SummonCreature(CREATURE_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* pArthas = me->SummonCreature(CREATURE_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) { pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); pArthas->SetFloatValue(OBJECT_FIELD_SCALE_X, 5); @@ -151,7 +151,7 @@ public: if (uiIntroTimer <= diff) { - Creature *pArthas = Unit::GetCreature(*me, uiArthasGUID); + Creature* pArthas = Unit::GetCreature(*me, uiArthasGUID); if (!pArthas) return; @@ -219,7 +219,7 @@ public: struct mob_ritual_channelerAI : public Scripted_NoMovementAI { - mob_ritual_channelerAI(Creature *c) :Scripted_NoMovementAI(c) + mob_ritual_channelerAI(Creature* c) :Scripted_NoMovementAI(c) { pInstance = c->GetInstanceScript(); } @@ -235,7 +235,7 @@ public: void DoAction(const int32 /*action*/) { if (pInstance) - if (Unit *pVictim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER))) + if (Unit* pVictim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER))) DoCast(pVictim, SPELL_PARALYZE); } @@ -258,7 +258,7 @@ public: struct boss_svala_sorrowgraveAI : public ScriptedAI { - boss_svala_sorrowgraveAI(Creature *c) : ScriptedAI(c), summons(c) + boss_svala_sorrowgraveAI(Creature* c) : ScriptedAI(c), summons(c) { pInstance = c->GetInstanceScript(); } @@ -307,12 +307,12 @@ public: pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { summons.Despawn(summon); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 7bd659400b7..100d3496215 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -108,7 +108,7 @@ public: struct boss_ymironAI : public ScriptedAI { - boss_ymironAI(Creature *c) : ScriptedAI(c) + boss_ymironAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); for (int i = 0; i < 4; ++i) diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 04935d3fb99..e160cda0699 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -99,7 +99,7 @@ class boss_emalon : public CreatureScript { for (std::list<uint64>::const_iterator itr = summons.begin(); itr != summons.end(); ++itr) { - Creature *minion = Unit::GetCreature(*me, *itr); + Creature* minion = Unit::GetCreature(*me, *itr); if (minion && minion->isAlive() && !minion->getVictim() && minion->AI()) minion->AI()->AttackStart(who); } @@ -208,7 +208,7 @@ class mob_tempest_minion : public CreatureScript DoZoneInCombat(); events.ScheduleEvent(EVENT_SHOCK, 20000); - if (Creature *pEmalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) + if (Creature* pEmalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) { if (!pEmalon->getVictim() && pEmalon->AI()) pEmalon->AI()->AttackStart(who); diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 804d602a06f..0d24b92620e 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -57,7 +57,7 @@ public: struct boss_cyanigosaAI : public ScriptedAI { - boss_cyanigosaAI(Creature *c) : ScriptedAI(c) + boss_cyanigosaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -111,7 +111,7 @@ public: if (uiBlizzardTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_BLIZZARD); uiBlizzardTimer = 15000; } else uiBlizzardTimer -= diff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index d36533cb906..c621fbc5f1c 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -55,7 +55,7 @@ public: struct boss_erekemAI : public ScriptedAI { - boss_erekemAI(Creature *c) : ScriptedAI(c) + boss_erekemAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -83,12 +83,12 @@ public: pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } - if (Creature *pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) + if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { if (!pGuard1->isAlive()) pGuard1->Respawn(); } - if (Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) + if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { if (!pGuard2->isAlive()) pGuard2->Respawn(); @@ -107,13 +107,13 @@ public: pWho->SetInCombatWith(me); DoStartMovement(pWho); - if (Creature *pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) + if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { pGuard1->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); if (!pGuard1->getVictim() && pGuard1->AI()) pGuard1->AI()->AttackStart(pWho); } - if (Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) + if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { pGuard2->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); if (!pGuard2->getVictim() && pGuard2->AI()) @@ -129,7 +129,7 @@ public: if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_EREKEM_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_EREKEM_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); @@ -154,9 +154,9 @@ public: //spam stormstrike in hc mode if spawns are dead if (IsHeroic()) { - if (Creature *pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) + if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { - if (Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) + if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { if (!pGuard1->isAlive() && !pGuard2->isAlive()) DoCast(me->getVictim(), SPELL_STORMSTRIKE); @@ -174,12 +174,12 @@ public: { if (uint64 TargetGUID = GetChainHealTargetGUID()) { - if (Creature *pTarget = Unit::GetCreature(*me, TargetGUID)) + if (Creature* pTarget = Unit::GetCreature(*me, TargetGUID)) DoCast(pTarget, SPELL_CHAIN_HEAL); //If one of the adds is dead spawn heals faster - Creature *pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); - Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); + Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); + Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); uiChainHealTimer = ((pGuard1 && !pGuard1->isAlive()) || (pGuard2 && !pGuard2->isAlive()) ? 3000 : 8000) + rand()%3000; } } else uiChainHealTimer -= diff; @@ -237,11 +237,11 @@ public: if (HealthBelowPct(85)) return me->GetGUID(); - Creature *pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); + Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); if (pGuard1 && pGuard1->isAlive() && !pGuard1->HealthAbovePct(75)) return pGuard1->GetGUID(); - Creature *pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); + Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); if (pGuard2 && pGuard2->isAlive() && !pGuard2->HealthAbovePct(75)) return pGuard2->GetGUID(); @@ -270,7 +270,7 @@ public: struct mob_erekem_guardAI : public ScriptedAI { - mob_erekem_guardAI(Creature *c) : ScriptedAI(c) + mob_erekem_guardAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 1e3914ab40b..f1c72e1becb 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -125,7 +125,7 @@ public: if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ICHORON_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ICHORON_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); @@ -312,7 +312,7 @@ public: } } - void SummonedCreatureDespawn(Creature *pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { if (pSummoned) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 67153a0cf81..6988f5f0714 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -41,7 +41,7 @@ public: struct boss_lavanthorAI : public ScriptedAI { - boss_lavanthorAI(Creature *c) : ScriptedAI(c) + boss_lavanthorAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -72,7 +72,7 @@ public: { if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_LAVANTHOR_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_LAVANTHOR_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index e2893a5445b..da0294d7d89 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -37,7 +37,7 @@ public: struct boss_moraggAI : public ScriptedAI { - boss_moraggAI(Creature *c) : ScriptedAI(c) + boss_moraggAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -65,7 +65,7 @@ public: { if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MORAGG_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MORAGG_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index bfaf971abce..ff7a67b6a29 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -140,7 +140,7 @@ public: DoScriptText(SAY_AGGRO, me); if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_XEVOZZ_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_XEVOZZ_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 16f49316782..1e795e86759 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -61,7 +61,7 @@ public: struct boss_zuramatAI : public ScriptedAI { - boss_zuramatAI(Creature *c) : ScriptedAI(c) + boss_zuramatAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -108,7 +108,7 @@ public: DoScriptText(SAY_AGGRO, me); if (pInstance) { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ZURAMAT_CELL))) + if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ZURAMAT_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index d009063109f..e250cfa399d 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -426,7 +426,7 @@ public: struct mob_azure_saboteurAI : public npc_escortAI { - mob_azure_saboteurAI(Creature *c):npc_escortAI(c) + mob_azure_saboteurAI(Creature* c):npc_escortAI(c) { pInstance = c->GetInstanceScript(); bHasGotMovingPoints = false; @@ -543,14 +543,14 @@ class npc_teleportation_portal_vh : public CreatureScript public: npc_teleportation_portal_vh() : CreatureScript("npc_teleportation_portal_vh") { } - CreatureAI* GetAI(Creature *pCreature) const + CreatureAI* GetAI(Creature* pCreature) const { return new npc_teleportation_portalAI(pCreature); } struct npc_teleportation_portalAI : public ScriptedAI { - npc_teleportation_portalAI(Creature *c) : ScriptedAI(c), listOfMobs(me) + npc_teleportation_portalAI(Creature* c) : ScriptedAI(c), listOfMobs(me) { pInstance = c->GetInstanceScript(); uiTypeOfMobsPortal = urand(0, 1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs @@ -635,7 +635,7 @@ public: { bPortalGuardianOrKeeperOrEliteSpawn = true; uint32 entry = RAND(CREATURE_PORTAL_GUARDIAN, CREATURE_PORTAL_KEEPER); - if (Creature *pPortalKeeper = DoSummon(entry, me, 2.0f, 0, TEMPSUMMON_DEAD_DESPAWN)) + if (Creature* pPortalKeeper = DoSummon(entry, me, 2.0f, 0, TEMPSUMMON_DEAD_DESPAWN)) me->CastSpell(pPortalKeeper, SPELL_PORTAL_CHANNEL, false); } uiSpawnTimer = SPAWN_TIME; @@ -656,14 +656,14 @@ public: pInstance->SetData(DATA_WAVE_COUNT, pInstance->GetData(DATA_WAVE_COUNT)+1); } - void JustSummoned(Creature *pSummoned) + void JustSummoned(Creature* pSummoned) { listOfMobs.Summon(pSummoned); if (pSummoned) pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); } - void SummonedMobDied(Creature *pSummoned) + void SummonedMobDied(Creature* pSummoned) { listOfMobs.Despawn(pSummoned); if (pSummoned) @@ -675,7 +675,7 @@ public: struct violet_hold_trashAI : public npc_escortAI { - violet_hold_trashAI(Creature *c):npc_escortAI(c) + violet_hold_trashAI(Creature* c):npc_escortAI(c) { pInstance = c->GetInstanceScript(); bHasGotMovingPoints = false; @@ -808,7 +808,7 @@ public: struct mob_azure_invaderAI : public violet_hold_trashAI { - mob_azure_invaderAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_invaderAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -886,7 +886,7 @@ public: struct mob_azure_binderAI : public violet_hold_trashAI { - mob_azure_binderAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_binderAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -964,7 +964,7 @@ public: struct mob_azure_mage_slayerAI : public violet_hold_trashAI { - mob_azure_mage_slayerAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_mage_slayerAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -1024,7 +1024,7 @@ public: struct mob_azure_raiderAI : public violet_hold_trashAI { - mob_azure_raiderAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_raiderAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -1076,7 +1076,7 @@ public: struct mob_azure_stalkerAI : public violet_hold_trashAI { - mob_azure_stalkerAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_stalkerAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -1219,7 +1219,7 @@ public: struct mob_azure_captainAI : public violet_hold_trashAI { - mob_azure_captainAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_captainAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } @@ -1271,7 +1271,7 @@ public: struct mob_azure_sorcerorAI : public violet_hold_trashAI { - mob_azure_sorcerorAI(Creature *c) : violet_hold_trashAI(c) + mob_azure_sorcerorAI(Creature* c) : violet_hold_trashAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 00d9b943f0b..641301a17d8 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -73,7 +73,7 @@ public: casterGuid = 0; } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (Phase) return; @@ -138,7 +138,7 @@ public: break; case 7: DoCast(me, SPELL_EXPLODE_CART, true); - if (Player *caster = Unit::GetPlayer(*me, casterGuid)) + if (Player* caster = Unit::GetPlayer(*me, casterGuid)) caster->KilledMonster(me->GetCreatureInfo(), me->GetGUID()); uiPhaseTimer = 5000; Phase = 8; @@ -153,7 +153,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_sinkhole_kill_creditAI(creature); } @@ -170,9 +170,9 @@ public: struct npc_khunok_the_behemothAI : public ScriptedAI { - npc_khunok_the_behemothAI(Creature *c) : ScriptedAI(c) {} + npc_khunok_the_behemothAI(Creature* c) : ScriptedAI(c) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { ScriptedAI::MoveInLineOfSight(who); @@ -181,7 +181,7 @@ public: if (who->GetEntry() == 25861 && me->IsWithinDistInMap(who, 10.0f)) { - if (Unit *owner = who->GetOwner()) + if (Unit* owner = who->GetOwner()) { if (owner->GetTypeId() == TYPEID_PLAYER) { @@ -193,7 +193,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_khunok_the_behemothAI(creature); } @@ -350,7 +350,7 @@ public: struct mob_nerubar_victimAI : public ScriptedAI { - mob_nerubar_victimAI(Creature *c) : ScriptedAI(c) {} + mob_nerubar_victimAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} @@ -375,7 +375,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_nerubar_victimAI(creature); } @@ -410,7 +410,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_scourge_prisonerAI(creature); } @@ -483,7 +483,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_jennyAI (creature); } @@ -527,7 +527,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_fezzix_geartwistAI(creature); } @@ -575,7 +575,7 @@ public: struct npc_nesingwary_trapperAI : public ScriptedAI { - npc_nesingwary_trapperAI(Creature *c) : ScriptedAI(c) { c->SetVisible(false); } + npc_nesingwary_trapperAI(Creature* c) : ScriptedAI(c) { c->SetVisible(false); } uint64 go_caribouGUID; uint8 Phase; @@ -593,16 +593,16 @@ public: void JustDied(Unit* /*who*/) { - if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) + if (GameObject* go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetLootState(GO_JUST_DEACTIVATED); if (TempSummon *summon = me->ToTempSummon()) if (summon->isSummon()) - if (Unit *pTemp = summon->GetSummoner()) + if (Unit* pTemp = summon->GetSummoner()) if (pTemp->GetTypeId() == TYPEID_PLAYER) CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(), 0); - if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) + if (GameObject* go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetGoState(GO_STATE_READY); } @@ -619,7 +619,7 @@ public: break; case 2: - if (GameObject *go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) + if (GameObject* go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) me->GetMotionMaster()->MovePoint(0, go_fur->GetPositionX(), go_fur->GetPositionY(), go_fur->GetPositionZ()); uiPhaseTimer = 1500; Phase = 3; @@ -640,7 +640,7 @@ public: Phase = 6; break; case 6: - if (GameObject *go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) + if (GameObject* go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) go_fur->Delete(); uiPhaseTimer = 500; Phase = 7; @@ -648,7 +648,7 @@ public: case 7: { - GameObject *go_caribou = NULL; + GameObject* go_caribou = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) { go_caribou = me->FindNearestGameObject(CaribouTraps[i], 5.0f); @@ -672,7 +672,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_nesingwary_trapperAI(creature); } @@ -789,7 +789,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_lurgglbrAI(creature); } @@ -849,7 +849,7 @@ public: struct npc_nexus_drake_hatchlingAI : public FollowerAI //The spell who makes the npc follow the player is missing, also we can use FollowerAI! { - npc_nexus_drake_hatchlingAI(Creature *c) : FollowerAI(c) {} + npc_nexus_drake_hatchlingAI(Creature* c) : FollowerAI(c) {} uint64 HarpoonerGUID; bool WithRedDragonBlood; @@ -866,7 +866,7 @@ public: AttackStart(pWho); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == SPELL_DRAKE_HARPOON && caster->GetTypeId() == TYPEID_PLAYER) { @@ -876,7 +876,7 @@ public: WithRedDragonBlood = true; } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit* pWho) { FollowerAI::MoveInLineOfSight(pWho); @@ -887,7 +887,7 @@ public: { if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE)) { - if (Player *pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) + if (Player* pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) { pHarpooner->KilledMonsterCredit(26175, 0); pHarpooner->RemoveAura(SPELL_DRAKE_HATCHLING_SUBDUED); @@ -903,7 +903,7 @@ public: { if (WithRedDragonBlood && HarpoonerGUID && !me->HasAura(SPELL_RED_DRAGONBLOOD)) { - if (Player *pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) + if (Player* pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) { EnterEvadeMode(); StartFollow(pHarpooner, 35, NULL); @@ -923,7 +923,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_nexus_drake_hatchlingAI(creature); } @@ -1025,7 +1025,7 @@ public: { case 3: SetEscortPaused(true); - if (Creature *pArthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313f, 3518.689f, 473.324f, 1.562f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* pArthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313f, 3518.689f, 473.324f, 1.562f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiArthas = pArthas->GetGUID(); pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -1033,7 +1033,7 @@ public: pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f, 3564.841309f, 477.433014f); } - if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiTalbot = pTalbot->GetGUID(); pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -1121,7 +1121,7 @@ public: pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); pArlos->GetMotionMaster()->MovePoint(0, 3735.570068f, 3572.419922f, 477.441010f); } - if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiLeryssa = pLeryssa->GetGUID(); pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -1269,7 +1269,7 @@ public: return true; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_thassarianAI(creature); } @@ -1304,7 +1304,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_image_lich_kingAI(creature); } @@ -1336,7 +1336,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_general_arlosAI(creature); } @@ -1396,9 +1396,9 @@ public: { if (bCheck) { - if (Creature *pLeryssa = me->FindNearestCreature(NPC_LERYSSA, 50.0f, true)) + if (Creature* pLeryssa = me->FindNearestCreature(NPC_LERYSSA, 50.0f, true)) LeryssaGUID = pLeryssa->GetGUID(); - if (Creature *pArlos = me->FindNearestCreature(NPC_GENERAL_ARLOS, 50.0f, true)) + if (Creature* pArlos = me->FindNearestCreature(NPC_GENERAL_ARLOS, 50.0f, true)) ArlosGUID = pArlos->GetGUID(); bCheck = false; } @@ -1435,8 +1435,8 @@ public: if (!LeryssaGUID || !ArlosGUID) return; - Creature *pLeryssa = Unit::GetCreature(*me, LeryssaGUID); - Creature *pArlos = Unit::GetCreature(*me, ArlosGUID); + Creature* pLeryssa = Unit::GetCreature(*me, LeryssaGUID); + Creature* pArlos = Unit::GetCreature(*me, ArlosGUID); if (!pLeryssa || !pArlos) return; @@ -1454,7 +1454,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_counselor_talbotAI(creature); } @@ -1579,7 +1579,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_leryssaAI(creature); } @@ -1656,7 +1656,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_beryl_sorcererAI(creature); } @@ -1762,7 +1762,7 @@ public: case 5: if (uiStep == 5) { - if (Player *pCaster = Unit::GetPlayer(*me, CasterGUID)) + if (Player* pCaster = Unit::GetPlayer(*me, CasterGUID)) { DoScriptText(SAY_IMPRISIONED_BERYL_5, me); pCaster->KilledMonsterCredit(25478, 0); @@ -1791,7 +1791,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_imprisoned_beryl_sorcererAI(creature); } @@ -1840,7 +1840,7 @@ public: struct npc_mootoo_the_youngerAI : public npc_escortAI { - npc_mootoo_the_youngerAI(Creature *c) : npc_escortAI(c) {} + npc_mootoo_the_youngerAI(Creature* c) : npc_escortAI(c) {} void Reset() { @@ -1886,7 +1886,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_mootoo_the_youngerAI(creature); } @@ -1933,7 +1933,7 @@ public: struct npc_bonker_togglevoltAI : public npc_escortAI { - npc_bonker_togglevoltAI(Creature *c) : npc_escortAI(c) {} + npc_bonker_togglevoltAI(Creature* c) : npc_escortAI(c) {} uint32 Bonker_agro; void Reset() @@ -1979,7 +1979,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_bonker_togglevoltAI(creature); } @@ -2095,7 +2095,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_trapped_mammoth_calfAI(creature); } @@ -2123,7 +2123,7 @@ public: { npc_magmoth_crusherAI(Creature* c) : ScriptedAI(c) {} - void JustDied(Unit *pKiller) + void JustDied(Unit* pKiller) { if (pKiller->GetTypeId() == TYPEID_PLAYER && CAST_PLR(pKiller)->GetQuestStatus(QUEST_YOU_RE_NOT_SO_BIG_NOW) == QUEST_STATUS_INCOMPLETE && @@ -2137,7 +2137,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_magmoth_crusherAI(creature); } @@ -2157,7 +2157,7 @@ public: struct npc_seaforium_depth_chargeAI : public ScriptedAI { - npc_seaforium_depth_chargeAI(Creature *c) : ScriptedAI(c) {} + npc_seaforium_depth_chargeAI(Creature* c) : ScriptedAI(c) {} uint32 uiExplosionTimer; void Reset() @@ -2187,7 +2187,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_seaforium_depth_chargeAI(creature); } @@ -2239,7 +2239,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_valiance_keep_cannoneerAI(creature); } @@ -2344,7 +2344,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_warmage_coldarraAI(creature); } diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/crystalsong_forest.cpp index 277f9d98091..8392c57ea26 100644 --- a/src/server/scripts/Northrend/crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/crystalsong_forest.cpp @@ -98,7 +98,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_warmage_violetstandAI(creature); } diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp index 13dc395712a..74f6bbf4f49 100644 --- a/src/server/scripts/Northrend/dalaran.cpp +++ b/src/server/scripts/Northrend/dalaran.cpp @@ -61,7 +61,7 @@ public: void AttackStart(Unit* /*pWho*/){} - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit* pWho) { if (!pWho || !pWho->IsInWorld() || pWho->GetZoneId() != 4395) return; @@ -69,7 +69,7 @@ public: if (!me->IsWithinDist(pWho, 65.0f, false)) return; - Player *pPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself(); + Player* pPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself(); if (!pPlayer || pPlayer->isGameMaster() || pPlayer->IsBeingTeleported()) return; @@ -108,7 +108,7 @@ public: void UpdateAI(const uint32 /*diff*/){} }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_mageguard_dalaranAI(creature); } diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index 1678e36b1a8..4f77010203e 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -188,7 +188,7 @@ public: switch (i) { case 9: - if (Creature *Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 100.0f)) + if (Creature* Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 100.0f)) MrfloppyGUID = Mrfloppy->GetGUID(); break; case 10: @@ -199,45 +199,45 @@ public: } break; case 11: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->GetMotionMaster()->MoveFollow(me, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); break; case 17: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); DoScriptText(SAY_WORGRAGGRO3, me); - if (Creature *RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000)) + if (Creature* RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000)) { RWORG->setFaction(35); RWORGGUID = RWORG->GetGUID(); } break; case 18: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) { - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) RWORG->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); DoCast(Mrfloppy, SPELL_MRFLOPPY); } break; case 19: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) { if (Mrfloppy->HasAura(SPELL_MRFLOPPY, 0)) { - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) Mrfloppy->EnterVehicle(RWORG); } } break; case 20: - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) RWORG->HandleEmoteCommand(34); break; case 21: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) { - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) { RWORG->Kill(Mrfloppy); Mrfloppy->ExitVehicle(); @@ -248,11 +248,11 @@ public: } break; case 22: - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) { if (Mrfloppy->isDead()) { - if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) + if (Creature* RWORG = Unit::GetCreature(*me, RWORGGUID)) RWORG->DisappearAndDie(); me->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); Mrfloppy->setDeathState(ALIVE); @@ -275,7 +275,7 @@ public: break; case 27: me->DisappearAndDie(); - if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) + if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->DisappearAndDie(); break; } @@ -325,7 +325,7 @@ public: return true; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_emilyAI(creature); } @@ -339,7 +339,7 @@ public: struct npc_mrfloppyAI : public ScriptedAI { - npc_mrfloppyAI(Creature *c) : ScriptedAI(c) {} + npc_mrfloppyAI(Creature* c) : ScriptedAI(c) {} uint64 EmilyGUID; uint64 RWORGGUID; @@ -376,7 +376,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_mrfloppyAI(creature); } @@ -440,7 +440,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_outhouse_bunnyAI(creature); } @@ -484,7 +484,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_tallhorn_stagAI(creature); } @@ -550,7 +550,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_amberpine_woodsmanAI(creature); } @@ -576,7 +576,7 @@ public: struct npc_wounded_skirmisherAI : public ScriptedAI { - npc_wounded_skirmisherAI(Creature *c) : ScriptedAI(c) {} + npc_wounded_skirmisherAI(Creature* c) : ScriptedAI(c) {} uint64 uiPlayerGUID; @@ -594,7 +594,7 @@ public: me->DespawnOrUnsummon(DespawnTimer); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == SPELL_RENEW_SKIRMISHER && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(12288) == QUEST_STATUS_INCOMPLETE) @@ -620,7 +620,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_wounded_skirmisherAI(creature); } @@ -643,14 +643,14 @@ class npc_lightning_sentry : public CreatureScript public: npc_lightning_sentry() : CreatureScript("npc_lightning_sentry") { } - CreatureAI *GetAI(Creature *pCreature) const + CreatureAI *GetAI(Creature* pCreature) const { return new npc_lightning_sentryAI(pCreature); } struct npc_lightning_sentryAI : public ScriptedAI { - npc_lightning_sentryAI(Creature *pCreature) : ScriptedAI(pCreature) { } + npc_lightning_sentryAI(Creature* pCreature) : ScriptedAI(pCreature) { } uint32 uiChargedSentryTotem; @@ -710,14 +710,14 @@ class npc_venture_co_straggler : public CreatureScript public: npc_venture_co_straggler() : CreatureScript("npc_venture_co_straggler") { } - CreatureAI *GetAI(Creature *pCreature) const + CreatureAI *GetAI(Creature* pCreature) const { return new npc_venture_co_stragglerAI(pCreature); } struct npc_venture_co_stragglerAI : public ScriptedAI { - npc_venture_co_stragglerAI(Creature *pCreature) : ScriptedAI(pCreature) { } + npc_venture_co_stragglerAI(Creature* pCreature) : ScriptedAI(pCreature) { } uint64 uiPlayerGUID; uint32 uiRunAwayTimer; @@ -737,7 +737,7 @@ public: { if (uiRunAwayTimer <= uiDiff) { - if (Player *pPlayer = Unit::GetPlayer(*me, uiPlayerGUID)) + if (Player* pPlayer = Unit::GetPlayer(*me, uiPlayerGUID)) { switch (uiTimer) { @@ -784,7 +784,7 @@ public: DoMeleeAttackIfReady(); } - void SpellHit(Unit *pCaster, const SpellEntry *pSpell) + void SpellHit(Unit* pCaster, const SpellEntry *pSpell) { if (pCaster && pCaster->GetTypeId() == TYPEID_PLAYER && pSpell->Id == SPELL_SMOKE_BOMB) { diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index dd91279584e..4be95efa5c5 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -147,7 +147,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_Apothecary_HanesAI(creature); } @@ -196,7 +196,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_plaguehound_trackerAI(creature); } @@ -362,7 +362,7 @@ public: // TODO: make prisoners help (unclear if summoned or using npc's from surrounding cages (summon inside small cages?)) struct npc_daegarnAI : public ScriptedAI { - npc_daegarnAI(Creature *pCreature) : ScriptedAI(pCreature) { } + npc_daegarnAI(Creature* pCreature) : ScriptedAI(pCreature) { } bool bEventInProgress; uint64 uiPlayerGUID; @@ -421,7 +421,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_daegarnAI(creature); } diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 6d6cf8998c0..bdc1489d610 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -269,7 +269,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_argent_valiantAI(creature); } @@ -328,7 +328,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_alorah_and_grimminAI(creature); } @@ -375,7 +375,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_guardian_pavilionAI(creature); } diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 255a1779ff7..63b89064b4d 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -161,7 +161,7 @@ public: return false; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_injured_rainspeaker_oracleAI(creature); } @@ -323,7 +323,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_bushwhackerAI(creature); } @@ -428,7 +428,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_engineer_heliceAI(creature); } @@ -587,7 +587,7 @@ public: } }; - CreatureAI *GetAI(Creature *pCreature) const + CreatureAI *GetAI(Creature* pCreature) const { return new npc_jungle_punch_targetAI(pCreature); } @@ -624,13 +624,13 @@ class npc_adventurous_dwarf : public CreatureScript public: npc_adventurous_dwarf() : CreatureScript("npc_adventurous_dwarf") { } - CreatureAI *GetAI(Creature *pCreature) const + CreatureAI *GetAI(Creature* pCreature) const { DoScriptText(SAY_DWARF_OUCH, pCreature); return NULL; } - bool OnGossipHello(Player *pPlayer, Creature *pCreature) + bool OnGossipHello(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_12634) != QUEST_STATUS_INCOMPLETE) return false; @@ -648,7 +648,7 @@ public: return true; } - bool OnGossipSelect(Player *pPlayer, Creature *pCreature, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); uint32 spellId = 0; diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index 156ee5eb67b..cc5754ffde2 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -46,7 +46,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_agnetta_tyrsdottarAI(creature); } @@ -222,7 +222,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_goblin_prisonerAI(creature); } @@ -319,7 +319,7 @@ public: return true; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_victorious_challengerAI(creature); } @@ -445,7 +445,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_injured_goblinAI(creature); } @@ -590,7 +590,7 @@ public: enter_timer -= diff; } - void MoveInLineOfSight(Unit *unit) + void MoveInLineOfSight(Unit* unit) { if (!unit || !drake) return; @@ -659,7 +659,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_brunnhildar_prisonerAI(creature); } diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index eab88800203..0382f30e04f 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -62,7 +62,7 @@ public: void LockRageclaw() { - Unit *Rageclaw = Unit::GetCreature(*me, RageclawGUID); + Unit* Rageclaw = Unit::GetCreature(*me, RageclawGUID); // pointer check not needed me->SetInFront(Rageclaw); Rageclaw->SetInFront(me); @@ -76,7 +76,7 @@ public: if (!pWho) return; - Creature *Rageclaw = Unit::GetCreature(*me, RageclawGUID); + Creature* Rageclaw = Unit::GetCreature(*me, RageclawGUID); // pointer check not needed DoCast(Rageclaw, SPELL_FREE_RAGECLAW, true); @@ -102,7 +102,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_drakuru_shacklesAI(creature); } @@ -184,7 +184,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_captured_rageclawAI(creature); } @@ -554,7 +554,7 @@ public: return false; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_gurgthockAI(creature); } @@ -613,7 +613,7 @@ public: void EnterEvadeMode() { - if (Creature *pWhisker = me->GetCreature(*me, uiWhisker)) + if (Creature* pWhisker = me->GetCreature(*me, uiWhisker)) pWhisker->RemoveFromWorld(); } @@ -646,7 +646,7 @@ public: if (uiFishyScentTimer <= uiDiff) { - if (Unit *pAffected = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pAffected = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pAffected, SPELL_FISHY_SCENT); AffectedGUID = pAffected->GetGUID(); @@ -659,7 +659,7 @@ public: DoScriptText(SAY_CALL_FOR_HELP , me); //DoCast(me->getVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? - if (Creature *pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) + if (Creature* pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) uiWhisker = pWhisker->GetGUID(); bSummoned = true; } @@ -675,7 +675,7 @@ public: pSummon->AI()->AttackStart(me->getVictim()); break; case NPC_HUNGRY_PENGUIN: - if (Unit *pAffected = Unit::GetUnit(*me, AffectedGUID)) + if (Unit* pAffected = Unit::GetUnit(*me, AffectedGUID)) { if (pAffected->isAlive()) pSummon->AI()->AttackStart(pAffected); @@ -687,7 +687,7 @@ public: void JustDied(Unit* pKiller) { if (uiWhisker) - if (Creature *pWhisker = me->GetCreature(*me, uiWhisker)) + if (Creature* pWhisker = me->GetCreature(*me, uiWhisker)) pWhisker->RemoveFromWorld(); if (pKiller->GetTypeId() == TYPEID_PLAYER) @@ -696,7 +696,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_orinoko_tuskbreakerAI(creature); } @@ -794,7 +794,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_korrak_bloodragerAI(creature); } @@ -886,7 +886,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_yggdrasAI(creature); } @@ -1019,7 +1019,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_stinkbeardAI(creature); } @@ -1229,7 +1229,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_fiend_elementalAI(creature); } @@ -1263,7 +1263,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_released_offspring_harkoaAI(creature); } @@ -1351,7 +1351,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_crusade_recruitAI(creature); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index ad39be101ac..5eaa19b4f82 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -127,7 +127,7 @@ void OPvPCapturePointEP_EWT::UpdateTowerState() m_PvP->SendUpdateWorldState(EP_EWT_N , bool(m_TowerState & EP_TS_N)); } -bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player *plr) +bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player* plr) { if (OPvPCapturePoint::HandlePlayerEnter(plr)) { @@ -140,7 +140,7 @@ bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player *plr) return false; } -void OPvPCapturePointEP_EWT::HandlePlayerLeave(Player *plr) +void OPvPCapturePointEP_EWT::HandlePlayerLeave(Player* plr) { plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0); OPvPCapturePoint::HandlePlayerLeave(plr); @@ -276,7 +276,7 @@ void OPvPCapturePointEP_NPT::UpdateTowerState() m_PvP->SendUpdateWorldState(EP_NPT_N , bool(m_TowerState & EP_TS_N)); } -bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player *plr) +bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player* plr) { if (OPvPCapturePoint::HandlePlayerEnter(plr)) { @@ -289,7 +289,7 @@ bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player *plr) return false; } -void OPvPCapturePointEP_NPT::HandlePlayerLeave(Player *plr) +void OPvPCapturePointEP_NPT::HandlePlayerLeave(Player* plr) { plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0); OPvPCapturePoint::HandlePlayerLeave(plr); @@ -408,7 +408,7 @@ void OPvPCapturePointEP_CGT::UpdateTowerState() m_PvP->SendUpdateWorldState(EP_CGT_N , bool(m_TowerState & EP_TS_N)); } -bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player *plr) +bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player* plr) { if (OPvPCapturePoint::HandlePlayerEnter(plr)) { @@ -421,7 +421,7 @@ bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player *plr) return false; } -void OPvPCapturePointEP_CGT::HandlePlayerLeave(Player *plr) +void OPvPCapturePointEP_CGT::HandlePlayerLeave(Player* plr) { plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0); OPvPCapturePoint::HandlePlayerLeave(plr); @@ -547,7 +547,7 @@ void OPvPCapturePointEP_PWT::UpdateTowerState() m_PvP->SendUpdateWorldState(EP_PWT_N , bool(m_TowerState & EP_TS_N)); } -bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player *plr) +bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player* plr) { if (OPvPCapturePoint::HandlePlayerEnter(plr)) { @@ -560,7 +560,7 @@ bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player *plr) return false; } -void OPvPCapturePointEP_PWT::HandlePlayerLeave(Player *plr) +void OPvPCapturePointEP_PWT::HandlePlayerLeave(Player* plr) { plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0); OPvPCapturePoint::HandlePlayerLeave(plr); @@ -727,7 +727,7 @@ void OutdoorPvPEP::FillInitialWorldStates(WorldPacket & data) } } -void OutdoorPvPEP::SendRemoveWorldStates(Player *plr) +void OutdoorPvPEP::SendRemoveWorldStates(Player* plr) { plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_A, 0); plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_H, 0); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h index b0a3f744c3d..54235bbb569 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h @@ -319,8 +319,8 @@ class OutdoorPvPEP : public OutdoorPvP bool SetupOutdoorPvP(); - void HandlePlayerEnterZone(Player *plr, uint32 zone); - void HandlePlayerLeaveZone(Player *plr, uint32 zone); + void HandlePlayerEnterZone(Player* plr, uint32 zone); + void HandlePlayerLeaveZone(Player* plr, uint32 zone); bool Update(uint32 diff); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index cf754e528a4..2224f4cbf4f 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -131,7 +131,7 @@ bool OutdoorPvPHP::Update(uint32 diff) return changed; } -void OutdoorPvPHP::SendRemoveWorldStates(Player *plr) +void OutdoorPvPHP::SendRemoveWorldStates(Player* plr) { plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A, 0); plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_H, 0); @@ -301,7 +301,7 @@ void OPvPCapturePointHP::FillInitialWorldStates(WorldPacket &data) } } -bool OPvPCapturePointHP::HandlePlayerEnter(Player *plr) +bool OPvPCapturePointHP::HandlePlayerEnter(Player* plr) { if (OPvPCapturePoint::HandlePlayerEnter(plr)) { @@ -314,13 +314,13 @@ bool OPvPCapturePointHP::HandlePlayerEnter(Player *plr) return false; } -void OPvPCapturePointHP::HandlePlayerLeave(Player *plr) +void OPvPCapturePointHP::HandlePlayerLeave(Player* plr) { plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 0); OPvPCapturePoint::HandlePlayerLeave(plr); } -void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit* killed) +void OutdoorPvPHP::HandleKillImpl(Player* plr, Unit* killed) { if (killed->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h index 42c62c2584b..3cbc1296b99 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h @@ -116,8 +116,8 @@ class OutdoorPvPHP : public OutdoorPvP bool SetupOutdoorPvP(); - void HandlePlayerEnterZone(Player *plr, uint32 zone); - void HandlePlayerLeaveZone(Player *plr, uint32 zone); + void HandlePlayerEnterZone(Player* plr, uint32 zone); + void HandlePlayerLeaveZone(Player* plr, uint32 zone); bool Update(uint32 diff); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index eb9f2b1928a..44b939f806f 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -29,7 +29,7 @@ OutdoorPvPNA::OutdoorPvPNA() m_TypeId = OUTDOOR_PVP_NA; } -void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit* killed) +void OutdoorPvPNA::HandleKillImpl(Player* plr, Unit* killed) { if (killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != killed->ToPlayer()->GetTeam()) { @@ -178,7 +178,7 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team) UpdateWyvernRoostWorldState(NA_ROOST_E); } -bool OPvPCapturePointNA::HandlePlayerEnter(Player *plr) +bool OPvPCapturePointNA::HandlePlayerEnter(Player* plr) { if (OPvPCapturePoint::HandlePlayerEnter(plr)) { @@ -191,7 +191,7 @@ bool OPvPCapturePointNA::HandlePlayerEnter(Player *plr) return false; } -void OPvPCapturePointNA::HandlePlayerLeave(Player *plr) +void OPvPCapturePointNA::HandlePlayerLeave(Player* plr) { plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0); OPvPCapturePoint::HandlePlayerLeave(plr); @@ -292,7 +292,7 @@ void OPvPCapturePointNA::FillInitialWorldStates(WorldPacket &data) data << NA_MAP_HALAA_ALLIANCE << uint32(bool(m_HalaaState & HALAA_A)); } -void OutdoorPvPNA::SendRemoveWorldStates(Player *plr) +void OutdoorPvPNA::SendRemoveWorldStates(Player* plr) { plr->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0); plr->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0); @@ -404,7 +404,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* plr, uint32 spellId, GameObje return false; } -int32 OPvPCapturePointNA::HandleOpenGo(Player *plr, uint64 guid) +int32 OPvPCapturePointNA::HandleOpenGo(Player* plr, uint64 guid) { int32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid); if (retval >= 0) diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index 8a50ef65ba1..81812f30402 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -270,9 +270,9 @@ class OPvPCapturePointNA : public OPvPCapturePoint bool HandlePlayerEnter(Player* plr); void HandlePlayerLeave(Player* plr); - bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go); + bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject* go); - int32 HandleOpenGo(Player *plr, uint64 guid); + int32 HandleOpenGo(Player* plr, uint64 guid); uint32 GetAliveGuardsCount(); @@ -320,8 +320,8 @@ class OutdoorPvPNA : public OutdoorPvP bool SetupOutdoorPvP(); - void HandlePlayerEnterZone(Player *plr, uint32 zone); - void HandlePlayerLeaveZone(Player *plr, uint32 zone); + void HandlePlayerEnterZone(Player* plr, uint32 zone); + void HandlePlayerLeaveZone(Player* plr, uint32 zone); bool Update(uint32 diff); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 627bb28b0e7..fa058f1d4ec 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -41,7 +41,7 @@ void OutdoorPvPSI::FillInitialWorldStates(WorldPacket &data) data << SI_SILITHYST_MAX << SI_MAX_RESOURCES; } -void OutdoorPvPSI::SendRemoveWorldStates(Player *plr) +void OutdoorPvPSI::SendRemoveWorldStates(Player* plr) { plr->SendUpdateWorldState(SI_GATHERED_A, 0); plr->SendUpdateWorldState(SI_GATHERED_H, 0); @@ -81,7 +81,7 @@ void OutdoorPvPSI::HandlePlayerLeaveZone(Player* plr, uint32 zone) OutdoorPvP::HandlePlayerLeaveZone(plr, zone); } -bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger) +bool OutdoorPvPSI::HandleAreaTrigger(Player* plr, uint32 trigger) { switch(trigger) { @@ -139,7 +139,7 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger) return false; } -bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) +bool OutdoorPvPSI::HandleDropFlag(Player* plr, uint32 spellId) { if (spellId == SI_SILITHYST_FLAG) { @@ -211,7 +211,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) return false; } -bool OutdoorPvPSI::HandleCustomSpell(Player *plr, uint32 spellId, GameObject *go) +bool OutdoorPvPSI::HandleCustomSpell(Player* plr, uint32 spellId, GameObject* go) { if (!go || spellId != SI_SILITHYST_FLAG_GO_SPELL) return false; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h index b93a0f2a5a5..1b3bf284fff 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h @@ -59,8 +59,8 @@ class OutdoorPvPSI : public OutdoorPvP bool SetupOutdoorPvP(); - void HandlePlayerEnterZone(Player *plr, uint32 zone); - void HandlePlayerLeaveZone(Player *plr, uint32 zone); + void HandlePlayerEnterZone(Player* plr, uint32 zone); + void HandlePlayerLeaveZone(Player* plr, uint32 zone); bool Update(uint32 diff); @@ -72,7 +72,7 @@ class OutdoorPvPSI : public OutdoorPvP bool HandleDropFlag(Player* plr, uint32 spellId); - bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject *go); + bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject* go); void UpdateWorldState(); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index a4fc38e7e80..d822c65cd5e 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -100,7 +100,7 @@ void OPvPCapturePointTF::UpdateTowerState() m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a), uint32(bool(m_TowerState & TF_TOWERSTATE_A))); } -bool OPvPCapturePointTF::HandlePlayerEnter(Player *plr) +bool OPvPCapturePointTF::HandlePlayerEnter(Player* plr) { if (OPvPCapturePoint::HandlePlayerEnter(plr)) { @@ -113,7 +113,7 @@ bool OPvPCapturePointTF::HandlePlayerEnter(Player *plr) return false; } -void OPvPCapturePointTF::HandlePlayerLeave(Player *plr) +void OPvPCapturePointTF::HandlePlayerLeave(Player* plr) { plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, 0); OPvPCapturePoint::HandlePlayerLeave(plr); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h index f04faf81fd8..874aafd6352 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h @@ -158,8 +158,8 @@ class OutdoorPvPTF : public OutdoorPvP bool SetupOutdoorPvP(); - void HandlePlayerEnterZone(Player *plr, uint32 zone); - void HandlePlayerLeaveZone(Player *plr, uint32 zone); + void HandlePlayerEnterZone(Player* plr, uint32 zone); + void HandlePlayerLeaveZone(Player* plr, uint32 zone); bool Update(uint32 diff); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 4fdc22f04b3..a3a07e3ddd6 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -52,7 +52,7 @@ void OPvPCapturePointZM_Beacon::UpdateTowerState() m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H))); } -bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player *plr) +bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player* plr) { if (OPvPCapturePoint::HandlePlayerEnter(plr)) { @@ -65,7 +65,7 @@ bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player *plr) return false; } -void OPvPCapturePointZM_Beacon::HandlePlayerLeave(Player *plr) +void OPvPCapturePointZM_Beacon::HandlePlayerLeave(Player* plr) { plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_disp, 0); OPvPCapturePoint::HandlePlayerLeave(plr); @@ -190,7 +190,7 @@ bool OutdoorPvPZM::SetupOutdoorPvP() return true; } -void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit* killed) +void OutdoorPvPZM::HandleKillImpl(Player* plr, Unit* killed) { if (killed->GetTypeId() != TYPEID_PLAYER) return; @@ -208,7 +208,7 @@ bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/) return retval; } -int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player *plr, uint64 guid) +int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* plr, uint64 guid) { int32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid); if (retval >= 0) @@ -340,7 +340,7 @@ bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player* plr, Creature* c, GossipMen return false; } -bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, uint32 /*gossipid*/) +bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player* plr, uint64 guid, uint32 /*gossipid*/) { std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); if (itr != m_CreatureTypes.end()) @@ -391,7 +391,7 @@ void OutdoorPvPZM::FillInitialWorldStates(WorldPacket &data) } } -void OutdoorPvPZM::SendRemoveWorldStates(Player *plr) +void OutdoorPvPZM::SendRemoveWorldStates(Player* plr) { plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W, 0); plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_W, 0); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index 5cd2afde243..6b37afce37c 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -215,7 +215,7 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint void UpdateTowerState(); - int32 HandleOpenGo(Player *plr, uint64 guid); + int32 HandleOpenGo(Player* plr, uint64 guid); void SetBeaconState(uint32 controlling_team); // not good atm @@ -246,8 +246,8 @@ class OutdoorPvPZM : public OutdoorPvP bool SetupOutdoorPvP(); - void HandlePlayerEnterZone(Player *plr, uint32 zone); - void HandlePlayerLeaveZone(Player *plr, uint32 zone); + void HandlePlayerEnterZone(Player* plr, uint32 zone); + void HandlePlayerLeaveZone(Player* plr, uint32 zone); bool Update(uint32 diff); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 378a60fbefa..ee052d3bd4f 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -53,7 +53,7 @@ public: struct mob_stolen_soulAI : public ScriptedAI { - mob_stolen_soulAI(Creature *c) : ScriptedAI(c) {} + mob_stolen_soulAI(Creature* c) : ScriptedAI(c) {} uint8 myClass; uint32 Class_Timer; @@ -162,7 +162,7 @@ public: struct boss_exarch_maladaarAI : public ScriptedAI { - boss_exarch_maladaarAI(Creature *c) : ScriptedAI(c) + boss_exarch_maladaarAI(Creature* c) : ScriptedAI(c) { HasTaunted = false; } @@ -191,7 +191,7 @@ public: Avatar_summoned = false; } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!HasTaunted && me->IsWithinDistInMap(who, 150.0)) { @@ -207,7 +207,7 @@ public: DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned->GetEntry() == ENTRY_STOLEN_SOUL) { @@ -216,7 +216,7 @@ public: summoned->SetDisplayId(soulmodel); summoned->setFaction(me->getFaction()); - if (Unit *pTarget = Unit::GetUnit(*me, soulholder)) + if (Unit* pTarget = Unit::GetUnit(*me, soulholder)) { CAST_AI(mob_stolen_soul::mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass); @@ -259,7 +259,7 @@ public: if (StolenSoul_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->GetTypeId() == TYPEID_PLAYER) { @@ -286,7 +286,7 @@ public: if (Ribbon_of_Souls_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_RIBBON_OF_SOULS); Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000); @@ -319,7 +319,7 @@ public: struct mob_avatar_of_martyredAI : public ScriptedAI { - mob_avatar_of_martyredAI(Creature *c) : ScriptedAI(c) {} + mob_avatar_of_martyredAI(Creature* c) : ScriptedAI(c) {} uint32 Mortal_Strike_timer; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 6aeb4bfc02f..dc60969a729 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -52,7 +52,7 @@ public: struct boss_shirrak_the_dead_watcherAI : public ScriptedAI { - boss_shirrak_the_dead_watcherAI(Creature *c) : ScriptedAI(c) + boss_shirrak_the_dead_watcherAI(Creature* c) : ScriptedAI(c) { } @@ -75,7 +75,7 @@ public: void EnterCombat(Unit* /*who*/) { } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned && summoned->GetEntry() == ENTRY_FOCUS_FIRE) { @@ -84,7 +84,7 @@ public: summoned->SetLevel(me->getLevel()); summoned->AddUnitState(UNIT_STAT_ROOT); - if (Unit *pFocusedTarget = Unit::GetUnit(*me, FocusedTargetGUID)) + if (Unit* pFocusedTarget = Unit::GetUnit(*me, FocusedTargetGUID)) summoned->AI()->AttackStart(pFocusedTarget); } } @@ -136,7 +136,7 @@ public: if (FocusFire_Timer <= diff) { // Summon Focus Fire & Emote - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { FocusedTargetGUID = pTarget->GetGUID(); @@ -172,7 +172,7 @@ public: struct mob_focus_fireAI : public ScriptedAI { - mob_focus_fireAI(Creature *c) : ScriptedAI(c) + mob_focus_fireAI(Creature* c) : ScriptedAI(c) { } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 7d5c64ca182..e373382504e 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -67,7 +67,7 @@ public: struct boss_nexusprince_shaffarAI : public ScriptedAI { - boss_nexusprince_shaffarAI(Creature *c) : ScriptedAI(c), summons(me) { HasTaunted = false; } + boss_nexusprince_shaffarAI(Creature* c) : ScriptedAI(c), summons(me) { HasTaunted = false; } uint32 Blink_Timer; uint32 Beacon_Timer; @@ -105,7 +105,7 @@ public: ScriptedAI::EnterEvadeMode(); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!HasTaunted && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f)) { @@ -122,20 +122,20 @@ public: summons.DoZoneInCombat(); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned->GetEntry() == NPC_BEACON) { summoned->CastSpell(summoned, SPELL_ETHEREAL_BEACON_VISUAL, false); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { summons.Despawn(summon); } @@ -233,7 +233,7 @@ public: struct mob_ethereal_beaconAI : public ScriptedAI { - mob_ethereal_beaconAI(Creature *c) : ScriptedAI(c) + mob_ethereal_beaconAI(Creature* c) : ScriptedAI(c) { } @@ -266,7 +266,7 @@ public: Shaffar->AI()->AttackStart(who); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->AI()->AttackStart(me->getVictim()); } @@ -278,7 +278,7 @@ public: if (Check_Timer <= diff) { - Creature *Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); + Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); if (!Shaffar || Shaffar->isDead() || !Shaffar->isInCombat()) { KillSelf(); @@ -325,7 +325,7 @@ public: struct mob_ethereal_apprenticeAI : public ScriptedAI { - mob_ethereal_apprenticeAI(Creature *c) : ScriptedAI(c) {} + mob_ethereal_apprenticeAI(Creature* c) : ScriptedAI(c) {} uint32 Cast_Timer; diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index e79d712aef4..d55a717d831 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -53,7 +53,7 @@ public: struct boss_pandemoniusAI : public ScriptedAI { - boss_pandemoniusAI(Creature *c) : ScriptedAI(c) + boss_pandemoniusAI(Creature* c) : ScriptedAI(c) { } @@ -90,7 +90,7 @@ public: if (VoidBlast_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_VOID_BLAST); VoidBlast_Timer = 500; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index c0fd4433b16..c7c904e0402 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -65,7 +65,7 @@ public: struct boss_darkweaver_sythAI : public ScriptedAI { - boss_darkweaver_sythAI(Creature *c) : ScriptedAI(c) + boss_darkweaver_sythAI(Creature* c) : ScriptedAI(c) { } @@ -110,9 +110,9 @@ public: DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } @@ -154,7 +154,7 @@ public: if (flameshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FLAME_SHOCK); flameshock_timer = 10000 + rand()%5000; @@ -162,7 +162,7 @@ public: if (arcaneshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCANE_SHOCK); arcaneshock_timer = 10000 + rand()%5000; @@ -170,7 +170,7 @@ public: if (frostshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FROST_SHOCK); frostshock_timer = 10000 + rand()%5000; @@ -178,7 +178,7 @@ public: if (shadowshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_SHOCK); shadowshock_timer = 10000 + rand()%5000; @@ -186,7 +186,7 @@ public: if (chainlightning_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAIN_LIGHTNING); chainlightning_timer = 25000; @@ -206,7 +206,7 @@ public: struct mob_syth_fireAI : public ScriptedAI { - mob_syth_fireAI(Creature *c) : ScriptedAI(c) + mob_syth_fireAI(Creature* c) : ScriptedAI(c) { } @@ -229,7 +229,7 @@ public: if (flameshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FLAME_SHOCK); flameshock_timer = 5000; @@ -237,7 +237,7 @@ public: if (flamebuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FLAME_BUFFET); flamebuffet_timer = 5000; @@ -265,7 +265,7 @@ public: struct mob_syth_arcaneAI : public ScriptedAI { - mob_syth_arcaneAI(Creature *c) : ScriptedAI(c) + mob_syth_arcaneAI(Creature* c) : ScriptedAI(c) { } @@ -288,7 +288,7 @@ public: if (arcaneshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCANE_SHOCK); arcaneshock_timer = 5000; @@ -296,7 +296,7 @@ public: if (arcanebuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCANE_BUFFET); arcanebuffet_timer = 5000; @@ -319,7 +319,7 @@ public: struct mob_syth_frostAI : public ScriptedAI { - mob_syth_frostAI(Creature *c) : ScriptedAI(c) + mob_syth_frostAI(Creature* c) : ScriptedAI(c) { } @@ -342,7 +342,7 @@ public: if (frostshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FROST_SHOCK); frostshock_timer = 5000; @@ -350,7 +350,7 @@ public: if (frostbuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FROST_BUFFET); frostbuffet_timer = 5000; @@ -374,7 +374,7 @@ public: struct mob_syth_shadowAI : public ScriptedAI { - mob_syth_shadowAI(Creature *c) : ScriptedAI(c) + mob_syth_shadowAI(Creature* c) : ScriptedAI(c) { } @@ -397,7 +397,7 @@ public: if (shadowshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_SHOCK); shadowshock_timer = 5000; @@ -405,7 +405,7 @@ public: if (shadowbuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_BUFFET); shadowbuffet_timer = 5000; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index 2dec3658b39..29df59cc7cb 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -64,7 +64,7 @@ public: struct boss_talon_king_ikissAI : public ScriptedAI { - boss_talon_king_ikissAI(Creature *c) : ScriptedAI(c) + boss_talon_king_ikissAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -91,7 +91,7 @@ public: ManaShield = false; } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who)) && who->isInAccessiblePlaceFor(me)) { @@ -151,7 +151,7 @@ public: if (Sheep_Timer <= diff) { - Unit *pTarget; + Unit* pTarget; //second top aggro target in normal, random target in heroic correct? if (IsHeroic()) @@ -184,7 +184,7 @@ public: { DoScriptText(EMOTE_ARCANE_EXP, me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 1fbf91e8598..0177a66ca73 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -66,7 +66,7 @@ public: struct boss_blackheart_the_inciterAI : public ScriptedAI { - boss_blackheart_the_inciterAI(Creature *c) : ScriptedAI(c) + boss_blackheart_the_inciterAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -136,7 +136,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->CastSpell(pTarget, SPELL_INCITE_CHAOS_B, true); } @@ -150,7 +150,7 @@ public: //Charge_Timer if (Charge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHARGE); Charge_Timer = 15000 + rand()%10000; } else Charge_Timer -= diff; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 70439bf9027..becaed6ae6a 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -74,7 +74,7 @@ public: struct mob_voidtravelerAI : public ScriptedAI { - mob_voidtravelerAI(Creature *c) : ScriptedAI(c) + mob_voidtravelerAI(Creature* c) : ScriptedAI(c) { } @@ -100,7 +100,7 @@ public: } if (move <= diff) { - Creature *Vorpil = Unit::GetCreature(*me, VorpilGUID); + Creature* Vorpil = Unit::GetCreature(*me, VorpilGUID); if (!Vorpil) { VorpilGUID = 0; @@ -147,7 +147,7 @@ public: struct boss_grandmaster_vorpilAI : public ScriptedAI { - boss_grandmaster_vorpilAI(Creature *c) : ScriptedAI(c) + boss_grandmaster_vorpilAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); Intro = false; @@ -182,7 +182,7 @@ public: { for (uint8 i = 0; i < 5; ++i) { - Creature *Portal = NULL; + Creature* Portal = NULL; Portal = me->SummonCreature(MOB_VOID_PORTAL, VoidPortalCoords[i][0], VoidPortalCoords[i][1], VoidPortalCoords[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 3000000); if (Portal) { @@ -201,7 +201,7 @@ public: { for (uint8 i = 0; i < 5; ++i) { - Unit *Portal = Unit::GetUnit((*me), PortalsGuid[i]); + Unit* Portal = Unit::GetUnit((*me), PortalsGuid[i]); if (Portal && Portal->isAlive()) Portal->DealDamage(Portal, Portal->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); PortalsGuid[i] = 0; @@ -221,7 +221,7 @@ public: } } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned && summoned->GetEntry() == MOB_VOID_TRAVELER) CAST_AI(mob_voidtraveler::mob_voidtravelerAI, summoned->AI())->VorpilGUID = me->GetGUID(); @@ -250,7 +250,7 @@ public: pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { ScriptedAI::MoveInLineOfSight(who); @@ -274,7 +274,7 @@ public: if (IsHeroic() && banish_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, false); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, false); if (pTarget) { DoCast(pTarget, SPELL_BANISH); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index a220531a929..08ea0eaeb09 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -48,7 +48,7 @@ public: struct boss_murmurAI : public ScriptedAI { - boss_murmurAI(Creature *c) : ScriptedAI(c) + boss_murmurAI(Creature* c) : ScriptedAI(c) { SetCombatMovement(false); } @@ -82,7 +82,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) { //Not do anything without aura, spell can be resisted! @@ -98,7 +98,7 @@ public: void EnterCombat(Unit* /*who*/) { } // Sonic Boom instant damage (needs core fix instead of this) - void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) + void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) { if (pTarget && pTarget->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) me->DealDamage(pTarget, (pTarget->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell); @@ -131,7 +131,7 @@ public: // Murmur's Touch if (MurmursTouch_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 80, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 80, true)) DoCast(pTarget, SPELL_MURMURS_TOUCH); MurmursTouch_Timer = 25000 + rand()%10000; } else MurmursTouch_Timer -= diff; @@ -149,7 +149,7 @@ public: // Magnetic Pull if (MagneticPull_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { DoCast(pTarget, SPELL_MAGNETIC_PULL); @@ -166,7 +166,7 @@ public: { std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit *pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) + if (Unit* pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) if (pTarget->isAlive() && !me->IsWithinDist(pTarget, 35, false)) DoCast(pTarget, SPELL_THUNDERING_STORM, true); ThunderingStorm_Timer = 15000; @@ -175,7 +175,7 @@ public: // Sonic Shock if (SonicShock_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 20, false)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 20, false)) if (pTarget->isAlive()) DoCast(pTarget, SPELL_SONIC_SHOCK); SonicShock_Timer = 10000+rand()%10000; @@ -189,7 +189,7 @@ public: { std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit *pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) + if (Unit* pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) if (pTarget->isAlive() && me->IsWithinMeleeRange(pTarget)) { me->TauntApply(pTarget); diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 6bec350adfc..5ebe89ffea9 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -67,7 +67,7 @@ public: struct boss_gurtogg_bloodboilAI : public ScriptedAI { - boss_gurtogg_bloodboilAI(Creature *c) : ScriptedAI(c) + boss_gurtogg_bloodboilAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -147,11 +147,11 @@ public: if (!m_threatlist.size()) // He doesn't have anyone in his threatlist, useless to continue return; - std::list<Unit *> targets; + std::list<Unit* > targets; std::list<HostileReference *>::const_iterator itr = m_threatlist.begin(); for (; itr!= m_threatlist.end(); ++itr) //store the threat list in a different container { - Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); //only on alive players if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) targets.push_back(pTarget); @@ -166,9 +166,9 @@ public: /*SpellEntry const *spellInfo = GetSpellStore()->LookupEntry(SPELL_BLOODBOIL); if (spellInfo) { - for (std::list<Unit *>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) + for (std::list<Unit* >::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) { - Unit *pTarget = *itr; + Unit* pTarget = *itr; if (!pTarget) return; for (uint32 i = 0; i<3; ++i) { @@ -228,7 +228,7 @@ public: { DoCast(me->getVictim(), SPELL_BEWILDERING_STRIKE); float mt_threat = DoGetThreat(me->getVictim()); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1)) me->AddThreat(pTarget, mt_threat); BewilderingStrikeTimer = 20000; } else BewilderingStrikeTimer -= diff; @@ -277,7 +277,7 @@ public: { if (Phase1) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->isAlive()) { Phase1 = false; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index dad131eb6f5..c0f59817a79 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -375,7 +375,7 @@ public: struct flame_of_azzinothAI : public ScriptedAI { - flame_of_azzinothAI(Creature *c) : ScriptedAI(c) {} + flame_of_azzinothAI(Creature* c) : ScriptedAI(c) {} uint32 FlameBlastTimer; uint32 CheckTimer; @@ -392,7 +392,7 @@ public: void ChargeCheck() { - Unit *pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 200, false); + Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 200, false); if (pTarget && (!me->IsWithinCombatRange(pTarget, FLAME_CHARGE_DISTANCE))) { me->AddThreat(pTarget, 5000000.0f); @@ -411,7 +411,7 @@ public: Glaive->InterruptNonMeleeSpells(true); DoCast(me, SPELL_FLAME_ENRAGE, true); DoResetThreat(); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->isAlive()) { me->AddThreat(me->getVictim(), 5000000.0f); @@ -538,7 +538,7 @@ public: DoZoneInCombat(); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!who || Phase >= PHASE_TALK_SEQUENCE) return; @@ -549,7 +549,7 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit *) {} + void MoveInLineOfSight(Unit* ) {} void JustDied(Unit* /*killer*/) { @@ -581,7 +581,7 @@ public: } } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (damage >= me->GetHealth() && done_by != me) damage = 0; @@ -1038,7 +1038,7 @@ public: case EVENT_PARASITIC_SHADOWFIEND: { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true)) DoCast(pTarget, SPELL_PARASITIC_SHADOWFIEND, true); Timer[EVENT_PARASITIC_SHADOWFIEND] = 35000 + rand()%10000; } @@ -1157,7 +1157,7 @@ public: struct boss_maievAI : public ScriptedAI { - boss_maievAI(Creature *c) : ScriptedAI(c) {}; + boss_maievAI(Creature* c) : ScriptedAI(c) {}; uint64 IllidanGUID; @@ -1183,7 +1183,7 @@ public: void EnterEvadeMode() {} void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1197,7 +1197,7 @@ public: } } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!who || Timer[EVENT_MAIEV_STEALTH]) return; @@ -1271,7 +1271,7 @@ public: { if (GETCRE(Illidan, IllidanGUID)) { - Unit *pTarget = Illidan->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = Illidan->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget || !me->IsWithinDistInMap(pTarget, 80) || Illidan->IsWithinDistInMap(pTarget, 20)) { @@ -1466,7 +1466,7 @@ public: Timer = 1; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (damage > me->GetHealth() || done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1886,7 +1886,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su summon->setDeathState(JUST_DIED); return; } - Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 999, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 999, true); if (!pTarget || pTarget->HasAura(SPELL_PARASITIC_SHADOWFIEND) || pTarget->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); @@ -1895,7 +1895,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su } break; case SHADOW_DEMON: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) // only on players. + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) // only on players. { summon->AddThreat(pTarget, 5000000.0f); summon->AI()->AttackStart(pTarget); @@ -2017,7 +2017,7 @@ public: struct cage_trap_triggerAI : public ScriptedAI { - cage_trap_triggerAI(Creature *c) : ScriptedAI(c) {} + cage_trap_triggerAI(Creature* c) : ScriptedAI(c) {} uint64 IllidanGUID; uint32 DespawnTimer; @@ -2039,7 +2039,7 @@ public: void EnterCombat(Unit* /*who*/){} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!Active) return; @@ -2114,7 +2114,7 @@ public: struct shadow_demonAI : public ScriptedAI { - shadow_demonAI(Creature *c) : ScriptedAI(c) {} + shadow_demonAI(Creature* c) : ScriptedAI(c) {} uint64 TargetGUID; @@ -2128,7 +2128,7 @@ public: void JustDied(Unit* /*killer*/) { - if (Unit *pTarget = Unit::GetUnit((*me), TargetGUID)) + if (Unit* pTarget = Unit::GetUnit((*me), TargetGUID)) pTarget->RemoveAurasDueToSpell(SPELL_PARALYZE); } @@ -2231,7 +2231,7 @@ public: { if (!me->getVictim()) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) AttackStart(pTarget); else { diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 309b1884685..1cfd66bdfd1 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -90,7 +90,7 @@ public: struct boss_shahrazAI : public ScriptedAI { - boss_shahrazAI(Creature *c) : ScriptedAI(c) + boss_shahrazAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -190,7 +190,7 @@ public: //Randomly cast one beam. if (BeamTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget || !pTarget->isAlive()) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 4e545087303..18899fc5db8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -113,7 +113,7 @@ public: struct npc_enslaved_soulAI : public ScriptedAI { - npc_enslaved_soulAI(Creature *c) : ScriptedAI(c) {} + npc_enslaved_soulAI(Creature* c) : ScriptedAI(c) {} uint64 ReliquaryGUID; @@ -142,7 +142,7 @@ public: struct boss_reliquary_of_soulsAI : public ScriptedAI { - boss_reliquary_of_soulsAI(Creature *c) : ScriptedAI(c) + boss_reliquary_of_soulsAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); EssenceGUID = 0; @@ -199,7 +199,7 @@ public: float y = Coords[random].y; Creature* Soul = me->SummonCreature(CREATURE_ENSLAVED_SOUL, x, y, me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0); if (!Soul) return false; - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { CAST_AI(npc_enslaved_soul::npc_enslaved_soulAI, Soul->AI())->ReliquaryGUID = me->GetGUID(); Soul->AI()->AttackStart(pTarget); @@ -207,7 +207,7 @@ public: return true; } - void MergeThreatList(Creature *pTarget) + void MergeThreatList(Creature* pTarget) { if (!pTarget) return; @@ -361,7 +361,7 @@ public: void npc_enslaved_soul::npc_enslaved_soulAI::JustDied(Unit* /*killer*/) { if (ReliquaryGUID) - if (Creature *Reliquary = (Unit::GetCreature((*me), ReliquaryGUID))) + if (Creature* Reliquary = (Unit::GetCreature((*me), ReliquaryGUID))) ++(CAST_AI(boss_reliquary_of_souls::boss_reliquary_of_soulsAI, Reliquary->AI())->SoulDeathCount); DoCast(me, SPELL_SOUL_RELEASE, true); @@ -379,7 +379,7 @@ public: struct boss_essence_of_sufferingAI : public ScriptedAI { - boss_essence_of_sufferingAI(Creature *c) : ScriptedAI(c) {} + boss_essence_of_sufferingAI(Creature* c) : ScriptedAI(c) {} uint64 StatAuraGUID; @@ -446,7 +446,7 @@ public: return; // No targets added for some reason. No point continuing. targets.sort(Trinity::ObjectDistanceOrderPred(me)); // Sort players by distance. targets.resize(1); // Only need closest target. - Unit *pTarget = targets.front(); // Get the first target. + Unit* pTarget = targets.front(); // Get the first target. if (pTarget) pTarget->CastSpell(me, SPELL_FIXATE_TAUNT, true); DoResetThreat(); @@ -504,7 +504,7 @@ public: struct boss_essence_of_desireAI : public ScriptedAI { - boss_essence_of_desireAI(Creature *c) : ScriptedAI(c) {} + boss_essence_of_desireAI(Creature* c) : ScriptedAI(c) {} uint32 RuneShieldTimer; uint32 DeadenTimer; @@ -518,7 +518,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_CONFUSE, true); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by == me) return; @@ -607,7 +607,7 @@ public: struct boss_essence_of_angerAI : public ScriptedAI { - boss_essence_of_angerAI(Creature *c) : ScriptedAI(c) {} + boss_essence_of_angerAI(Creature* c) : ScriptedAI(c) {} uint64 AggroTargetGUID; diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index e0b732b42c3..b935f82c7f5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -278,12 +278,12 @@ public: { summons.DespawnAll(); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Despawn(summon); @@ -371,7 +371,7 @@ public: { Spawn->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); Spawn->GetMotionMaster()->MovePoint(0, AGGRO_X, AGGRO_Y, AGGRO_Z); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); Spawn->AI()->AttackStart(pTarget); } } @@ -628,12 +628,12 @@ public: summons.DespawnAll(); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon->GetEntry() == CREATURE_BROKEN) summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { if (summon->GetEntry() == CREATURE_BROKEN) summons.Despawn(summon); diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 49eaeea2767..9863ad9b972 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -65,7 +65,7 @@ public: struct molten_flameAI : public NullCreatureAI { - molten_flameAI(Creature *c) : NullCreatureAI(c) {} + molten_flameAI(Creature* c) : NullCreatureAI(c) {} void InitializeAI() { @@ -91,7 +91,7 @@ public: struct boss_supremusAI : public ScriptedAI { - boss_supremusAI(Creature *c) : ScriptedAI(c), summons(me) + boss_supremusAI(Creature* c) : ScriptedAI(c), summons(me) { pInstance = c->GetInstanceScript(); } @@ -165,13 +165,13 @@ public: summons.DespawnAll(); } - void JustSummoned(Creature *summon) {summons.Summon(summon);} - void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} + void JustSummoned(Creature* summon) {summons.Summon(summon);} + void SummonedCreatureDespawn(Creature* summon) {summons.Despawn(summon);} Unit* CalculateHatefulStrikeTarget() { uint32 health = 0; - Unit *pTarget = NULL; + Unit* pTarget = NULL; std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); @@ -211,13 +211,13 @@ public: events.ScheduleEvent(EVENT_FLAME, 20000, GCD_CAST); break; case EVENT_HATEFUL_STRIKE: - if (Unit *pTarget = CalculateHatefulStrikeTarget()) + if (Unit* pTarget = CalculateHatefulStrikeTarget()) DoCast(pTarget, SPELL_HATEFUL_STRIKE); events.DelayEvents(1000, GCD_CAST); events.ScheduleEvent(EVENT_HATEFUL_STRIKE, 5000, GCD_CAST, PHASE_STRIKE); break; case EVENT_SWITCH_TARGET: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { DoResetThreat(); me->AddThreat(pTarget, 5000000.0f); @@ -227,7 +227,7 @@ public: break; case EVENT_VOLCANO: { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); if (!pTarget) pTarget = me->getVictim(); if (pTarget) { @@ -263,7 +263,7 @@ public: struct npc_volcanoAI : public Scripted_NoMovementAI { - npc_volcanoAI(Creature *c) : Scripted_NoMovementAI(c) {} + npc_volcanoAI(Creature* c) : Scripted_NoMovementAI(c) {} void Reset() { diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index c5491ed2d0c..99ef003b98a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -63,7 +63,7 @@ public: struct mob_doom_blossomAI : public ScriptedAI { - mob_doom_blossomAI(Creature *c) : ScriptedAI(c) {} + mob_doom_blossomAI(Creature* c) : ScriptedAI(c) {} uint32 CheckTeronTimer; uint32 ShadowBoltTimer; @@ -148,7 +148,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || (!who->isAlive()) || (who->GetGUID() == GhostGUID)) return; @@ -178,7 +178,7 @@ public: targets.push_back(pUnit); } targets.sort(Trinity::ObjectDistanceOrderPred(me)); - Unit *pTarget = targets.front(); + Unit* pTarget = targets.front(); if (pTarget && me->IsWithinDistInMap(pTarget, me->GetAttackDistance(pTarget))) { DoCast(pTarget, SPELL_ATROPHY); @@ -219,7 +219,7 @@ public: struct boss_teron_gorefiendAI : public ScriptedAI { - boss_teron_gorefiendAI(Creature *c) : ScriptedAI(c) + boss_teron_gorefiendAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -365,7 +365,7 @@ public: Construct->CastSpell(Construct, SPELL_PASSIVE_SHADOWFORM, true); SetThreatList(Construct); // Use same function as Doom Blossom to set Threat List. CAST_AI(mob_shadowy_construct::mob_shadowy_constructAI, Construct->AI())->GhostGUID = GhostGUID; - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) // someone's trying to solo. pTarget = me->getVictim(); @@ -417,7 +417,7 @@ public: Shadow = me->SummonCreature(CREATURE_SHADOWY_CONSTRUCT, X, me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 0); if (Shadow) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); @@ -430,7 +430,7 @@ public: if (SummonDoomBlossomTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { float X = CalculateRandomLocation(pTarget->GetPositionX(), 20); float Y = CalculateRandomLocation(pTarget->GetPositionY(), 20); @@ -452,7 +452,7 @@ public: if (IncinerateTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); @@ -466,7 +466,7 @@ public: if (CrushingShadowsTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->isAlive()) DoCast(pTarget, SPELL_CRUSHING_SHADOWS); CrushingShadowsTimer = 10000 + rand()%16 * 1000; @@ -475,7 +475,7 @@ public: /*** NOTE FOR FUTURE DEV: UNCOMMENT BELOW ONLY IF MIND CONTROL IS FULLY IMPLEMENTED **/ /*if (ShadowOfDeathTimer <= diff) { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index e3c59203903..922124a51b5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -72,7 +72,7 @@ public: struct boss_najentusAI : public ScriptedAI { - boss_najentusAI(Creature *c) : ScriptedAI(c) + boss_najentusAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -131,7 +131,7 @@ public: bool RemoveImpalingSpine() { if (!SpineTargetGUID) return false; - Unit *pTarget = Unit::GetUnit(*me, SpineTargetGUID); + Unit* pTarget = Unit::GetUnit(*me, SpineTargetGUID); if (pTarget && pTarget->HasAura(SPELL_IMPALING_SPINE)) pTarget->RemoveAurasDueToSpell(SPELL_IMPALING_SPINE); SpineTargetGUID=0; @@ -167,7 +167,7 @@ public: break; case EVENT_SPINE: { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); if (pTarget) { diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index fc3ac269260..42b7463b5b0 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -217,7 +217,7 @@ public: struct mob_illidari_councilAI : public ScriptedAI { - mob_illidari_councilAI(Creature *c) : ScriptedAI(c) + mob_illidari_councilAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); for (uint8 i = 0; i < 4; ++i) @@ -275,7 +275,7 @@ public: void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void StartEvent(Unit *pTarget) + void StartEvent(Unit* pTarget) { if (!pInstance) return; @@ -475,7 +475,7 @@ public: struct boss_gathios_the_shattererAI : public boss_illidari_councilAI { - boss_gathios_the_shattererAI(Creature *c) : boss_illidari_councilAI(c) {} + boss_gathios_the_shattererAI(Creature* c) : boss_illidari_councilAI(c) {} uint32 ConsecrationTimer; uint32 HammerOfJusticeTimer; @@ -557,7 +557,7 @@ public: if (HammerOfJusticeTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { // is in ~10-40 yd range if (me->IsInRange(pTarget, 10.0f, 40.0f, false)) @@ -602,7 +602,7 @@ public: struct boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI { - boss_high_nethermancer_zerevorAI(Creature *c) : boss_illidari_councilAI(c) {} + boss_high_nethermancer_zerevorAI(Creature* c) : boss_illidari_councilAI(c) {} uint32 BlizzardTimer; uint32 FlamestrikeTimer; @@ -670,7 +670,7 @@ public: if (BlizzardTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_BLIZZARD); BlizzardTimer = 45000 + rand()%46 * 1000; @@ -681,7 +681,7 @@ public: if (FlamestrikeTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_FLAMESTRIKE); FlamestrikeTimer = 55000 + rand()%46 * 1000; @@ -706,7 +706,7 @@ public: struct boss_lady_malandeAI : public boss_illidari_councilAI { - boss_lady_malandeAI(Creature *c) : boss_illidari_councilAI(c) {} + boss_lady_malandeAI(Creature* c) : boss_illidari_councilAI(c) {} uint32 EmpoweredSmiteTimer; uint32 CircleOfHealingTimer; @@ -738,7 +738,7 @@ public: if (EmpoweredSmiteTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_EMPOWERED_SMITE); EmpoweredSmiteTimer = 38000; @@ -753,7 +753,7 @@ public: if (DivineWrathTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_DIVINE_WRATH); DivineWrathTimer = 40000 + rand()%41 * 1000; @@ -784,7 +784,7 @@ public: struct boss_veras_darkshadowAI : public boss_illidari_councilAI { - boss_veras_darkshadowAI(Creature *c) : boss_illidari_councilAI(c) {} + boss_veras_darkshadowAI(Creature* c) : boss_illidari_councilAI(c) {} uint64 EnvenomTargetGUID; @@ -838,7 +838,7 @@ public: if (VanishTimer <= diff) // Disappear and stop attacking, but follow a random unit { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { VanishTimer = 30000; AppearEnvenomTimer= 28000; @@ -858,7 +858,7 @@ public: { if (VanishTimer <= diff) // Become attackable and poison current target { - Unit *pTarget = me->getVictim(); + Unit* pTarget = me->getVictim(); DoCast(pTarget, SPELL_DEADLY_POISON); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoResetThreat(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 499652f6034..dd81d4d763f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -107,7 +107,7 @@ public: struct boss_fathomlord_karathressAI : public ScriptedAI { - boss_fathomlord_karathressAI(Creature *c) : ScriptedAI(c) + boss_fathomlord_karathressAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); Advisors[0] = 0; @@ -185,7 +185,7 @@ public: Advisors[2] = pInstance->GetData64(DATA_CARIBDIS); } - void StartEvent(Unit *who) + void StartEvent(Unit* who) { if (!pInstance) return; @@ -225,7 +225,7 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); if (pTarget) { @@ -249,7 +249,7 @@ public: if (CataclysmicBolt_Timer <= diff) { //select a random unit other than the main tank - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); //if there aren't other units, cast on the tank if (!pTarget) @@ -317,7 +317,7 @@ public: struct boss_fathomguard_sharkkisAI : public ScriptedAI { - boss_fathomguard_sharkkisAI(Creature *c) : ScriptedAI(c) + boss_fathomguard_sharkkisAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -342,7 +342,7 @@ public: pet = false; - Creature *Pet = Unit::GetCreature(*me, SummonedPet); + Creature* Pet = Unit::GetCreature(*me, SummonedPet); if (Pet && Pet->isAlive()) { Pet->DealDamage(Pet, Pet->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -358,7 +358,7 @@ public: { if (pInstance) { - Creature *Karathress = NULL; + Creature* Karathress = NULL; Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); if (Karathress) @@ -381,7 +381,7 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); if (pTarget) { @@ -418,7 +418,7 @@ public: if (TheBeastWithin_Timer <= diff) { DoCast(me, SPELL_THE_BEAST_WITHIN); - Creature *Pet = Unit::GetCreature(*me, SummonedPet); + Creature* Pet = Unit::GetCreature(*me, SummonedPet); if (Pet && Pet->isAlive()) { Pet->CastSpell(Pet, SPELL_PET_ENRAGE, true); @@ -443,8 +443,8 @@ public: pet_id = CREATURE_FATHOM_SPOREBAT; } //DoCast(me, spell_id, true); - Creature *Pet = DoSpawnCreature(pet_id, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Creature* Pet = DoSpawnCreature(pet_id, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (Pet && pTarget) { Pet->AI()->AttackStart(pTarget); @@ -471,7 +471,7 @@ public: struct boss_fathomguard_tidalvessAI : public ScriptedAI { - boss_fathomguard_tidalvessAI(Creature *c) : ScriptedAI(c) + boss_fathomguard_tidalvessAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -498,7 +498,7 @@ public: { if (pInstance) { - Creature *Karathress = NULL; + Creature* Karathress = NULL; Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); if (Karathress) @@ -522,7 +522,7 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); if (pTarget) { @@ -557,7 +557,7 @@ public: if (Spitfire_Timer <= diff) { DoCast(me, SPELL_SPITFIRE_TOTEM); - Unit *SpitfireTotem = Unit::GetUnit(*me, CREATURE_SPITFIRE_TOTEM); + Unit* SpitfireTotem = Unit::GetUnit(*me, CREATURE_SPITFIRE_TOTEM); if (SpitfireTotem) { CAST_CRE(SpitfireTotem)->AI()->AttackStart(me->getVictim()); @@ -598,7 +598,7 @@ public: struct boss_fathomguard_caribdisAI : public ScriptedAI { - boss_fathomguard_caribdisAI(Creature *c) : ScriptedAI(c) + boss_fathomguard_caribdisAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -625,7 +625,7 @@ public: { if (pInstance) { - Creature *Karathress = NULL; + Creature* Karathress = NULL; Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); if (Karathress) @@ -648,7 +648,7 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); if (pTarget) { @@ -688,14 +688,14 @@ public: { //DoCast(me, SPELL_SUMMON_CYCLONE); // Doesn't work Cyclone_Timer = 30000+rand()%10000; - Creature *Cyclone = me->SummonCreature(CREATURE_CYCLONE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 15000); + Creature* Cyclone = me->SummonCreature(CREATURE_CYCLONE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 15000); if (Cyclone) { CAST_CRE(Cyclone)->SetFloatValue(OBJECT_FIELD_SCALE_X, 3.0f); Cyclone->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Cyclone->setFaction(me->getFaction()); Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_CYCLONE, true); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { Cyclone->AI()->AttackStart(pTarget); @@ -707,7 +707,7 @@ public: if (Heal_Timer <= diff) { // It can be cast on any of the mobs - Unit *pUnit = NULL; + Unit* pUnit = NULL; while (pUnit == NULL || !pUnit->isAlive()) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 520a22e414d..f33210ad799 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -88,7 +88,7 @@ public: struct boss_hydross_the_unstableAI : public ScriptedAI { - boss_hydross_the_unstableAI(Creature *c) : ScriptedAI(c), Summons(me) + boss_hydross_the_unstableAI(Creature* c) : ScriptedAI(c), Summons(me) { pInstance = c->GetInstanceScript(); } @@ -202,7 +202,7 @@ public: } } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { Summons.Despawn(summon); } @@ -262,7 +262,7 @@ public: //VileSludge_Timer if (VileSludge_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_VILE_SLUDGE); @@ -329,7 +329,7 @@ public: //WaterTomb_Timer if (WaterTomb_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) DoCast(pTarget, SPELL_WATER_TOMB); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 93903e4f297..0f3cf979e66 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -145,7 +145,7 @@ public: struct boss_lady_vashjAI : public ScriptedAI { - boss_lady_vashjAI (Creature *c) : ScriptedAI(c) + boss_lady_vashjAI (Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); Intro = false; @@ -201,7 +201,7 @@ public: JustCreated = false; } else CanAttack = true; - Unit *remo; + Unit* remo; for (uint8 i = 0; i < 4; ++i) { remo = Unit::GetUnit(*me, ShieldGeneratorChannel[i]); @@ -270,7 +270,7 @@ public: AttackStart(who); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!Intro) { @@ -363,7 +363,7 @@ public: { //Static Charge //Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic. - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); if (pTarget && !pTarget->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) @@ -404,7 +404,7 @@ public: me->GetMotionMaster()->Clear(); DoTeleportTo(MIDDLE_X, MIDDLE_Y, MIDDLE_Z); - Creature *pCreature; + Creature* pCreature; for (uint8 i = 0; i < 4; ++i) { pCreature = me->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); @@ -420,12 +420,12 @@ public: //SummonSporebat_Timer if (SummonSporebat_Timer <= diff) { - Creature *Sporebat = NULL; + Creature* Sporebat = NULL; Sporebat = me->SummonCreature(TOXIC_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, TEMPSUMMON_CORPSE_DESPAWN, 0); if (Sporebat) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) Sporebat->AI()->AttackStart(pTarget); @@ -450,7 +450,7 @@ public: if (Check_Timer <= diff) { bool InMeleeRange = false; - Unit *pTarget; + Unit* pTarget; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { @@ -478,7 +478,7 @@ public: { //Forked Lightning //Used constantly in Phase 2, it shoots out completely randomly targeted bolts of lightning which hit everybody in a roughtly 60 degree cone in front of Vashj for 2313-2687 nature damage. - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) @@ -519,7 +519,7 @@ public: CoilfangElite = me->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (CoilfangElite) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) CoilfangElite->AI()->AttackStart(pTarget); @@ -537,7 +537,7 @@ public: CoilfangStrider = me->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (CoilfangStrider) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) CoilfangStrider->AI()->AttackStart(pTarget); @@ -587,7 +587,7 @@ public: struct mob_enchanted_elementalAI : public ScriptedAI { - mob_enchanted_elementalAI(Creature *c) : ScriptedAI(c) + mob_enchanted_elementalAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -660,7 +660,7 @@ public: if (me->IsWithinDist3d(MIDDLE_X, MIDDLE_Y, MIDDLE_Z, 3)) DoCast(me, SPELL_SURGE); } - if (Creature *Vashj = Unit::GetCreature(*me, VashjGUID)) + if (Creature* Vashj = Unit::GetCreature(*me, VashjGUID)) { if (!Vashj->isInCombat() || CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->Phase != 2 || Vashj->isDead()) { @@ -689,7 +689,7 @@ public: struct mob_tainted_elementalAI : public ScriptedAI { - mob_tainted_elementalAI(Creature *c) : ScriptedAI(c) + mob_tainted_elementalAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -709,7 +709,7 @@ public: { if (pInstance) { - Creature *Vashj = NULL; + Creature* Vashj = NULL; Vashj = (Unit::GetCreature((*me), pInstance->GetData64(DATA_LADYVASHJ))); if (Vashj) @@ -727,7 +727,7 @@ public: //PoisonBolt_Timer if (PoisonBolt_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->IsWithinDistInMap(me, 30)) @@ -764,7 +764,7 @@ public: struct mob_toxic_sporebatAI : public ScriptedAI { - mob_toxic_sporebatAI(Creature *c) : ScriptedAI(c) + mob_toxic_sporebatAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); EnterEvadeMode(); @@ -819,7 +819,7 @@ public: //toxic spores if (bolt_timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { @@ -840,7 +840,7 @@ public: if (pInstance) { //check if vashj is death - Unit *Vashj = NULL; + Unit* Vashj = NULL; Vashj = Unit::GetUnit((*me), pInstance->GetData64(DATA_LADYVASHJ)); if (!Vashj || (Vashj && !Vashj->isAlive()) || (Vashj && CAST_AI(boss_lady_vashj::boss_lady_vashjAI, CAST_CRE(Vashj)->AI())->Phase != 3)) { @@ -922,7 +922,7 @@ public: struct mob_shield_generator_channelAI : public ScriptedAI { - mob_shield_generator_channelAI(Creature *c) : ScriptedAI(c) + mob_shield_generator_channelAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -950,7 +950,7 @@ public: if (Check_Timer <= diff) { - Unit *Vashj = NULL; + Unit* Vashj = NULL; Vashj = Unit::GetUnit((*me), pInstance->GetData64(DATA_LADYVASHJ)); if (Vashj && Vashj->isAlive()) @@ -984,7 +984,7 @@ public: return true; } - Creature *Vashj = NULL; + Creature* Vashj = NULL; Vashj = (Unit::GetCreature((*pPlayer), pInstance->GetData64(DATA_LADYVASHJ))); if (Vashj && (CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->Phase == 2)) { @@ -1021,7 +1021,7 @@ public: } //get and remove channel - Unit *Channel = NULL; + Unit* Channel = NULL; Channel = Unit::GetCreature(*Vashj, CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->ShieldGeneratorChannel[channel_identifier]); if (Channel) { 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 dd2d980e8d7..be35d848b30 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 @@ -79,7 +79,7 @@ public: struct mob_inner_demonAI : public ScriptedAI { - mob_inner_demonAI(Creature *c) : ScriptedAI(c) + mob_inner_demonAI(Creature* c) : ScriptedAI(c) { victimGUID = 0; } @@ -101,7 +101,7 @@ public: pUnit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetGUID() != victimGUID && done_by->GetGUID() != me->GetGUID()) { @@ -170,7 +170,7 @@ public: struct boss_leotheras_the_blindAI : public ScriptedAI { - boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c) + boss_leotheras_the_blindAI(Creature* c) : ScriptedAI(c) { c->GetPosition(x, y, z); pInstance = c->GetInstanceScript(); @@ -233,7 +233,7 @@ public: { for (uint8 i = 0; i < 3; ++i) { - if (Creature *add = Unit::GetCreature(*me, SpellBinderGUID[i])) + if (Creature* add = Unit::GetCreature(*me, SpellBinderGUID[i])) add->DisappearAndDie(); float nx = x; @@ -248,7 +248,7 @@ public: } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (me->HasAura(AURA_BANISH)) return; @@ -282,7 +282,7 @@ public: uint8 AliveChannelers = 0; for (uint8 i = 0; i < 3; ++i) { - Unit *add = Unit::GetUnit(*me, SpellBinderGUID[i]); + Unit* add = Unit::GetUnit(*me, SpellBinderGUID[i]); if (add && add->isAlive()) ++AliveChannelers; } @@ -420,7 +420,7 @@ public: { if (Whirlwind_Timer <= diff) { - Unit *newTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* newTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (newTarget) { DoResetThreat(); @@ -508,15 +508,15 @@ public: if (InnerDemons_Timer <= diff) { std::list<HostileReference *>& ThreatList = me->getThreatManager().getThreatList(); - std::vector<Unit *> TargetList; + std::vector<Unit* > TargetList; for (std::list<HostileReference *>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) { - Unit *tempTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + Unit* tempTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != me->getVictim()->GetGUID() && TargetList.size()<5) TargetList.push_back(tempTarget); } //SpellEntry *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER); - for (std::vector<Unit *>::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) + for (std::vector<Unit* >::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) { if ((*itr) && (*itr)->isAlive()) { @@ -566,7 +566,7 @@ public: //at this point he divides himself in two parts CastConsumingMadness(); DespawnDemon(); - Creature *Copy = NULL; + Creature* Copy = NULL; Copy = DoSpawnCreature(DEMON_FORM, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 6000); if (Copy) { @@ -600,7 +600,7 @@ public: struct boss_leotheras_the_blind_demonformAI : public ScriptedAI { - boss_leotheras_the_blind_demonformAI(Creature *c) : ScriptedAI(c) {} + boss_leotheras_the_blind_demonformAI(Creature* c) : ScriptedAI(c) {} uint32 ChaosBlast_Timer; bool DealDamage; @@ -673,7 +673,7 @@ public: struct mob_greyheart_spellbinderAI : public ScriptedAI { - mob_greyheart_spellbinderAI(Creature *c) : ScriptedAI(c) + mob_greyheart_spellbinderAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); leotherasGUID = 0; @@ -697,7 +697,7 @@ public: if (pInstance) { pInstance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, 0); - Creature *leotheras = Unit::GetCreature(*me, leotherasGUID); + Creature* leotheras = Unit::GetCreature(*me, leotherasGUID); if (leotheras && leotheras->isAlive()) CAST_AI(boss_leotheras_the_blind::boss_leotheras_the_blindAI, leotheras->AI())->CheckChannelers(/*false*/); } @@ -722,7 +722,7 @@ public: { if (leotherasGUID) { - Creature *leotheras = Unit::GetCreature(*me, leotherasGUID); + Creature* leotheras = Unit::GetCreature(*me, leotherasGUID); if (leotheras && leotheras->isAlive()) DoCast(leotheras, BANISH_BEAM); } @@ -759,7 +759,7 @@ public: if (Mindblast_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget)DoCast(pTarget, SPELL_MINDBLAST); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 51327f5d985..d4593e6118c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -78,7 +78,7 @@ public: struct boss_the_lurker_belowAI : public Scripted_NoMovementAI { - boss_the_lurker_belowAI(Creature *c) : Scripted_NoMovementAI(c), Summons(me) + boss_the_lurker_belowAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me) { pInstance = c->GetInstanceScript(); SpellEntry *TempSpell = GET_SPELL(SPELL_SPOUT_ANIM); @@ -164,7 +164,7 @@ public: Scripted_NoMovementAI::EnterCombat(who); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!CanStartEvent)//boss is invisible, don't attack return; @@ -299,7 +299,7 @@ public: if (GeyserTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget && me->getVictim()) pTarget = me->getVictim(); if (pTarget) @@ -311,7 +311,7 @@ public: { if (WaterboltTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget && me->getVictim()) pTarget = me->getVictim(); if (pTarget) @@ -408,7 +408,7 @@ public: struct mob_coilfang_ambusherAI : public Scripted_NoMovementAI { - mob_coilfang_ambusherAI(Creature *c) : Scripted_NoMovementAI(c) + mob_coilfang_ambusherAI(Creature* c) : Scripted_NoMovementAI(c) { SpellEntry *TempSpell = GET_SPELL(SPELL_SHOOT); if (TempSpell) @@ -430,7 +430,7 @@ public: } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || me->getVictim()) return; @@ -453,7 +453,7 @@ public: if (ShootBowTimer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); int bp0 = 1100; if (pTarget) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index ce80a1b3ee7..f1c0fb98bee 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -89,7 +89,7 @@ public: struct boss_morogrim_tidewalkerAI : public ScriptedAI { - boss_morogrim_tidewalkerAI(Creature *c) : ScriptedAI(c) + boss_morogrim_tidewalkerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -187,7 +187,7 @@ public: for (uint8 i = 0; i < 10; ++i) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Murloc = me->SummonCreature(NPC_TIDEWALKER_LURKER, MurlocCords[i][0], MurlocCords[i][1], MurlocCords[i][2], MurlocCords[i][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (pTarget && Murloc) Murloc->AI()->AttackStart(pTarget); @@ -211,7 +211,7 @@ public: if (WateryGrave_Timer <= diff) { //Teleport 4 players under the waterfalls - Unit *pTarget; + Unit* pTarget; std::set<uint64> list; std::set<uint64>::const_iterator itr; for (uint8 i = 0; i < 4; ++i) @@ -296,7 +296,7 @@ public: struct mob_water_globuleAI : public ScriptedAI { - mob_water_globuleAI(Creature *c) : ScriptedAI(c) {} + mob_water_globuleAI(Creature* c) : ScriptedAI(c) {} uint32 Check_Timer; @@ -311,7 +311,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || me->getVictim()) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index e84ced2db5a..622c8705551 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -58,7 +58,7 @@ public: struct boss_thespiaAI : public ScriptedAI { - boss_thespiaAI(Creature *c) : ScriptedAI(c) + boss_thespiaAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -108,12 +108,12 @@ public: //LightningCloud_Timer if (LightningCloud_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_LIGHTNING_CLOUD); //cast twice in Heroic mode if (IsHeroic()) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_LIGHTNING_CLOUD); LightningCloud_Timer = 15000+rand()%10000; @@ -122,7 +122,7 @@ public: //LungBurst_Timer if (LungBurst_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_LUNG_BURST); LungBurst_Timer = 7000+rand()%5000; } else LungBurst_Timer -=diff; @@ -130,12 +130,12 @@ public: //EnvelopingWinds_Timer if (EnvelopingWinds_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ENVELOPING_WINDS); //cast twice in Heroic mode if (IsHeroic()) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ENVELOPING_WINDS); EnvelopingWinds_Timer = 10000+rand()%5000; } else EnvelopingWinds_Timer -=diff; @@ -158,7 +158,7 @@ public: struct mob_coilfang_waterelementalAI : public ScriptedAI { - mob_coilfang_waterelementalAI(Creature *c) : ScriptedAI(c) {} + mob_coilfang_waterelementalAI(Creature* c) : ScriptedAI(c) {} uint32 WaterBoltVolley_Timer; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 4129438f140..556a0310f38 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -60,7 +60,7 @@ public: struct boss_mekgineer_steamriggerAI : public ScriptedAI { - boss_mekgineer_steamriggerAI(Creature *c) : ScriptedAI(c) + boss_mekgineer_steamriggerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -137,7 +137,7 @@ public: if (Saw_Blade_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_SAW_BLADE); else DoCast(me->getVictim(), SPELL_SAW_BLADE); @@ -204,7 +204,7 @@ public: struct mob_steamrigger_mechanicAI : public ScriptedAI { - mob_steamrigger_mechanicAI(Creature *c) : ScriptedAI(c) + mob_steamrigger_mechanicAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index ffe7265a566..d29fa5fbec4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -54,7 +54,7 @@ public: struct mob_naga_distillerAI : public ScriptedAI { - mob_naga_distillerAI(Creature *c) : ScriptedAI(c) + mob_naga_distillerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -112,7 +112,7 @@ public: struct boss_warlord_kalithreshAI : public ScriptedAI { - boss_warlord_kalithreshAI(Creature *c) : ScriptedAI(c) + boss_warlord_kalithreshAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -191,7 +191,7 @@ public: //Impale_Timer if (Impale_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_IMPALE); Impale_Timer = 7500+rand()%5000; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index d9a8b629d68..f39e1e35bb7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -40,7 +40,7 @@ public: struct boss_hungarfenAI : public ScriptedAI { - boss_hungarfenAI(Creature *c) : ScriptedAI(c) + boss_hungarfenAI(Creature* c) : ScriptedAI(c) { } @@ -75,7 +75,7 @@ public: if (Mushroom_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) me->SummonCreature(17990, pTarget->GetPositionX()+(rand()%8), pTarget->GetPositionY()+(rand()%8), pTarget->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); else me->SummonCreature(17990, me->GetPositionX()+(rand()%8), me->GetPositionY()+(rand()%8), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); @@ -85,7 +85,7 @@ public: if (AcidGeyser_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ACID_GEYSER); AcidGeyser_Timer = 10000+rand()%7500; } else AcidGeyser_Timer -= diff; @@ -112,7 +112,7 @@ public: struct mob_underbog_mushroomAI : public ScriptedAI { - mob_underbog_mushroomAI(Creature *c) : ScriptedAI(c) {} + mob_underbog_mushroomAI(Creature* c) : ScriptedAI(c) {} bool Stop; uint32 Grow_Timer; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index 00559eeec99..5899de455b9 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -47,7 +47,7 @@ public: struct boss_the_black_stalkerAI : public ScriptedAI { - boss_the_black_stalkerAI(Creature *c) : ScriptedAI(c) + boss_the_black_stalkerAI(Creature* c) : ScriptedAI(c) { } @@ -75,12 +75,12 @@ public: void EnterCombat(Unit* /*who*/) {} - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { Striders.push_back(summon->GetGUID()); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) summon->AI()->AttackStart(pTarget); else if (me->getVictim()) @@ -91,7 +91,7 @@ public: void JustDied(Unit* /*who*/) { for (std::list<uint64>::const_iterator i = Striders.begin(); i != Striders.end(); ++i) - if (Creature *strider = Unit::GetCreature(*me, *i)) + if (Creature* strider = Unit::GetCreature(*me, *i)) strider->DisappearAndDie(); } @@ -125,7 +125,7 @@ public: { if (LevitatedTarget_Timer <= diff) { - if (Unit *pTarget = Unit::GetUnit(*me, LevitatedTarget)) + if (Unit* pTarget = Unit::GetUnit(*me, LevitatedTarget)) { if (!pTarget->HasAura(SPELL_LEVITATE)) { @@ -150,7 +150,7 @@ public: } if (Levitate_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) { DoCast(pTarget, SPELL_LEVITATE); LevitatedTarget = pTarget->GetGUID(); @@ -163,7 +163,7 @@ public: // Chain Lightning if (ChainLightning_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAIN_LIGHTNING); ChainLightning_Timer = 7000; } else ChainLightning_Timer -= diff; @@ -171,7 +171,7 @@ public: // Static Charge if (StaticCharge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true)) DoCast(pTarget, SPELL_STATIC_CHARGE); StaticCharge_Timer = 10000; } else StaticCharge_Timer -= diff; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 67dfd42815b..1ea7b0ad91e 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -66,7 +66,7 @@ public: struct boss_gruulAI : public ScriptedAI { - boss_gruulAI(Creature *c) : ScriptedAI(c) + boss_gruulAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -197,7 +197,7 @@ public: // Hurtful Strike if (m_uiHurtfulStrike_Timer <= uiDiff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); + Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget && me->IsWithinMeleeRange(me->getVictim())) DoCast(pTarget, SPELL_HURTFUL_STRIKE); @@ -221,7 +221,7 @@ public: // Cave In if (m_uiCaveIn_Timer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CAVE_IN); if (m_uiCaveIn_StaticTimer >= 4000) diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index b1b19898161..c175c0baa8c 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -118,7 +118,7 @@ public: struct boss_high_king_maulgarAI : public ScriptedAI { - boss_high_king_maulgarAI(Creature *c) : ScriptedAI(c) + boss_high_king_maulgarAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); for (uint8 i = 0; i < 4; ++i) @@ -149,7 +149,7 @@ public: Phase2 = false; - Creature *pCreature = NULL; + Creature* pCreature = NULL; for (uint8 i = 0; i < 4; ++i) { if (Council[i]) @@ -186,7 +186,7 @@ public: DoScriptText(RAND(SAY_OGRE_DEATH1, SAY_OGRE_DEATH2, SAY_OGRE_DEATH3, SAY_OGRE_DEATH4), me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { StartEvent(who); } @@ -203,7 +203,7 @@ public: } } - void StartEvent(Unit *who) + void StartEvent(Unit* who) { if (!pInstance) return; @@ -223,7 +223,7 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); if (pTarget) { @@ -280,7 +280,7 @@ public: //Charging_Timer if (Charging_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { @@ -317,7 +317,7 @@ public: struct boss_olm_the_summonerAI : public ScriptedAI { - boss_olm_the_summonerAI(Creature *c) : ScriptedAI(c) + boss_olm_the_summonerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -354,7 +354,7 @@ public: } } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { if (pInstance) { @@ -367,7 +367,7 @@ public: { if (pInstance) { - Creature *Maulgar = NULL; + Creature* Maulgar = NULL; Maulgar = (Unit::GetCreature((*me), pInstance->GetData64(DATA_MAULGAR))); if (Maulgar) @@ -383,7 +383,7 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); if (pTarget) { @@ -419,7 +419,7 @@ public: //DeathCoil Timer /need correct timer if (DeathCoil_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_DEATH_COIL); @@ -445,7 +445,7 @@ public: struct boss_kiggler_the_crazedAI : public ScriptedAI { - boss_kiggler_the_crazedAI(Creature *c) : ScriptedAI(c) + boss_kiggler_the_crazedAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -482,7 +482,7 @@ public: { if (pInstance) { - Creature *Maulgar = NULL; + Creature* Maulgar = NULL; Maulgar = (Unit::GetCreature((*me), pInstance->GetData64(DATA_MAULGAR))); if (Maulgar) @@ -498,7 +498,7 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); if (pTarget) { @@ -520,7 +520,7 @@ public: //GreaterPolymorph_Timer if (GreaterPolymorph_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_GREATER_POLYMORPH); @@ -567,7 +567,7 @@ public: struct boss_blindeye_the_seerAI : public ScriptedAI { - boss_blindeye_the_seerAI(Creature *c) : ScriptedAI(c) + boss_blindeye_the_seerAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -602,7 +602,7 @@ public: { if (pInstance) { - Creature *Maulgar = NULL; + Creature* Maulgar = NULL; Maulgar = (Unit::GetCreature((*me), pInstance->GetData64(DATA_MAULGAR))); if (Maulgar) @@ -618,7 +618,7 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); if (pTarget) { @@ -677,7 +677,7 @@ public: struct boss_krosh_firehandAI : public ScriptedAI { - boss_krosh_firehandAI(Creature *c) : ScriptedAI(c) + boss_krosh_firehandAI(Creature* c) : ScriptedAI(c) { pInstance = c->GetInstanceScript(); } @@ -712,7 +712,7 @@ public: { if (pInstance) { - Creature *Maulgar = NULL; + Creature* Maulgar = NULL; Maulgar = (Unit::GetCreature((*me), pInstance->GetData64(DATA_MAULGAR))); if (Maulgar) @@ -728,7 +728,7 @@ public: //Only if not incombat check if the event is started if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); if (pTarget) { @@ -765,9 +765,9 @@ public: //BlastWave_Timer if (BlastWave_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); - std::vector<Unit *> target_list; + std::vector<Unit* > target_list; for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index f07f559df8e..f290c0f8125 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -81,7 +81,7 @@ class boss_broggok : public CreatureScript } } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index a409351ddd2..7953ac48fc7 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -136,7 +136,7 @@ class boss_kelidan_the_breaker : public CreatureScript } for (uint8 i=0; i<5; ++i) { - Creature *channeler = Unit::GetCreature(*me, Channelers[i]); + Creature* channeler = Unit::GetCreature(*me, Channelers[i]); if (who && channeler && !channeler->isInCombat()) channeler->AI()->AttackStart(who); } @@ -146,7 +146,7 @@ class boss_kelidan_the_breaker : public CreatureScript { for (uint8 i=0; i<5; ++i) { - Creature *channeler = Unit::GetCreature(*me, Channelers[i]); + Creature* channeler = Unit::GetCreature(*me, Channelers[i]); if (channeler && channeler->isAlive()) return; } @@ -155,14 +155,14 @@ class boss_kelidan_the_breaker : public CreatureScript me->AI()->AttackStart(killer); } - uint64 GetChanneled(Creature *channeler1) + uint64 GetChanneled(Creature* channeler1) { SummonChannelers(); if (!channeler1) return 0; uint8 i; for (i=0; i<5; ++i) { - Creature *channeler = Unit::GetCreature(*me, Channelers[i]); + Creature* channeler = Unit::GetCreature(*me, Channelers[i]); if (channeler && channeler->GetGUID() == channeler1->GetGUID()) break; } @@ -173,7 +173,7 @@ class boss_kelidan_the_breaker : public CreatureScript { for (uint8 i=0; i<5; ++i) { - Creature *channeler = Unit::GetCreature(*me, Channelers[i]); + Creature* channeler = Unit::GetCreature(*me, Channelers[i]); if (!channeler || channeler->isDead()) channeler = me->SummonCreature(ENTRY_CHANNELER, ShadowmoonChannelers[i][0], ShadowmoonChannelers[i][1], ShadowmoonChannelers[i][2], ShadowmoonChannelers[i][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); if (channeler) @@ -317,7 +317,7 @@ class mob_shadowmoon_channeler : public CreatureScript void EnterCombat(Unit* who) { - if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) + if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who); if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); @@ -326,7 +326,7 @@ class mob_shadowmoon_channeler : public CreatureScript void JustDied(Unit* Killer) { - if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) + if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(Killer); } @@ -337,10 +337,10 @@ class mob_shadowmoon_channeler : public CreatureScript if (check_Timer <= diff) { if (!me->IsNonMeleeSpellCasted(false)) - if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) + if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) { uint64 channeler = CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->GetChanneled(me); - if (Unit *channeled = Unit::GetUnit(*me, channeler)) + if (Unit* channeled = Unit::GetUnit(*me, channeler)) DoCast(channeled, SPELL_CHANNELING); } check_Timer = 5000; @@ -352,7 +352,7 @@ class mob_shadowmoon_channeler : public CreatureScript if (MarkOfShadow_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MARK_OF_SHADOW); MarkOfShadow_Timer = 15000+rand()%5000; } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 2c559c9bf34..a457d06809a 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -122,7 +122,7 @@ class boss_the_maker : public CreatureScript if (ExplodingBreaker_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_EXPLODING_BREAKER); ExplodingBreaker_Timer = 4000+rand()%8000; } @@ -132,7 +132,7 @@ class boss_the_maker : public CreatureScript /* // Disabled until Core Support for mind control if (domination_timer_timer <= diff) { - Unit *pTarget; + Unit* pTarget; pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); DoCast(pTarget, SPELL_DOMINATION); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 85f8c394fb2..17a2ab8d8d7 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -192,7 +192,7 @@ class boss_omor_the_unscarred : public CreatureScript { DoScriptText(SAY_CURSE, me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_TREACHEROUS_AURA); Aura_Timer = 8000+rand()%8000; @@ -203,7 +203,7 @@ class boss_omor_the_unscarred : public CreatureScript if (Shadowbolt_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget) pTarget = me->getVictim(); 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 f3675e4f40b..88997f8aad9 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 @@ -106,7 +106,7 @@ class boss_nazan : public CreatureScript void EnterCombat(Unit* /*who*/) {} - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned && summoned->GetEntry() == ENTRY_LIQUID_FIRE) { @@ -117,7 +117,7 @@ class boss_nazan : public CreatureScript } } - void SpellHitTarget(Unit *pTarget, const SpellEntry* entry) + void SpellHitTarget(Unit* pTarget, const SpellEntry* entry) { if (pTarget && entry->Id == uint32(SPELL_FIREBALL)) me->SummonCreature(ENTRY_LIQUID_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), pTarget->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000); @@ -139,7 +139,7 @@ class boss_nazan : public CreatureScript if (flight) // phase 1 - the flight { - Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID); + Creature* Vazruden = Unit::GetCreature(*me, VazrudenGUID); if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && Vazruden->HealthAbovePct(20))) { flight = false; @@ -319,7 +319,7 @@ class boss_vazruden_the_herald : public CreatureScript { if (summoned) { - Creature *Nazan = Unit::GetCreature(*me, NazanGUID); + Creature* Nazan = Unit::GetCreature(*me, NazanGUID); if (!Nazan) Nazan = me->FindNearestCreature(ENTRY_NAZAN, 5000); if (Nazan) @@ -328,7 +328,7 @@ class boss_vazruden_the_herald : public CreatureScript NazanGUID = 0; } - Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID); + Creature* Vazruden = Unit::GetCreature(*me, VazrudenGUID); if (!Vazruden) Vazruden = me->FindNearestCreature(ENTRY_VAZRUDEN, 5000); if (Vazruden) @@ -424,8 +424,8 @@ class boss_vazruden_the_herald : public CreatureScript default: // adds do the job now if (check <= diff) { - Creature *Nazan = Unit::GetCreature(*me, NazanGUID); - Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID); + Creature* Nazan = Unit::GetCreature(*me, NazanGUID); + Creature* Vazruden = Unit::GetCreature(*me, VazrudenGUID); if ((Nazan && Nazan->isAlive()) || (Vazruden && Vazruden->isAlive())) { if ((Nazan && Nazan->getVictim()) || (Vazruden && Vazruden->getVictim())) @@ -482,7 +482,7 @@ class mob_hellfire_sentry : public CreatureScript void JustDied(Unit* who) { - if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150)) + if (Creature* herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150)) CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index c8163e19da5..97d57f10ad5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -131,7 +131,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript { DoScriptText(SAY_SURGE, me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SURGE); Surge_Timer = 5000+rand()%8000; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 793d49e8cae..09f0001aa82 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -151,12 +151,12 @@ class mob_abyssal : public CreatureScript { DoZoneInCombat(); } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!trigger) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!trigger) ScriptedAI::MoveInLineOfSight(who); @@ -290,7 +290,7 @@ class boss_magtheridon : public CreatureScript } //function to interrupt channeling and debuff clicker with mind exh(used if second person clicks with same cube or after dispeling/ending shadow grasp DoT) - void DebuffClicker(Unit *clicker) + void DebuffClicker(Unit* clicker) { if (!clicker || !clicker->isAlive()) return; @@ -307,7 +307,7 @@ class boss_magtheridon : public CreatureScript // if not - apply mind exhaustion and delete from clicker's list for (CubeMap::iterator i = Cube.begin(); i != Cube.end(); ++i) { - Unit *clicker = Unit::GetUnit(*me, (*i).second); + Unit* clicker = Unit::GetUnit(*me, (*i).second); if (!clicker || !clicker->HasAura(SPELL_SHADOW_GRASP)) { DebuffClicker(clicker); @@ -346,7 +346,7 @@ class boss_magtheridon : public CreatureScript void MoveInLineOfSight(Unit* /*who*/) {} - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (!me->HasUnitState(UNIT_STAT_STUNNED)) ScriptedAI::AttackStart(who); @@ -426,11 +426,11 @@ class boss_magtheridon : public CreatureScript if (Blaze_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { float x, y, z; pTarget->GetPosition(x, y, z); - Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (summon) { CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(2); @@ -460,11 +460,11 @@ class boss_magtheridon : public CreatureScript { if (Debris_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { float x, y, z; pTarget->GetPosition(x, y, z); - Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (summon) CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(1); } @@ -536,7 +536,7 @@ class mob_hellfire_channeler : public CreatureScript DoCast(me, SPELL_SHADOW_GRASP_C, false); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { summon->AI()->AttackStart(me->getVictim()); } @@ -577,7 +577,7 @@ class mob_hellfire_channeler : public CreatureScript if (Fear_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_FEAR); Fear_Timer = 25000 + rand()%15000; } @@ -586,7 +586,7 @@ class mob_hellfire_channeler : public CreatureScript if (Infernal_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_BURNING_ABYSSAL, true); Infernal_Timer = 30000 + rand()%10000; } @@ -611,7 +611,7 @@ public: { } - bool OnGossipHello(Player *pPlayer, GameObject* pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { InstanceScript* pInstance = pGO->GetInstanceScript(); @@ -620,7 +620,7 @@ public: if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true; - Creature *Magtheridon =Unit::GetCreature(*pGO, pInstance->GetData64(DATA_MAGTHERIDON)); + Creature* Magtheridon =Unit::GetCreature(*pGO, pInstance->GetData64(DATA_MAGTHERIDON)); if (!Magtheridon || !Magtheridon->isAlive()) return true; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index b29d41070bc..72bb21e6b89 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -182,7 +182,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!IntroOnce && me->IsWithinDistInMap(who, 50.0f)) { @@ -208,7 +208,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -277,7 +277,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript { if (ShadowFissure_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_FISSURE); ShadowFissure_Timer = urand(7500, 15000); } @@ -286,7 +286,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (DeathCoil_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_DEATH_COIL); DeathCoil_Timer = urand(15000, 20000); } @@ -342,7 +342,7 @@ class mob_fel_orc_convert : public CreatureScript { if (pInstance->GetData64(DATA_NETHEKURSE)) { - Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)); + Creature* pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)); if (pKurse && me->IsWithinDist(pKurse, 45.0f)) { CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro(); @@ -363,7 +363,7 @@ class mob_fel_orc_convert : public CreatureScript if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS) return; if (pInstance->GetData64(DATA_NETHEKURSE)) - if (Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE))) + if (Creature* pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE))) CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath(); } } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 44397fe4299..5d3fe13757f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -221,15 +221,15 @@ class boss_warbringer_omrogg : public CreatureScript void DoYellForThreat() { - Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); - Unit *pRightHead = Unit::GetUnit(*me, RightHeadGUID); + Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID); if (!pLeftHead || !pRightHead) return; ithreat = rand()%4; - Unit *source = (pLeftHead->GetEntry() == Threat[ithreat].creature ? pLeftHead : pRightHead); + Unit* source = (pLeftHead->GetEntry() == Threat[ithreat].creature ? pLeftHead : pRightHead); DoScriptText(Threat[ithreat].id, source); @@ -242,7 +242,7 @@ class boss_warbringer_omrogg : public CreatureScript me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); - if (Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID)) + if (Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID)) { iaggro = rand()%3; @@ -256,7 +256,7 @@ class boss_warbringer_omrogg : public CreatureScript pInstance->SetData(TYPE_OMROGG, IN_PROGRESS); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned->GetEntry() == NPC_LEFT_HEAD) LeftHeadGUID = summoned->GetGUID(); @@ -279,7 +279,7 @@ class boss_warbringer_omrogg : public CreatureScript ikilling = rand()%2; - Unit *source = (pLeftHead->GetEntry() == Killing[ikilling].creature ? pLeftHead : pRightHead); + Unit* source = (pLeftHead->GetEntry() == Killing[ikilling].creature ? pLeftHead : pRightHead); switch(ikilling) { @@ -331,7 +331,7 @@ class boss_warbringer_omrogg : public CreatureScript if (ThreatYell2) { - Unit *source = (pLeftHead->GetEntry() == ThreatDelay2[ithreat].creature ? pLeftHead : pRightHead); + Unit* source = (pLeftHead->GetEntry() == ThreatDelay2[ithreat].creature ? pLeftHead : pRightHead); DoScriptText(ThreatDelay2[ithreat].id, source); ThreatYell2 = false; @@ -339,7 +339,7 @@ class boss_warbringer_omrogg : public CreatureScript if (ThreatYell) { - Unit *source = (pLeftHead->GetEntry() == ThreatDelay1[ithreat].creature ? pLeftHead : pRightHead); + Unit* source = (pLeftHead->GetEntry() == ThreatDelay1[ithreat].creature ? pLeftHead : pRightHead); DoScriptText(ThreatDelay1[ithreat].id, source); ThreatYell = false; @@ -348,7 +348,7 @@ class boss_warbringer_omrogg : public CreatureScript if (KillingYell) { - Unit *source = (pLeftHead->GetEntry() == KillingDelay[ikilling].creature ? pLeftHead : pRightHead); + Unit* source = (pLeftHead->GetEntry() == KillingDelay[ikilling].creature ? pLeftHead : pRightHead); DoScriptText(KillingDelay[ikilling].id, source); KillingYell = false; @@ -383,7 +383,7 @@ class boss_warbringer_omrogg : public CreatureScript if (ResetThreat_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoYellForThreat(); DoResetThreat(); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 018aefaa3d1..a3cac32c06f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -113,7 +113,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { switch(summoned->GetEntry()) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 8fa39447198..67b67f61742 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -151,10 +151,10 @@ class boss_alar : public CreatureScript pInstance->SetData(DATA_ALAREVENT, DONE); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summon->AI()->AttackStart(pTarget); } @@ -283,7 +283,7 @@ class boss_alar : public CreatureScript WaitTimer = 4000; return; case WE_DIVE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL); DoCast(pTarget, SPELL_DIVE_BOMB, true); @@ -371,7 +371,7 @@ class boss_alar : public CreatureScript { if (Charge_Timer <= diff) { - Unit *pTarget= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* pTarget= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); if (pTarget) DoCast(pTarget, SPELL_CHARGE); Charge_Timer = 30000; @@ -403,7 +403,7 @@ class boss_alar : public CreatureScript if (FlamePatch_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000); if (Summoned) @@ -436,7 +436,7 @@ class boss_alar : public CreatureScript } else { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = me->SelectNearestTargetInAttackDistance(5); if (pTarget) me->AI()->AttackStart(pTarget); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index e894cd2be78..b14803a9214 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -171,7 +171,7 @@ class boss_high_astromancer_solarian : public CreatureScript Creature* Summoned = me->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (Summoned) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) Summoned->AI()->AttackStart(pTarget); Summons.Summon(Summoned); @@ -227,7 +227,7 @@ class boss_high_astromancer_solarian : public CreatureScript if (Wrath_Timer <= diff) { me->InterruptNonMeleeSpells(false); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) DoCast(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER, true); Wrath_Timer = 20000+rand()%5000; } @@ -243,7 +243,7 @@ class boss_high_astromancer_solarian : public CreatureScript } else { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!me->HasInArc(2.5f, pTarget)) pTarget = me->getVictim(); if (pTarget) @@ -446,7 +446,7 @@ class mob_solarium_priest : public CreatureScript if (healTimer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; switch (urand(0, 1)) { case 0: diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 5c4f3cb959a..a2d0fbd5ba7 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -175,11 +175,11 @@ struct advisorbase_ai : public ScriptedAI //reset encounter if (m_pInstance && (m_pInstance->GetData(DATA_KAELTHASEVENT) == 1 || m_pInstance->GetData(DATA_KAELTHASEVENT) == 3)) - if (Creature *Kaelthas = Unit::GetCreature((*me), m_pInstance->GetData64(DATA_KAELTHAS))) + if (Creature* Kaelthas = Unit::GetCreature((*me), m_pInstance->GetData64(DATA_KAELTHAS))) Kaelthas->AI()->EnterEvadeMode(); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -343,7 +343,7 @@ class boss_kaelthas : public CreatureScript { for (uint8 i = 0; i < MAX_ADVISORS; ++i) { - if (Creature *pCreature = Unit::GetCreature((*me), m_auiAdvisorGuid[i])) + if (Creature* pCreature = Unit::GetCreature((*me), m_auiAdvisorGuid[i])) { pCreature->Respawn(); pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -376,7 +376,7 @@ class boss_kaelthas : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) AttackStart(pTarget); } @@ -395,7 +395,7 @@ class boss_kaelthas : public CreatureScript } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!me->HasUnitState(UNIT_STAT_STUNNED) && who->isTargetableForAttack() && me->IsHostileTo(who) && who->isInAccessiblePlaceFor(me)) @@ -446,7 +446,7 @@ class boss_kaelthas : public CreatureScript } } - void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} + void SummonedCreatureDespawn(Creature* summon) {summons.Despawn(summon);} void JustDied(Unit* /*Killer*/) { @@ -474,7 +474,7 @@ class boss_kaelthas : public CreatureScript { case 1: { - Unit *pTarget = NULL; + Unit* pTarget = NULL; Creature* Advisor = NULL; //Subphase switch @@ -683,9 +683,9 @@ class boss_kaelthas : public CreatureScript if (PhaseSubphase == 0) { //Respawn advisors - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - Creature *Advisor; + Creature* Advisor; for (uint8 i = 0; i < MAX_ADVISORS; ++i) { Advisor = Unit::GetCreature((*me), m_auiAdvisorGuid[i]); @@ -714,7 +714,7 @@ class boss_kaelthas : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) AttackStart(pTarget); Phase_Timer = 30000; @@ -1031,7 +1031,7 @@ class boss_thaladred_the_darkener : public CreatureScript advisorbase_ai::Reset(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1064,7 +1064,7 @@ class boss_thaladred_the_darkener : public CreatureScript //Gaze_Timer if (Gaze_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoResetThreat(); me->AddThreat(pTarget, 5000000.0f); @@ -1124,7 +1124,7 @@ class boss_lord_sanguinar : public CreatureScript advisorbase_ai::Reset(); } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1221,7 +1221,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1266,7 +1266,7 @@ class boss_grand_astromancer_capernian : public CreatureScript //Conflagration_Timer if (Conflagration_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && me->IsWithinDistInMap(pTarget, 30)) @@ -1283,7 +1283,7 @@ class boss_grand_astromancer_capernian : public CreatureScript if (ArcaneExplosion_Timer <= diff) { bool InMeleeRange = false; - Unit *pTarget = NULL; + Unit* pTarget = NULL; std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { @@ -1345,7 +1345,7 @@ class boss_master_engineer_telonicus : public CreatureScript DoScriptText(SAY_TELONICUS_DEATH, me); } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1380,7 +1380,7 @@ class boss_master_engineer_telonicus : public CreatureScript //RemoteToy_Timer if (RemoteToy_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_REMOTE_TOY); RemoteToy_Timer = 10000+rand()%5000; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index e348ac5aab4..a16f2d16cfe 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -118,9 +118,9 @@ class boss_void_reaver : public CreatureScript // Arcane Orb if (ArcaneOrb_Timer <= diff) { - Unit *pTarget = NULL; + Unit* pTarget = NULL; std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); - std::vector<Unit *> target_list; + std::vector<Unit* > target_list; for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index d82edd7391e..8c5abbcadc0 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -233,7 +233,7 @@ class mob_ragin_flames : public CreatureScript if (!onlyonce) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) me->GetMotionMaster()->MoveChase(pTarget); onlyonce = true; } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index f4eacb9bf3c..056b46a38fd 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -110,11 +110,11 @@ class boss_pathaleon_the_calculator : public CreatureScript summons.DespawnAll(); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature* summon) { summons.Despawn(summon); } @@ -129,7 +129,7 @@ class boss_pathaleon_the_calculator : public CreatureScript { for (uint8 i = 0; i < 3; ++i) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Wraith = me->SummonCreature(21062, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); if (pTarget && Wraith) Wraith->AI()->AttackStart(pTarget); @@ -158,7 +158,7 @@ class boss_pathaleon_the_calculator : public CreatureScript if (Domination_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) { DoScriptText(RAND(SAY_DOMINATION_1, SAY_DOMINATION_2), me); DoCast(pTarget, SPELL_DOMINATION); @@ -233,7 +233,7 @@ class mob_nether_wraith : public CreatureScript if (ArcaneMissiles_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_ARCANE_MISSILES); else DoCast(me->getVictim(), SPELL_ARCANE_MISSILES); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 57d9cacd5a6..2d2ac51a317 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -310,7 +310,7 @@ class npc_warden_mellichar : public CreatureScript void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (IsRunning) return; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 75a1d3b51a0..b0580df3e42 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -102,7 +102,7 @@ class boss_harbinger_skyriss : public CreatureScript ManaBurn_Timer = 25000; } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!Intro) return; @@ -119,7 +119,7 @@ class boss_harbinger_skyriss : public CreatureScript pInstance->SetData(TYPE_HARBINGERSKYRISS, DONE); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (!summon) return; @@ -128,7 +128,7 @@ class boss_harbinger_skyriss : public CreatureScript else summon->SetHealth(summon->CountPctFromMaxHealth(66)); if (me->getVictim()) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summon->AI()->AttackStart(pTarget); } @@ -173,7 +173,7 @@ class boss_harbinger_skyriss : public CreatureScript break; case 2: DoScriptText(SAY_AGGRO, me); - if (Unit *mellic = Unit::GetUnit(*me, pInstance->GetData64(DATA_MELLICHAR))) + if (Unit* mellic = Unit::GetUnit(*me, pInstance->GetData64(DATA_MELLICHAR))) { //should have a better way to do this. possibly spell exist. mellic->setDeathState(JUST_DIED); @@ -208,7 +208,7 @@ class boss_harbinger_skyriss : public CreatureScript if (MindRend_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_MIND_REND); else DoCast(me->getVictim(), SPELL_MIND_REND); @@ -225,7 +225,7 @@ class boss_harbinger_skyriss : public CreatureScript DoScriptText(RAND(SAY_FEAR_1, SAY_FEAR_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_FEAR); else DoCast(me->getVictim(), SPELL_FEAR); @@ -242,7 +242,7 @@ class boss_harbinger_skyriss : public CreatureScript DoScriptText(RAND(SAY_MIND_1, SAY_MIND_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_DOMINATION); else DoCast(me->getVictim(), SPELL_DOMINATION); @@ -259,7 +259,7 @@ class boss_harbinger_skyriss : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) return; - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, H_SPELL_MANA_BURN); ManaBurn_Timer = 16000+rand()%16000; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 56377818eae..3a91b23599a 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -85,7 +85,7 @@ class boss_high_botanist_freywinn : public CreatureScript DoScriptText(SAY_AGGRO, me); } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { if (summoned->GetEntry() == ENTRY_FRAYER) Adds_List.push_back(summoned->GetGUID()); @@ -146,7 +146,7 @@ class boss_high_botanist_freywinn : public CreatureScript { for (std::list<uint64>::iterator itr = Adds_List.begin(); itr != Adds_List.end(); ++itr) { - if (Unit *temp = Unit::GetUnit(*me, *itr)) + if (Unit* temp = Unit::GetUnit(*me, *itr)) { if (!temp->isAlive()) { diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 6e2ba1ad4d7..e8adc8659c4 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -159,7 +159,7 @@ class boss_laj : public CreatureScript { } - void JustSummoned(Creature *summon) + void JustSummoned(Creature* summon) { if (summon && me->getVictim()) summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 2fccfd0eddc..df6da33ad43 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -96,7 +96,7 @@ class mob_warp_splinter_treant : public CreatureScript { if (WarpGuid && check_Timer <= diff) { - if (Unit *Warp = Unit::GetUnit(*me, WarpGuid)) + if (Unit* Warp = Unit::GetUnit(*me, WarpGuid)) { if (me->IsWithinMeleeRange(Warp, 2.5f)) { @@ -184,7 +184,7 @@ class boss_warp_splinter : public CreatureScript float Y = Treant_Spawn_Pos_Y + TREANT_SPAWN_DIST * sin(angle); float O = - me->GetAngle(X, Y); - if (Creature *pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000)) + if (Creature* pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000)) CAST_AI(mob_warp_splinter_treant::mob_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID(); } DoScriptText(RAND(SAY_SUMMON_1, SAY_SUMMON_2), me); diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index 0b8beb3edc9..d23471f596c 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -60,7 +60,7 @@ public: struct mobs_bladespire_ogreAI : public ScriptedAI { - mobs_bladespire_ogreAI(Creature *c) : ScriptedAI(c) {} + mobs_bladespire_ogreAI(Creature* c) : ScriptedAI(c) {} void Reset() { } @@ -112,7 +112,7 @@ public: struct mobs_nether_drakeAI : public ScriptedAI { - mobs_nether_drakeAI(Creature *c) : ScriptedAI(c) {} + mobs_nether_drakeAI(Creature* c) : ScriptedAI(c) {} bool IsNihil; uint32 NihilSpeech_Timer; @@ -135,7 +135,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -157,7 +157,7 @@ public: } } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TYPEID_PLAYER) { @@ -237,7 +237,7 @@ public: if (ManaBurn_Timer <= diff) { - Unit *pTarget = me->getVictim(); + Unit* pTarget = me->getVictim(); if (pTarget && pTarget->getPowerType() == POWER_MANA) DoCast(pTarget, SPELL_MANA_BURN); ManaBurn_Timer = 8000+rand()%8000; @@ -277,13 +277,13 @@ public: struct npc_daranelleAI : public ScriptedAI { - npc_daranelleAI(Creature *c) : ScriptedAI(c) {} + npc_daranelleAI(Creature* c) : ScriptedAI(c) {} void Reset() { } void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (who->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 8a0a6fd4478..0126bf3eb1b 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -406,7 +406,7 @@ public: struct npc_wounded_blood_elfAI : public npc_escortAI { - npc_wounded_blood_elfAI(Creature *c) : npc_escortAI(c) {} + npc_wounded_blood_elfAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index e7f1f01b670..c9cfc7dc03a 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -56,7 +56,7 @@ public: { bool Spawn; - mob_shattered_rumblerAI(Creature *c) : ScriptedAI(c) {} + mob_shattered_rumblerAI(Creature* c) : ScriptedAI(c) {} void Reset() { @@ -65,7 +65,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) + void SpellHit(Unit* Hitter, const SpellEntry *Spellkind) { if (Spellkind->Id == 32001 && !Spawn) { @@ -149,7 +149,7 @@ public: struct mob_lumpAI : public ScriptedAI { - mob_lumpAI(Creature *c) : ScriptedAI(c) + mob_lumpAI(Creature* c) : ScriptedAI(c) { bReset = false; } @@ -177,7 +177,7 @@ public: AttackStart(pAttacker); } - void DamageTaken(Unit *done_by, uint32 & damage) + void DamageTaken(Unit* done_by, uint32 & damage) { if (done_by->GetTypeId() == TYPEID_PLAYER && me->HealthBelowPctDamaged(30, damage)) { @@ -259,7 +259,7 @@ public: struct mob_sunspring_villagerAI : public ScriptedAI { - mob_sunspring_villagerAI(Creature *c) : ScriptedAI(c) {} + mob_sunspring_villagerAI(Creature* c) : ScriptedAI(c) {} void Reset() { @@ -762,7 +762,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who) return; @@ -805,7 +805,7 @@ public: struct mob_sparrowhawkAI : public ScriptedAI { - mob_sparrowhawkAI(Creature *c) : ScriptedAI(c) {} + mob_sparrowhawkAI(Creature* c) : ScriptedAI(c) {} uint32 Check_Timer; uint64 PlayerGUID; @@ -818,7 +818,7 @@ public: PlayerGUID = 0; fleeing = false; } - void AttackStart(Unit *who) + void AttackStart(Unit* who) { if (PlayerGUID) return; @@ -828,7 +828,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!who || PlayerGUID) return; @@ -877,7 +877,7 @@ public: ScriptedAI::UpdateAI(diff); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (caster->GetTypeId() == TYPEID_PLAYER) { @@ -964,7 +964,7 @@ class npc_corki : public CreatureScript public: npc_corki() : CreatureScript("npc_corki") { } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_corkiAI(creature); } diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index 3e801bd1eed..d9322384d40 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -77,7 +77,7 @@ public: struct npc_manaforge_control_consoleAI : public ScriptedAI { - npc_manaforge_control_consoleAI(Creature *c) : ScriptedAI(c) {} + npc_manaforge_control_consoleAI(Creature* c) : ScriptedAI(c) {} uint32 Event_Timer; uint32 Wave_Timer; @@ -100,7 +100,7 @@ public: void EnterCombat(Unit* /*who*/) {} - /*void SpellHit(Unit *caster, const SpellEntry *spell) + /*void SpellHit(Unit* caster, const SpellEntry *spell) { //we have no way of telling the Creature was hit by spell -> got aura applied after 10-12 seconds //then no way for the mobs to actually stop the shutdown as intended. @@ -395,7 +395,7 @@ public: struct npc_commander_dawnforgeAI : public ScriptedAI { - npc_commander_dawnforgeAI(Creature *c) : ScriptedAI(c) { Reset (); } + npc_commander_dawnforgeAI(Creature* c) : ScriptedAI(c) { Reset (); } uint64 PlayerGUID; uint64 ardonisGUID; @@ -423,7 +423,7 @@ public: void EnterCombat(Unit* /*who*/) { } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature* summoned) { pathaleonGUID = summoned->GetGUID(); } @@ -431,8 +431,8 @@ public: // Emote Ardonis and Pathaleon void Turn_to_Pathaleons_Image() { - Creature *ardonis = Unit::GetCreature(*me, ardonisGUID); - Creature *pathaleon = Unit::GetCreature(*me, pathaleonGUID); + Creature* ardonis = Unit::GetCreature(*me, ardonisGUID); + Creature* pathaleon = Unit::GetCreature(*me, pathaleonGUID); Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); if (!ardonis || !pathaleon || !pPlayer) @@ -457,7 +457,7 @@ public: //Set them back to each other void Turn_to_eachother() { - if (Unit *ardonis = Unit::GetUnit(*me, ardonisGUID)) + if (Unit* ardonis = Unit::GetUnit(*me, ardonisGUID)) { Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); @@ -514,8 +514,8 @@ public: return; } - Unit *ardonis = Unit::GetUnit(*me, ardonisGUID); - Unit *pathaleon = Unit::GetUnit(*me, pathaleonGUID); + Unit* ardonis = Unit::GetUnit(*me, ardonisGUID); + Unit* pathaleon = Unit::GetUnit(*me, pathaleonGUID); Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); if (!ardonis || !pPlayer) @@ -749,14 +749,14 @@ public: struct mob_phase_hunterAI : public ScriptedAI { - mob_phase_hunterAI(Creature *c) : ScriptedAI(c) {} + mob_phase_hunterAI(Creature* c) : ScriptedAI(c) {} bool Weak; bool Materialize; bool Drained; uint8 WeakPercent; - Player *pPlayer; + Player* pPlayer; uint64 PlayerGUID; uint32 ManaBurnTimer; @@ -809,7 +809,7 @@ public: for (std::list<HostileReference*>::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr) { - if (Unit *pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { if (pUnit->GetCreateMana() > 0) UnitsWithMana.push_back(pUnit); @@ -826,7 +826,7 @@ public: ManaBurnTimer = 3500; } else ManaBurnTimer -= diff; - if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID)) // start: support for quest 10190 + if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) // start: support for quest 10190 { if (!Weak && HealthBelowPct(WeakPercent) && pPlayer->GetQuestStatus(QUEST_RECHARGING_THE_BATTERIES) == QUEST_STATUS_INCOMPLETE) @@ -890,7 +890,7 @@ public: struct npc_bessyAI : public npc_escortAI { - npc_bessyAI(Creature *c) : npc_escortAI(c) {} + npc_bessyAI(Creature* c) : npc_escortAI(c) {} void JustDied(Unit* /*killer*/) { diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 7b571c5874c..c0ac25756f9 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -716,7 +716,7 @@ public: struct npc_overlord_morghorAI : public ScriptedAI { - npc_overlord_morghorAI(Creature *c) : ScriptedAI(c) {} + npc_overlord_morghorAI(Creature* c) : ScriptedAI(c) {} uint64 PlayerGUID; uint64 IllidanGUID; @@ -1298,7 +1298,7 @@ public: switch(slayer->GetTypeId()) { case TYPEID_UNIT: - if (Unit *owner = slayer->GetOwner()) + if (Unit* owner = slayer->GetOwner()) if (owner->GetTypeId() == TYPEID_PLAYER) CAST_PLR(owner)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me); break; @@ -1541,7 +1541,7 @@ public: { if (SpellTimer1 <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->GetTypeId() == TYPEID_PLAYER) { @@ -1735,7 +1735,7 @@ public: struct npc_enraged_spiritAI : public ScriptedAI { - npc_enraged_spiritAI(Creature *c) : ScriptedAI(c) {} + npc_enraged_spiritAI(Creature* c) : ScriptedAI(c) {} void Reset() { } diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index 7255a7432e9..f7cd1b832aa 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -162,7 +162,7 @@ public: me->RestoreFaction(); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->HealthBelowPctDamaged(20, damage)) @@ -321,7 +321,7 @@ public: struct npc_kservantAI : public npc_escortAI { public: - npc_kservantAI(Creature *c) : npc_escortAI(c) {} + npc_kservantAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 92765ec61de..74615f3e27e 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -90,7 +90,7 @@ public: UnkorUnfriendly_Timer = 60000; } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->HealthBelowPctDamaged(30, damage)) @@ -99,7 +99,7 @@ public: { for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player *pGroupie = itr->getSource(); + Player* pGroupie = itr->getSource(); if (pGroupie && pGroupie->GetQuestStatus(QUEST_DONTKILLTHEFATONE) == QUEST_STATUS_INCOMPLETE && pGroupie->GetReqKillOrCastCurrentCount(QUEST_DONTKILLTHEFATONE, 18260) == 10) @@ -169,12 +169,12 @@ public: struct mob_infested_root_walkerAI : public ScriptedAI { - mob_infested_root_walkerAI(Creature *c) : ScriptedAI(c) {} + mob_infested_root_walkerAI(Creature* c) : ScriptedAI(c) {} void Reset() { } void EnterCombat(Unit* /*who*/) { } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by && done_by->GetTypeId() == TYPEID_PLAYER) if (me->GetHealth() <= damage) @@ -202,7 +202,7 @@ public: struct npc_skywingAI : public npc_escortAI { public: - npc_skywingAI(Creature *c) : npc_escortAI(c) {} + npc_skywingAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { @@ -220,7 +220,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -264,12 +264,12 @@ public: struct mob_rotting_forest_ragerAI : public ScriptedAI { - mob_rotting_forest_ragerAI(Creature *c) : ScriptedAI(c) {} + mob_rotting_forest_ragerAI(Creature* c) : ScriptedAI(c) {} void Reset() { } void EnterCombat(Unit* /*who*/) { } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) { if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->GetHealth() <= damage) @@ -304,7 +304,7 @@ public: struct mob_netherweb_victimAI : public ScriptedAI { - mob_netherweb_victimAI(Creature *c) : ScriptedAI(c) {} + mob_netherweb_victimAI(Creature* c) : ScriptedAI(c) {} void Reset() { } void EnterCombat(Unit* /*who*/) { } @@ -667,7 +667,7 @@ public: struct npc_akunoAI : public npc_escortAI { - npc_akunoAI(Creature *c) : npc_escortAI(c) {} + npc_akunoAI(Creature* c) : npc_escortAI(c) {} void WaypointReached(uint32 i) { diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 987572fe13c..c1b9b564ad1 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -647,7 +647,7 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - if (Player *caster = GetCaster()->ToPlayer()) + if (Player* caster = GetCaster()->ToPlayer()) if (caster->HasSpellCooldown(SPELL_DIVINE_STORM)) caster->RemoveSpellCooldown(SPELL_DIVINE_STORM, true); } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index d809df9f449..acf96f4e0a7 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -189,7 +189,7 @@ public: void HandleDummy(SpellEffIndex /*effIndex*/) { - Unit *caster = GetCaster(); + Unit* caster = GetCaster(); int32 healthModSpellBasePoints0 = int32(caster->CountPctFromMaxHealth(30)); caster->CastCustomSpell(caster, HUNTER_PET_SPELL_LAST_STAND_TRIGGERED, &healthModSpellBasePoints0, NULL, NULL, true, NULL); } @@ -265,7 +265,7 @@ public: PrepareSpellScript(spell_hun_readiness_SpellScript) void HandleDummy(SpellEffIndex /*effIndex*/) { - Unit *caster = GetCaster(); + Unit* caster = GetCaster(); if (caster->GetTypeId() != TYPEID_PLAYER) return; @@ -423,8 +423,8 @@ public: void HandleScript(SpellEffIndex /*effIndex*/) { - Unit *caster = GetCaster(); - Unit *owner = caster->GetOwner(); + Unit* caster = GetCaster(); + Unit* owner = caster->GetOwner(); if (!owner || caster->HasAura(HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF)) return; owner->CastCustomSpell(HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED, SPELLVALUE_BASE_POINT0, 100, caster, true); @@ -470,7 +470,7 @@ public: { if (!GetHitUnit()) return; - Unit *caster = GetCaster(); + Unit* caster = GetCaster(); caster->CastSpell(caster, HUNTER_PET_SPELL_CARRION_FEEDER_TRIGGERED, false); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 95ed91f5a77..32dca054d43 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -81,7 +81,7 @@ class spell_mage_cold_snap : public SpellScriptLoader PrepareSpellScript(spell_mage_cold_snap_SpellScript) void HandleDummy(SpellEffIndex /*effIndex*/) { - Unit *caster = GetCaster(); + Unit* caster = GetCaster(); if (caster->GetTypeId() != TYPEID_PLAYER) return; @@ -137,7 +137,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit *unitTarget = GetHitUnit()) + if (Unit* unitTarget = GetHitUnit()) if (unitTarget->GetTypeId() == TYPEID_UNIT) unitTarget->CastSpell(unitTarget, spell_list[urand(0, 5)], true); } @@ -186,7 +186,7 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit *unitTarget = GetHitUnit()) + if (Unit* unitTarget = GetHitUnit()) { // Glyph of Eternal Water if (unitTarget->HasAura(SPELL_MAGE_GLYPH_OF_ETERNAL_WATER)) diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 5902bc04885..031a7da97f2 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -138,7 +138,7 @@ public: void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit *unitTarget = GetHitUnit()) + if (Unit* unitTarget = GetHitUnit()) { uint32 spell_id = 0; switch(unitTarget->getClass()) @@ -273,9 +273,9 @@ public: void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit *unitTarget = GetHitUnit()) + if (Unit* unitTarget = GetHitUnit()) { - Unit *caster = GetCaster(); + Unit* caster = GetCaster(); uint8 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id); @@ -309,7 +309,7 @@ public: PrepareSpellScript(spell_pal_judgement_of_command_SpellScript) void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit *unitTarget = GetHitUnit()) + if (Unit* unitTarget = GetHitUnit()) if (SpellEntry const* spell_proto = sSpellStore.LookupEntry(GetEffectValue())) GetCaster()->CastSpell(unitTarget, spell_proto, true, NULL); } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index d4b6c293af7..2d35ed41bf0 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -158,7 +158,7 @@ class spell_pri_pain_and_suffering_proc : public SpellScriptLoader void HandleEffectScriptEffect(SpellEffIndex /*effIndex*/) { // Refresh Shadow Word: Pain on target - if (Unit *unitTarget = GetHitUnit()) + if (Unit* unitTarget = GetHitUnit()) if (AuraEffect* aur = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0, 0, GetCaster()->GetGUID())) aur->GetBase()->RefreshDuration(); } @@ -203,11 +203,11 @@ class spell_pri_penance : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { - Unit *unitTarget = GetHitUnit(); + Unit* unitTarget = GetHitUnit(); if (!unitTarget || !unitTarget->isAlive()) return; - Unit *caster = GetCaster(); + Unit* caster = GetCaster(); uint8 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 2d926118ed2..8a782e4ca2b 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -435,7 +435,7 @@ public: void HandleDummy(SpellEffIndex /*effIndex*/) { - Item *castItem = GetCastItem(); + Item* castItem = GetCastItem(); if (!castItem) return; diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 4e0f7d47674..4c2bdbfa4de 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -162,7 +162,7 @@ class spell_rog_preparation : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { - Unit *caster = GetCaster(); + Unit* caster = GetCaster(); if (caster->GetTypeId() != TYPEID_PLAYER) return; @@ -269,11 +269,11 @@ class spell_rog_shiv : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { - Unit *caster = GetCaster(); + Unit* caster = GetCaster(); if (caster->GetTypeId() != TYPEID_PLAYER) return; - if (Unit *unitTarget = GetHitUnit()) + if (Unit* unitTarget = GetHitUnit()) caster->CastSpell(unitTarget, ROGUE_SPELL_SHIV_TRIGGERED, true); } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 2c84f7b97aa..8f81bb88fb2 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -166,7 +166,7 @@ public: { int32 effValue = GetEffectValue(); // Glyph of Mana Tide - if (Unit *owner = caster->GetOwner()) + if (Unit* owner = caster->GetOwner()) if (AuraEffect *dummy = owner->GetAuraEffect(SHAMAN_SPELL_GLYPH_OF_MANA_TIDE, 0)) effValue += dummy->GetAmount(); // Regenerate 6% of Total Mana Every 3 secs @@ -210,7 +210,7 @@ public: void HandleEffectPeriodic(AuraEffect const* aurEff) { Unit* target = GetTarget(); - if (Unit *caster = aurEff->GetBase()->GetCaster()) + if (Unit* caster = aurEff->GetBase()->GetCaster()) if (AuraEffect* aur = caster->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, 2289, 0)) if (roll_chance_i(aur->GetBaseAmount())) target->CastSpell(target, SHAMAN_TOTEM_SPELL_EARTHEN_POWER, true, NULL, aurEff); diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 4ebb0fc3aea..de59cdf8841 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -65,7 +65,7 @@ class go_cat_figurine : public GameObjectScript public: go_cat_figurine() : GameObjectScript("go_cat_figurine") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true); return false; @@ -80,7 +80,7 @@ class go_northern_crystal_pylon : public GameObjectScript public: go_northern_crystal_pylon() : GameObjectScript("go_northern_crystal_pylon") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -100,7 +100,7 @@ class go_eastern_crystal_pylon : public GameObjectScript public: go_eastern_crystal_pylon() : GameObjectScript("go_eastern_crystal_pylon") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -120,7 +120,7 @@ class go_western_crystal_pylon : public GameObjectScript public: go_western_crystal_pylon() : GameObjectScript("go_western_crystal_pylon") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -144,7 +144,7 @@ class go_barov_journal : public GameObjectScript public: go_barov_journal() : GameObjectScript("go_barov_journal") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086)) { @@ -163,7 +163,7 @@ class go_field_repair_bot_74A : public GameObjectScript public: go_field_repair_bot_74A() : GameObjectScript("go_field_repair_bot_74A") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704)) { @@ -187,7 +187,7 @@ class go_gilded_brazier : public GameObjectScript public: go_gilded_brazier() : GameObjectScript("go_gilded_brazier") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) { @@ -210,7 +210,7 @@ class go_orb_of_command : public GameObjectScript public: go_orb_of_command() : GameObjectScript("go_orb_of_command") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(7761)) pPlayer->CastSpell(pPlayer, 23460, true); @@ -228,7 +228,7 @@ class go_tablet_of_madness : public GameObjectScript public: go_tablet_of_madness() : GameObjectScript("go_tablet_of_madness") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266)) { @@ -248,7 +248,7 @@ public: go_tablet_of_the_seven() : GameObjectScript("go_tablet_of_the_seven") { } //TODO: use gossip option ("Transcript the Tablet") instead, if Trinity adds support. - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) return true; @@ -269,7 +269,7 @@ class go_jump_a_tron : public GameObjectScript public: go_jump_a_tron() : GameObjectScript("go_jump_a_tron") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) pPlayer->CastSpell(pPlayer, 33382, true); @@ -303,7 +303,7 @@ class go_ethereum_prison : public GameObjectScript public: go_ethereum_prison() : GameObjectScript("go_ethereum_prison") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { int Random = rand() % (sizeof(NpcPrisonEntry) / sizeof(uint32)); @@ -353,7 +353,7 @@ class go_ethereum_stasis : public GameObjectScript public: go_ethereum_stasis() : GameObjectScript("go_ethereum_stasis") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { int Random = rand() % (sizeof(NpcStasisEntry) / sizeof(uint32)); @@ -379,7 +379,7 @@ class go_resonite_cask : public GameObjectScript public: go_resonite_cask() : GameObjectScript("go_resonite_cask") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) pGO->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000); @@ -399,7 +399,7 @@ class go_sacred_fire_of_life : public GameObjectScript public: go_sacred_fire_of_life() : GameObjectScript("go_sacred_fire_of_life") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) pPlayer->SummonCreature(NPC_ARIKARA, -5008.338f, -2118.894f, 83.657f, 0.874f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -427,7 +427,7 @@ class go_shrine_of_the_birds : public GameObjectScript public: go_shrine_of_the_birds() : GameObjectScript("go_shrine_of_the_birds") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { uint32 BirdEntry = 0; @@ -470,7 +470,7 @@ class go_southfury_moonstone : public GameObjectScript public: go_southfury_moonstone() : GameObjectScript("go_southfury_moonstone") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose //pPlayer->CastSpell(pPlayer, SPELL_SUMMON_RIZZLE, false); @@ -498,7 +498,7 @@ class go_tele_to_dalaran_crystal : public GameObjectScript public: go_tele_to_dalaran_crystal() : GameObjectScript("go_tele_to_dalaran_crystal") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) { @@ -520,7 +520,7 @@ class go_tele_to_violet_stand : public GameObjectScript public: go_tele_to_violet_stand() : GameObjectScript("go_tele_to_violet_stand") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || pPlayer->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; @@ -550,7 +550,7 @@ class go_fel_crystalforge : public GameObjectScript public: go_fel_crystalforge() : GameObjectScript("go_fel_crystalforge") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ pPlayer->PrepareQuestMenu(pGO->GetGUID()); /* return true*/ @@ -563,7 +563,7 @@ public: return true; } - bool OnGossipSelect(Player *pPlayer, GameObject *pGO, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch(uiAction) @@ -609,7 +609,7 @@ class go_bashir_crystalforge : public GameObjectScript public: go_bashir_crystalforge() : GameObjectScript("go_bashir_crystalforge") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ pPlayer->PrepareQuestMenu(pGO->GetGUID()); /* return true*/ @@ -622,7 +622,7 @@ public: return true; } - bool OnGossipSelect(Player *pPlayer, GameObject *pGO, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); switch(uiAction) @@ -673,7 +673,7 @@ class go_matrix_punchograph : public GameObjectScript public: go_matrix_punchograph() : GameObjectScript("go_matrix_punchograph") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { switch(pGO->GetEntry()) { @@ -726,9 +726,9 @@ class go_rusty_cage : public GameObjectScript public: go_rusty_cage() : GameObjectScript("go_rusty_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { - if (Creature *pGoblinPrisoner = pGO->FindNearestCreature(NPC_GOBLIN_PRISIONER, 5.0f, true)) + if (Creature* pGoblinPrisoner = pGO->FindNearestCreature(NPC_GOBLIN_PRISIONER, 5.0f, true)) { pGO->SetGoState(GO_STATE_ACTIVE); pPlayer->KilledMonsterCredit(NPC_GOBLIN_PRISIONER, pGoblinPrisoner->GetGUID()); @@ -753,9 +753,9 @@ class go_scourge_cage : public GameObjectScript public: go_scourge_cage() : GameObjectScript("go_scourge_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { - if (Creature *pNearestPrisoner = pGO->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true)) + if (Creature* pNearestPrisoner = pGO->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true)) { pGO->SetGoState(GO_STATE_ACTIVE); pPlayer->KilledMonsterCredit(NPC_SCOURGE_PRISONER, pNearestPrisoner->GetGUID()); @@ -781,7 +781,7 @@ class go_arcane_prison : public GameObjectScript public: go_arcane_prison() : GameObjectScript("go_arcane_prison") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pPlayer->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE) { @@ -804,7 +804,7 @@ class go_blood_filled_orb : public GameObjectScript public: go_blood_filled_orb() : GameObjectScript("go_blood_filled_orb") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) pPlayer->SummonCreature(NPC_ZELEMAR, -369.746f, 166.759f, -21.50f, 5.235f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -910,7 +910,7 @@ class go_inconspicuous_landmark : public GameObjectScript public: go_inconspicuous_landmark() : GameObjectScript("go_inconspicuous_landmark") { } - bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) + bool OnGossipHello(Player* pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY, 1)) return false; @@ -930,13 +930,13 @@ class go_soulwell : public GameObjectScript public: go_soulwell() : GameObjectScript("go_soulwell") { } - bool OnGossipHello(Player *pPlayer, GameObject* pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { - Unit *caster = pGO->GetOwner(); + Unit* caster = pGO->GetOwner(); if (!caster || caster->GetTypeId() != TYPEID_PLAYER) return true; - if (!pPlayer->IsInSameRaidWith(static_cast<Player *>(caster))) + if (!pPlayer->IsInSameRaidWith(static_cast<Player* >(caster))) return true; // Repeating this at every use is ugly and inefficient. But as long as we don't have proper @@ -985,7 +985,7 @@ class go_dragonflayer_cage : public GameObjectScript public: go_dragonflayer_cage() : GameObjectScript("go_dragonflayer_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pPlayer->GetQuestStatus(QUEST_PRISONERS_OF_WYRMSKULL) != QUEST_STATUS_INCOMPLETE) return true; @@ -1032,11 +1032,11 @@ class go_tadpole_cage : public GameObjectScript public: go_tadpole_cage() : GameObjectScript("go_tadpole_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if (pPlayer->GetQuestStatus(QUEST_OH_NOES_THE_TADPOLES) == QUEST_STATUS_INCOMPLETE) { - Creature *pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE, 1.0f); + Creature* pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE, 1.0f); if (pTadpole) { pGO->UseDoorOrButton(); @@ -1067,12 +1067,12 @@ class go_black_cage : public GameObjectScript public: go_black_cage() : GameObjectScript("go_black_cage") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { if ((pPlayer->GetTeamId() == TEAM_ALLIANCE && pPlayer->GetQuestStatus(QUEST_ALLIANCE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetTeamId() == TEAM_HORDE && pPlayer->GetQuestStatus(QUEST_HORDE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE)) { - Creature *pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT, 1.0f); + Creature* pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT, 1.0f); if (!pPrisoner) pPrisoner = pGO->FindNearestCreature(NPC_KUL, 1.0f); if (pPrisoner) @@ -1110,7 +1110,7 @@ class go_amberpine_outhouse : public GameObjectScript public: go_amberpine_outhouse() : GameObjectScript("go_amberpine_outhouse") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { QuestStatus status = pPlayer->GetQuestStatus(QUEST_DOING_YOUR_DUTY); if (status == QUEST_STATUS_INCOMPLETE || status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) @@ -1124,7 +1124,7 @@ public: return true; } - bool OnGossipSelect(Player *pPlayer, GameObject *pGO, uint32 /*uiSender*/, uint32 uiAction) + bool OnGossipSelect(Player* pPlayer, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF +1) @@ -1165,7 +1165,7 @@ class go_hive_pod : public GameObjectScript public: go_hive_pod() : GameObjectScript("go_hive_pod") { } - bool OnGossipHello(Player *pPlayer, GameObject *pGO) + bool OnGossipHello(Player* pPlayer, GameObject* pGO) { pPlayer->SendLoot(pGO->GetGUID(), LOOT_CORPSE); pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX()+1, pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); @@ -1179,7 +1179,7 @@ class go_massive_seaforium_charge : public GameObjectScript public: go_massive_seaforium_charge() : GameObjectScript("go_massive_seaforium_charge") { } - bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGo) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) { pGo->SetLootState(GO_JUST_DEACTIVATED); return true; diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 5ff807e0e40..52b7b233f88 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -301,7 +301,7 @@ public: bool canTeleport; }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new guard_shattrath_scryerAI(creature); } @@ -365,7 +365,7 @@ public: bool canTeleport; }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new guard_shattrath_aldorAI(creature); } diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 073625943aa..440a75975ff 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -97,7 +97,7 @@ public: { if (urand(0, 99) < 35) { - Creature *Murloc = pPlayer->SummonCreature(17102, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); + Creature* Murloc = pPlayer->SummonCreature(17102, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Murloc) Murloc->AI()->AttackStart(pPlayer); } @@ -132,9 +132,9 @@ public: { if (player->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE) { - if (Creature *nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()+20, player->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000)) + if (Creature* nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()+20, player->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000)) nether->AI()->AttackStart(player); - if (Creature *nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()-20, player->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000)) + if (Creature* nether = player->SummonCreature(22408, player->GetPositionX(), player->GetPositionY()-20, player->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000)) nether->AI()->AttackStart(player); } return false; @@ -150,7 +150,7 @@ class item_gor_dreks_ointment : public ItemScript public: item_gor_dreks_ointment() : ItemScript("item_gor_dreks_ointment") { } - bool OnUse(Player *pPlayer, Item *pItem, SpellCastTargets const& targets) + bool OnUse(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { if (targets.GetUnitTarget() && targets.GetUnitTarget()->GetTypeId() == TYPEID_UNIT && targets.GetUnitTarget()->GetEntry() == 20748 && !targets.GetUnitTarget()->HasAura(32578)) @@ -170,7 +170,7 @@ class item_incendiary_explosives : public ItemScript public: item_incendiary_explosives() : ItemScript("item_incendiary_explosives") { } - bool OnUse(Player *pPlayer, Item *pItem, SpellCastTargets const & /*targets*/) + bool OnUse(Player* pPlayer, Item* pItem, SpellCastTargets const & /*targets*/) { if (pPlayer->FindNearestCreature(26248, 15) || pPlayer->FindNearestCreature(26249, 15)) return false; @@ -190,7 +190,7 @@ class item_mysterious_egg : public ItemScript { public: item_mysterious_egg() : ItemScript("item_mysterious_egg") { } - bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) + bool OnExpire(Player* pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg @@ -210,7 +210,7 @@ class item_disgusting_jar : public ItemScript public: item_disgusting_jar() : ItemScript("item_disgusting_jar") {} - bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) + bool OnExpire(Player* pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar @@ -259,9 +259,9 @@ class item_pile_fake_furs : public ItemScript public: item_pile_fake_furs() : ItemScript("item_pile_fake_furs") { } - bool OnUse(Player *pPlayer, Item* /*pItem*/, SpellCastTargets const & /*targets*/) + bool OnUse(Player* pPlayer, Item* /*pItem*/, SpellCastTargets const & /*targets*/) { - GameObject *pGo = NULL; + GameObject* pGo = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) { pGo = pPlayer->FindNearestGameObject(CaribouTraps[i], 5.0f); diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 455615561f5..f8616c3fa5e 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -34,7 +34,7 @@ public: struct generic_creatureAI : public ScriptedAI { - generic_creatureAI(Creature *c) : ScriptedAI(c) {} + generic_creatureAI(Creature* c) : ScriptedAI(c) {} uint32 GlobalCooldown; //This variable acts like the global cooldown that players have (1.5 seconds) uint32 BuffTimer; //This variable keeps track of buffs @@ -47,7 +47,7 @@ public: IsSelfRooted = false; } - void EnterCombat(Unit *who) + void EnterCombat(Unit* who) { if (!me->IsWithinMeleeRange(who)) IsSelfRooted = true; @@ -161,7 +161,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new generic_creatureAI(creature); } @@ -197,7 +197,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new trigger_periodicAI(creature); } @@ -218,7 +218,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new trigger_deathAI(creature); } diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index e0726035e5b..e22b1d48e4c 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -42,7 +42,7 @@ class npc_innkeeper : public CreatureScript public: npc_innkeeper() : CreatureScript("npc_innkeeper") { } - bool OnGossipHello(Player *pPlayer, Creature *pCreature) + bool OnGossipHello(Player* pPlayer, Creature* pCreature) { if (IsEventActive(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED)) { diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 671892e9ef2..0d4d5cb6837 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -254,7 +254,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_air_force_botsAI(creature); } @@ -280,7 +280,7 @@ class npc_lunaclaw_spirit : public CreatureScript public: npc_lunaclaw_spirit() : CreatureScript("npc_lunaclaw_spirit") { } - bool OnGossipHello(Player *pPlayer, Creature *pCreature) + bool OnGossipHello(Player* pPlayer, Creature* pCreature) { if (pPlayer->GetQuestStatus(QUEST_BODY_HEART_A) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_BODY_HEART_H) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GRANT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -319,7 +319,7 @@ public: struct npc_chicken_cluckAI : public ScriptedAI { - npc_chicken_cluckAI(Creature *c) : ScriptedAI(c) {} + npc_chicken_cluckAI(Creature* c) : ScriptedAI(c) {} uint32 ResetFlagTimer; @@ -372,7 +372,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_chicken_cluckAI(creature); } @@ -409,7 +409,7 @@ public: struct npc_dancing_flamesAI : public ScriptedAI { - npc_dancing_flamesAI(Creature *c) : ScriptedAI(c) {} + npc_dancing_flamesAI(Creature* c) : ScriptedAI(c) {} bool active; uint32 can_iteract; @@ -472,7 +472,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_dancing_flamesAI(creature); } @@ -552,7 +552,7 @@ public: struct npc_doctorAI : public ScriptedAI { - npc_doctorAI(Creature *c) : ScriptedAI(c) {} + npc_doctorAI(Creature* c) : ScriptedAI(c) {} uint64 PlayerGUID; @@ -680,7 +680,7 @@ public: return true; } - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_doctorAI(creature); } @@ -697,7 +697,7 @@ public: struct npc_injured_patientAI : public ScriptedAI { - npc_injured_patientAI(Creature *c) : ScriptedAI(c) {} + npc_injured_patientAI(Creature* c) : ScriptedAI(c) {} uint64 Doctorguid; Location* Coord; @@ -737,7 +737,7 @@ public: void EnterCombat(Unit* /*who*/){} - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit* caster, const SpellEntry *spell) { if (caster->GetTypeId() == TYPEID_PLAYER && me->isAlive() && spell->Id == 20804) { @@ -800,7 +800,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_injured_patientAI(creature); } @@ -899,7 +899,7 @@ public: struct npc_garments_of_questsAI : public npc_escortAI { - npc_garments_of_questsAI(Creature *c) : npc_escortAI(c) {Reset();} + npc_garments_of_questsAI(Creature* c) : npc_escortAI(c) {Reset();} uint64 caster; @@ -1044,7 +1044,7 @@ public: { if (RunAwayTimer <= diff) { - if (Unit *pUnit = Unit::GetUnit(*me, caster)) + if (Unit* pUnit = Unit::GetUnit(*me, caster)) { switch(me->GetEntry()) { @@ -1068,7 +1068,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_garments_of_questsAI(creature); } @@ -1087,7 +1087,7 @@ public: struct npc_guardianAI : public ScriptedAI { - npc_guardianAI(Creature *c) : ScriptedAI(c) {} + npc_guardianAI(Creature* c) : ScriptedAI(c) {} void Reset() { @@ -1111,7 +1111,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_guardianAI(creature); } @@ -1504,7 +1504,7 @@ public: struct npc_steam_tonkAI : public ScriptedAI { - npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {} + npc_steam_tonkAI(Creature* c) : ScriptedAI(c) {} void Reset() {} void EnterCombat(Unit* /*who*/) {} @@ -1525,7 +1525,7 @@ public: }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_steam_tonkAI(creature); } @@ -1540,7 +1540,7 @@ public: struct npc_tonk_mineAI : public ScriptedAI { - npc_tonk_mineAI(Creature *c) : ScriptedAI(c) + npc_tonk_mineAI(Creature* c) : ScriptedAI(c) { me->SetReactState(REACT_PASSIVE); } @@ -1567,7 +1567,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_tonk_mineAI(creature); } @@ -1595,7 +1595,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_brewfest_revelerAI(creature); } @@ -1635,7 +1635,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_winter_revelerAI(creature); } @@ -1663,7 +1663,7 @@ public: struct npc_snake_trap_serpentsAI : public ScriptedAI { - npc_snake_trap_serpentsAI(Creature *c) : ScriptedAI(c) {} + npc_snake_trap_serpentsAI(Creature* c) : ScriptedAI(c) {} uint32 SpellTimer; bool IsViper; @@ -1695,7 +1695,7 @@ public: } //Redefined for random target selection: - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit* who) { if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who)) && who->isInAccessiblePlaceFor(me)) { @@ -1748,7 +1748,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_snake_trap_serpentsAI(creature); } @@ -1771,7 +1771,7 @@ public: struct mob_mojoAI : public ScriptedAI { - mob_mojoAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_mojoAI(Creature* c) : ScriptedAI(c) {Reset();} uint32 hearts; uint64 victimGUID; void Reset() @@ -1833,7 +1833,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new mob_mojoAI(creature); } @@ -1846,7 +1846,7 @@ public: struct npc_mirror_imageAI : CasterAI { - npc_mirror_imageAI(Creature *c) : CasterAI(c) {} + npc_mirror_imageAI(Creature* c) : CasterAI(c) {} void InitializeAI() { @@ -1868,7 +1868,7 @@ public: if (me->IsInEvadeMode() || !me->isAlive()) return; - Unit *owner = me->GetCharmerOrOwner(); + Unit* owner = me->GetCharmerOrOwner(); me->CombatStop(true); if (owner && !me->HasUnitState(UNIT_STAT_FOLLOW)) @@ -1879,7 +1879,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_mirror_imageAI(creature); } @@ -1892,7 +1892,7 @@ public: struct npc_ebon_gargoyleAI : CasterAI { - npc_ebon_gargoyleAI(Creature *c) : CasterAI(c) {} + npc_ebon_gargoyleAI(Creature* c) : CasterAI(c) {} uint32 despawnTimer; @@ -1920,17 +1920,17 @@ public: void JustDied(Unit* /*killer*/) { // Stop Feeding Gargoyle when it dies - if (Unit *owner = me->GetOwner()) + if (Unit* owner = me->GetOwner()) owner->RemoveAurasDueToSpell(50514); } // Fly away when dismissed - void SpellHit(Unit *source, const SpellEntry *spell) + void SpellHit(Unit* source, const SpellEntry *spell) { if (spell->Id != 50515 || !me->isAlive()) return; - Unit *owner = me->GetOwner(); + Unit* owner = me->GetOwner(); if (!owner || owner != source) return; @@ -1971,7 +1971,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_ebon_gargoyleAI(creature); } @@ -1984,7 +1984,7 @@ public: struct npc_lightwellAI : public PassiveAI { - npc_lightwellAI(Creature *c) : PassiveAI(c) {} + npc_lightwellAI(Creature* c) : PassiveAI(c) {} void Reset() { @@ -1992,7 +1992,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_lightwellAI(creature); } @@ -2117,7 +2117,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI *GetAI(Creature* creature) const { return new npc_shadowfiendAI(creature); } |