diff options
390 files changed, 1545 insertions, 1545 deletions
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index dbc5f65c711..8226868fa7a 100755 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -75,7 +75,7 @@ extern int main(int argc, char **argv) // Command line parsing to get the configuration file name char const* cfg_file = _TRINITY_REALM_CONFIG; int c = 1; - while(c < argc) + while (c < argc) { if (strcmp(argv[c], "-c") == 0) { diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h index f4636b38bac..0dc597e98bc 100755 --- a/src/server/collision/BoundingIntervalHierarchy.h +++ b/src/server/collision/BoundingIntervalHierarchy.h @@ -86,7 +86,7 @@ class BIH template< class T, class BoundsFunc > void build(const std::vector<T> &primitives, BoundsFunc &getBounds, uint32 leafSize = 3, bool printStats=false) { - if(primitives.empty()) + if (primitives.empty()) return; buildData dat; dat.maxPrims = leafSize; @@ -156,7 +156,7 @@ class BIH uint32 offsetBack3[3]; // compute custom offsets from direction sign bit - for(int i=0; i<3; ++i) + for (int i=0; i<3; ++i) { offsetFront[i] = floatToRawIntBits(dir[i]) >> 31; offsetBack[i] = offsetFront[i] ^ 1; @@ -218,7 +218,7 @@ class BIH int n = tree[node + 1]; while (n > 0) { bool hit = intersectCallback(r, objects[offset], maxDist, stopAtFirst); - if(stopAtFirst && hit) return; + if (stopAtFirst && hit) return; --n; ++offset; } @@ -376,7 +376,7 @@ class BIH maxObjects(0xFFFFFFFF), sumDepth(0), minDepth(0x0FFFFFFF), maxDepth(0xFFFFFFFF), numBVH2(0) { - for(int i=0; i<6; ++i) numLeavesN[i] = 0; + for (int i=0; i<6; ++i) numLeavesN[i] = 0; } void updateInner() { numNodes++; } diff --git a/src/server/collision/Management/VMapFactory.cpp b/src/server/collision/Management/VMapFactory.cpp index 21907fef263..438b854de16 100755 --- a/src/server/collision/Management/VMapFactory.cpp +++ b/src/server/collision/Management/VMapFactory.cpp @@ -27,10 +27,10 @@ namespace VMAP { void chompAndTrim(std::string& str) { - while(str.length() >0) + while (str.length() >0) { char lc = str[str.length()-1]; - if(lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'') + if (lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'') { str = str.substr(0, str.length()-1); } @@ -39,10 +39,10 @@ namespace VMAP break; } } - while(str.length() >0) + while (str.length() >0) { char lc = str[0]; - if(lc == ' ' || lc == '"' || lc == '\'') + if (lc == ' ' || lc == '"' || lc == '\'') { str = str.substr(1, str.length()-1); } @@ -54,7 +54,7 @@ namespace VMAP } IVMapManager* gVMapManager = 0; - Table<unsigned int , bool>* iIgnoreSpellIds=0; + Table<unsigned int, bool>* iIgnoreSpellIds=0; //=============================================== // result false, if no more id are found @@ -63,14 +63,14 @@ namespace VMAP { bool result = false; unsigned int i; - for(i=pStartPos;i<pString.size(); ++i) + for (i=pStartPos;i<pString.size(); ++i) { - if(pString[i] == ',') + if (pString[i] == ',') { break; } } - if(i>pStartPos) + if (i>pStartPos) { std::string idString = pString.substr(pStartPos, i-pStartPos); pStartPos = i+1; @@ -88,15 +88,15 @@ namespace VMAP void VMapFactory::preventSpellsFromBeingTestedForLoS(const char* pSpellIdString) { - if(!iIgnoreSpellIds) - iIgnoreSpellIds = new Table<unsigned int , bool>(); - if(pSpellIdString != NULL) + if (!iIgnoreSpellIds) + iIgnoreSpellIds = new Table<unsigned int, bool>(); + if (pSpellIdString != NULL) { unsigned int pos =0; unsigned int id; std::string confString(pSpellIdString); chompAndTrim(confString); - while(getNextId(confString, pos, id)) + while (getNextId(confString, pos, id)) { iIgnoreSpellIds->set(id, true); } @@ -114,7 +114,7 @@ namespace VMAP // just return the instance IVMapManager* VMapFactory::createOrGetVMapManager() { - if(gVMapManager == 0) + if (gVMapManager == 0) gVMapManager= new VMapManager2(); // should be taken from config ... Please change if you like :-) return gVMapManager; } diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index bfbbef3d915..594e1a9382b 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -265,13 +265,13 @@ namespace VMAP int readOperation = 1; // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; // only use this for array deletes - #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN_WITH_DELETE(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); delete[] V; return(false); }readOperation++; - #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ + #define CMP_OR_RETURN(V, S) if (strcmp((V), (S)) != 0) { \ fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } READ_OR_RETURN(&ident, 8); @@ -377,11 +377,11 @@ namespace VMAP int readOperation = 1; // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; - #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN_WITH_DELETE(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); delete[] V; return(false); }readOperation++; - #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ + #define CMP_OR_RETURN(V, S) if (strcmp((V), (S)) != 0) { \ fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } READ_OR_RETURN(&ident, 8); diff --git a/src/server/collision/Models/ModelInstance.cpp b/src/server/collision/Models/ModelInstance.cpp index a86f6cac45a..f0bff0cef73 100644 --- a/src/server/collision/Models/ModelInstance.cpp +++ b/src/server/collision/Models/ModelInstance.cpp @@ -57,7 +57,7 @@ namespace VMAP Ray modRay(p, iInvRot * pRay.direction()); float distance = pMaxDist * iInvScale; bool hit = iModel->IntersectRay(modRay, distance, pStopAtFirstHit); - if(hit) + if (hit) { distance *= iScale; pMaxDist = distance; diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index 3dad4a10174..da75492c9c6 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -161,7 +161,7 @@ namespace VMAP if ((iFlags[tx + ty*iTilesX] & 0x0F) == 0x0F) return false; - // (dx, dy) coordinates inside tile, in [0,1]^2 + // (dx, dy) coordinates inside tile, in [0, 1]^2 float dx = tx_f - (float)tx; float dy = ty_f - (float)ty; @@ -169,7 +169,7 @@ namespace VMAP ^ dy | - 1 x---------x (1,1) + 1 x---------x (1, 1) | (b) / | | / | | / | @@ -442,7 +442,7 @@ namespace VMAP { float group_Z; //float pVol = prims[entry].GetBound().volume(); - //if(pVol < minVol) + //if (pVol < minVol) //{ /* if (prims[entry].iBound.contains(point)) */ if (prims[entry].IsInsideObject(point, zVec, group_Z)) diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index e11be0612a2..8397ad7954e 100755 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -131,7 +131,7 @@ void UnitAI::DoCast(uint32 spellId) { Unit* target = NULL; //sLog->outError("aggre %u %u", spellId, (uint32)AISpellInfo[spellId].target); - switch(AISpellInfo[spellId].target) + switch (AISpellInfo[spellId].target) { default: case AITARGET_SELF: target = me; break; diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 8485559c7fa..4fdedea414a 100755 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -49,7 +49,7 @@ enum SelectAggroTarget }; // default predicate function to select target based on distance, player and/or aura criteria -struct DefaultTargetSelector : public std::unary_function<Unit* , bool> +struct DefaultTargetSelector : public std::unary_function<Unit*, bool> { const Unit* me; float m_dist; @@ -152,7 +152,7 @@ class UnitAI Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); // Select the targets satifying the predicate. - // predicate shall extend std::unary_function<Unit* , bool> + // predicate shall extend std::unary_function<Unit*, bool> template <class PREDICATE> Unit* SelectTarget(SelectAggroTarget targetType, uint32 position, PREDICATE const& predicate) { const std::list<HostileReference*>& threatlist = me->getThreatManager().getThreatList(); @@ -202,7 +202,7 @@ class UnitAI void SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectAggroTarget targetType, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); // Select the targets satifying the predicate. - // predicate shall extend std::unary_function<Unit* , bool> + // predicate shall extend std::unary_function<Unit*, bool> template <class PREDICATE> void SelectTargetList(std::list<Unit*>& targetList, PREDICATE const& predicate, uint32 maxTargets, SelectAggroTarget targetType) { std::list<HostileReference*> const& threatlist = me->getThreatManager().getThreatList(); diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index 27807283edc..62d7a1f4f58 100755 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -1272,7 +1272,7 @@ void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* source, Unit* t sLog->outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process emote for invalid TypeId (%u).", textEntry, source->GetTypeId()); } - switch((*i).second.Type) + switch ((*i).second.Type) { case CHAT_TYPE_SAY: source->MonsterSay(textEntry, (*i).second.Language, target ? target->GetGUID() : 0); diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp index 72828ad01d6..c27613f320f 100755 --- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp @@ -278,7 +278,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() sLog->outErrorDb("CreatureEventAI: Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i); break; case EVENT_T_SPAWNED: - switch(temp.spawned.condition) + switch (temp.spawned.condition) { case SPAWNED_EVENT_ALWAY: break; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index ecdae923a9d..305821095fa 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -436,7 +436,7 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(uint32 const diff) float y = me->GetPositionY(); float z = me->GetPositionZ(); - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_BROODLORD: // broodlord (not move down stairs) if (z > 448.60f) @@ -457,7 +457,7 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(uint32 const diff) default: // For most of creatures that certain area is their home area. sLog->outDetail("TSCR: EnterEvadeIfOutOfCombatArea used for creature entry %u, but does not have any definition. Using the default one.", me->GetEntry()); uint32 homeAreaId = me->GetMap()->GetAreaId(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY(), me->GetHomePosition().GetPositionZ()); - if(me->GetAreaId() == homeAreaId) + if (me->GetAreaId() == homeAreaId) return false; } diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h index 9bf602d499d..5d376be888e 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedGossip.h +++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.h @@ -82,7 +82,7 @@ enum eTradeskill #define ADD_GOSSIP_ITEM(a, b, c, d) PlayerTalkClass->GetGossipMenu().AddMenuItem(-1, a, b, c, d, "", 0) #define ADD_GOSSIP_ITEM_EXTENDED(a, b, c, d, e, f, g) PlayerTalkClass->GetGossipMenu().AddMenuItem(-1, a, b, c, d, e, f, g) -// This fuction Sends the current menu to show to client, a - NPCTEXTID(uint32) , b - npc guid(uint64) +// This fuction Sends the current menu to show to client, a - NPCTEXTID(uint32), b - npc guid(uint64) #define SEND_GOSSIP_MENU(a, b) PlayerTalkClass->SendGossipMenu(a, b) // Closes the Menu diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 2b3f3dd7305..72dbb4baff7 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -843,7 +843,7 @@ void SmartGameObjectAI::Reset() bool SmartGameObjectAI::GossipHello(Player* player) { sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartGameObjectAI::GossipHello"); - GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 0 , 0 , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 0, 0, false, NULL, go); return false; } @@ -863,14 +863,14 @@ bool SmartGameObjectAI::GossipSelectCode(Player* /*player*/, uint32 /*sender*/, // Called when a player accepts a quest from the gameobject. bool SmartGameObjectAI::QuestAccept(Player* player, Quest const* quest) { - GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId() , 0 , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId(), 0, false, NULL, go); return false; } // Called when a player selects a quest reward. bool SmartGameObjectAI::QuestReward(Player* player, Quest const* quest, uint32 opt) { - GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId() , opt , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId(), opt, false, NULL, go); return false; } @@ -880,7 +880,7 @@ uint32 SmartGameObjectAI::GetDialogStatus(Player* /*player*/) { return 100; } // Called when the gameobject is destroyed (destructible buildings only). void SmartGameObjectAI::Destroyed(Player* player, uint32 eventId) { - GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, player, eventId , 0 , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, player, eventId, 0, false, NULL, go); } void SmartGameObjectAI::SetData(uint32 id, uint32 value) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 854e155c148..b17e2e4736e 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -460,7 +460,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (IsPlayer(*itr)) { (*itr)->ToPlayer()->CastedCreatureOrGO(e.action.castedCreatureOrGO.creature, GetBaseObject()->GetGUID(), e.action.castedCreatureOrGO.spell); - sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SEND_CASTCREATUREORGO: Player guidLow %u.org Creature: %u, BaseObject GUID: "UI64FMTD" , Spell: %u", + sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SEND_CASTCREATUREORGO: Player guidLow %u.org Creature: %u, BaseObject GUID: "UI64FMTD", Spell: %u", (*itr)->GetGUIDLow(), e.action.castedCreatureOrGO.creature, GetBaseObject()->GetGUID(), e.action.castedCreatureOrGO.spell); } } @@ -1309,7 +1309,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u bool run = e.action.setRun.run ? true : false; CAST_AI(SmartAI, me->AI())->SetRun(run); - me->GetMotionMaster()->MovePoint(0, e.target.x, e.target.y , e.target.z); + me->GetMotionMaster()->MovePoint(0, e.target.x, e.target.y, e.target.z); break; } case SMART_ACTION_RESPAWN_TARGET: @@ -1781,7 +1781,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } case SMART_ACTION_JUMP_TO_POS: { - me->GetMotionMaster()->MoveJump(e.target.x, e.target.y , e.target.z, (float)e.action.jump.speedxy, (float)e.action.jump.speedz); + me->GetMotionMaster()->MoveJump(e.target.x, e.target.y, e.target.z, (float)e.action.jump.speedxy, (float)e.action.jump.speedz); break; } default: diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index f03e278a133..fab2a6b7722 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -123,7 +123,7 @@ void SmartAIMgr::LoadSmartAIFromDB() } if (temp.entryOrGuid >= 0) { - switch(source_type) + switch (source_type) { case SMART_SCRIPT_TYPE_CREATURE: { diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index b16c2223d25..bfc8c956eb6 100755 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -1600,7 +1600,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui } } -static const uint32 achievIdByClass[MAX_CLASSES] = { 0, 459, 465 , 462, 458, 464, 461, 467, 460, 463, 0, 466 }; +static const uint32 achievIdByClass[MAX_CLASSES] = { 0, 459, 465, 462, 458, 464, 461, 467, 460, 463, 0, 466 }; static const uint32 achievIdByRace[MAX_RACES] = { 0, 1408, 1410, 1407, 1409, 1413, 1411, 1404, 1412, 0, 1405, 1406 }; bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achievementCriteria, AchievementEntry const* achievement) @@ -2039,9 +2039,9 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) return; // titles - //! Currently there's only one achievement that deals with gender-specific titles. + //! Currently there's only one achievement that deals with gender-specific titles. //! Since no common attributes were found, (not even in titleRewardFlags field) - //! we explicitly check by ID. Maybe in the future we could move the achievement_reward + //! we explicitly check by ID. Maybe in the future we could move the achievement_reward //! condition fields to the condition system. if (uint32 titleId = reward->titleId[achievement->ID == 1793 ? GetPlayer()->getGender() : (GetPlayer()->GetTeam() == ALLIANCE ? 0 : 1)]) if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId)) diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index a5feac09ea4..445c5c26bd6 100755 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -255,7 +255,7 @@ void Battleground::Update(uint32 diff) return; } - switch(GetStatus()) + switch (GetStatus()) { case STATUS_WAIT_JOIN: if (GetPlayersSize()) @@ -890,7 +890,7 @@ uint32 Battleground::GetBonusHonorFromKill(uint32 kills) const uint32 Battleground::GetBattlemasterEntry() const { - switch(GetTypeID(true)) + switch (GetTypeID(true)) { case BATTLEGROUND_AV: return 15972; case BATTLEGROUND_WS: return 14623; diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 86a9511bcf8..43b315c3928 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -203,7 +203,7 @@ void BattlegroundMgr::BuildBattlegroundStatusPacket(WorldPacket* data, Battlegro *data << uint8(bg->isRated()); // 1 for rated match, 0 for bg or non rated match *data << uint32(StatusID); // status - switch(StatusID) + switch (StatusID) { case STATUS_WAIT_QUEUE: // status_in_queue *data << uint32(Time1); // average wait time, milliseconds @@ -300,10 +300,10 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg) } *data << uint32(itr2->second->DamageDone); // damage done *data << uint32(itr2->second->HealingDone); // healing done - switch(bg->GetTypeID(true)) // battleground specific things + switch (bg->GetTypeID(true)) // battleground specific things { case BATTLEGROUND_RB: - switch(bg->GetMapId()) + switch (bg->GetMapId()) { case 489: *data << uint32(0x00000002); // count of next fields @@ -554,7 +554,7 @@ Battleground* BattlegroundMgr::CreateNewBattleground(BattlegroundTypeId bgTypeId Battleground* bg = NULL; // create a copy of the BG template - switch(bgTypeId) + switch (bgTypeId) { case BATTLEGROUND_AV: bg = new BattlegroundAV(*(BattlegroundAV*)bg_template); @@ -863,7 +863,7 @@ void BattlegroundMgr::BuildBattlegroundListPacket(WorldPacket* data, uint64 guid *data << uint32(*itr); ++count; } - data->put<uint32>(count_pos , count); + data->put<uint32>(count_pos, count); } } } @@ -913,7 +913,7 @@ bool BattlegroundMgr::IsArenaType(BattlegroundTypeId bgTypeId) BattlegroundQueueTypeId BattlegroundMgr::BGQueueTypeId(BattlegroundTypeId bgTypeId, uint8 arenaType) { - switch(bgTypeId) + switch (bgTypeId) { case BATTLEGROUND_WS: return BATTLEGROUND_QUEUE_WS; @@ -935,7 +935,7 @@ BattlegroundQueueTypeId BattlegroundMgr::BGQueueTypeId(BattlegroundTypeId bgType case BATTLEGROUND_BE: case BATTLEGROUND_DS: case BATTLEGROUND_RV: - switch(arenaType) + switch (arenaType) { case ARENA_TYPE_2v2: return BATTLEGROUND_QUEUE_2v2; @@ -953,7 +953,7 @@ BattlegroundQueueTypeId BattlegroundMgr::BGQueueTypeId(BattlegroundTypeId bgType BattlegroundTypeId BattlegroundMgr::BGTemplateId(BattlegroundQueueTypeId bgQueueTypeId) { - switch(bgQueueTypeId) + switch (bgQueueTypeId) { case BATTLEGROUND_QUEUE_WS: return BATTLEGROUND_WS; @@ -980,7 +980,7 @@ BattlegroundTypeId BattlegroundMgr::BGTemplateId(BattlegroundQueueTypeId bgQueue uint8 BattlegroundMgr::BGArenaType(BattlegroundQueueTypeId bgQueueTypeId) { - switch(bgQueueTypeId) + switch (bgQueueTypeId) { case BATTLEGROUND_QUEUE_2v2: return ARENA_TYPE_2v2; diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 9cd87bf4725..67cea3e7be1 100755 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -805,7 +805,7 @@ void BattlegroundQueue::BattlegroundQueueUpdate(uint32 diff, BattlegroundTypeId //this switch can be much shorter MaxPlayersPerTeam = arenaType; MinPlayersPerTeam = arenaType; - /*switch(arenaType) + /*switch (arenaType) { case ARENA_TYPE_2v2: MaxPlayersPerTeam = 2; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index efe8075a03e..a647a3c6299 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -618,9 +618,9 @@ void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) //send a nice message to all :) char buf[256]; if (IsTower(node)) - sprintf(buf, GetTrinityString(LANG_BG_AV_TOWER_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetTrinityString(LANG_BG_AV_TOWER_TAKEN), GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); else - sprintf(buf, GetTrinityString(LANG_BG_AV_GRAVE_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) :GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetTrinityString(LANG_BG_AV_GRAVE_TAKEN), GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) :GetTrinityString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) @@ -1298,17 +1298,17 @@ bool BattlegroundAV::SetupBattleground() } } - if (!AddObject(BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE, BG_AV_OBJECTID_BANNER_SNOWFALL_N , BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][0], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][1], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][2], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3], 0, 0, sin(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), cos(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE, BG_AV_OBJECTID_BANNER_SNOWFALL_N, BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][0], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][1], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][2], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3], 0, 0, sin(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), cos(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), RESPAWN_ONE_DAY)) { sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!8"); return false; } for (uint8 i = 0; i < 4; i++) { - if (!AddObject(BG_AV_OBJECT_SNOW_EYECANDY_A+i, BG_AV_OBJECTID_SNOWFALL_CANDY_A , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PA+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PA , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_H+i, BG_AV_OBJECTID_SNOWFALL_CANDY_H , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PH+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PH , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_SNOW_EYECANDY_A+i, BG_AV_OBJECTID_SNOWFALL_CANDY_A, BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PA+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PA, BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_H+i, BG_AV_OBJECTID_SNOWFALL_CANDY_H, BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PH+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PH, BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY)) { sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!9.%i", i); return false; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index ff40739f83d..fdb81491771 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -48,7 +48,7 @@ enum BG_EY_WorldStates BLOOD_ELF_ALLIANCE_CONTROL = 2723, BLOOD_ELF_UNCONTROL = 2722, PROGRESS_BAR_PERCENT_GREY = 2720, //100 = empty (only grey), 0 = blue|red (no grey) - PROGRESS_BAR_STATUS = 2719, //50 init!, 48 ... hordak bere .. 33 .. 0 = full 100% hordacky , 100 = full alliance + PROGRESS_BAR_STATUS = 2719, //50 init!, 48 ... hordak bere .. 33 .. 0 = full 100% hordacky, 100 = full alliance PROGRESS_BAR_SHOW = 2718, //1 init, 0 druhy send - bez messagu, 1 = controlled aliance NETHERSTORM_FLAG = 2757, //set to 2 when flag is picked up, and to 1 if it is dropped diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index 47c13d8f860..b00e8dac1d8 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -332,7 +332,7 @@ void BattlegroundIC::UpdatePlayerScore(Player* Source, uint32 type, uint32 value if (itr == m_PlayerScores.end()) // player not found... return; - switch(type) + switch (type) { case SCORE_BASES_ASSAULTED: ((BattlegroundICScore*)itr->second)->BasesAssaulted += value; @@ -642,7 +642,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) sLog->outError("Isle of Conquest: Failed to spawn spirit guide! point: %u, team: %u, ", nodePoint->nodeType, nodePoint->faction); } - switch(nodePoint->gameobject_type) + switch (nodePoint->gameobject_type) { case BG_IC_GO_HANGAR_BANNER: // all the players on the stopped transport should be teleported out @@ -833,7 +833,7 @@ void BattlegroundIC::DestroyGate(Player* player, GameObject* go) uint32 lang_entry = 0; - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_HORDE_GATE_1: lang_entry = LANG_BG_IC_NORTH_GATE_DESTROYED; @@ -940,7 +940,7 @@ Transport* BattlegroundIC::CreateTransport(uint32 goEntry, uint32 period) t->SetMap(GetBgMap()); for (uint8 i = 0; i < 5; i++) - t->AddNPCPassenger(0, (goEntry == GO_HORDE_GUNSHIP ? NPC_HORDE_GUNSHIP_CANNON : NPC_ALLIANCE_GUNSHIP_CANNON), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionX() : allianceGunshipPassengers[i].GetPositionX()) , (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionY() : allianceGunshipPassengers[i].GetPositionY()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionZ() : allianceGunshipPassengers[i].GetPositionZ()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetOrientation() : allianceGunshipPassengers[i].GetOrientation())); + t->AddNPCPassenger(0, (goEntry == GO_HORDE_GUNSHIP ? NPC_HORDE_GUNSHIP_CANNON : NPC_ALLIANCE_GUNSHIP_CANNON), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionX() : allianceGunshipPassengers[i].GetPositionX()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionY() : allianceGunshipPassengers[i].GetPositionY()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionZ() : allianceGunshipPassengers[i].GetPositionZ()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetOrientation() : allianceGunshipPassengers[i].GetOrientation())); return t; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h index ed8a271921d..efa91559ca6 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h @@ -911,7 +911,7 @@ class BattlegroundIC : public Battleground uint32 GetGateIDFromEntry(uint32 id) { uint32 i = 0; - switch(id) + switch (id) { case GO_HORDE_GATE_1: i = BG_IC_H_FRONT ;break; case GO_HORDE_GATE_2: i = BG_IC_H_WEST ;break; @@ -927,7 +927,7 @@ class BattlegroundIC : public Battleground { uint32 uws = 0; - switch(id) + switch (id) { case GO_HORDE_GATE_1: uws = (open ? BG_IC_GATE_FRONT_H_WS_OPEN : BG_IC_GATE_FRONT_H_WS_CLOSED); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index 775467fecde..c214ac21068 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -201,13 +201,13 @@ bool BattlegroundSA::ResetObjs() } //Player may enter BEFORE we set up bG - lets update his worldstates anyway... - UpdateWorldState(BG_SA_RIGHT_GY_HORDE , GraveyardStatus[BG_SA_RIGHT_CAPTURABLE_GY] == TEAM_HORDE?1:0); - UpdateWorldState(BG_SA_LEFT_GY_HORDE , GraveyardStatus[BG_SA_LEFT_CAPTURABLE_GY] == TEAM_HORDE?1:0); - UpdateWorldState(BG_SA_CENTER_GY_HORDE , GraveyardStatus[BG_SA_CENTRAL_CAPTURABLE_GY] == TEAM_HORDE?1:0); + UpdateWorldState(BG_SA_RIGHT_GY_HORDE, GraveyardStatus[BG_SA_RIGHT_CAPTURABLE_GY] == TEAM_HORDE?1:0); + UpdateWorldState(BG_SA_LEFT_GY_HORDE, GraveyardStatus[BG_SA_LEFT_CAPTURABLE_GY] == TEAM_HORDE?1:0); + UpdateWorldState(BG_SA_CENTER_GY_HORDE, GraveyardStatus[BG_SA_CENTRAL_CAPTURABLE_GY] == TEAM_HORDE?1:0); - UpdateWorldState(BG_SA_RIGHT_GY_ALLIANCE , GraveyardStatus[BG_SA_RIGHT_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); - UpdateWorldState(BG_SA_LEFT_GY_ALLIANCE , GraveyardStatus[BG_SA_LEFT_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); - UpdateWorldState(BG_SA_CENTER_GY_ALLIANCE , GraveyardStatus[BG_SA_CENTRAL_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); + UpdateWorldState(BG_SA_RIGHT_GY_ALLIANCE, GraveyardStatus[BG_SA_RIGHT_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); + UpdateWorldState(BG_SA_LEFT_GY_ALLIANCE, GraveyardStatus[BG_SA_LEFT_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); + UpdateWorldState(BG_SA_CENTER_GY_ALLIANCE, GraveyardStatus[BG_SA_CENTRAL_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); if (Attackers == TEAM_ALLIANCE) { @@ -612,7 +612,7 @@ void BattlegroundSA::DestroyGate(Player* player, GameObject* go) UpdateWorldState(uws, GateStatus[i]); bool rewardHonor = true; gateDestroyed = true; - switch(i) + switch (i) { case BG_SA_GREEN_GATE: if (GateStatus[BG_SA_BLUE_GATE] == BG_SA_GATE_DESTROYED) @@ -686,7 +686,7 @@ void BattlegroundSA::SendTime() void BattlegroundSA::EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) { - switch(target_obj->GetEntry()) + switch (target_obj->GetEntry()) { case 191307: case 191308: @@ -721,7 +721,7 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source) uint32 npc = 0; uint32 flag = 0; - switch(i) + switch (i) { case BG_SA_LEFT_CAPTURABLE_GY: flag = BG_SA_LEFT_FLAG; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index 9d8325f2c6f..5f01d0fac4d 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -168,7 +168,7 @@ const float BG_SA_NpcSpawnlocs[BG_SA_MAXNPC + BG_SA_DEMOLISHER_AMOUNT][4] = { 1232.345f, -187.517f, 66.945f, 0.45f }, { 1249.634f, -224.189f, 66.72f, 0.635f }, { 1236.213f, 92.287f, 64.965f, 5.751f }, - { 1215.11f, 57.772f, 64.739f, 5.78f } , + { 1215.11f, 57.772f, 64.739f, 5.78f }, //Demolishers { 1611.597656f, -117.270073f, 8.719355f, 2.513274f}, { 1575.562500f, -158.421875f, 5.024450f, 2.129302f}, @@ -446,7 +446,7 @@ class BattlegroundSA : public Battleground uint32 GetGateIDFromDestroyEventID(uint32 id) { uint32 i = 0; - switch(id) + switch (id) { case 19046: i = BG_SA_GREEN_GATE; break; //Green gate destroyed case 19045: i = BG_SA_BLUE_GATE; break; //blue gate @@ -461,7 +461,7 @@ class BattlegroundSA : public Battleground uint32 GetWorldStateFromGateID(uint32 id) { uint32 uws = 0; - switch(id) + switch (id) { case BG_SA_GREEN_GATE: uws = BG_SA_GREEN_GATEWS; break; case BG_SA_YELLOW_GATE: uws = BG_SA_YELLOW_GATEWS; break; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index b34ab0997ac..951fe8f6b51 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -607,7 +607,7 @@ void BattlegroundWS::HandleAreaTrigger(Player* Source, uint32 Trigger) //uint32 SpellId = 0; //uint64 buff_guid = 0; - switch(Trigger) + switch (Trigger) { case 3686: // Alliance elixir of speed spawn. Trigger not working, because located inside other areatrigger, can be replaced by IsWithinDist(object, dist) in Battleground::Update(). //buff_guid = m_BgObjects[BG_WS_OBJECT_SPEEDBUFF_1]; @@ -761,7 +761,7 @@ void BattlegroundWS::UpdatePlayerScore(Player* Source, uint32 type, uint32 value if (itr == m_PlayerScores.end()) // player not found return; - switch(type) + switch (type) { case SCORE_FLAG_CAPTURES: // flags captured ((BattlegroundWGScore*)itr->second)->FlagCaptures += value; diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 91a9382b2e3..cd62d93c242 100755 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -986,7 +986,7 @@ void ChatHandler::FillMessageData(WorldPacket* data, WorldSession* session, uint else *data << uint32(LANG_UNIVERSAL); - switch(type) + switch (type) { case CHAT_MSG_SAY: case CHAT_MSG_PARTY: @@ -1287,7 +1287,7 @@ uint32 ChatHandler::extractSpellIdFromLink(char* text) uint32 id = (uint32)atol(idS); - switch(type) + switch (type) { case SPELL_LINK_SPELL: return id; @@ -1367,7 +1367,7 @@ uint64 ChatHandler::extractGuidFromLink(char* text) if (!idS) return 0; - switch(type) + switch (type) { case SPELL_LINK_PLAYER: { diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index 2055952a233..9e772e2cde7 100755 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -373,7 +373,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) PSendSysMessage(LANG_PINFO_BAN, banTime > 0 ? secsToTimeString(banTime - time(NULL), true).c_str() : "permanently", bannedby.c_str(), banreason.c_str()); std::string race_s, Class_s; - switch(race) + switch (race) { case RACE_HUMAN: race_s = "Human"; break; case RACE_ORC: race_s = "Orc"; break; @@ -386,7 +386,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) case RACE_BLOODELF: race_s = "Blood Elf"; break; case RACE_DRAENEI: race_s = "Draenei"; break; } - switch(Class) + switch (Class) { case CLASS_WARRIOR: Class_s = "Warrior"; break; case CLASS_PALADIN: Class_s = "Paladin"; break; diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index 9a5edda8700..78fcd55278d 100755 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -1596,7 +1596,7 @@ bool ChatHandler::HandleLookupMapCommand(const char *args) if (MapInfo->IsContinent()) ss << GetTrinityString(LANG_CONTINENT); - switch(MapInfo->map_type) + switch (MapInfo->map_type) { case MAP_INSTANCE: ss << GetTrinityString(LANG_INSTANCE); break; case MAP_BATTLEGROUND: ss << GetTrinityString(LANG_BATTLEGROUND); break; @@ -2908,7 +2908,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) if (!reason) return false; - switch(mode) + switch (mode) { case BAN_ACCOUNT: if (!AccountMgr::normalizeString(nameOrIP)) @@ -2932,7 +2932,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) break; } - switch(sWorld->BanAccount(mode, nameOrIP, duration, reason, m_session ? m_session->GetPlayerName() : "")) + switch (sWorld->BanAccount(mode, nameOrIP, duration, reason, m_session ? m_session->GetPlayerName() : "")) { case BAN_SUCCESS: if (atoi(duration)>0) @@ -2943,7 +2943,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) case BAN_SYNTAX_ERROR: return false; case BAN_NOTFOUND: - switch(mode) + switch (mode) { default: PSendSysMessage(LANG_BAN_NOTFOUND, "account", nameOrIP.c_str()); @@ -3016,7 +3016,7 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char *args) std::string nameOrIP = cnameOrIP; - switch(mode) + switch (mode) { case BAN_ACCOUNT: if (!AccountMgr::normalizeString(nameOrIP)) @@ -3569,7 +3569,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) } } - switch(PlayerDumpReader().LoadDump(file, account_id, name, guid)) + switch (PlayerDumpReader().LoadDump(file, account_id, name, guid)) { case DUMP_SUCCESS: PSendSysMessage(LANG_COMMAND_IMPORT_SUCCESS); @@ -3630,7 +3630,7 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args) return false; } - switch(PlayerDumpWriter().WriteDump(file, uint32(guid))) + switch (PlayerDumpWriter().WriteDump(file, uint32(guid))) { case DUMP_SUCCESS: PSendSysMessage(LANG_COMMAND_EXPORT_SUCCESS); @@ -3673,7 +3673,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) SendSysMessage("Empty"); continue; } - switch(mg->GetMovementGeneratorType()) + switch (mg->GetMovementGeneratorType()) { case IDLE_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_IDLE); break; case RANDOM_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_RANDOM); break; @@ -3766,7 +3766,7 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args) uint32 pLimit = sWorld->GetPlayerAmountLimit(); AccountTypes allowedAccountType = sWorld->GetPlayerSecurityLimit(); char const* secName = ""; - switch(allowedAccountType) + switch (allowedAccountType) { case SEC_PLAYER: secName = "Player"; break; case SEC_MODERATOR: secName = "Moderator"; break; diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index e5a2460b1a6..6303181a44d 100755 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -519,7 +519,7 @@ void ThreatManager::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStat HostileReference* hostilRef = threatRefStatusChangeEvent->getReference(); - switch(threatRefStatusChangeEvent->getType()) + switch (threatRefStatusChangeEvent->getType()) { case UEV_THREAT_REF_THREAT_CHANGE: if ((getCurrentVictim() == hostilRef && threatRefStatusChangeEvent->getFValue()<0.0f) || diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 7e3b19336ee..bfefb3e4e76 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1213,7 +1213,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) return false; } - switch(cond->mConditionValue1) + switch (cond->mConditionValue1) { case SPELL_TARGET_TYPE_GAMEOBJECT: { diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index e2506a36f63..faa73cefb11 100755 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -739,7 +739,7 @@ ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId) if (!mapEntry) return CONTENT_1_60; - switch(mapEntry->Expansion()) + switch (mapEntry->Expansion()) { default: return CONTENT_1_60; case 1: return CONTENT_61_70; diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 2c7bfb3eb1d..e01acd2e03d 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1056,7 +1056,7 @@ struct HolidaysEntry //uint32 holidayDescriptionId; // 50 m_holidayDescriptionID (HolidayDescriptions.dbc) //char *textureFilename; // 51 m_textureFilename //uint32 priority; // 52 m_priority - //uint32 calendarFilterType; // 53 m_calendarFilterType (-1 = Fishing Contest, 0 = Unk,1 = Darkmoon Festival, 2 = Yearly holiday) + //uint32 calendarFilterType; // 53 m_calendarFilterType (-1 = Fishing Contest, 0 = Unk, 1 = Darkmoon Festival, 2 = Yearly holiday) //uint32 flags; // 54 m_flags (0 = Darkmoon Faire, Fishing Contest and Wotlk Launch, rest is 1) }; diff --git a/src/server/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp index 0691c6e1b40..e81b8bd1774 100644 --- a/src/server/game/DungeonFinding/LFGGroupData.cpp +++ b/src/server/game/DungeonFinding/LFGGroupData.cpp @@ -30,7 +30,7 @@ LfgGroupData::~LfgGroupData() void LfgGroupData::SetState(LfgState state) { - switch(state) + switch (state) { case LFG_STATE_NONE: case LFG_STATE_DUNGEON: diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 7d2c02d6b23..d3a0c68a9e7 100755 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -271,7 +271,7 @@ void LFGMgr::Update(uint32 diff) role &= ~ROLE_LEADER; int32 waitTime = -1; - switch(role) + switch (role) { case ROLE_NONE: // Should not happen - just in case waitTime = -1; @@ -514,7 +514,7 @@ void LFGMgr::Join(Player* plr, uint8 roles, const LfgDungeonSet& selectedDungeon bool isDungeon = false; for (LfgDungeonSet::const_iterator it = dungeons.begin(); it != dungeons.end() && joinData.result == LFG_JOIN_OK; ++it) { - switch(GetDungeonType(*it)) + switch (GetDungeonType(*it)) { case LFG_TYPE_RANDOM: if (dungeons.size() > 1) // Only allow 1 random dungeon @@ -657,7 +657,7 @@ void LFGMgr::Leave(Player* plr, Group* grp /* = NULL*/) LfgState state = GetState(guid); sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::Leave: [" UI64FMTD "]", guid); - switch(state) + switch (state) { case LFG_STATE_QUEUED: { @@ -904,7 +904,7 @@ bool LFGMgr::CheckCompatibility(LfgGuidList check, LfgProposal*& pProposal) { LfgQueueInfoMap::const_iterator itOther = itFirst; ++itOther; - while(itOther != pqInfoMap.end() && itOther->second->dungeons.find(*itDungeon) != itOther->second->dungeons.end()) + while (itOther != pqInfoMap.end() && itOther->second->dungeons.find(*itDungeon) != itOther->second->dungeons.end()) ++itOther; if (itOther == pqInfoMap.end()) @@ -1358,7 +1358,7 @@ void LFGMgr::UpdateProposal(uint32 proposalId, uint64 guid, bool accept) // Update timers uint8 role = GetRoles(pguid); role &= ~ROLE_LEADER; - switch(role) + switch (role) { case ROLE_DAMAGE: { diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp index e3e84c6a8a0..e9400f85d3b 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.cpp +++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp @@ -27,7 +27,7 @@ LfgPlayerData::~LfgPlayerData() void LfgPlayerData::SetState(LfgState state) { - switch(state) + switch (state) { case LFG_STATE_NONE: case LFG_STATE_DUNGEON: diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index bf0fd1ae214..7a86136b3a8 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -434,7 +434,7 @@ void Creature::Update(uint32 diff) m_vehicleKit->Reset(); } - switch(m_deathState) + switch (m_deathState) { case JUST_ALIVED: // Must not be called, see Creature::setDeathState JUST_ALIVED -> ALIVE promoting. @@ -674,7 +674,7 @@ void Creature::DoFleeToGetAssistance() UpdateSpeed(MOVE_RUN, false); if (!pCreature) - //SetFeared(true, getVictim()->GetGUID(), 0 , sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY)); + //SetFeared(true, getVictim()->GetGUID(), 0, sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY)); //TODO: use 31365 SetControlled(true, UNIT_STAT_FLEEING); else @@ -819,7 +819,7 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const return false; } - switch(GetCreatureInfo()->trainer_type) + switch (GetCreatureInfo()->trainer_type) { case TRAINER_TYPE_CLASS: if (pPlayer->getClass() != GetCreatureInfo()->trainer_class) @@ -827,7 +827,7 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const if (msg) { pPlayer->PlayerTalkClass->ClearMenus(); - switch(GetCreatureInfo()->trainer_class) + switch (GetCreatureInfo()->trainer_class) { case CLASS_DRUID: pPlayer->PlayerTalkClass->SendGossipMenu(4913, GetGUID()); break; case CLASS_HUNTER: pPlayer->PlayerTalkClass->SendGossipMenu(10090, GetGUID()); break; @@ -857,7 +857,7 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const if (msg) { pPlayer->PlayerTalkClass->ClearMenus(); - switch(GetCreatureInfo()->trainer_class) + switch (GetCreatureInfo()->trainer_class) { case RACE_DWARF: pPlayer->PlayerTalkClass->SendGossipMenu(5865, GetGUID()); break; case RACE_GNOME: pPlayer->PlayerTalkClass->SendGossipMenu(4881, GetGUID()); break; @@ -903,7 +903,7 @@ bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const if (!pPlayer->GetBGAccessByLevel(bgTypeId)) { pPlayer->PlayerTalkClass->ClearMenus(); - switch(bgTypeId) + switch (bgTypeId) { case BATTLEGROUND_AV: pPlayer->PlayerTalkClass->SendGossipMenu(7616, GetGUID()); break; case BATTLEGROUND_WS: pPlayer->PlayerTalkClass->SendGossipMenu(7599, GetGUID()); break; diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 27b0ba53b3d..b17606b83cc 100755 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -44,7 +44,7 @@ void TempSummon::Update(uint32 diff) UnSummon(); return; } - switch(m_type) + switch (m_type) { case TEMPSUMMON_MANUAL_DESPAWN: break; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 1af59592eea..4ec77e38bcf 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -276,7 +276,7 @@ void GameObject::Update(uint32 diff) { case GO_NOT_READY: { - switch(GetGoType()) + switch (GetGoType()) { case GAMEOBJECT_TYPE_TRAP: { @@ -484,7 +484,7 @@ void GameObject::Update(uint32 diff) } case GO_ACTIVATED: { - switch(GetGoType()) + switch (GetGoType()) { case GAMEOBJECT_TYPE_DOOR: case GAMEOBJECT_TYPE_BUTTON: @@ -1537,7 +1537,7 @@ void GameObject::Use(Unit* user) GameObjectTemplate const* info = GetGOInfo(); if (info) { - switch(info->entry) + switch (info->entry) { case 179785: // Silverwing Flag // check if it's correct bg diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index ff0cf03c8b8..49230569498 100755 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -409,7 +409,7 @@ struct GameObjectTemplate // helpers bool IsDespawnAtAction() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_CHEST: return chest.consumable; case GAMEOBJECT_TYPE_GOOBER: return goober.consumable; @@ -419,7 +419,7 @@ struct GameObjectTemplate uint32 GetLockId() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_DOOR: return door.lockId; case GAMEOBJECT_TYPE_BUTTON: return button.lockId; @@ -438,7 +438,7 @@ struct GameObjectTemplate bool GetDespawnPossibility() const // despawn at targeting of cast? { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_DOOR: return door.noDamageImmune; case GAMEOBJECT_TYPE_BUTTON: return button.noDamageImmune; @@ -452,7 +452,7 @@ struct GameObjectTemplate uint32 GetCharges() const // despawn at uses amount { - switch(type) + switch (type) { //case GAMEOBJECT_TYPE_TRAP: return trap.charges; case GAMEOBJECT_TYPE_GUARDPOST: return guardpost.charges; @@ -463,7 +463,7 @@ struct GameObjectTemplate uint32 GetLinkedGameObjectEntry() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_CHEST: return chest.linkedTrapId; case GAMEOBJECT_TYPE_SPELL_FOCUS: return spellFocus.linkedTrapId; @@ -475,7 +475,7 @@ struct GameObjectTemplate uint32 GetAutoCloseTime() const { uint32 autoCloseTime = 0; - switch(type) + switch (type) { case GAMEOBJECT_TYPE_DOOR: autoCloseTime = door.autoCloseTime; break; case GAMEOBJECT_TYPE_BUTTON: autoCloseTime = button.autoCloseTime; break; @@ -490,7 +490,7 @@ struct GameObjectTemplate uint32 GetLootId() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_CHEST: return chest.lootId; case GAMEOBJECT_TYPE_FISHINGHOLE: return fishinghole.lootId; @@ -500,7 +500,7 @@ struct GameObjectTemplate uint32 GetGossipMenuId() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_QUESTGIVER: return questgiver.gossipID; case GAMEOBJECT_TYPE_GOOBER: return goober.gossipID; @@ -510,7 +510,7 @@ struct GameObjectTemplate uint32 GetEventScriptId() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_GOOBER: return goober.eventId; case GAMEOBJECT_TYPE_CHEST: return chest.eventId; diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 1394b018df4..6ea9bf92dfe 100755 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -173,10 +173,10 @@ bool ItemCanGoIntoBag(ItemTemplate const* pProto, ItemTemplate const* pBagProto) if (!pProto || !pBagProto) return false; - switch(pBagProto->Class) + switch (pBagProto->Class) { case ITEM_CLASS_CONTAINER: - switch(pBagProto->SubClass) + switch (pBagProto->SubClass) { case ITEM_SUBCLASS_CONTAINER: return true; @@ -216,7 +216,7 @@ bool ItemCanGoIntoBag(ItemTemplate const* pProto, ItemTemplate const* pBagProto) return false; } case ITEM_CLASS_QUIVER: - switch(pBagProto->SubClass) + switch (pBagProto->SubClass) { case ITEM_SUBCLASS_QUIVER: if (!(pProto->BagFamily & BAG_FAMILY_MASK_ARROWS)) @@ -1103,7 +1103,7 @@ bool ItemRequiredTarget::IsFitToRequirements(Unit* pUnitTarget) const if (pUnitTarget->GetEntry() != m_uiTargetEntry) return false; - switch(m_uiType) + switch (m_uiType) { case ITEM_TARGET_TYPE_CREATURE: return pUnitTarget->isAlive(); @@ -1145,7 +1145,7 @@ void Item::SetNotRefundable(Player* owner, bool changestate /*=true*/, SQLTransa // Following is not applicable in the trading procedure if (changestate) SetState(ITEM_CHANGED, owner); - + SetRefundRecipient(0); SetPaidMoney(0); SetPaidExtendedCost(0); diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index 7f7f1c4ae7f..4ed475e0545 100755 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -132,7 +132,7 @@ uint32 GenerateEnchSuffixFactor(uint32 item_id) return 0; uint32 suffixFactor; - switch(itemProto->InventoryType) + switch (itemProto->InventoryType) { // Items of that type don`t have points case INVTYPE_NON_EQUIP: diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h index 94c740de1f6..155673edbaa 100755 --- a/src/server/game/Entities/Item/ItemPrototype.h +++ b/src/server/game/Entities/Item/ItemPrototype.h @@ -527,7 +527,7 @@ const uint32 MaxItemSubclassValues[MAX_ITEM_CLASS] = inline uint8 ItemSubClassToDurabilityMultiplierId(uint32 ItemClass, uint32 ItemSubClass) { - switch(ItemClass) + switch (ItemClass) { case ITEM_CLASS_WEAPON: return ItemSubClass; case ITEM_CLASS_ARMOR: return ItemSubClass + 21; @@ -656,7 +656,7 @@ struct ItemTemplate // helpers bool CanChangeEquipStateInCombat() const { - switch(InventoryType) + switch (InventoryType) { case INVTYPE_RELIC: case INVTYPE_SHIELD: @@ -664,7 +664,7 @@ struct ItemTemplate return true; } - switch(Class) + switch (Class) { case ITEM_CLASS_WEAPON: case ITEM_CLASS_PROJECTILE: diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 7413ff221f1..7894abd3c59 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -48,7 +48,7 @@ uint32 GuidHigh2TypeId(uint32 guid_hi) { - switch(guid_hi) + switch (guid_hi) { case HIGHGUID_ITEM: return TYPEID_ITEM; //case HIGHGUID_CONTAINER: return TYPEID_CONTAINER; HIGHGUID_CONTAINER == HIGHGUID_ITEM currently @@ -134,7 +134,7 @@ void Object::_Create(uint32 guidlow, uint32 entry, HighGuid guidhigh) uint64 guid = MAKE_NEW_GUID(guidlow, entry, guidhigh); SetUInt64Value(OBJECT_FIELD_GUID, guid); uint32 type = 0; - switch(m_objectType) + switch (m_objectType) { //case TYPEID_ITEM: type = 3; break; //case TYPEID_CONTAINER: type = 7; break; //+4 @@ -220,7 +220,7 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c // UPDATETYPE_CREATE_OBJECT2 for some gameobject types... if (isType(TYPEMASK_GAMEOBJECT)) { - switch(((GameObject*)this)->GetGoType()) + switch (((GameObject*)this)->GetGoType()) { case GAMEOBJECT_TYPE_TRAP: case GAMEOBJECT_TYPE_DUEL_ARBITER: @@ -430,7 +430,7 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const // 0x8 if (flags & UPDATEFLAG_LOWGUID) { - switch(GetTypeId()) + switch (GetTypeId()) { case TYPEID_OBJECT: case TYPEID_ITEM: @@ -895,7 +895,7 @@ void Object::SetUInt64Value(uint16 index, uint64 value) bool Object::AddUInt64Value(uint16 index, uint64 value) { - ASSERT(index + 1 < m_valuesCount || PrintIndexError(index , true)); + ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, true)); if (value && !*((uint64*)&(m_uint32Values[index]))) { m_uint32Values[index] = PAIR64_LOPART(value); @@ -917,7 +917,7 @@ bool Object::AddUInt64Value(uint16 index, uint64 value) bool Object::RemoveUInt64Value(uint16 index, uint64 value) { - ASSERT(index + 1 < m_valuesCount || PrintIndexError(index , true)); + ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, true)); if (value && *((uint64*)&(m_uint32Values[index])) == value) { m_uint32Values[index] = 0; @@ -2285,13 +2285,13 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy pet->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, getFaction()); pet->setPowerType(POWER_MANA); - pet->SetUInt32Value(UNIT_NPC_FLAGS , 0); + pet->SetUInt32Value(UNIT_NPC_FLAGS, 0); pet->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pet->InitStatsForLevel(getLevel()); SetMinion(pet, true); - switch(petType) + switch (petType) { case SUMMON_PET: // this enables pet details window (Shift+P) @@ -2309,7 +2309,7 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy map->Add(pet->ToCreature()); - switch(petType) + switch (petType) { case SUMMON_PET: pet->InitPetCreateSpells(); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index ec2ec8f6edc..d27ea23ba7e 100755 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -151,38 +151,38 @@ class Object int32 GetInt32Value(uint16 index) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); return m_int32Values[index]; } uint32 GetUInt32Value(uint16 index) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); return m_uint32Values[index]; } uint64 GetUInt64Value(uint16 index) const { - ASSERT(index + 1 < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, false)); return *((uint64*)&(m_uint32Values[index])); } float GetFloatValue(uint16 index) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); return m_floatValues[index]; } uint8 GetByteValue(uint16 index, uint8 offset) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); ASSERT(offset < 4); return *(((uint8*)&m_uint32Values[index])+offset); } uint16 GetUInt16Value(uint16 index, uint8 offset) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); ASSERT(offset < 2); return *(((uint16*)&m_uint32Values[index])+offset); } @@ -227,7 +227,7 @@ class Object bool HasFlag(uint16 index, uint32 flag) const { - if (index >= m_valuesCount && !PrintIndexError(index , false)) return false; + if (index >= m_valuesCount && !PrintIndexError(index, false)) return false; return (m_uint32Values[index] & flag) != 0; } @@ -244,7 +244,7 @@ class Object bool HasByteFlag(uint16 index, uint8 offset, uint8 flag) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); ASSERT(offset < 4); return (((uint8*)&m_uint32Values[index])[offset] & flag) != 0; } @@ -278,7 +278,7 @@ class Object bool HasFlag64(uint16 index, uint64 flag) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); return (GetUInt64Value(index) & flag) != 0; } @@ -294,7 +294,7 @@ class Object virtual bool hasQuest(uint32 /* quest_id */) const { return false; } virtual bool hasInvolvedQuest(uint32 /* quest_id */) const { return false; } virtual void BuildUpdate(UpdateDataMapType&) {} - void BuildFieldsUpdate(Player* , UpdateDataMapType &) const; + void BuildFieldsUpdate(Player*, UpdateDataMapType &) const; // FG: some hacky helpers void ForceValuesUpdateAtIndex(uint32); diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h index 6dd04e1dee4..4108063bfb3 100755 --- a/src/server/game/Entities/Object/ObjectDefines.h +++ b/src/server/game/Entities/Object/ObjectDefines.h @@ -80,7 +80,7 @@ enum HighGuid inline bool IsGuidHaveEnPart(uint64 guid) { - switch(GUID_HIPART(guid)) + switch (GUID_HIPART(guid)) { case HIGHGUID_ITEM: case HIGHGUID_PLAYER: @@ -104,7 +104,7 @@ inline bool IsGuidHaveEnPart(uint64 guid) inline char const* GetLogNameForGuid(uint64 guid) { - switch(GUID_HIPART(guid)) + switch (GUID_HIPART(guid)) { case HIGHGUID_ITEM: return "item"; case HIGHGUID_PLAYER: return guid ? "player" : "none"; diff --git a/src/server/game/Entities/Object/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp index e90e21eb2df..c322c35ef81 100755 --- a/src/server/game/Entities/Object/ObjectPosSelector.cpp +++ b/src/server/game/Entities/Object/ObjectPosSelector.cpp @@ -85,7 +85,7 @@ bool ObjectPosSelector::FirstAngle(float& angle) bool ObjectPosSelector::NextAngle(float& angle) { - while(m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() || + while (m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() || m_nextUsedPos[USED_POS_MINUS]!=m_UsedPosLists[USED_POS_MINUS].end() || m_smallStepOk[USED_POS_PLUS] || m_smallStepOk[USED_POS_MINUS] ) { @@ -99,7 +99,7 @@ bool ObjectPosSelector::NextAngle(float& angle) bool ObjectPosSelector::NextUsedAngle(float& angle) { - while(m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() || + while (m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() || m_nextUsedPos[USED_POS_MINUS]!=m_UsedPosLists[USED_POS_MINUS].end() ) { // calculate next possible angle diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 2a151f50064..25a66206663 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -483,7 +483,7 @@ void Pet::Update(uint32 diff) if (m_loading) return; - switch(m_deathState) + switch (m_deathState) { case CORPSE: { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9b4b8b8251e..579a704bd83 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -151,7 +151,7 @@ PlayerTaxi::PlayerTaxi() void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level) { // class specific initial known nodes - switch(chrClass) + switch (chrClass) { case CLASS_DEATH_KNIGHT: { @@ -162,7 +162,7 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level } // race specific initial known nodes: capital and taxi hub masks - switch(race) + switch (race) { case RACE_HUMAN: SetTaximaskNode(2); break; // Human case RACE_ORC: SetTaximaskNode(23); break; // Orc @@ -178,7 +178,7 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level } // new continent starting masks (It will be accessible only at new map) - switch(Player::TeamForRace(race)) + switch (Player::TeamForRace(race)) { case ALLIANCE: SetTaximaskNode(100); break; case HORDE: SetTaximaskNode(99); break; @@ -1035,7 +1035,7 @@ bool Player::Create(uint32 guidlow, CharacterCreateInfo* createInfo) GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1077), 42999); // Factions depending on team, like cities and some more stuff - switch(GetTeam()) + switch (GetTeam()) { case ALLIANCE: GetReputationMgr().SetReputation(sFactionStore.LookupEntry(72), 42999); @@ -1132,7 +1132,7 @@ bool Player::Create(uint32 guidlow, CharacterCreateInfo* createInfo) // special amount for food/drink if (iProto->Class == ITEM_CLASS_CONSUMABLE && iProto->SubClass == ITEM_SUBCLASS_FOOD) { - switch(iProto->Spells[0].SpellCategory) + switch (iProto->Spells[0].SpellCategory) { case SPELL_CATEGORY_FOOD: // food count = getClass() == CLASS_DEATH_KNIGHT ? 10 : 4; @@ -1220,7 +1220,7 @@ bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount) } // item can't be added - sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u , error msg = %u", titem_id, getRace(), getClass(), msg); + sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u, error msg = %u", titem_id, getRace(), getClass(), msg); return false; } @@ -2384,13 +2384,13 @@ void Player::ProcessDelayedOperations() ContinueTaxiFlight(); } } - + if (m_DelayedOperations & DELAYED_BG_GROUP_RESTORE) { if (Group *g = GetGroup()) g->SendUpdateToPlayer(GetGUID()); } - + //we have executed ALL delayed ops, so clear the flag m_DelayedOperations = 0; } @@ -2876,7 +2876,7 @@ void Player::SetGMVisible(bool on) bool Player::IsGroupVisibleFor(Player const* p) const { - switch(sWorld->getIntConfig(CONFIG_GROUP_VISIBILITY)) + switch (sWorld->getIntConfig(CONFIG_GROUP_VISIBILITY)) { default: return IsInSameGroupWith(p); case 1: return IsInSameRaidWith(p); @@ -3627,7 +3627,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen disabled_case = true; } - else switch(itr->second->state) + else switch (itr->second->state) { case PLAYERSPELL_UNCHANGED: // known saved spell return false; @@ -3813,7 +3813,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen // lockpicking/runeforging special case, not have ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL ((pSkill->id == SKILL_LOCKPICKING || pSkill->id == SKILL_RUNEFORGING) && _spell_idx->second->max_value == 0)) { - switch(GetSkillRangeType(pSkill, _spell_idx->second->racemask != 0)) + switch (GetSkillRangeType(pSkill, _spell_idx->second->racemask != 0)) { case SKILL_RANGE_LANGUAGE: SetSkill(pSkill->id, GetSkillStep(pSkill->id), 300, 300); @@ -4992,14 +4992,14 @@ void Player::DeleteOldCharacters(uint32 keepDays) { Field* charFields = resultChars->Fetch(); Player::DeleteFromDB(charFields[0].GetUInt64(), charFields[1].GetUInt32(), true, true); - } while(resultChars->NextRow()); + } while (resultChars->NextRow()); } } void Player::SetMovement(PlayerMovementType pType) { WorldPacket data; - switch(pType) + switch (pType) { case MOVE_ROOT: data.Initialize(SMSG_FORCE_MOVE_ROOT, GetPackGUID().size()+4); break; case MOVE_UNROOT: data.Initialize(SMSG_FORCE_MOVE_UNROOT, GetPackGUID().size()+4); break; @@ -5699,7 +5699,7 @@ void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, floa if (!CanModifyStats()) return; - switch(modGroup) + switch (modGroup) { case CRIT_PERCENTAGE: UpdateCritPercentage(BASE_ATTACK); break; case RANGED_CRIT_PERCENTAGE: UpdateCritPercentage(RANGED_ATTACK); break; @@ -6250,7 +6250,7 @@ void Player::UpdateWeaponSkill (WeaponAttackType attType) uint32 weapon_skill_gain = sWorld->getIntConfig(CONFIG_SKILL_GAIN_WEAPON); - switch(attType) + switch (attType) { case BASE_ATTACK: { @@ -10166,7 +10166,7 @@ Item* Player::GetShield(bool useable) const uint8 Player::GetAttackBySlot(uint8 slot) { - switch(slot) + switch (slot) { case EQUIPMENT_SLOT_MAINHAND: return BASE_ATTACK; case EQUIPMENT_SLOT_OFFHAND: return OFF_ATTACK; @@ -12149,7 +12149,7 @@ Item* Player::EquipItem(uint16 pos, Item* pItem, bool update) else if (slot == EQUIPMENT_SLOT_OFFHAND) UpdateExpertise(OFF_ATTACK); - switch(slot) + switch (slot) { case EQUIPMENT_SLOT_MAINHAND: case EQUIPMENT_SLOT_OFFHAND: @@ -12307,7 +12307,7 @@ void Player::RemoveItem(uint8 bag, uint8 slot, bool update) else if (slot == EQUIPMENT_SLOT_OFFHAND) UpdateExpertise(OFF_ATTACK); // update armor penetration - passive auras may need it - switch(slot) + switch (slot) { case EQUIPMENT_SLOT_MAINHAND: case EQUIPMENT_SLOT_OFFHAND: @@ -13260,7 +13260,7 @@ void Player::SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2, uint data << uint64(pItem2 ? pItem2->GetGUID() : 0); data << uint8(0); // bag type subclass, used with EQUIP_ERR_EVENT_AUTOEQUIP_BIND_CONFIRM and EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG2 - switch(msg) + switch (msg) { case EQUIP_ERR_CANT_EQUIP_LEVEL_I: case EQUIP_ERR_PURCHASE_LEVEL_TOO_LOW: @@ -13563,7 +13563,7 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool uint32 enchant_amount = pEnchant->amount[s]; uint32 enchant_spell_id = pEnchant->spellid[s]; - switch(enchant_display_type) + switch (enchant_display_type) { case ITEM_ENCHANTMENT_TYPE_NONE: break; @@ -13864,7 +13864,7 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool default: sLog->outError("Unknown item enchantment (id = %d) display type: %d", enchant_id, enchant_display_type); break; - } /*switch(enchant_display_type)*/ + } /*switch (enchant_display_type)*/ } /*for*/ } @@ -15284,7 +15284,7 @@ bool Player::SatisfyQuestReputation(Quest const* qInfo, bool msg) SendCanTakeQuestResponse(INVALIDREASON_DONT_HAVE_REQ); return false; } - + // ReputationObjective2 does not seem to be an objective requirement but a requirement // to be able to accept the quest uint32 fIdObj = qInfo->GetRepObjectiveFaction2(); @@ -15863,7 +15863,7 @@ void Player::KilledPlayerCredit() { uint32 reqkill = qInfo->GetPlayersSlain(); uint16 curkill = q_status.m_playercount; - + if (curkill < reqkill) { q_status.m_playercount = curkill + addkillcount; @@ -17122,7 +17122,7 @@ bool Player::isAllowedToLoot(const Creature* creature) { if (!creature->isDead() || !creature->IsDamageEnoughForLootingAndReward()) return false; - + if (HasPendingBind()) return false; @@ -17136,7 +17136,7 @@ bool Player::isAllowedToLoot(const Creature* creature) else if (thisGroup != creature->GetLootRecipientGroup()) return false; - switch(thisGroup->GetLootMethod()) + switch (thisGroup->GetLootMethod()) { case FREE_FOR_ALL: return true; @@ -19295,7 +19295,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) if (returnreagent) { - switch(pet->GetEntry()) + switch (pet->GetEntry()) { //warlock pets except imp are removed(?) when logging out case 1860: @@ -20336,7 +20336,7 @@ void Player::InitDisplayIds() } uint8 gender = getGender(); - switch(gender) + switch (gender) { case GENDER_FEMALE: SetDisplayId(info->displayId_f); @@ -20872,7 +20872,7 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot) // if have <CompareColor> use them as count, else use <value> from Condition uint32 _cmp_gem = Condition->CompareColor[i] ? curcount[Condition->CompareColor[i] - 1]: Condition->Value[i]; - switch(Condition->Comparator[i]) + switch (Condition->Comparator[i]) { case 2: // requires less <color> than (<value> || <comparecolor>) gems activate &= (_cur_gem < _cmp_gem) ? true : false; @@ -21594,7 +21594,7 @@ void Player::SendTransferAborted(uint32 mapid, TransferAbortReason reason, uint8 WorldPacket data(SMSG_TRANSFER_ABORTED, 4+2); data << uint32(mapid); data << uint8(reason); // transfer abort reason - switch(reason) + switch (reason) { case TRANSFER_ABORT_INSUF_EXPAN_LVL: case TRANSFER_ABORT_DIFFICULTY: @@ -22509,7 +22509,7 @@ void Player::UpdateAreaDependentAuras(uint32 newArea) if (newArea == 4273 && GetVehicle() && GetPositionX() > 400) // Ulduar { - switch(GetVehicleBase()->GetEntry()) + switch (GetVehicleBase()->GetEntry()) { case 33062: case 33109: @@ -23310,7 +23310,7 @@ void Player::_LoadSkills(PreparedQueryResult result) } // set fixed skill ranges - switch(GetSkillRangeType(pSkill, false)) + switch (GetSkillRangeType(pSkill, false)) { case SKILL_RANGE_LANGUAGE: // 300..300 value = max = 300; @@ -23513,7 +23513,7 @@ void Player::HandleFall(MovementInfo const& movementInfo) } //Z given by moveinfo, LastZ, FallTime, WaterZ, MapZ, Damage, Safefall reduction - sLog->outStaticDebug("FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d" , movementInfo.pos.GetPositionZ(), height, GetPositionZ(), movementInfo.fallTime, height, damage, safe_fall); + sLog->outStaticDebug("FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d", movementInfo.pos.GetPositionZ(), height, GetPositionZ(), movementInfo.fallTime, height, damage, safe_fall); } } RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LANDING); // No fly zone - Parachute diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 65746043894..59522241d49 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1806,7 +1806,7 @@ class Player : public Unit, public GridObject<Player> bool IsInSameGroupWith(Player const* p) const; bool IsInSameRaidWith(Player const* p) const { return p == this || (GetGroup() != NULL && GetGroup() == p->GetGroup()); } void UninviteFromGroup(); - static void RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, uint64 kicker = 0 , const char* reason = NULL); + static void RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, uint64 kicker = 0, const char* reason = NULL); void RemoveFromGroup(RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT) { RemoveFromGroup(GetGroup(), GetGUID(), method); } void SendUpdateToOutOfRangeGroupMembers(); diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index fe1abea0f1d..21a3c5ce58d 100755 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -116,7 +116,7 @@ void MapManager::LoadTransports() uint32 guid = fields[0].GetUInt32(); uint32 entry = fields[1].GetUInt32(); std::string name = fields[2].GetString(); - sLog->outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports must not have any records in `gameobject` or its behavior will be unpredictable/bugged.",entry,name.c_str(),guid); + sLog->outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports must not have any records in `gameobject` or its behavior will be unpredictable/bugged.", entry, name.c_str(), guid); } while (result->NextRow()); } @@ -661,7 +661,7 @@ uint32 Transport::AddNPCPassenger(uint32 tguid, uint32 entry, float x, float y, pCreature->Relocate( GetPositionX() + (x * cos(GetOrientation()) + y * sin(GetOrientation() + float(M_PI))), GetPositionY() + (y * cos(GetOrientation()) + x * sin(GetOrientation())), - z + GetPositionZ() , + z + GetPositionZ(), o + GetOrientation()); pCreature->SetHomePosition(pCreature->GetPositionX(), pCreature->GetPositionY(), pCreature->GetPositionZ(), pCreature->GetOrientation()); diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 471a8324f90..594203e0c46 100755 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -68,7 +68,7 @@ bool Player::UpdateStats(Stats stat) pet->UpdateStats(stat); } - switch(stat) + switch (stat) { case STAT_STRENGTH: UpdateShieldBlockValue(); @@ -472,7 +472,7 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bo { UnitMods unitMod; - switch(attType) + switch (attType) { case BASE_ATTACK: default: @@ -584,7 +584,7 @@ void Player::UpdateCritPercentage(WeaponAttackType attType) uint16 index; CombatRating cr; - switch(attType) + switch (attType) { case OFF_ATTACK: modGroup = OFFHAND_CRIT_PERCENTAGE; @@ -814,7 +814,7 @@ void Player::UpdateExpertise(WeaponAttackType attack) if (expertise < 0) expertise = 0; - switch(attack) + switch (attack) { case BASE_ATTACK: SetUInt32Value(PLAYER_EXPERTISE, expertise); break; case OFF_ATTACK: SetUInt32Value(PLAYER_OFFHAND_EXPERTISE, expertise); break; @@ -998,7 +998,7 @@ void Creature::UpdateAttackPowerAndDamage(bool ranged) void Creature::UpdateDamagePhysical(WeaponAttackType attType) { UnitMods unitMod; - switch(attType) + switch (attType) { case BASE_ATTACK: default: @@ -1034,7 +1034,7 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType) float mindamage = ((base_value + weapon_mindamage) * dmg_multiplier * base_pct + total_value) * total_pct; float maxdamage = ((base_value + weapon_maxdamage) * dmg_multiplier * base_pct + total_value) * total_pct; - switch(attType) + switch (attType) { case BASE_ATTACK: default: @@ -1221,7 +1221,7 @@ void Guardian::UpdateMaxHealth() float stamina = GetStat(STAT_STAMINA) - GetCreateStat(STAT_STAMINA); float multiplicator; - switch(GetEntry()) + switch (GetEntry()) { case ENTRY_IMP: multiplicator = 8.4f; break; case ENTRY_VOIDWALKER: multiplicator = 11.0f; break; @@ -1246,7 +1246,7 @@ void Guardian::UpdateMaxPower(Powers power) float addValue = (power == POWER_MANA) ? GetStat(STAT_INTELLECT) - GetCreateStat(STAT_INTELLECT) : 0.0f; float multiplicator = 15.0f; - switch(GetEntry()) + switch (GetEntry()) { case ENTRY_IMP: multiplicator = 4.95f; break; case ENTRY_VOIDWALKER: @@ -1386,7 +1386,7 @@ void Guardian::UpdateDamagePhysical(WeaponAttackType attType) // Pet's base damage changes depending on happiness if (isHunterPet() && attType == BASE_ATTACK) { - switch(ToPet()->GetHappinessState()) + switch (ToPet()->GetHappinessState()) { case HAPPY: // 125% of normal damage diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9e74e3a8f5b..15984477a79 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -685,7 +685,7 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam uint32 weaponSpeedHitFactor; uint32 rage_damage = damage + cleanDamage->absorbed_damage; - switch(cleanDamage->attackType) + switch (cleanDamage->attackType) { case BASE_ATTACK: { @@ -1196,7 +1196,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam // Calculate armor reduction if (IsDamageReducedByArmor((SpellSchoolMask)(damageInfo->damageSchoolMask))) { - damageInfo->damage = CalcArmorReducedDamage(damageInfo->target, damage, NULL , damageInfo->attackType); + damageInfo->damage = CalcArmorReducedDamage(damageInfo->target, damage, NULL, damageInfo->attackType); damageInfo->cleanDamage += damage - damageInfo->damage; } else @@ -1420,7 +1420,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss) { SpellInfo const* i_spellProto = (*dmgShieldItr)->GetSpellInfo(); // Damage shield can be resisted... - if (SpellMissInfo missInfo = victim->SpellHitResult(this, i_spellProto , false)) + if (SpellMissInfo missInfo = victim->SpellHitResult(this, i_spellProto, false)) { victim->SendSpellMiss(this, i_spellProto->Id, missInfo); continue; @@ -2734,7 +2734,7 @@ float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit* victi if (GetTypeId() == TYPEID_PLAYER) { - switch(attackType) + switch (attackType) { case BASE_ATTACK: crit = GetFloatValue(PLAYER_CRIT_PERCENTAGE); @@ -3601,7 +3601,7 @@ void Unit::RemoveAuraFromStack(uint32 spellId, uint64 caster, AuraRemoveMode rem if ((aura->GetType() == UNIT_AURA_TYPE) && (!caster || aura->GetCasterGUID() == caster)) { - aura->ModStackAmount(-1,removeMode); + aura->ModStackAmount(-1, removeMode); return; } else @@ -4079,7 +4079,7 @@ void Unit::DelayOwnedAuras(uint32 spellId, uint64 caster, int32 delaytime) // update for out of range group members (on 1 slot use) aura->SetNeedClientUpdateForTargets(); - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u partially interrupted on unit %u, new duration: %u ms", aura->GetId() , GetGUIDLow(), aura->GetDuration()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u partially interrupted on unit %u, new duration: %u ms", aura->GetId(), GetGUIDLow(), aura->GetDuration()); } } } @@ -4769,7 +4769,7 @@ void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo* pInfo) data << uint32(aura->GetId()); // spellId data << uint32(1); // count data << uint32(aura->GetAuraType()); // auraId - switch(aura->GetAuraType()) + switch (aura->GetAuraType()) { case SPELL_AURA_PERIODIC_DAMAGE: case SPELL_AURA_PERIODIC_DAMAGE_PERCENT: @@ -4928,11 +4928,11 @@ bool Unit::HandleHasteAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere Unit* target = victim; int32 basepoints0 = 0; - switch(hasteSpell->SpellFamilyName) + switch (hasteSpell->SpellFamilyName) { case SPELLFAMILY_ROGUE: { - switch(hasteSpell->Id) + switch (hasteSpell->Id) { // Blade Flurry case 13877: @@ -4987,11 +4987,11 @@ bool Unit::HandleSpellCritChanceAuraProc(Unit* victim, uint32 /*damage*/, AuraEf Unit* target = victim; int32 basepoints0 = 0; - switch(triggeredByAuraSpell->SpellFamilyName) + switch (triggeredByAuraSpell->SpellFamilyName) { case SPELLFAMILY_MAGE: { - switch(triggeredByAuraSpell->Id) + switch (triggeredByAuraSpell->Id) { // Focus Magic case 54646: @@ -5054,7 +5054,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere int32 basepoints0 = 0; uint64 originalCaster = 0; - switch(dummySpell->SpellFamilyName) + switch (dummySpell->SpellFamilyName) { case SPELLFAMILY_GENERIC: { @@ -5118,7 +5118,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere if (!GetAuraEffect(SPELL_AURA_MOD_MANA_REGEN_INTERRUPT, SPELLFAMILY_MAGE, 0x10000000, 0, 0)) return false; - switch(GetFirstSchoolInMask(procSpell->GetSchoolMask())) + switch (GetFirstSchoolInMask(procSpell->GetSchoolMask())) { case SPELL_SCHOOL_NORMAL: case SPELL_SCHOOL_HOLY: @@ -5141,7 +5141,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere if (!procSpell) return false; - switch(GetFirstSchoolInMask(procSpell->GetSchoolMask())) + switch (GetFirstSchoolInMask(procSpell->GetSchoolMask())) { case SPELL_SCHOOL_NORMAL: return false; // ignore @@ -5701,7 +5701,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere triggered_spell_id = 37436; break; } - switch(dummySpell->Id) + switch (dummySpell->Id) { // Glyph of Polymorph case 56375: @@ -5795,7 +5795,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } case SPELLFAMILY_WARRIOR: { - switch(dummySpell->Id) + switch (dummySpell->Id) { // Sweeping Strikes case 12328: @@ -6206,7 +6206,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } case SPELLFAMILY_DRUID: { - switch(dummySpell->Id) + switch (dummySpell->Id) { // Glyph of Innervate case 54832: @@ -6957,7 +6957,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } case SPELLFAMILY_SHAMAN: { - switch(dummySpell->Id) + switch (dummySpell->Id) { // Earthen Power (Rank 1, 2) case 51523: @@ -7776,7 +7776,7 @@ bool Unit::HandleObsModEnergyAuraProc(Unit* victim, uint32 /*damage*/, AuraEffec Unit* target = victim; int32 basepoints0 = 0; - switch(dummySpell->SpellFamilyName) + switch (dummySpell->SpellFamilyName) { case SPELLFAMILY_HUNTER: { @@ -7829,7 +7829,7 @@ bool Unit::HandleModDamagePctTakenAuraProc(Unit* victim, uint32 /*damage*/, Aura Unit* target = victim; int32 basepoints0 = 0; - switch(dummySpell->SpellFamilyName) + switch (dummySpell->SpellFamilyName) { case SPELLFAMILY_PALADIN: { @@ -7878,7 +7878,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp { SpellInfo const* dummySpell = triggeredByAura->GetSpellInfo(); - switch(dummySpell->SpellFamilyName) + switch (dummySpell->SpellFamilyName) { case SPELLFAMILY_GENERIC: switch (dummySpell->Id) @@ -8084,7 +8084,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp return false; } - switch(dummySpell->Id) + switch (dummySpell->Id) { // Bone Shield cooldown case 49222: @@ -8270,7 +8270,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg { if (!procSpell) return false; - switch(GetFirstSchoolInMask(procSpell->GetSchoolMask())) + switch (GetFirstSchoolInMask(procSpell->GetSchoolMask())) { case SPELL_SCHOOL_NORMAL: return false; // ignore @@ -8456,7 +8456,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg // Holy Shock heal if (procSpell->SpellFamilyFlags[1] & 0x00010000) { - switch(procSpell->Id) + switch (procSpell->Id) { case 25914: originalSpellId = 20473; break; case 25913: originalSpellId = 20929; break; @@ -8562,7 +8562,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg { if (!procSpell) return false; - switch(GetFirstSchoolInMask(procSpell->GetSchoolMask())) + switch (GetFirstSchoolInMask(procSpell->GetSchoolMask())) { case SPELL_SCHOOL_NORMAL: return false; // ignore @@ -9038,7 +9038,7 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit* victim, uint32 /*damage*/, Au uint32 triggered_spell_id = 0; - switch(scriptId) + switch (scriptId) { case 836: // Improved Blizzard (Rank 1) { @@ -9089,7 +9089,7 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit* victim, uint32 /*damage*/, Au { if (!roll_chance_i(triggeredByAura->GetAmount())) return false; - switch(victim->getPowerType()) + switch (victim->getPowerType()) { case POWER_MANA: triggered_spell_id = 48542; break; case POWER_RAGE: triggered_spell_id = 48541; break; @@ -9147,7 +9147,7 @@ void Unit::setPowerType(Powers new_powertype) } } - switch(new_powertype) + switch (new_powertype) { default: case POWER_MANA: @@ -10405,7 +10405,7 @@ uint32 Unit::SpellDamageBonus(Unit* victim, SpellInfo const* spellProto, uint32 } // Custom scripted damage - switch(spellProto->SpellFamilyName) + switch (spellProto->SpellFamilyName) { case SPELLFAMILY_MAGE: // Ice Lance @@ -10577,7 +10577,7 @@ uint32 Unit::SpellDamageBonus(Unit* victim, SpellInfo const* spellProto, uint32 AuraEffectList const& mDummyAuras = victim->GetAuraEffectsByType(SPELL_AURA_DUMMY); for (AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) { - switch((*i)->GetSpellInfo()->SpellIconID) + switch ((*i)->GetSpellInfo()->SpellIconID) { // Cheat Death case 2109: @@ -10814,7 +10814,7 @@ bool Unit::isSpellCrit(Unit* victim, SpellInfo const* spellProto, SpellSchoolMas return false; float crit_chance = 0.0f; - switch(spellProto->DmgClass) + switch (spellProto->DmgClass) { case SPELL_DAMAGE_CLASS_NONE: // We need more spells to find a general way (if there is any) @@ -10857,7 +10857,7 @@ bool Unit::isSpellCrit(Unit* victim, SpellInfo const* spellProto, SpellSchoolMas if (!((*i)->IsAffectedOnSpell(spellProto))) continue; int32 modChance = 0; - switch((*i)->GetMiscValue()) + switch ((*i)->GetMiscValue()) { // Shatter case 911: modChance+= 16; @@ -10954,7 +10954,7 @@ bool Unit::isSpellCrit(Unit* victim, SpellInfo const* spellProto, SpellSchoolMas if (victim) { // Custom crit by class - switch(spellProto->SpellFamilyName) + switch (spellProto->SpellFamilyName) { case SPELLFAMILY_DRUID: // Rend and Tear - bonus crit chance for Ferocious Bite on bleeding targets @@ -11008,7 +11008,7 @@ uint32 Unit::SpellCriticalDamageBonus(SpellInfo const* spellProto, uint32 damage int32 crit_bonus = damage; float crit_mod = 0.0f; - switch(spellProto->DmgClass) + switch (spellProto->DmgClass) { case SPELL_DAMAGE_CLASS_MELEE: // for melee based spells is 100% case SPELL_DAMAGE_CLASS_RANGED: @@ -11043,7 +11043,7 @@ uint32 Unit::SpellCriticalHealingBonus(SpellInfo const* spellProto, uint32 damag { // Calculate critical bonus int32 crit_bonus; - switch(spellProto->DmgClass) + switch (spellProto->DmgClass) { case SPELL_DAMAGE_CLASS_MELEE: // for melee based spells is 100% case SPELL_DAMAGE_CLASS_RANGED: @@ -11099,7 +11099,7 @@ uint32 Unit::SpellHealingBonus(Unit* victim, SpellInfo const* spellProto, uint32 { if (!(*i)->IsAffectedOnSpell(spellProto)) continue; - switch((*i)->GetMiscValue()) + switch ((*i)->GetMiscValue()) { case 4415: // Increased Rejuvenation Healing case 4953: @@ -11144,7 +11144,7 @@ uint32 Unit::SpellHealingBonus(Unit* victim, SpellInfo const* spellProto, uint32 } case 7871: // Glyph of Lesser Healing Wave { - if (victim->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_SHAMAN, 0 , 0x00000400, 0, GetGUID())) + if (victim->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_SHAMAN, 0, 0x00000400, 0, GetGUID())) AddPctN(DoneTotalMod, (*i)->GetAmount()); break; } @@ -11680,7 +11680,7 @@ void Unit::MeleeDamageBonus(Unit* victim, uint32 *pdamage, WeaponAttackType attT // Custom scripted damage if (spellProto) - switch(spellProto->SpellFamilyName) + switch (spellProto->SpellFamilyName) { case SPELLFAMILY_DEATHKNIGHT: // Glacier Rot @@ -11723,7 +11723,7 @@ void Unit::MeleeDamageBonus(Unit* victim, uint32 *pdamage, WeaponAttackType attT AuraEffectList const& mDummyAuras = victim->GetAuraEffectsByType(SPELL_AURA_DUMMY); for (AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) { - switch((*i)->GetSpellInfo()->SpellIconID) + switch ((*i)->GetSpellInfo()->SpellIconID) { // Cheat Death case 2109: @@ -11759,7 +11759,7 @@ void Unit::MeleeDamageBonus(Unit* victim, uint32 *pdamage, WeaponAttackType attT /*AuraEffectList const& mclassScritAuras = GetAuraEffectsByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); for (AuraEffectList::const_iterator i = mclassScritAuras.begin(); i != mclassScritAuras.end(); ++i) { - switch((*i)->GetMiscValue()) + switch ((*i)->GetMiscValue()) { } }*/ @@ -12559,7 +12559,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) WorldPacket data; if (!forced) { - switch(mtype) + switch (mtype) { case MOVE_WALK: data.Initialize(MSG_MOVE_SET_WALK_SPEED, 8+4+2+4+4+4+4+4+4+4); @@ -12618,7 +12618,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) pet->SetSpeed(mtype, m_speed_rate[mtype], forced); } - switch(mtype) + switch (mtype) { case MOVE_WALK: data.Initialize(SMSG_FORCE_WALK_SPEED_CHANGE, 16); @@ -13202,7 +13202,7 @@ float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration, if (GetTypeId() == TYPEID_UNIT && (ToCreature()->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_TAUNT_DIMINISH)) { DiminishingLevels diminish = Level; - switch(diminish) + switch (diminish) { case DIMINISHING_LEVEL_1: break; case DIMINISHING_LEVEL_2: mod = 0.65f; break; @@ -13220,7 +13220,7 @@ float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration, || GetDiminishingReturnsGroupType(group) == DRTYPE_ALL) { DiminishingLevels diminish = Level; - switch(diminish) + switch (diminish) { case DIMINISHING_LEVEL_1: break; case DIMINISHING_LEVEL_2: mod = 0.5f; break; @@ -13334,7 +13334,7 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f if (!CanModifyStats()) return false; - switch(unitMod) + switch (unitMod) { case UNIT_MOD_STAT_STRENGTH: case UNIT_MOD_STAT_AGILITY: @@ -13427,7 +13427,7 @@ SpellSchools Unit::GetSpellSchoolByAuraGroup(UnitMods unitMod) const { SpellSchools school = SPELL_SCHOOL_NORMAL; - switch(unitMod) + switch (unitMod) { case UNIT_MOD_RESISTANCE_HOLY: school = SPELL_SCHOOL_HOLY; break; case UNIT_MOD_RESISTANCE_FIRE: school = SPELL_SCHOOL_FIRE; break; @@ -13447,7 +13447,7 @@ Stats Unit::GetStatByAuraGroup(UnitMods unitMod) const { Stats stat = STAT_STRENGTH; - switch(unitMod) + switch (unitMod) { case UNIT_MOD_STAT_STRENGTH: stat = STAT_STRENGTH; break; case UNIT_MOD_STAT_AGILITY: stat = STAT_AGILITY; break; @@ -13495,7 +13495,7 @@ float Unit::GetTotalAttackPowerValue(WeaponAttackType attType) const } } -float Unit::GetWeaponDamageRange(WeaponAttackType attType , WeaponDamageRange type) const +float Unit::GetWeaponDamageRange(WeaponAttackType attType, WeaponDamageRange type) const { if (attType == OFF_ATTACK && !haveOffhandWeapon()) return 0.0f; @@ -14306,7 +14306,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, AuraEffect* triggeredByAura = i->aura->GetEffect(effIndex); ASSERT(triggeredByAura); - switch(triggeredByAura->GetAuraType()) + switch (triggeredByAura->GetAuraType()) { case SPELL_AURA_PROC_TRIGGER_SPELL: { @@ -14318,7 +14318,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, } case SPELL_AURA_PROC_TRIGGER_DAMAGE: { - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: doing %u damage from spell id %u (triggered by %s aura of spell %u)", triggeredByAura->GetAmount() , spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: doing %u damage from spell id %u (triggered by %s aura of spell %u)", triggeredByAura->GetAmount(), spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); SpellNonMeleeDamage damageInfo(this, pTarget, spellInfo->Id, spellInfo->SchoolMask); uint32 damage = SpellDamageBonus(pTarget, spellInfo, triggeredByAura->GetAmount(), SPELL_DIRECT_DAMAGE); CalculateSpellDamageTaken(&damageInfo, damage, spellInfo); @@ -15588,7 +15588,7 @@ void Unit::SetControlled(bool apply, UnitState state) return; AddUnitState(state); - switch(state) + switch (state) { case UNIT_STAT_STUNNED: SetStunned(true); @@ -15618,7 +15618,7 @@ void Unit::SetControlled(bool apply, UnitState state) } else { - switch(state) + switch (state) { case UNIT_STAT_STUNNED: if (HasAuraType(SPELL_AURA_MOD_STUN)) return; else SetStunned(false); break; @@ -15901,7 +15901,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au if (charmer->GetTypeId() == TYPEID_PLAYER) { - switch(type) + switch (type) { case CHARM_TYPE_VEHICLE: SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED); @@ -16008,7 +16008,7 @@ void Unit::RemoveCharmedBy(Unit* charmer) if (charmer->GetTypeId() == TYPEID_PLAYER) { - switch(type) + switch (type) { case CHARM_TYPE_VEHICLE: charmer->ToPlayer()->SetClientControl(charmer, 1); @@ -16572,7 +16572,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form) // Male if (getGender() == GENDER_MALE) { - switch(skinColor) + switch (skinColor) { case 12: // White case 13: diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 8f68cd3e9e6..269df57301c 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1443,7 +1443,7 @@ class Unit : public WorldObject int32 DealHeal(Unit* pVictim, uint32 addhealth); void ProcDamageAndSpell(Unit* pVictim, uint32 procAttacker, uint32 procVictim, uint32 procEx, uint32 amount, WeaponAttackType attType = BASE_ATTACK, SpellInfo const* procSpell = NULL, SpellInfo const* procAura = NULL); - void ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellInfo const* procSpell, uint32 damage , SpellInfo const* procAura = NULL); + void ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellInfo const* procSpell, uint32 damage, SpellInfo const* procAura = NULL); void GetProcAurasTriggeredOnEvent(std::list<AuraApplication*>& aurasTriggeringProc, std::list<AuraApplication*>* procAuras, ProcEventInfo eventInfo); void TriggerAurasProcOnEvent(CalcDamageInfo& damageInfo); @@ -1490,7 +1490,7 @@ class Unit : public WorldObject int32 GetMechanicResistChance(const SpellInfo* spell); bool CanUseAttackType(uint8 attacktype) const { - switch(attacktype) + switch (attacktype) { case BASE_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISARMED); case OFF_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISARM_OFFHAND); @@ -1783,7 +1783,7 @@ class Unit : public WorldObject AuraEffect* GetAuraEffect(uint32 spellId, uint8 effIndex, uint64 casterGUID = 0) const; AuraEffect* GetAuraEffectOfRankedSpell(uint32 spellId, uint8 effIndex, uint64 casterGUID = 0) const; AuraEffect* GetAuraEffect(AuraType type, SpellFamilyNames name, uint32 iconId, uint8 effIndex) const; // spell mustn't have familyflags - AuraEffect* GetAuraEffect(AuraType type, SpellFamilyNames family, uint32 familyFlag1 , uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID =0); + AuraEffect* GetAuraEffect(AuraType type, SpellFamilyNames family, uint32 familyFlag1, uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID =0); inline AuraEffect* GetDummyAuraEffect(SpellFamilyNames name, uint32 iconId, uint8 effIndex) const { return GetAuraEffect(SPELL_AURA_DUMMY, name, iconId, effIndex);} AuraApplication * GetAuraApplication(uint32 spellId, uint64 casterGUID = 0, uint64 itemCasterGUID = 0, uint8 reqEffMask = 0, AuraApplication * except = NULL) const; @@ -1926,8 +1926,8 @@ class Unit : public WorldObject virtual void UpdateAttackPowerAndDamage(bool ranged = false) = 0; virtual void UpdateDamagePhysical(WeaponAttackType attType) = 0; float GetTotalAttackPowerValue(WeaponAttackType attType) const; - float GetWeaponDamageRange(WeaponAttackType attType , WeaponDamageRange type) const; - void SetBaseWeaponDamage(WeaponAttackType attType , WeaponDamageRange damageRange, float value) { m_weaponDamage[attType][damageRange] = value; } + float GetWeaponDamageRange(WeaponAttackType attType, WeaponDamageRange type) const; + void SetBaseWeaponDamage(WeaponAttackType attType, WeaponDamageRange damageRange, float value) { m_weaponDamage[attType][damageRange] = value; } bool isInFrontInMap(Unit const* target, float distance, float arc = M_PI) const; void SetInFront(Unit const* target) diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index bbba91b2658..effd43cd320 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -159,7 +159,7 @@ void Vehicle::ApplyAllImmunities() _me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_UNATTACKABLE, true); _me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_SCHOOL_ABSORB, true); _me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_SHIELD, true); - _me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_IMMUNE_SHIELD , true); + _me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_IMMUNE_SHIELD, true); // ... Resistance, Split damage, Change stats ... _me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_DAMAGE_SHIELD, true); diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 84ad326e445..8187661f63f 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -30,7 +30,7 @@ bool GameEventMgr::CheckOneGameEvent(uint16 entry) const { - switch(mGameEvent[entry].state) + switch (mGameEvent[entry].state) { default: case GAMEEVENT_NORMAL: @@ -1079,7 +1079,7 @@ void GameEventMgr::UnApplyEvent(uint16 event_id) void GameEventMgr::ApplyNewEvent(uint16 event_id) { - switch(sWorld->getIntConfig(CONFIG_EVENT_ANNOUNCE)) + switch (sWorld->getIntConfig(CONFIG_EVENT_ANNOUNCE)) { case 0: // disable break; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 8d0751ef9ab..89eca58576b 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2266,7 +2266,7 @@ void ObjectMgr::LoadItemTemplates() if (itemTemplate.Unk0 != dbcitem->Unk0) { - sLog->outErrorDb("Item (Entry: %u) does not have a correct Unk0 (%i) , must be %i .", entry, itemTemplate.Unk0, dbcitem->Unk0); + sLog->outErrorDb("Item (Entry: %u) does not have a correct Unk0 (%i), must be %i .", entry, itemTemplate.Unk0, dbcitem->Unk0); if (enforceDBCAttributes) itemTemplate.Unk0 = dbcitem->Unk0; } @@ -3612,7 +3612,7 @@ void ObjectMgr::BuildPlayerLevelInfo(uint8 race, uint8 _class, uint8 level, Play // if conversion from uint32 to uint8 causes unexpected behaviour, change lvl to uint32 for (uint8 lvl = sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)-1; lvl < level; ++lvl) { - switch(_class) + switch (_class) { case CLASS_WARRIOR: info->stats[STAT_STRENGTH] += (lvl > 23 ? 2: (lvl > 1 ? 1: 0)); @@ -4206,7 +4206,7 @@ void ObjectMgr::LoadQuests() } if (!sFactionStore.LookupEntry(qinfo->RewRepFaction[j])) { - sLog->outErrorDb("Quest %u has `RewRepFaction%d` = %u but raw faction (faction.dbc) %u does not exist, quest will not reward reputation for this faction.", qinfo->GetQuestId(), j+1, qinfo->RewRepFaction[j] , qinfo->RewRepFaction[j]); + sLog->outErrorDb("Quest %u has `RewRepFaction%d` = %u but raw faction (faction.dbc) %u does not exist, quest will not reward reputation for this faction.", qinfo->GetQuestId(), j+1, qinfo->RewRepFaction[j], qinfo->RewRepFaction[j]); qinfo->RewRepFaction[j] = 0; // quest will not reward this } } @@ -4298,7 +4298,7 @@ void ObjectMgr::LoadQuests() if (qNextItr == mQuestTemplates.end()) { sLog->outErrorDb("Quest %u has `NextQuestInChain` = %u but quest %u does not exist, quest chain will not work.", - qinfo->GetQuestId(), qinfo->NextQuestInChain , qinfo->NextQuestInChain); + qinfo->GetQuestId(), qinfo->NextQuestInChain, qinfo->NextQuestInChain); qinfo->NextQuestInChain = 0; } else @@ -4362,7 +4362,7 @@ void ObjectMgr::LoadQuests() if (!quest->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT)) { - sLog->outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u , but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags must be fixed, quest modified to enable objective.", spellInfo->Id, quest_id); + sLog->outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u, but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags must be fixed, quest modified to enable objective.", spellInfo->Id, quest_id); // this will prevent quest completing without objective const_cast<Quest*>(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT); @@ -4921,7 +4921,7 @@ void ObjectMgr::LoadSpellScriptNames() sLog->outErrorDb("Scriptname:`%s` spell (spell_id:%d) is not first rank of spell.", scriptName, fields[0].GetInt32()); continue; } - while(spellInfo) + while (spellInfo) { mSpellScripts.insert(SpellScriptsMap::value_type(spellInfo->Id, GetScriptId(scriptName))); spellInfo = sSpellMgr->GetSpellInfo(spellInfo->Id)->GetNextRankSpell(); @@ -6255,7 +6255,7 @@ uint32 ObjectMgr::GenerateMailID() uint32 ObjectMgr::GenerateLowGuid(HighGuid guidhigh) { - switch(guidhigh) + switch (guidhigh) { case HIGHGUID_ITEM: if (m_hiItemGuid >= 0xFFFFFFFE) @@ -6474,7 +6474,7 @@ void ObjectMgr::LoadGameObjectTemplate() // Checks - switch(got.type) + switch (got.type) { case GAMEOBJECT_TYPE_DOOR: //0 { @@ -7562,7 +7562,7 @@ enum LanguageType static LanguageType GetRealmLanguageType(bool create) { - switch(sWorld->getIntConfig(CONFIG_REALM_ZONE)) + switch (sWorld->getIntConfig(CONFIG_REALM_ZONE)) { case REALM_ZONE_UNKNOWN: // any language case REALM_ZONE_DEVELOPMENT: @@ -7701,7 +7701,7 @@ void ObjectMgr::LoadGameObjectForQuests() GameObjectTemplateContainer const* gotc = sObjectMgr->GetGameObjectTemplates(); for (GameObjectTemplateContainer::const_iterator itr = gotc->begin(); itr != gotc->end(); ++itr) { - switch(itr->second.type) + switch (itr->second.type) { // scan GO chest with loot including quest items case GAMEOBJECT_TYPE_CHEST: @@ -7933,7 +7933,7 @@ SpellScriptsBounds ObjectMgr::GetSpellScriptsBounds(uint32 spell_id) SkillRangeType GetSkillRangeType(SkillLineEntry const* pSkill, bool racial) { - switch(pSkill->categoryId) + switch (pSkill->categoryId) { case SKILL_CATEGORY_LANGUAGES: return SKILL_RANGE_LANGUAGE; case SKILL_CATEGORY_WEAPON: @@ -8648,7 +8648,7 @@ void ObjectMgr::CheckScripts(ScriptsType type, std::set<int32>& ids) { for (ScriptMap::const_iterator itrM = itrMM->second.begin(); itrM != itrMM->second.end(); ++itrM) { - switch(itrM->second.command) + switch (itrM->second.command) { case SCRIPT_COMMAND_TALK: { diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h index b9e734ab7ed..d36892ffcb0 100755 --- a/src/server/game/Grids/Cells/CellImpl.h +++ b/src/server/game/Grids/Cells/CellImpl.h @@ -54,7 +54,7 @@ Cell::Visit(const CellPair& standing_cell, TypeContainerVisitor<T, CONTAINER> &v CellPair begin_cell = standing_cell; CellPair end_cell = standing_cell; - switch(district) + switch (district) { case ALL_DISTRICT: { diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index df9ed7a4145..d0e2852e552 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1207,7 +1207,7 @@ void Group::SendUpdateToPlayer(uint64 playerGUID, MemberSlot* slot) slot = &(*witr); } - + WorldPacket data(SMSG_GROUP_LIST, (1+1+1+1+1+4+8+4+4+(GetMembersCount()-1)*(13+8+1+1+1+1)+8+1+8+1+1+1+1)); data << uint8(m_groupType); // group type (flags in 3.3) data << uint8(slot->group); diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index f421c135233..6d54aacb311 100755 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -29,7 +29,7 @@ MailSender::MailSender(Object* sender, MailStationery stationery) : m_stationery(stationery) { - switch(sender->GetTypeId()) + switch (sender->GetTypeId()) { case TYPEID_UNIT: m_messageType = MAIL_CREATURE; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 5dcce67bcd3..e122c5bffae 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -119,7 +119,7 @@ void Map::LoadVMap(int gx, int gy) { // x and y are swapped !! int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld->GetDataPath()+ "vmaps").c_str(), GetId(), gx, gy); - switch(vmapLoadResult) + switch (vmapLoadResult) { case VMAP::VMAP_LOAD_RESULT_OK: sLog->outDetail("VMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); @@ -305,8 +305,8 @@ void Map::SwitchGridContainers(T* obj, bool on) obj->m_isWorldObject = on; } -template void Map::SwitchGridContainers(Creature* , bool); -//template void Map::SwitchGridContainers(DynamicObject* , bool); +template void Map::SwitchGridContainers(Creature*, bool); +//template void Map::SwitchGridContainers(DynamicObject*, bool); template<class T> void Map::DeleteFromWorld(T* obj) @@ -2028,7 +2028,7 @@ void Map::RemoveAllObjectsInRemoveList() bool on = itr->second; i_objectsToSwitch.erase(itr); - switch(obj->GetTypeId()) + switch (obj->GetTypeId()) { case TYPEID_UNIT: if (!obj->ToCreature()->isPet()) @@ -2045,7 +2045,7 @@ void Map::RemoveAllObjectsInRemoveList() std::set<WorldObject*>::iterator itr = i_objectsToRemove.begin(); WorldObject* obj = *itr; - switch(obj->GetTypeId()) + switch (obj->GetTypeId()) { case TYPEID_CORPSE: { @@ -2181,10 +2181,10 @@ template void Map::Add(Creature*); template void Map::Add(GameObject*); template void Map::Add(DynamicObject*); -template void Map::Remove(Corpse* , bool); -template void Map::Remove(Creature* , bool); -template void Map::Remove(GameObject* , bool); -template void Map::Remove(DynamicObject* , bool); +template void Map::Remove(Corpse*, bool); +template void Map::Remove(Creature*, bool); +template void Map::Remove(GameObject*, bool); +template void Map::Remove(DynamicObject*, bool); /* ******* Dungeon Instance Maps ******* */ @@ -2593,7 +2593,7 @@ BattlegroundMap::BattlegroundMap(uint32 id, time_t expiry, uint32 InstanceId, Ma BattlegroundMap::~BattlegroundMap() { - if(m_bg) + if (m_bg) { //unlink to prevent crash, always unlink all pointer reference before destruction m_bg->SetBgMap(NULL); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 081516bb338..640b70413f8 100755 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -255,7 +255,7 @@ class Map : public GridRefManager<NGridType> } virtual bool Add(Player*); - virtual void Remove(Player* , bool); + virtual void Remove(Player*, bool); template<class T> void Add(T *); template<class T> void Remove(T *, bool); @@ -266,7 +266,7 @@ class Map : public GridRefManager<NGridType> //function for setting up visibility distance for maps on per-type/per-Id basis virtual void InitVisibilityDistance(); - void PlayerRelocation(Player* , float x, float y, float z, float orientation); + void PlayerRelocation(Player*, float x, float y, float z, float orientation); void CreatureRelocation(Creature* creature, float x, float y, float z, float ang, bool respawnRelocationOnFail = true); template<class T, class CONTAINER> void Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER> &visitor); @@ -578,7 +578,7 @@ class InstanceMap : public Map InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent); ~InstanceMap(); bool Add(Player*); - void Remove(Player* , bool); + void Remove(Player*, bool); void Update(const uint32); void CreateInstanceData(bool load); bool Reset(uint8 method); @@ -608,7 +608,7 @@ class BattlegroundMap : public Map ~BattlegroundMap(); bool Add(Player*); - void Remove(Player* , bool); + void Remove(Player*, bool); bool CanEnter(Player* player); void SetUnload(); //void UnloadAll(bool pForce); diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 9d015a5284d..fa18cd801a4 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -2402,7 +2402,7 @@ enum QuestSort inline uint8 ClassByQuestSort(int32 QuestSort) { - switch(QuestSort) + switch (QuestSort) { case QUEST_SORT_WARLOCK: return CLASS_WARLOCK; case QUEST_SORT_WARRIOR: return CLASS_WARRIOR; @@ -2578,7 +2578,7 @@ enum SkillType inline SkillType SkillByLockType(LockType locktype) { - switch(locktype) + switch (locktype) { case LOCKTYPE_PICKLOCK: return SKILL_LOCKPICKING; case LOCKTYPE_HERBALISM: return SKILL_HERBALISM; @@ -2592,7 +2592,7 @@ inline SkillType SkillByLockType(LockType locktype) inline uint32 SkillByQuestSort(int32 QuestSort) { - switch(QuestSort) + switch (QuestSort) { case QUEST_SORT_HERBALISM: return SKILL_HERBALISM; case QUEST_SORT_FISHING: return SKILL_FISHING; diff --git a/src/server/game/Movement/DestinationHolderImp.h b/src/server/game/Movement/DestinationHolderImp.h index f1e815c093e..84e7fbf4f08 100755 --- a/src/server/game/Movement/DestinationHolderImp.h +++ b/src/server/game/Movement/DestinationHolderImp.h @@ -113,7 +113,7 @@ DestinationHolder<TRAVELLER>::UpdateTraveller(TRAVELLER &traveller, uint32 diff, return true; if (traveller.GetTraveller().HasUnitState(UNIT_STAT_IN_FLIGHT)) - GetLocationNow(traveller.GetTraveller().GetBaseMap() , x, y, z, true); // Should reposition Object with right Coord, so I can bypass some Grid Relocation + GetLocationNow(traveller.GetTraveller().GetBaseMap(), x, y, z, true); // Should reposition Object with right Coord, so I can bypass some Grid Relocation else GetLocationNow(traveller.GetTraveller().GetBaseMap(), x, y, z, false); diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 00fc3dde11f..5f84d6bc7b0 100755 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -85,7 +85,7 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z) float distance = 5.0f; - switch(i) + switch (i) { case 0: angle = i_cur_angle; diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h index a12c05e847a..cca986ffea7 100755 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h @@ -37,7 +37,7 @@ class RandomMovementGenerator void Reset(T &); bool Update(T &, const uint32); bool GetDestination(float &x, float &y, float &z) const; - void UpdateMapPosition(uint32 mapid, float &x , float &y, float &z) + void UpdateMapPosition(uint32 mapid, float &x, float &y, float &z) { i_destinationHolder.GetLocationNow(mapid, x, y, z); } diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index a4432d7ca19..6cab6110741 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -413,7 +413,7 @@ void OPvPCapturePoint::SendUpdateWorldState(uint32 field, uint32 value) void OPvPCapturePoint::SendObjectiveComplete(uint32 id, uint64 guid) { uint32 team; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: team = 0; diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index 3b1a2041515..1969d1f98e1 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -180,7 +180,7 @@ class OPvPCapturePoint OutdoorPvP* m_PvP; // map to store the various gameobjects and creatures spawned by the objective - // type , guid + // type, guid std::map<uint32, uint64> m_Objects; std::map<uint32, uint64> m_Creatures; std::map<uint64, uint32> m_ObjectTypes; diff --git a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp index 23aa4c7a55a..cce89de27a8 100755 --- a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp @@ -148,7 +148,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data) etime *= MINUTE; // client understand only 3 auction time - switch(etime) + switch (etime) { case 1*MIN_AUCTION_TIME: case 2*MIN_AUCTION_TIME: @@ -578,7 +578,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data) AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(pCreature->getFaction()); - //sLog->outDebug("Auctionhouse search (GUID: %u TypeId: %u)", , list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", + //sLog->outDebug("Auctionhouse search (GUID: %u TypeId: %u)",, list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", // GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid)), listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable); WorldPacket data(SMSG_AUCTION_LIST_RESULT, (4+4+4)); diff --git a/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp b/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp index efdcb5f4e1e..95327a71374 100755 --- a/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp @@ -414,7 +414,7 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recv_data) } uint32 queueSlot = _player->GetBattlegroundQueueIndex(bgQueueTypeId); WorldPacket data; - switch(action) + switch (action) { case 1: // port to battleground if (!_player->IsInvitedForBattlegroundQueueType(bgQueueTypeId)) @@ -631,7 +631,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data) uint32 arenaRating = 0; uint32 matchmakerRating = 0; - switch(arenaslot) + switch (arenaslot) { case 0: arenatype = ARENA_TYPE_2v2; diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index 8cd2484bfa2..dc57baff7fe 100755 --- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp @@ -1006,7 +1006,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) std::string IP_str = GetRemoteAddress(); sLog->outChar("Account: %d (IP: %s) Login Character:[%s] (GUID: %u)", - GetAccountId(), IP_str.c_str(), pCurrChar->GetName() , pCurrChar->GetGUIDLow()); + GetAccountId(), IP_str.c_str(), pCurrChar->GetName(), pCurrChar->GetGUIDLow()); if (!pCurrChar->IsStandState() && !pCurrChar->HasUnitState(UNIT_STAT_STUNNED)) pCurrChar->SetStandState(UNIT_STAND_STATE_STAND); diff --git a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp index cd80331069c..83d92df4f7a 100755 --- a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp @@ -141,7 +141,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recv_data) lang = LANG_UNIVERSAL; else { - switch(type) + switch (type) { case CHAT_MSG_PARTY: case CHAT_MSG_PARTY_LEADER: @@ -549,7 +549,7 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket & recv_data) uint32 emote_anim = em->textid; - switch(emote_anim) + switch (emote_anim) { case EMOTE_STATE_SLEEP: case EMOTE_STATE_SIT: diff --git a/src/server/game/Server/Protocol/Handlers/LootHandler.cpp b/src/server/game/Server/Protocol/Handlers/LootHandler.cpp index a3edcd3f827..7ace25832f2 100755 --- a/src/server/game/Server/Protocol/Handlers/LootHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/LootHandler.cpp @@ -106,7 +106,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/) Loot* loot = NULL; bool shareMoney = true; - switch(GUID_HIPART(guid)) + switch (GUID_HIPART(guid)) { case HIGHGUID_GAMEOBJECT: { diff --git a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp index 564478e75b9..432a8bf3f6a 100755 --- a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp @@ -577,7 +577,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data) data << uint32((*itr)->messageID); // Message ID data << uint8((*itr)->messageType); // Message Type - switch((*itr)->messageType) + switch ((*itr)->messageType) { case MAIL_NORMAL: // sender guid data << uint64(MAKE_NEW_GUID((*itr)->sender, 0, HIGHGUID_PLAYER)); @@ -743,7 +743,7 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/) else data << uint32(m->sender); // creature entry - switch(m->messageType) + switch (m->messageType) { case MAIL_AUCTION: data << uint32(2); diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index 125fba6db91..c75c02a723d 100755 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -820,7 +820,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data) if (player->GetMapId() != atEntry->mapid) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", + sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", player->GetName(), atEntry->mapid, player->GetMapId(), player->GetGUIDLow(), triggerId); return; } @@ -1036,7 +1036,7 @@ void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data) } else { - switch(type) + switch (type) { case ACTION_BUTTON_MACRO: case ACTION_BUTTON_CMACRO: @@ -1347,7 +1347,7 @@ void WorldSession::HandleComplainOpcode(WorldPacket & recv_data) std::string description = ""; recv_data >> spam_type; // unk 0x01 const, may be spam type (mail/chat) recv_data >> spammer_guid; // player guid - switch(spam_type) + switch (spam_type) { case 0: recv_data >> unk1; // const 0 @@ -1401,7 +1401,7 @@ void WorldSession::HandleFarSightOpcode(WorldPacket & recv_data) uint8 apply; recv_data >> apply; - switch(apply) + switch (apply) { case 0: sLog->outDebug(LOG_FILTER_NETWORKIO, "Player %u set vision to self", _player->GetGUIDLow()); diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp index c8c7e882046..8023f98c93d 100755 --- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp @@ -427,7 +427,7 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data) static char const* move_type_name[MAX_MOVE_TYPE] = { "Walk", "Run", "RunBack", "Swim", "SwimBack", "TurnRate", "Flight", "FlightBack", "PitchRate" }; - switch(opcode) + switch (opcode) { case CMSG_FORCE_WALK_SPEED_CHANGE_ACK: move_type = MOVE_WALK; force_move_type = MOVE_WALK; break; case CMSG_FORCE_RUN_SPEED_CHANGE_ACK: move_type = MOVE_RUN; force_move_type = MOVE_RUN; break; diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp index 3976517152d..5a8781d3925 100755 --- a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp @@ -147,10 +147,10 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid return; } - switch(flag) + switch (flag) { case ACT_COMMAND: //0x07 - switch(spellid) + switch (spellid) { case COMMAND_STAY: //flat=1792 //STAY pet->AttackStop(); @@ -267,7 +267,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid } break; case ACT_REACTION: // 0x6 - switch(spellid) + switch (spellid) { case REACT_PASSIVE: //passive pet->AttackStop(); @@ -677,7 +677,7 @@ void WorldSession::HandlePetAbandon(WorldPacket & recv_data) if (pet->GetGUID() == _player->GetPetGUID()) { uint32 feelty = pet->GetPower(POWER_HAPPINESS); - pet->SetPower(POWER_HAPPINESS , feelty > 50000 ? (feelty-50000) : 0); + pet->SetPower(POWER_HAPPINESS, feelty > 50000 ? (feelty-50000) : 0); } _player->RemovePet((Pet*)pet, PET_SAVE_AS_DELETED); diff --git a/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp index 80cb3eda484..e021b51c55e 100755 --- a/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp @@ -124,7 +124,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data) return; } - switch(clientIndex) // arenaSlot+1 as received from client (1 from 3 case) + switch (clientIndex) // arenaSlot+1 as received from client (1 from 3 case) { case 1: charterid = ARENA_TEAM_CHARTER_2v2; @@ -224,7 +224,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data) do { Field* fields = result->Fetch(); - ssInvalidPetitionGUIDs << '\'' << fields[0].GetUInt32() << "' , "; + ssInvalidPetitionGUIDs << '\'' << fields[0].GetUInt32() << "', "; } while (result->NextRow()); } diff --git a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp index 97f65865508..64711a41f97 100755 --- a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp @@ -47,7 +47,7 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recv_data) return; } - switch(questgiver->GetTypeId()) + switch (questgiver->GetTypeId()) { case TYPEID_UNIT: { @@ -185,7 +185,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data) if (_player->CanCompleteQuest(quest)) _player->CompleteQuest(quest); - switch(pObject->GetTypeId()) + switch (pObject->GetTypeId()) { case TYPEID_UNIT: sScriptMgr->OnQuestAccept(_player, (pObject->ToCreature()), qInfo); @@ -327,7 +327,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data) if (!(sScriptMgr->OnQuestReward(_player, (object->ToCreature()), quest, reward))) { // Send next quest - if (Quest const* nextQuest = _player->GetNextQuest(guid , quest)) + if (Quest const* nextQuest = _player->GetNextQuest(guid, quest)) { if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true) && _player->CanTakeQuest(quest, true)) { @@ -346,7 +346,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data) if (!sScriptMgr->OnQuestReward(_player, ((GameObject*)object), quest, reward)) { // Send next quest - if (Quest const* nextQuest = _player->GetNextQuest(guid , quest)) + if (Quest const* nextQuest = _player->GetNextQuest(guid, quest)) { if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true) && _player->CanTakeQuest(quest, true)) { @@ -623,7 +623,7 @@ uint32 WorldSession::getDialogStatus(Player* pPlayer, Object* questgiver, uint32 QuestRelationBounds qr; QuestRelationBounds qir; - switch(questgiver->GetTypeId()) + switch (questgiver->GetTypeId()) { case TYPEID_GAMEOBJECT: { diff --git a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp index 08b2d181cd4..fe6d3f02ffa 100755 --- a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp @@ -191,7 +191,7 @@ void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket & recv_data) if (nodes.empty()) return; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d" , nodes.front(), nodes.back()); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d", nodes.front(), nodes.back()); GetPlayer()->ActivateTaxiPathTo(nodes, npc); } @@ -283,7 +283,7 @@ void WorldSession::HandleActivateTaxiOpcode(WorldPacket & recv_data) nodes.resize(2); recv_data >> guid >> nodes[0] >> nodes[1]; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI from %d to %d" , nodes[0], nodes[1]); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI from %d to %d", nodes[0], nodes[1]); Creature* npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER); if (!npc) { diff --git a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp index b8289bfada3..865158e7860 100755 --- a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp @@ -34,7 +34,7 @@ void WorldSession::SendTradeStatus(TradeStatus status) { WorldPacket data; - switch(status) + switch (status) { case TRADE_STATUS_BEGIN_TRADE: data.Initialize(SMSG_TRADE_STATUS, 4+8); diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index cbaf789faf6..df7816f7cb9 100755 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -856,9 +856,9 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x33B*/ { "SMSG_INSTANCE_DIFFICULTY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x33C*/ { "MSG_GM_RESETINSTANCELIMIT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x33D*/ { "SMSG_MOTD", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x33E*/ { "SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x33F*/ { "SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x340*/ { "CMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY_ACK",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x33E*/ { "SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x33F*/ { "SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x340*/ { "CMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x341*/ { "MSG_MOVE_START_SWIM_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x342*/ { "MSG_MOVE_STOP_SWIM_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x343*/ { "SMSG_MOVE_SET_CAN_FLY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, @@ -868,7 +868,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x347*/ { "CMSG_SOCKET_GEMS", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSocketOpcode }, /*0x348*/ { "CMSG_ARENA_TEAM_CREATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x349*/ { "SMSG_ARENA_TEAM_COMMAND_RESULT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x34A*/ { "MSG_MOVE_UPDATE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x34A*/ { "MSG_MOVE_UPDATE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x34B*/ { "CMSG_ARENA_TEAM_QUERY", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamQueryOpcode }, /*0x34C*/ { "SMSG_ARENA_TEAM_QUERY_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x34D*/ { "CMSG_ARENA_TEAM_ROSTER", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamRosterOpcode }, @@ -1284,7 +1284,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x4E7*/ { "CMSG_BATTLEFIELD_MGR_EXIT_REQUEST", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x4E8*/ { "SMSG_BATTLEFIELD_MGR_STATE_CHANGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x4E9*/ { "CMSG_BATTLEFIELD_MANAGER_ADVANCE_STATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, - /*0x4EA*/ { "CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x4EA*/ { "CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x4EB*/ { "MSG_SET_RAID_DIFFICULTY", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetRaidDifficultyOpcode }, /*0x4EC*/ { "CMSG_TOGGLE_XP_GAIN", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x4ED*/ { "SMSG_TOGGLE_XP_GAIN", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index c02b52bfb5a..ef51d1be918 100755 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1282,7 +1282,7 @@ enum Opcodes CMSG_SET_PAID_SERVICE_CHEAT = 0x4DD, SMSG_BATTLEFIELD_MGR_ENTRY_INVITE = 0x4DE, // uint32 CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONSE = 0x4DF, - SMSG_BATTLEFIELD_MGR_ENTERED = 0x4E0, // uint32, uint8, uint8 + SMSG_BATTLEFIELD_MGR_ENTERED = 0x4E0, // uint32, uint8, uint8 SMSG_BATTLEFIELD_MGR_QUEUE_INVITE = 0x4E1, // uint32 CMSG_BATTLEFIELD_MGR_QUEUE_INVITE_RESPONSE = 0x4E2, CMSG_BATTLEFIELD_MGR_QUEUE_REQUEST = 0x4E3, @@ -1300,7 +1300,7 @@ enum Opcodes SMSG_GMRESPONSE_RECEIVED = 0x4EF, // uint32, uint32, string[2000], string[4000][4] CMSG_GMRESPONSE_RESOLVE = 0x4F0, SMSG_GMRESPONSE_STATUS_UPDATE = 0x4F1, // uint8 (1 - EVENT_GMSURVEY_DISPLAY, 0 - EVENT_UPDATE_TICKET) - SMSG_GMRESPONSE_CREATE_TICKET = 0x4F2, + SMSG_GMRESPONSE_CREATE_TICKET = 0x4F2, CMSG_GMRESPONSE_CREATE_TICKET = 0x4F3, CMSG_SERVERINFO = 0x4F4, SMSG_SERVERINFO = 0x4F5, diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 80af3961caf..d6004e809df 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -492,7 +492,7 @@ void WorldSession::LogoutPlayer(bool Save) // e.g if he got disconnected during a transfer to another map // calls to GetMap in this case may cause crashes _player->CleanupsBeforeDelete(); - sLog->outChar("Account: %d (IP: %s) Logout Character:[%s] (GUID: %u)", GetAccountId(), GetRemoteAddress().c_str(), _player->GetName() , _player->GetGUIDLow()); + sLog->outChar("Account: %d (IP: %s) Logout Character:[%s] (GUID: %u)", GetAccountId(), GetRemoteAddress().c_str(), _player->GetName(), _player->GetGUIDLow()); Map* _map = _player->GetMap(); _map->Remove(_player, true); SetPlayer(NULL); // deleted in Remove call diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index c5daa540632..3875156289e 100755 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -310,7 +310,7 @@ int WorldSocket::handle_input (ACE_HANDLE) if ((errno == EWOULDBLOCK) || (errno == EAGAIN)) { - return Update(); // interesting line , isn't it ? + return Update(); // interesting line, isn't it ? } sLog->outStaticDebug("WorldSocket::handle_input: Peer error closing connection errno = %s", ACE_OS::strerror (errno)); @@ -496,7 +496,7 @@ int WorldSocket::handle_input_header (void) if ((header.size < 4) || (header.size > 10240) || (header.cmd > 10240)) { Player* _player = m_Session ? m_Session->GetPlayer() : NULL; - sLog->outError ("WorldSocket::handle_input_header(): client (account: %u, char [GUID: %u, name: %s]) sent malformed packet (size: %d , cmd: %d)", + sLog->outError ("WorldSocket::handle_input_header(): client (account: %u, char [GUID: %u, name: %s]) sent malformed packet (size: %d, cmd: %d)", m_Session ? m_Session->GetAccountId() : 0, _player ? _player->GetGUIDLow() : 0, _player ? _player->GetName() : "<none>", @@ -599,7 +599,7 @@ int WorldSocket::handle_input_missing_data (void) // Its possible on some error situations that this happens // for example on closing when epoll receives more chunked data and stuff - // hope this is not hack , as proper m_RecvWPct is asserted around + // hope this is not hack, as proper m_RecvWPct is asserted around if (!m_RecvWPct) { sLog->outError ("Forcing close on input m_RecvWPct = NULL"); @@ -708,7 +708,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) try { - switch(opcode) + switch (opcode) { case CMSG_PING: return HandlePing (*new_pct); @@ -722,7 +722,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) sScriptMgr->OnPacketReceive(this, WorldPacket(*new_pct)); return HandleAuthSession (*new_pct); case CMSG_KEEP_ALIVE: - sLog->outStaticDebug ("CMSG_KEEP_ALIVE , size: " UI64FMTD, uint64(new_pct->size())); + sLog->outStaticDebug ("CMSG_KEEP_ALIVE, size: " UI64FMTD, uint64(new_pct->size())); sScriptMgr->OnPacketReceive(this, WorldPacket(*new_pct)); return 0; default: @@ -735,7 +735,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) // Catches people idling on the login screen and any lingering ingame connections. m_Session->ResetTimeOutTime(); - // OK , give the packet to WorldSession + // OK, give the packet to WorldSession aptr.release(); // WARNINIG here we call it with locks held. // Its possible to cause deadlock if QueuePacket calls back diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index d10b0a11301..aa7424085f8 100755 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -118,7 +118,7 @@ class WorldSocket : public WorldHandler /// things called by ACE framework. - /// Called on open , the void* is the acceptor. + /// Called on open, the void* is the acceptor. virtual int open (void *); /// Called on failures inside of the acceptor, don't call from your code. @@ -152,7 +152,7 @@ class WorldSocket : public WorldHandler int handle_output_queue (GuardType& g); /// process one incoming packet. - /// @param new_pct received packet , note that you need to delete it. + /// @param new_pct received packet, note that you need to delete it. int ProcessIncoming (WorldPacket* new_pct); /// Called by ProcessIncoming() on CMSG_AUTH_SESSION. @@ -165,7 +165,7 @@ class WorldSocket : public WorldHandler /// Time in which the last ping was received ACE_Time_Value m_LastPingTime; - /// Keep track of over-speed pings , to prevent ping flood. + /// Keep track of over-speed pings, to prevent ping flood. uint32 m_OverSpeedPings; /// Address of the remote peer diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 95db31fd5df..ec29273d6b0 100755 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -47,7 +47,7 @@ #include "ScriptMgr.h" /** -* This is a helper class to WorldSocketMgr , that manages +* This is a helper class to WorldSocketMgr, that manages * network threads, and assigning connections from acceptor thread * to other network threads */ @@ -263,7 +263,7 @@ WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address) if (m_Acceptor->open(listen_addr, m_NetThreads[0].GetReactor(), ACE_NONBLOCK) == -1) { - sLog->outError ("Failed to open acceptor , check if the port is free"); + sLog->outError ("Failed to open acceptor, check if the port is free"); return -1; } diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index fae94236c17..55dc29e5ef4 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -449,7 +449,7 @@ int32 AuraEffect::CalculateAmount(Unit* caster) float DoneActualBenefit = 0.0f; // custom amount calculations go here - switch(GetAuraType()) + switch (GetAuraType()) { // crowd control auras case SPELL_AURA_MOD_CONFUSE: @@ -483,7 +483,7 @@ int32 AuraEffect::CalculateAmount(Unit* caster) m_canBeRecalculated = false; if (!caster) break; - switch(GetSpellInfo()->SpellFamilyName) + switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_MAGE: // Ice Barrier @@ -864,7 +864,7 @@ void AuraEffect::CalculateSpellMod() switch (GetAuraType()) { case SPELL_AURA_DUMMY: - switch(GetSpellInfo()->SpellFamilyName) + switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_PRIEST: // Pain and Suffering @@ -904,7 +904,7 @@ void AuraEffect::CalculateSpellMod() break; } case SPELL_AURA_MOD_SPELL_CRIT_CHANCE: - switch(GetId()) + switch (GetId()) { case 51466: // Elemental oath case 51470: // Elemental oath @@ -1112,21 +1112,21 @@ void AuraEffect::Update(uint32 diff, Unit* caster) void AuraEffect::UpdatePeriodic(Unit* caster) { - switch(GetAuraType()) + switch (GetAuraType()) { case SPELL_AURA_DUMMY: // Haunting Spirits if (GetId() == 7057) { - m_amplitude = irand (0 , 60) + 30; + m_amplitude = irand (0, 60) + 30; m_amplitude *= IN_MILLISECONDS; } break; case SPELL_AURA_PERIODIC_DUMMY: - switch(GetSpellInfo()->SpellFamilyName) + switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_GENERIC: - switch(GetId()) + switch (GetId()) { // Drink case 430: @@ -1287,7 +1287,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit* caster) const Unit* target = aurApp->GetTarget(); - switch(GetAuraType()) + switch (GetAuraType()) { case SPELL_AURA_PERIODIC_DUMMY: HandlePeriodicDummyAuraTick(target, caster); @@ -1327,7 +1327,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit* caster) const case SPELL_AURA_DUMMY: // Haunting Spirits if (GetId() == 7057) - target->CastSpell((Unit*)NULL , GetAmount(), true); + target->CastSpell((Unit*)NULL, GetAmount(), true); break; default: break; @@ -1337,7 +1337,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit* caster) const void AuraEffect::HandleProc(AuraApplication* aurApp, ProcEventInfo& eventInfo) { // TODO: effect script handlers here - switch(GetAuraType()) + switch (GetAuraType()) { case SPELL_AURA_PROC_TRIGGER_SPELL: HandleProcTriggerSpellAuraProc(aurApp, eventInfo); @@ -1388,7 +1388,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const //uint32 spellId3 = 0; uint32 HotWSpellId = 0; - switch(GetMiscValue()) + switch (GetMiscValue()) { case FORM_CAT: spellId = 3025; @@ -1518,11 +1518,11 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const } } } - switch(GetMiscValue()) + switch (GetMiscValue()) { case FORM_CAT: // Savage Roar - if (target->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 0 , 0x10000000, 0)) + if (target->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 0, 0x10000000, 0)) target->CastSpell(target, 62071, true); // Nurturing Instinct if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT, SPELLFAMILY_DRUID, 2254, 0)) @@ -3469,7 +3469,7 @@ void AuraEffect::HandleAuraModStateImmunity(AuraApplication const* aurApp, uint8 target->ApplySpellImmune(GetId(), IMMUNITY_STATE, GetMiscValue(), apply); if (apply && GetSpellInfo()->AttributesEx & SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY) - target->RemoveAurasByType(AuraType(GetMiscValue()), 0 , GetBase()); + target->RemoveAurasByType(AuraType(GetMiscValue()), 0, GetBase()); } void AuraEffect::HandleAuraModSchoolImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const @@ -4488,8 +4488,8 @@ void AuraEffect::HandleModDamagePercentDone(AuraApplication const* aurApp, uint8 if (target->GetTypeId() == TYPEID_PLAYER) { - for(int i = 0; i < MAX_ATTACK; ++i) - if(Item* item = target->ToPlayer()->GetWeaponForAttack(WeaponAttackType(i),false)) + for (int i = 0; i < MAX_ATTACK; ++i) + if (Item* item = target->ToPlayer()->GetWeaponForAttack(WeaponAttackType(i), false)) target->ToPlayer()->_ApplyWeaponDependentAuraDamageMod(item, WeaponAttackType(i), this, apply); } @@ -4669,7 +4669,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool break; } } - switch(GetId()) + switch (GetId()) { case 1515: // Tame beast // FIX_ME: this is 2.0.12 threat effect replaced in 2.1.x by dummy aura, must be checked for correctness @@ -4707,7 +4707,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool { if (caster) { - switch(caster->getGender()) + switch (caster->getGender()) { case GENDER_FEMALE: caster->CastSpell(target, 37095, true, NULL, this); // Blood Elf Disguise @@ -4747,7 +4747,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool case 46354: // Blood Elf Illusion if (caster) { - switch(caster->getGender()) + switch (caster->getGender()) { case GENDER_FEMALE: caster->CastSpell(target, 46356, true, NULL, this); @@ -4787,7 +4787,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if (caster) // actually we can also use cast(this, originalcasterguid) { int32 damage; - switch(GetBase()->GetStackAmount()) + switch (GetBase()->GetStackAmount()) { case 1: damage = 0; break; case 2: damage = 500; break; @@ -4820,7 +4820,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if ((GetSpellInfo()->IsQuestTame()) && caster && caster->isAlive() && target->isAlive()) { uint32 finalSpelId = 0; - switch(GetId()) + switch (GetId()) { case 19548: finalSpelId = 19597; break; case 19674: finalSpelId = 19677; break; @@ -4846,10 +4846,10 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool caster->CastSpell(target, finalSpelId, true, NULL, this); } - switch(m_spellInfo->SpellFamilyName) + switch (m_spellInfo->SpellFamilyName) { case SPELLFAMILY_GENERIC: - switch(GetId()) + switch (GetId()) { case 2584: // Waiting to Resurrect // Waiting to resurrect spell cancel, we must remove player from resurrect queue @@ -4967,13 +4967,13 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool // AT APPLY & REMOVE - switch(m_spellInfo->SpellFamilyName) + switch (m_spellInfo->SpellFamilyName) { case SPELLFAMILY_GENERIC: { if (!(mode & AURA_EFFECT_HANDLE_REAL)) break; - switch(GetId()) + switch (GetId()) { // Recently Bandaged case 11196: @@ -5050,7 +5050,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool case 57723: // Exhaustion case 57724: // Sated { - switch(GetId()) + switch (GetId()) { case 57723: target->ApplySpellImmune(GetId(), IMMUNITY_ID, 32182, apply); break; // Heroism case 57724: target->ApplySpellImmune(GetId(), IMMUNITY_ID, 2825, apply); break; // Bloodlust @@ -5069,7 +5069,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if (apply) { - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { case 57819: FactionID = 1106; break; // Argent Crusade case 57820: FactionID = 1098; break; // Knights of the Ebon Blade @@ -5151,7 +5151,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) break; - switch(GetId()) + switch (GetId()) { case 52610: // Savage Roar { @@ -5608,8 +5608,8 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const case 66149: // Bullet Controller Periodic - 10 Man case 68396: // Bullet Controller Periodic - 25 Man { - caster->CastCustomSpell(66152, SPELLVALUE_MAX_TARGETS, urand(1,6), target, true); - caster->CastCustomSpell(66153, SPELLVALUE_MAX_TARGETS, urand(1,6), target, true); + caster->CastCustomSpell(66152, SPELLVALUE_MAX_TARGETS, urand(1, 6), target, true); + caster->CastCustomSpell(66153, SPELLVALUE_MAX_TARGETS, urand(1, 6), target, true); break; } case 54798: // FLAMING Arrow Triggered Effect @@ -5979,7 +5979,7 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) } case SPELLFAMILY_SHAMAN: { - switch(auraId) + switch (auraId) { // Lightning Shield (The Earthshatterer set trigger after cast Lighting Shield) case 28820: @@ -6541,7 +6541,7 @@ void AuraEffect::HandlePeriodicManaLeechAuraTick(Unit* target, Unit* caster) con } // spell-specific code - switch(GetId()) + switch (GetId()) { case 31447: // Mark of Kaz'rogal if (target->GetPower(powerType) == 0) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 8bb46ed6144..e2690c02b1d 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -57,7 +57,7 @@ m_effectsToApply(effMask), m_removeMode(AURA_REMOVE_NONE), m_needClientUpdate(fa Unit::VisibleAuraMap const* visibleAuras = GetTarget()->GetVisibleAuras(); // lookup for free slots in units visibleAuras Unit::VisibleAuraMap::const_iterator itr = visibleAuras->find(0); - for (uint32 freeSlot = 0; freeSlot < MAX_AURAS; ++itr , ++freeSlot) + for (uint32 freeSlot = 0; freeSlot < MAX_AURAS; ++itr, ++freeSlot) { if (itr == visibleAuras->end() || itr->first != freeSlot) { @@ -224,7 +224,7 @@ uint8 Aura::BuildEffectMaskForOwner(SpellInfo const* spellProto, uint8 avalibleE ASSERT(spellProto); ASSERT(owner); uint8 effMask = 0; - switch(owner->GetTypeId()) + switch (owner->GetTypeId()) { case TYPEID_UNIT: case TYPEID_PLAYER: @@ -362,7 +362,7 @@ void Aura::_InitEffects(uint8 effMask, Unit* caster, int32 *baseAmount) Aura::~Aura() { // unload scripts - while(!m_loadedScripts.empty()) + while (!m_loadedScripts.empty()) { std::list<AuraScript*>::iterator itr = m_loadedScripts.begin(); (*itr)->_Unload(); @@ -469,7 +469,7 @@ void Aura::UpdateTargetMap(Unit* caster, bool apply) // fill up to date target list // target, effMask - std::map<Unit* , uint8> targets; + std::map<Unit*, uint8> targets; FillTargetMap(targets, caster); @@ -478,7 +478,7 @@ void Aura::UpdateTargetMap(Unit* caster, bool apply) // mark all auras as ready to remove for (ApplicationMap::iterator appIter = m_applications.begin(); appIter != m_applications.end();++appIter) { - std::map<Unit* , uint8>::iterator existing = targets.find(appIter->second->GetTarget()); + std::map<Unit*, uint8>::iterator existing = targets.find(appIter->second->GetTarget()); // not found in current area - remove the aura if (existing == targets.end()) targetsToRemove.push_back(appIter->second->GetTarget()); @@ -495,7 +495,7 @@ void Aura::UpdateTargetMap(Unit* caster, bool apply) } // register auras for units - for (std::map<Unit* , uint8>::iterator itr = targets.begin(); itr!= targets.end();) + for (std::map<Unit*, uint8>::iterator itr = targets.begin(); itr!= targets.end();) { // aura mustn't be already applied on target if (AuraApplication * aurApp = GetApplicationOfTarget(itr->first->GetGUID())) @@ -572,7 +572,7 @@ void Aura::UpdateTargetMap(Unit* caster, bool apply) return; // apply aura effects for units - for (std::map<Unit* , uint8>::iterator itr = targets.begin(); itr!= targets.end();++itr) + for (std::map<Unit*, uint8>::iterator itr = targets.begin(); itr!= targets.end();++itr) { if (AuraApplication * aurApp = GetApplicationOfTarget(itr->first->GetGUID())) { @@ -1091,7 +1091,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_GENERIC: - switch(GetId()) + switch (GetId()) { case 32474: // Buffeting Winds of Susurrus if (target->GetTypeId() == TYPEID_PLAYER) @@ -1153,7 +1153,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b caster->CastSpell(target, 61634, true); } } - switch(GetId()) + switch (GetId()) { case 12536: // Clearcasting case 12043: // Presence of Mind @@ -1190,7 +1190,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; case SPELLFAMILY_WARLOCK: - switch(GetId()) + switch (GetId()) { case 48020: // Demonic Circle if (target->GetTypeId() == TYPEID_PLAYER) @@ -1294,10 +1294,10 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b // mods at aura remove else { - switch(GetSpellInfo()->SpellFamilyName) + switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_GENERIC: - switch(GetId()) + switch (GetId()) { case 61987: // Avenging Wrath // Remove the immunity shield marker on Avenging Wrath removal if Forbearance is not present @@ -1319,7 +1319,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; case SPELLFAMILY_MAGE: - switch(GetId()) + switch (GetId()) { case 66: // Invisibility if (removeMode != AURA_REMOVE_BY_EXPIRE) @@ -1403,7 +1403,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b caster->CastSpell(target, spellId, true); } } - switch(GetId()) + switch (GetId()) { case 48018: // Demonic Circle // Do not remove GO when aura is removed by stack @@ -1461,7 +1461,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b break; int32 triggeredSpellId = 0; - switch(target->getPowerType()) + switch (target->getPowerType()) { case POWER_MANA: { @@ -1480,7 +1480,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } } } - switch(GetId()) + switch (GetId()) { case 47788: // Guardian Spirit if (removeMode != AURA_REMOVE_BY_EXPIRE) @@ -1570,7 +1570,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b else { int32 basepoints0 = aurEff->GetAmount(); - target->CastCustomSpell(target, 31665, &basepoints0, NULL, NULL , true); + target->CastCustomSpell(target, 31665, &basepoints0, NULL, NULL, true); } } // Overkill @@ -1585,7 +1585,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; case SPELLFAMILY_HUNTER: - switch(GetId()) + switch (GetId()) { case 19574: // Bestial Wrath // The Beast Within cast on owner if talent present @@ -1604,7 +1604,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; case SPELLFAMILY_PALADIN: - switch(GetId()) + switch (GetId()) { case 19746: case 31821: @@ -1646,7 +1646,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b Unit::AuraEffectList const& vDummyAuras = target->GetAuraEffectsByType(SPELL_AURA_DUMMY); for (Unit::AuraEffectList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr) { - switch((*itr)->GetId()) + switch ((*itr)->GetId()) { // Improved Blood Presence case 50365: @@ -1698,7 +1698,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b { // Not listed as any effect, only base points set int32 basePoints0 = unholyPresenceAura->GetSpellInfo()->Effects[EFFECT_1].CalcValue(); - target->CastCustomSpell(target, 63622, &basePoints0 , &basePoints0, &basePoints0, true, 0, unholyPresenceAura); + target->CastCustomSpell(target, 63622, &basePoints0, &basePoints0, &basePoints0, true, 0, unholyPresenceAura); } target->CastSpell(target, 49772, true); } @@ -2297,7 +2297,7 @@ void UnitAura::Remove(AuraRemoveMode removeMode) GetUnitOwner()->RemoveOwnedAura(this, removeMode); } -void UnitAura::FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster) +void UnitAura::FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster) { for (uint8 effIndex = 0; effIndex < MAX_SPELL_EFFECTS ; ++effIndex) { @@ -2355,7 +2355,7 @@ void UnitAura::FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster) for (UnitList::iterator itr = targetList.begin(); itr!= targetList.end();++itr) { - std::map<Unit* , uint8>::iterator existing = targets.find(*itr); + std::map<Unit*, uint8>::iterator existing = targets.find(*itr); if (existing != targets.end()) existing->second |= 1<<effIndex; else @@ -2382,7 +2382,7 @@ void DynObjAura::Remove(AuraRemoveMode removeMode) _Remove(removeMode); } -void DynObjAura::FillTargetMap(std::map<Unit* , uint8> & targets, Unit* /*caster*/) +void DynObjAura::FillTargetMap(std::map<Unit*, uint8> & targets, Unit* /*caster*/) { Unit* dynObjOwnerCaster = GetDynobjOwner()->GetCaster(); float radius = GetDynobjOwner()->GetRadius(); @@ -2408,7 +2408,7 @@ void DynObjAura::FillTargetMap(std::map<Unit* , uint8> & targets, Unit* /*caster for (UnitList::iterator itr = targetList.begin(); itr!= targetList.end();++itr) { - std::map<Unit* , uint8>::iterator existing = targets.find(*itr); + std::map<Unit*, uint8>::iterator existing = targets.find(*itr); if (existing != targets.end()) existing->second |= 1<<effIndex; else diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index 6c641ef7d9b..bcf40fe69d7 100755 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -112,7 +112,7 @@ class Aura void _Remove(AuraRemoveMode removeMode); virtual void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT) = 0; - virtual void FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster) = 0; + virtual void FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster) = 0; void UpdateTargetMap(Unit* caster, bool apply = true); void _RegisterForTargets() {Unit* caster = GetCaster(); UpdateTargetMap(caster, false);} @@ -252,7 +252,7 @@ class UnitAura : public Aura void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); - void FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster); + void FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster); // Allow Apply Aura Handler to modify and access m_AuraDRGroup void SetDiminishGroup(DiminishingGroup group) { m_AuraDRGroup = group; } @@ -270,6 +270,6 @@ class DynObjAura : public Aura public: void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); - void FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster); + void FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster); }; #endif diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 255c6307d58..bcceb3eebbc 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -569,7 +569,7 @@ m_caster((info->AttributesEx6 & SPELL_ATTR6_CAST_BY_CHARMER && caster->GetCharme Spell::~Spell() { // unload scripts - while(!m_loadedScripts.empty()) + while (!m_loadedScripts.empty()) { std::list<SpellScript*>::iterator itr = m_loadedScripts.begin(); (*itr)->_Unload(); @@ -1820,7 +1820,7 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin break; // Check if (*next) is a valid chain target. If not, don't add to TagUnitMap, and repeat loop. - // If you want to add any conditions to exclude a target from TagUnitMap, add condition in this while() loop. + // If you want to add any conditions to exclude a target from TagUnitMap, add condition in this while () loop. while ((m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE && !m_caster->isInFrontInMap(*next, max_range)) || !m_caster->canSeeOrDetect(*next) @@ -5162,12 +5162,12 @@ SpellCastResult Spell::CheckCast(bool strict) // RETURN HERE case SPELL_EFFECT_SUMMON_RAF_FRIEND: { - if(m_caster->GetTypeId() != TYPEID_PLAYER) + if (m_caster->GetTypeId() != TYPEID_PLAYER) return SPELL_FAILED_BAD_TARGETS; Player* playerCaster = m_caster->ToPlayer(); // - if(!(playerCaster->GetSelection())) + if (!(playerCaster->GetSelection())) return SPELL_FAILED_BAD_TARGETS; Player* target = ObjectAccessor::FindPlayer(playerCaster->GetSelection()); diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 6070df7e0aa..27b0844f32e 100755 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -723,7 +723,7 @@ namespace Trinity break; } - switch(i_push_type) + switch (i_push_type) { case PUSH_SRC_CENTER: case PUSH_DST_CENTER: diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 741648ce70f..1a3a5403bb2 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -330,7 +330,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) damage /= count; // divide to all targets } - switch(m_spellInfo->Id) // better way to check unknown + switch (m_spellInfo->Id) // better way to check unknown { // Positive/Negative Charge case 28062: @@ -945,7 +945,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) case 35745: // Socrethar's Stone { uint32 spell_id; - switch(m_caster->GetAreaId()) + switch (m_caster->GetAreaId()) { case 3900: spell_id = 35743; break; // Socrethar Portal case 3742: spell_id = 35744; break; // Socrethar Portal @@ -1281,7 +1281,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) m_damage += CalculatePctF(damage, m_caster->GetTotalAttackPowerValue(BASE_ATTACK)); return; } - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { // Bloodthirst case 23881: @@ -1363,7 +1363,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) return; } - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { case 31789: // Righteous Defense (step 1) { @@ -1564,7 +1564,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) && effectHandleMode == SPELL_EFFECT_HANDLE_LAUNCH_TARGET) { // special cases - switch(triggered_spell_id) + switch (triggered_spell_id) { // Mirror Image case 58832: @@ -2399,7 +2399,7 @@ void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype) // bg reward have some special in code work uint32 bgType = 0; - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { case SPELL_AV_MARK_WINNER: case SPELL_AV_MARK_LOSER: @@ -3189,7 +3189,7 @@ void Spell::EffectLearnSpell(SpellEffIndex effIndex) } typedef std::list< std::pair<uint32, uint64> > DispelList; -typedef std::list< std::pair<Aura* , uint8> > DispelChargesList; +typedef std::list< std::pair<Aura*, uint8> > DispelChargesList; void Spell::EffectDispel(SpellEffIndex effIndex) { if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) @@ -3659,7 +3659,7 @@ void Spell::EffectEnchantItemTmp(SpellEffIndex effIndex) // enchanting spell selected by calculated damage-per-sec stored in Effect[1] base value // Note: damage calculated (correctly) with rounding int32(float(v)) but // RW enchantments applied damage int32(float(v)+0.5), this create 0..1 difference sometime - switch(damage) + switch (damage) { // Rank 1 case 2: spell_id = 36744; break; // 0% [ 7% == 2, 14% == 2, 20% == 2] @@ -4236,7 +4236,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) { // We assume that a spell have at most one fixed_bonus // and at most one weaponDamagePercentMod - switch(m_spellInfo->Effects[j].Effect) + switch (m_spellInfo->Effects[j].Effect) { case SPELL_EFFECT_WEAPON_DAMAGE: case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL: @@ -4382,7 +4382,7 @@ void Spell::EffectSummonObjectWild(SpellEffIndex effIndex) Player* pl = m_caster->ToPlayer(); Battleground* bg = pl->GetBattleground(); - switch(pGameObj->GetMapId()) + switch (pGameObj->GetMapId()) { case 489: //WS { @@ -4438,11 +4438,11 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) // TODO: we must implement hunter pet summon at login there (spell 6962) - switch(m_spellInfo->SpellFamilyName) + switch (m_spellInfo->SpellFamilyName) { case SPELLFAMILY_GENERIC: { - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { // Glyph of Backstab case 63975: @@ -4525,7 +4525,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) return; uint32 spell_id = 0; - switch(urand(1, 5)) + switch (urand(1, 5)) { case 1: spell_id = 8854; break; default: spell_id = 8855; break; @@ -4660,7 +4660,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 75: unitTarget->CastSpell(unitTarget, 51621, true); break; case 150: unitTarget->CastSpell(unitTarget, 48024, true); break; @@ -4705,7 +4705,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 75: unitTarget->CastSpell(unitTarget, 42680, true); break; case 150: unitTarget->CastSpell(unitTarget, 42683, true); break; @@ -4775,7 +4775,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) return; uint32 spellId = 0; - switch(rand() % 4) + switch (rand() % 4) { case 0: spellId = 46740; break; case 1: spellId = 46739; break; @@ -5021,7 +5021,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 0: unitTarget->CastSpell(unitTarget, 71343, true); break; case 75: unitTarget->CastSpell(unitTarget, 71344, true); break; @@ -5067,7 +5067,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 75: unitTarget->CastSpell(unitTarget, 72281, true); break; case 150: unitTarget->CastSpell(unitTarget, 72282, true); break; @@ -5130,7 +5130,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 75: unitTarget->CastSpell(unitTarget, 75619, true); break; case 150: unitTarget->CastSpell(unitTarget, 75620, true); break; @@ -5229,7 +5229,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) uint32 spell_heal; - switch(m_caster->GetEntry()) + switch (m_caster->GetEntry()) { case 31897: spell_heal = 7001; break; case 31896: spell_heal = 27873; break; @@ -5396,7 +5396,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } case SPELLFAMILY_POTION: { - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { // Netherbloom case 28702: @@ -5562,8 +5562,8 @@ void Spell::EffectDuel(SpellEffIndex effIndex) Map* map = m_caster->GetMap(); if (!pGameObj->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), gameobject_id, map, m_caster->GetPhaseMask(), - m_caster->GetPositionX()+(unitTarget->GetPositionX()-m_caster->GetPositionX())/2 , - m_caster->GetPositionY()+(unitTarget->GetPositionY()-m_caster->GetPositionY())/2 , + m_caster->GetPositionX()+(unitTarget->GetPositionX()-m_caster->GetPositionX())/2, + m_caster->GetPositionY()+(unitTarget->GetPositionY()-m_caster->GetPositionY())/2, m_caster->GetPositionZ(), m_caster->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY)) { @@ -5879,7 +5879,7 @@ void Spell::EffectSummonObject(SpellEffIndex effIndex) uint32 go_id = m_spellInfo->Effects[effIndex].MiscValue; uint8 slot = 0; - switch(m_spellInfo->Effects[effIndex].Effect) + switch (m_spellInfo->Effects[effIndex].Effect) { case SPELL_EFFECT_SUMMON_OBJECT_SLOT1: slot = 0; break; case SPELL_EFFECT_SUMMON_OBJECT_SLOT2: slot = 1; break; @@ -6579,7 +6579,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) int32 duration = m_spellInfo->GetDuration(); - switch(goinfo->type) + switch (goinfo->type) { case GAMEOBJECT_TYPE_FISHINGNODE: { @@ -6589,7 +6589,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) // end time of range when possible catch fish (FISHING_BOBBER_READY_TIME..GetDuration(m_spellInfo)) // start time == fish-FISHING_BOBBER_READY_TIME (0..GetDuration(m_spellInfo)-FISHING_BOBBER_READY_TIME) int32 lastSec = 0; - switch(urand(0, 3)) + switch (urand(0, 3)) { case 0: lastSec = 3; break; case 1: lastSec = 7; break; @@ -7229,7 +7229,7 @@ void Spell::EffectPlayerNotification(SpellEffIndex effIndex) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { case 58730: // Restricted Flight Area case 58600: // Restricted Flight Area diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index b7bcf02f86c..8b831dd6c1a 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -370,7 +370,7 @@ SpellImplicitTargetInfo::StaticData SpellImplicitTargetInfo::_data[TOTAL_SPELL_ {TARGET_OBJECT_TYPE_GOBJ, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 23 TARGET_GAMEOBJECT_TARGET {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_CONE, TARGET_SELECT_CHECK_ENEMY, TARGET_DIR_FRONT}, // 24 TARGET_UNIT_CONE_ENEMY_24 {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 25 TARGET_UNIT_TARGET_ANY - {TARGET_OBJECT_TYPE_GOBJ_ITEM,TARGET_REFERENCE_TYPE_TARGET,TARGET_SELECT_CATEGORY_DEFAULT,TARGET_SELECT_CHECK_DEFAULT,TARGET_DIR_NONE}, // 26 TARGET_GAMEOBJECT_ITEM_TARGET + {TARGET_OBJECT_TYPE_GOBJ_ITEM, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 26 TARGET_GAMEOBJECT_ITEM_TARGET {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 27 TARGET_UNIT_MASTER {TARGET_OBJECT_TYPE_DEST, TARGET_REFERENCE_TYPE_DEST, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_ENEMY, TARGET_DIR_NONE}, // 28 TARGET_DEST_DYNOBJ_ENEMY {TARGET_OBJECT_TYPE_DEST, TARGET_REFERENCE_TYPE_DEST, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_ALLY, TARGET_DIR_NONE}, // 29 TARGET_DEST_DYNOBJ_ALLY @@ -437,9 +437,9 @@ SpellImplicitTargetInfo::StaticData SpellImplicitTargetInfo::_data[TOTAL_SPELL_ {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 90 TARGET_UNIT_TARGET_MINIPET {TARGET_OBJECT_TYPE_DEST, TARGET_REFERENCE_TYPE_DEST, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_RANDOM}, // 91 TARGET_DEST_DEST_RADIUS {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 92 TARGET_UNIT_SUMMONER - {TARGET_OBJECT_TYPE_CORPSE,TARGET_REFERENCE_TYPE_SRC, TARGET_SELECT_CATEGORY_NYI, TARGET_SELECT_CHECK_ENEMY, TARGET_DIR_NONE}, // 93 TARGET_CORPSE_SRC_AREA_ENEMY + {TARGET_OBJECT_TYPE_CORPSE, TARGET_REFERENCE_TYPE_SRC, TARGET_SELECT_CATEGORY_NYI, TARGET_SELECT_CHECK_ENEMY, TARGET_DIR_NONE}, // 93 TARGET_CORPSE_SRC_AREA_ENEMY {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 94 TARGET_UNIT_VEHICLE - {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_PASSENGER,TARGET_DIR_NONE}, // 95 TARGET_UNIT_TARGET_PASSENGER + {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_PASSENGER, TARGET_DIR_NONE}, // 95 TARGET_UNIT_TARGET_PASSENGER {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 96 TARGET_UNIT_PASSENGER_0 {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 97 TARGET_UNIT_PASSENGER_1 {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 98 TARGET_UNIT_PASSENGER_2 @@ -522,7 +522,7 @@ bool SpellEffectInfo::IsAreaAuraEffect() const bool SpellEffectInfo::IsFarUnitTargetEffect() const { - return (Effect == SPELL_EFFECT_SUMMON_PLAYER) + return (Effect == SPELL_EFFECT_SUMMON_PLAYER) || (Effect == SPELL_EFFECT_SUMMON_RAF_FRIEND) || (Effect == SPELL_EFFECT_RESURRECT) || (Effect == SPELL_EFFECT_RESURRECT_NEW) @@ -689,7 +689,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 2 SPELL_EFFECT_SCHOOL_DAMAGE {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 3 SPELL_EFFECT_DUMMY {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 4 SPELL_EFFECT_PORTAL_TELEPORT - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 5 SPELL_EFFECT_TELEPORT_UNITS + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 5 SPELL_EFFECT_TELEPORT_UNITS {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 6 SPELL_EFFECT_APPLY_AURA {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 7 SPELL_EFFECT_ENVIRONMENTAL_DAMAGE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 8 SPELL_EFFECT_POWER_DRAIN @@ -713,7 +713,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 26 SPELL_EFFECT_DEFENSE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_DEST}, // 27 SPELL_EFFECT_PERSISTENT_AREA_AURA {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_DEST}, // 28 SPELL_EFFECT_SUMMON - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 29 SPELL_EFFECT_LEAP + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 29 SPELL_EFFECT_LEAP {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 30 SPELL_EFFECT_ENERGIZE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 31 SPELL_EFFECT_WEAPON_PERCENT_DAMAGE {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 32 SPELL_EFFECT_TRIGGER_MISSILE @@ -727,7 +727,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 40 SPELL_EFFECT_DUAL_WIELD {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 41 SPELL_EFFECT_JUMP {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_DEST}, // 42 SPELL_EFFECT_JUMP_DEST - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 43 SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 43 SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 44 SPELL_EFFECT_SKILL_STEP {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 45 SPELL_EFFECT_ADD_HONOR {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 46 SPELL_EFFECT_SPAWN @@ -767,7 +767,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 80 SPELL_EFFECT_ADD_COMBO_POINTS {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_DEST}, // 81 SPELL_EFFECT_CREATE_HOUSE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 82 SPELL_EFFECT_BIND_SIGHT - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 83 SPELL_EFFECT_DUEL + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 83 SPELL_EFFECT_DUEL {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 84 SPELL_EFFECT_STUCK {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 85 SPELL_EFFECT_SUMMON_PLAYER {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_GOBJ}, // 86 SPELL_EFFECT_ACTIVATE_OBJECT @@ -828,8 +828,8 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 141 SPELL_EFFECT_FORCE_CAST_WITH_VALUE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 142 SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 143 SPELL_EFFECT_APPLY_AREA_AURA_OWNER - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 144 SPELL_EFFECT_KNOCK_BACK_DEST - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 145 SPELL_EFFECT_PULL_TOWARDS_DEST + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 144 SPELL_EFFECT_KNOCK_BACK_DEST + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 145 SPELL_EFFECT_PULL_TOWARDS_DEST {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 146 SPELL_EFFECT_ACTIVATE_RUNE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 147 SPELL_EFFECT_QUEST_FAIL {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 148 SPELL_EFFECT_TRIGGER_MISSILE_SPELL_WITH_VALUE diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 9b29120ef1c..b4f4ca8c11e 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -62,7 +62,7 @@ enum SpellCastTargetFlags TARGET_FLAG_UNUSED20 = 0x00080000, // uint32 counter, loop { vec3 - screen position (?), guid }, not used so far TARGET_FLAG_UNIT_PASSENGER = 0x00100000, // guessed, used to validate target (if vehicle passenger) - TARGET_FLAG_UNIT_MASK = TARGET_FLAG_UNIT | TARGET_FLAG_UNIT_RAID | TARGET_FLAG_UNIT_PARTY + TARGET_FLAG_UNIT_MASK = TARGET_FLAG_UNIT | TARGET_FLAG_UNIT_RAID | TARGET_FLAG_UNIT_PARTY | TARGET_FLAG_UNIT_ENEMY | TARGET_FLAG_UNIT_ALLY | TARGET_FLAG_UNIT_DEAD | TARGET_FLAG_UNIT_MINIPET | TARGET_FLAG_UNIT_PASSENGER, TARGET_FLAG_GAMEOBJECT_MASK = TARGET_FLAG_GAMEOBJECT | TARGET_FLAG_GAMEOBJECT_ITEM, TARGET_FLAG_CORPSE_MASK = TARGET_FLAG_CORPSE_ALLY | TARGET_FLAG_CORPSE_ENEMY, diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 57fa113dec8..c80a3123739 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1135,7 +1135,7 @@ void SpellMgr::LoadSpellRanks() } mSpellChains.clear(); - QueryResult result = WorldDatabase.Query("SELECT first_spell_id, spell_id, rank from spell_ranks ORDER BY first_spell_id , rank"); + QueryResult result = WorldDatabase.Query("SELECT first_spell_id, spell_id, rank from spell_ranks ORDER BY first_spell_id, rank"); if (!result) { @@ -1820,7 +1820,7 @@ void SpellMgr::LoadSpellProcs() baseProcEntry.cooldown = uint32(cooldown); baseProcEntry.charges = fields[14].GetUInt32(); - while(true) + while (true) { if (mSpellProcMap.find(spellId) != mSpellProcMap.end()) { diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 64d21b7c3a5..d701ab2882c 100755 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -144,10 +144,10 @@ enum ProcFlags PROC_FLAG_DEATH = 0x01000000, // 24 Died in any way // flag masks - AUTO_ATTACK_PROC_FLAG_MASK = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK + AUTO_ATTACK_PROC_FLAG_MASK = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK | PROC_FLAG_DONE_RANGED_AUTO_ATTACK | PROC_FLAG_TAKEN_RANGED_AUTO_ATTACK, - MELEE_PROC_FLAG_MASK = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK + MELEE_PROC_FLAG_MASK = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK | PROC_FLAG_DONE_SPELL_MELEE_DMG_CLASS | PROC_FLAG_TAKEN_SPELL_MELEE_DMG_CLASS | PROC_FLAG_DONE_MAINHAND_ATTACK | PROC_FLAG_DONE_OFFHAND_ATTACK, diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 2d83b2e8f1a..53ec7822623 100755 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -87,7 +87,7 @@ bool _SpellScript::EffectHook::IsEffectAffected(SpellInfo const* spellEntry, uin std::string _SpellScript::EffectHook::EffIndexToString() { - switch(effIndex) + switch (effIndex) { case EFFECT_ALL: return "EFFECT_ALL"; @@ -114,7 +114,7 @@ bool _SpellScript::EffectNameCheck::Check(SpellInfo const* spellEntry, uint8 eff std::string _SpellScript::EffectNameCheck::ToString() { - switch(effName) + switch (effName) { case SPELL_EFFECT_ANY: return "SPELL_EFFECT_ANY"; @@ -136,7 +136,7 @@ bool _SpellScript::EffectAuraNameCheck::Check(SpellInfo const* spellEntry, uint8 std::string _SpellScript::EffectAuraNameCheck::ToString() { - switch(effAurName) + switch (effAurName) { case SPELL_AURA_ANY: return "SPELL_AURA_ANY"; diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 15b22097f2d..dab77f6533d 100755 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -374,13 +374,13 @@ class AuraScript : public _SpellScript #define AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \ typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit* target); \ - typedef void(CLASSNAME::*AuraEffectApplicationModeFnType)(AuraEffect const* , AuraEffectHandleModes); \ + typedef void(CLASSNAME::*AuraEffectApplicationModeFnType)(AuraEffect const*, AuraEffectHandleModes); \ typedef void(CLASSNAME::*AuraEffectPeriodicFnType)(AuraEffect const*); \ typedef void(CLASSNAME::*AuraEffectUpdatePeriodicFnType)(AuraEffect*); \ - typedef void(CLASSNAME::*AuraEffectCalcAmountFnType)(AuraEffect const* , int32 &, bool &); \ - typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const* , bool &, int32 &); \ - typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const* , SpellModifier* &); \ - typedef void(CLASSNAME::*AuraEffectAbsorbFnType)(AuraEffect* , DamageInfo &, uint32 &); \ + typedef void(CLASSNAME::*AuraEffectCalcAmountFnType)(AuraEffect const*, int32 &, bool &); \ + typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const*, bool &, int32 &); \ + typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const*, SpellModifier* &); \ + typedef void(CLASSNAME::*AuraEffectAbsorbFnType)(AuraEffect*, DamageInfo &, uint32 &); \ AURASCRIPT_FUNCTION_TYPE_DEFINES(AuraScript) diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index 24955737b46..e5865cc4f90 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -97,7 +97,7 @@ void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table ss << id; } } - while(result->NextRow()); + while (result->NextRow()); if (found) { diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index fff06661e10..8f888f8fb85 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -493,7 +493,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s } // change the data to server values - switch(type) + switch (type) { case DTT_CHARACTER: { diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index 0e98ebc7b17..590e6912cc5 100755 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -218,7 +218,7 @@ bool Weather::UpdateWeather() ///- Log the event char const* wthstr; - switch(state) + switch (state) { case WEATHER_STATE_LIGHT_RAIN: wthstr = "light rain"; @@ -281,7 +281,7 @@ WeatherState Weather::GetWeatherState() const if (m_grade<0.27f) return WEATHER_STATE_FINE; - switch(m_type) + switch (m_type) { case WEATHER_TYPE_RAIN: if (m_grade<0.40f) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index d72f09f3279..6794d99db32 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2216,7 +2216,7 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, std::string dura PreparedStatement* stmt = NULL; ///- Update the database with ban information - switch(mode) + switch (mode) { case BAN_IP: // No SQL injection with prepared statements diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 6db414555da..1b3454e5ae6 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -104,7 +104,7 @@ public: std::string password = szPassword; AccountOpResult result = AccountMgr::CreateAccount(account_name, password); - switch(result) + switch (result) { case AOR_OK: handler->PSendSysMessage(LANG_ACCOUNT_CREATED, account_name.c_str()); @@ -165,7 +165,7 @@ public: return false; AccountOpResult result = AccountMgr::DeleteAccount(account_id); - switch(result) + switch (result) { case AOR_OK: handler->PSendSysMessage(LANG_ACCOUNT_DELETED, account_name.c_str()); @@ -299,7 +299,7 @@ public: } AccountOpResult result = AccountMgr::ChangePassword(handler->GetSession()->GetAccountId(), std::string(new_pass)); - switch(result) + switch (result) { case AOR_OK: handler->SendSysMessage(LANG_COMMAND_PASSWORD); diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 1848e22121c..dca2f1e4f0e 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -291,7 +291,7 @@ public: else if (commentToken[1] == '/') { std::string str; - getline(ifs,str); + getline(ifs, str); continue; } // regular data @@ -558,7 +558,7 @@ public: uint8 bag_slot = container ? container->GetSlot() : uint8(INVENTORY_SLOT_BAG_0); std::string st; - switch(item->GetState()) + switch (item->GetState()) { case ITEM_UNCHANGED: st = "unchanged"; break; case ITEM_CHANGED: st = "changed"; break; @@ -1061,13 +1061,13 @@ public: if (isint32) { uint32 iValue = (uint32)atoi(py); - target->SetUInt32Value(Opcode , iValue); + target->SetUInt32Value(Opcode, iValue); handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), Opcode, iValue); } else { float fValue = (float)atof(py); - target->SetFloatValue(Opcode , fValue); + target->SetFloatValue(Opcode, fValue); handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode, fValue); } @@ -1143,7 +1143,7 @@ public: int CurrentValue = (int)handler->GetSession()->GetPlayer()->GetUInt32Value(Opcode); CurrentValue += Value; - handler->GetSession()->GetPlayer()->SetUInt32Value(Opcode , (uint32)CurrentValue); + handler->GetSession()->GetPlayer()->SetUInt32Value(Opcode, (uint32)CurrentValue); handler->PSendSysMessage(LANG_CHANGE_32BIT_FIELD, Opcode, CurrentValue); @@ -1225,7 +1225,7 @@ public: return false; uint32 iValue = Value ? 1 << (Value - 1) : 0; - target->SetUInt32Value(Opcode , iValue); + target->SetUInt32Value(Opcode, iValue); handler->PSendSysMessage(LANG_SET_32BIT_FIELD, Opcode, iValue); return true; diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 9ffd366544e..118ab9eb13a 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -498,18 +498,18 @@ public: float z; float ort; uint32 mapid; - + if (pmapid) mapid = (uint32)atoi(pmapid); else mapid = _player->GetMapId(); - - if( port ) + + if ( port ) ort = (float)atof(port); else ort = _player->GetOrientation(); - - if( pz ) + + if ( pz ) { z = (float)atof(pz); if (!MapManager::IsValidMapCoord(mapid, x, y, z)) @@ -530,7 +530,7 @@ public: Map const* map = sMapMgr->CreateBaseMap(mapid); z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y)); } - + // stop flight if need if (_player->isInFlight()) { diff --git a/src/server/scripts/Commands/cs_gps.cpp b/src/server/scripts/Commands/cs_gps.cpp index 57b11630a85..2a270527fb8 100644 --- a/src/server/scripts/Commands/cs_gps.cpp +++ b/src/server/scripts/Commands/cs_gps.cpp @@ -129,7 +129,7 @@ public: { Player* player = handler->GetSession()->GetPlayer(); - sLog->outSQLDev("(@PATH,XX,%.3f,%.3f,%.5f,0,0,0,100,0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); + sLog->outSQLDev("(@PATH, XX, %.3f, %.3f, %.5f, 0,0, 0,100, 0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); handler->PSendSysMessage("Waypoint SQL written to SQL Developer log"); return true; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index fe4dc2af1e2..7c08fe4d297 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -27,7 +27,7 @@ public: {
static ChatCommand commandTable[] =
{
- { "dev", SEC_ADMINISTRATOR, false, &HandleDevCommand, "", NULL },
+ { "dev", SEC_ADMINISTRATOR, false, &HandleDevCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
return commandTable;
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index de12746a47b..28bc17a7450 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -725,7 +725,7 @@ public: uint32 num = 0; num = atoi((char*)args); - switch(num) + switch (num) { case 1: mId=14340; @@ -1282,7 +1282,7 @@ public: return false; uint32 anim_id = atoi((char*)args); - handler->GetSession()->GetPlayer()->SetUInt32Value(UNIT_NPC_EMOTESTATE , anim_id); + handler->GetSession()->GetPlayer()->SetUInt32Value(UNIT_NPC_EMOTESTATE, anim_id); return true; } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index b91f85ec1b6..cdb87fde354 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -952,7 +952,7 @@ public: // make some emotes char lastchar = args[strlen(args) - 1]; - switch(lastchar) + switch (lastchar) { case '?': creature->HandleEmoteCommand(EMOTE_ONESHOT_QUESTION); break; case '!': creature->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); break; @@ -1272,7 +1272,7 @@ public: bool added = false; if (tmpItem) { - switch(SlotID) + switch (SlotID) { case 1: creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY, ItemID); diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 5e08a1b0611..a616588367c 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -77,7 +77,7 @@ public: // check item starting quest (it can work incorrectly if added without item in inventory) ItemTemplateContainer const* itc = sObjectMgr->GetItemTemplateStore(); - ItemTemplateContainer::const_iterator result = find_if(itc->begin(), itc->end(), Finder<uint32, ItemTemplate>(entry, &ItemTemplate::StartQuest)); + ItemTemplateContainer::const_iterator result = find_if (itc->begin(), itc->end(), Finder<uint32, ItemTemplate>(entry, &ItemTemplate::StartQuest)); if (result != itc->end()) { diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 4e7a2794f58..7784d495f80 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -226,7 +226,7 @@ public: static bool HandleReloadAllNpcCommand(ChatHandler* handler, const char* args) { - if(*args != 'a') // will be reloaded from all_gossips + if (*args != 'a') // will be reloaded from all_gossips HandleReloadNpcTrainerCommand(handler, "a"); HandleReloadNpcVendorCommand(handler, "a"); HandleReloadPointsOfInterestCommand(handler, "a"); @@ -298,7 +298,7 @@ public: { HandleReloadGossipMenuCommand(handler, "a"); HandleReloadGossipMenuOptionCommand(handler, "a"); - if(*args != 'a') // already reload from all_scripts + if (*args != 'a') // already reload from all_scripts HandleReloadPointsOfInterestCommand(handler, "a"); return true; } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index dea747b97b8..e3295a6c45e 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -92,7 +92,7 @@ class mob_av_marshal_or_warmaster : public CreatureScript { if (!bHasAura) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_NORTH_MARSHAL: DoCast(me, SPELL_NORTH_MARSHAL); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 30bf51bdbb8..39ddbc2f6fc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -211,7 +211,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 0: DoScriptText(SCRIPT_TEXT1, me);//2 @@ -297,7 +297,7 @@ public: { if (Event_Timer <= diff) { - switch(EventPhase) + switch (EventPhase) { case 0: DoScriptText(SCRIPT_TEXT5, me);//1 @@ -662,7 +662,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 0:me->Say(SAY_DUGHAL_FREE, LANG_UNIVERSAL, PlayerGUID); break; case 1:pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; @@ -785,7 +785,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 1: me->Say(SAY_WINDSOR_1, LANG_UNIVERSAL, PlayerGUID); @@ -822,7 +822,7 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN , 0); + me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0); pInstance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED); break; } @@ -959,7 +959,7 @@ public: void WaypointReached(uint32 i) { wp=i; - switch(i) + switch (i) { case 0: me->setFaction(11); @@ -1166,7 +1166,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 0:me->Say(SAY_TOBIAS_FREE, LANG_UNIVERSAL, PlayerGUID); break; case 2: @@ -1293,7 +1293,7 @@ public: if (!pInstance) return; - switch(i) + switch (i) { case 1: me->HandleEmoteCommand(EMOTE_ONESHOT_KICK); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index f6fa3ca18d9..94181105be4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -162,7 +162,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_EMPEROR: EmperorGUID = creature->GetGUID(); break; case NPC_PHALANX: PhalanxGUID = creature->GetGUID(); break; @@ -184,7 +184,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ARENA1: GoArena1GUID = go->GetGUID(); break; case GO_ARENA2: GoArena2GUID = go->GetGUID(); break; @@ -220,7 +220,7 @@ public: { sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data); - switch(type) + switch (type) { case DATA_EVENSTARTER: TombEventStarterGUID = data; @@ -236,7 +236,7 @@ public: { sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data); - switch(type) + switch (type) { case TYPE_RING_OF_LAW: m_auiEncounter[0] = data; @@ -281,7 +281,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_RING_OF_LAW: return m_auiEncounter[0]; @@ -306,7 +306,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_EMPEROR: return EmperorGUID; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h index 72f4fb707c8..b330e80a294 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h @@ -27,7 +27,7 @@ enum Data DATA_UROK_DOOMHOWL, // not scripted DATA_QUARTERMASTER_ZIGRIS, DATA_GIZRUL_THE_SLAVENER, // not scripted - DATA_HALYCON , + DATA_HALYCON, DATA_OVERLORD_WYRMTHALAK, DATA_PYROGAURD_EMBERSEER, DATA_WARCHIEF_REND_BLACKHAND, diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp index 415f3796d52..d65c1c68090 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp @@ -81,7 +81,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_OMOKK: HighlordOmokk = creature->GetGUID(); @@ -130,7 +130,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_WHELP_SPAWNER: go->CastSpell(NULL, SPELL_SUMMON_ROOKERY_WHELP); @@ -169,7 +169,7 @@ public: uint64 GetData64(uint32 type) { - switch(type) + switch (type) { case DATA_OMOKK: return HighlordOmokk; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 53985ce9e58..7903bee11a7 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -98,7 +98,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(7134, creature->GetGUID()); return true; } diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index cbb4917de2e..929e201d71c 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -138,7 +138,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: me->HandleEmoteCommand(EMOTE_STATE_KNEEL); //dosen't work? diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 370bcfe13b9..2d626a64895 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -186,7 +186,7 @@ class instance_deadmines : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FACTORY_DOOR: FactoryDoorGUID = go->GetGUID(); break; case GO_IRONCLAD_DOOR: IronCladDoorGUID = go->GetGUID(); break; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index f18fc5ee243..364dd8532db 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -273,7 +273,7 @@ public: if (me->getFaction() != GetPlayerForEscort()->getFaction()) me->setFaction(GetPlayerForEscort()->getFaction()); - switch(uiPoint) + switch (uiPoint) { case 3: SetEscortPaused(true); @@ -312,7 +312,7 @@ public: void SetData(uint32 uiI, uint32 uiValue) { - switch(uiI) + switch (uiI) { case 1: SetEscortPaused(true); @@ -323,7 +323,7 @@ public: if (!pInstance) return; - switch(uiValue) + switch (uiValue) { case 1: pInstance->SetData(TYPE_EVENT, IN_PROGRESS); @@ -339,7 +339,7 @@ public: void Summon(uint8 uiCase) { - switch(uiCase) + switch (uiCase) { case 1: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); @@ -417,7 +417,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoScriptText(SAY_BLASTMASTER_1, me); diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index 8b42c7135e5..d0642d3a24d 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -77,7 +77,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_BLASTMASTER_EMI_SHORTFUSE: uiBastmasterEmiShortfuseGUID = creature->GetGUID(); break; } @@ -85,7 +85,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_CAVE_IN_LEFT: uiCaveInLeftGUID = go->GetGUID(); @@ -102,7 +102,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case TYPE_EVENT: m_auiEncounter[0] = uiData; @@ -114,7 +114,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case TYPE_EVENT: return m_auiEncounter[0]; } @@ -123,7 +123,7 @@ public: uint64 GetData64(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_GO_CAVE_IN_LEFT: return uiCaveInLeftGUID; case DATA_GO_CAVE_IN_RIGHT: return uiCaveInRightGUID; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 92c2d417cda..596dfa9c25f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -43,7 +43,7 @@ EndScriptData */ #define MOUNTED_DISPLAYID 16040 -//Attumen (TODO: Use the summoning spell instead of Creature id. It works , but is not convenient for us) +//Attumen (TODO: Use the summoning spell instead of Creature id. It works, but is not convenient for us) #define SUMMON_ATTUMEN 15550 class boss_attumen : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index d25d3518b9e..40d984d70a3 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; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 05ad283a428..15c697198d0 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -183,7 +183,7 @@ public: void SetData64(uint32 identifier, uint64 data) { - switch(identifier) + switch (identifier) { case DATA_IMAGE_OF_MEDIVH: ImageGUID = data; } @@ -191,7 +191,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 183932: m_uiCurtainGUID = go->GetGUID(); break; case 184278: @@ -221,7 +221,7 @@ public: case 185119: DustCoveredChest = go->GetGUID(); break; } - switch(m_uiOperaEvent) + switch (m_uiOperaEvent) { //TODO: Set Object visibilities for Opera based on performance case EVENT_OZ: diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index e22bdb1e9ef..b8025c1adee 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -163,7 +163,7 @@ public: if (!pInstance) return; - switch(i) + switch (i) { case 0: DoCast(me, SPELL_TUXEDO, false); @@ -197,7 +197,7 @@ public: { int32 text = 0; - switch(m_uiEventId) + switch (m_uiEventId) { case EVENT_OZ: if (OzDialogue[count].textid) @@ -231,7 +231,7 @@ public: uint8 index = 0; uint8 count = 0; - switch(m_uiEventId) + switch (m_uiEventId) { case EVENT_OZ: index = 0; @@ -329,7 +329,7 @@ public: player->PlayerTalkClass->ClearMenus(); npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -538,7 +538,7 @@ public: { Unit* arca = Unit::GetUnit((*me), ArcanagosGUID); Map* pMap = me->GetMap(); - switch(Step) + switch (Step) { case 0: return 9999999; case 1: diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 9f758edbba7..b3f06bdf2c7 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -276,7 +276,7 @@ public: if (!UpdateVictim()) return; - switch(Phase) + switch (Phase) { case 0: { @@ -353,7 +353,7 @@ public: { if (GravityLapseTimer <= diff) { - switch(GravityLapsePhase) + switch (GravityLapsePhase) { case 0: if (FirstGravityLapse) // Different yells at 50%, and at every following Gravity Lapse diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index 6e1574fe1c2..dd8031626bb 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -97,7 +97,7 @@ public: uint32 GetData(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SELIN_EVENT: return m_auiEncounter[0]; case DATA_VEXALLUS_EVENT: return m_auiEncounter[1]; @@ -111,7 +111,7 @@ public: void SetData(uint32 identifier, uint32 data) { - switch(identifier) + switch (identifier) { case DATA_SELIN_EVENT: m_auiEncounter[0] = data; break; case DATA_VEXALLUS_EVENT: @@ -139,7 +139,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 24723: SelinGUID = creature->GetGUID(); break; case 24560: DelrissaGUID = creature->GetGUID(); break; @@ -149,7 +149,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 187896: VexallusDoorGUID = go->GetGUID(); break; //SunwellRaid Gate 02 @@ -165,7 +165,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SELIN: return SelinGUID; case DATA_DELRISSA: return DelrissaGUID; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index d39f8e455ff..3e95c613f23 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -59,7 +59,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index d2982900be1..e255cc52871 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -173,7 +173,7 @@ public: void UpdateAI(const uint32 diff) { - switch(phase) + switch (phase) { case PHASE_CHAINED: if (!anchorGUID) @@ -247,7 +247,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_ICY_TOUCH: DoCast(me->getVictim(), SPELL_ICY_TOUCH); @@ -553,7 +553,7 @@ public: if (PhaseTimer <= diff) { - switch(Phase) + switch (Phase) { case 0: me->MonsterSay(SAY_DARK_RIDER, LANG_UNIVERSAL, 0); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 532ede1d3c6..481c8647c82 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -109,7 +109,7 @@ public: return; } - switch(uiSpeech_counter) + switch (uiSpeech_counter) { case 1: DoScriptText(SAY_PERSUADED1, me); uiSpeech_timer = 8000; break; case 2: DoScriptText(SAY_PERSUADED2, me); uiSpeech_timer = 8000; break; @@ -220,7 +220,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(SAY_BREAKOUT1, me); @@ -281,7 +281,7 @@ public: { if (m_uiWave_Timer <= uiDiff) { - switch(m_uiWave) + switch (m_uiWave) { case 0: DoScriptText(SAY_BREAKOUT3, me); @@ -397,7 +397,7 @@ public: { if (uiStage_timer <= diff) { - switch(uiStage) + switch (uiStage) { case 1: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -610,7 +610,7 @@ public: bool MeetQuestCondition(Unit* player) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case 29061: // Ellen Stanbridge if (CAST_PLR(player)->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE) @@ -682,10 +682,10 @@ public: //TODO: simplify text's selection - switch(player->getRace()) + switch (player->getRace()) { case RACE_HUMAN: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -713,7 +713,7 @@ public: } break; case RACE_ORC: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -741,7 +741,7 @@ public: } break; case RACE_DWARF: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_2, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -769,7 +769,7 @@ public: } break; case RACE_NIGHTELF: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -797,7 +797,7 @@ public: } break; case RACE_UNDEAD_PLAYER: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -825,7 +825,7 @@ public: } break; case RACE_TAUREN: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -853,7 +853,7 @@ public: } break; case RACE_GNOME: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -881,7 +881,7 @@ public: } break; case RACE_TROLL: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_3, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -909,7 +909,7 @@ public: } break; case RACE_BLOODELF: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -937,7 +937,7 @@ public: } break; case RACE_DRAENEI: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 2f7fde7ec60..2dc4553c3fa 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -23,7 +23,7 @@ enum mograine { #ifdef LESS_MOB - ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest , or - + ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest, or - ENCOUNTER_DK_TIMER = 10, // *every 5 minutes. These have to be done in instance data ENCOUNTER_DEFENDER_NUMBER = 10, // how many of defender ENCOUNTER_EARTHSHATTER_NUMBER = 1, // how many of earthshatter @@ -32,7 +32,7 @@ enum mograine ENCOUNTER_GHOUL_NUMBER = 5, // how many of ghoul ENCOUNTER_WARRIOR_NUMBER = 1, // how many of warrior #else - ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest , or - + ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest, or - ENCOUNTER_DK_TIMER = 10, // *every 5 minutes. These have to be done in instance data ENCOUNTER_DEFENDER_NUMBER = 20, // how many of defender ENCOUNTER_EARTHSHATTER_NUMBER = 20, // how many of earthshatter diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index a948ffa53cd..e6610294071 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -69,7 +69,7 @@ public: if (!player) phase = 3; - switch(phase) + switch (phase) { case 0: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 80cbcedda7c..f321e75caac 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -153,7 +153,7 @@ public: void EnterCombat(Unit* /*who*/){} void SetType(uint32 _type) { - switch(Creaturetype = _type) + switch (Creaturetype = _type) { case 1: spell = SPELL_PUMPKIN_AURA_GREEN; @@ -257,7 +257,7 @@ public: if (withbody) return; - switch(Phase) + switch (Phase) { case 1: if (me->HealthBelowPctDamaged(67, damage)) @@ -608,7 +608,7 @@ public: { if (withhead) { - switch(Phase) + switch (Phase) { case 0: { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index f9856673f5c..256525379cd 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -76,7 +76,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case ENTRY_PUMPKIN_SHRINE: PumpkinShrineGUID = go->GetGUID();break; case 104600: DoorHighInquisitorGUID = go->GetGUID(); break; @@ -85,7 +85,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case ENTRY_HORSEMAN: HorsemanGUID = creature->GetGUID(); break; case ENTRY_HEAD: HeadGUID = creature->GetGUID(); break; @@ -98,7 +98,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_MOGRAINE_AND_WHITE_EVENT: if (data == IN_PROGRESS) @@ -130,7 +130,7 @@ public: uint64 GetData64(uint32 type) { - switch(type) + switch (type) { //case GAMEOBJECT_PUMPKIN_SHRINE: return PumpkinShrineGUID; //case DATA_HORSEMAN: return HorsemanGUID; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 52d8b2b926d..4e935280a6e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -132,7 +132,7 @@ public: DoModifyThreatPercent(target, -100); Creature* Summoned = NULL; - switch(rand()%6) + switch (rand()%6) { case 0: DoTeleportPlayer(target, 250.0696f, 0.3921f, 84.8408f, 3.149f); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 8945728e45d..ccbe8336097 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -83,7 +83,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_GATE_KIRTONOS: GateKirtonosGUID = go->GetGUID(); break; case GO_GATE_GANDLING: GateGandlingGUID = go->GetGUID(); break; @@ -98,7 +98,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_LORDALEXEIBAROV_DEATH: IsBossDied[0] = true; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index b08a73c320b..5de6143e5a4 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -100,7 +100,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_ASH: uiAshGUID = creature->GetGUID(); break; case NPC_ADA: uiAdaGUID = creature->GetGUID(); break; @@ -110,7 +110,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_COURTYARD_DOOR: DoorCourtyardGUID = go->GetGUID(); @@ -144,7 +144,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_FREE_NPC: if (data == DONE) @@ -157,7 +157,7 @@ public: m_auiEncounter[1] = data; break; case TYPE_FENRUS: - switch(data) + switch (data) { case DONE: uiTimer = 1000; @@ -192,7 +192,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_FREE_NPC: return m_auiEncounter[0]; @@ -248,7 +248,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: summon = pArchmage->SummonCreature(pArchmage->GetEntry(), SpawnLocation[4], TEMPSUMMON_TIMED_DESPAWN, 10000); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 25ff8c9d9ec..e034fa098f4 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -101,7 +101,7 @@ public: void WaypointReached(uint32 uiPoint) { - switch(uiPoint) + switch (uiPoint) { case 0: if (uiNpcEntry == NPC_ASH) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp index af71960763d..980e8e41a6a 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp @@ -71,7 +71,7 @@ public: if (pInstance) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case SH_AELMAR: pInstance->SetData(TYPE_SH_AELMAR, 0); @@ -100,7 +100,7 @@ public: { if (pInstance) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case SH_AELMAR: pInstance->SetData(TYPE_SH_AELMAR, 2); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 82c83948c27..71b5a42a6b2 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -260,7 +260,7 @@ public: void ReceiveEmote(Player* player, uint32 emote) { - switch(emote) + switch (emote) { case TEXT_EMOTE_DANCE: EnterEvadeMode(); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 08ac34c938c..7c807859cbe 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -94,7 +94,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ATALAI_STATUE1: GOAtalaiStatue1 = go->GetGUID(); break; case GO_ATALAI_STATUE2: GOAtalaiStatue2 = go->GetGUID(); break; @@ -108,7 +108,7 @@ public: virtual void Update(uint32 /*diff*/) // correct order goes form 1-6 { - switch(State) + switch (State) { case GO_ATALAI_STATUE1: if (!s1 && !s2 && !s3 && !s4 && !s5 && !s6) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 644c0eacde5..4ca0846b04c 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -183,7 +183,7 @@ public: void SpellHitTarget(Unit* target, const SpellInfo* spell) { - switch(spell->Id) + switch (spell->Id) { case SPELL_SHADOW_BLADES: case SPELL_SHADOW_NOVA: @@ -199,7 +199,7 @@ public: void HandleTouchedSpells(Unit* target, uint32 TouchedType) { - switch(TouchedType) + switch (TouchedType) { case SPELL_FLAME_TOUCHED: if (!target->HasAura(SPELL_DARK_FLAME)) @@ -477,7 +477,7 @@ public: void SpellHitTarget(Unit* target, const SpellInfo* spell) { - switch(spell->Id) + switch (spell->Id) { case SPELL_BLAZE: @@ -494,7 +494,7 @@ public: void HandleTouchedSpells(Unit* target, uint32 TouchedType) { - switch(TouchedType) + switch (TouchedType) { case SPELL_FLAME_TOUCHED: if (!target->HasAura(SPELL_DARK_FLAME)) @@ -702,7 +702,7 @@ public: void SpellHitTarget(Unit* target, const SpellInfo* spell) { - switch(spell->Id) + switch (spell->Id) { case SPELL_SHADOW_FURY: diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 584ce3856a4..b79ec3a542d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -239,7 +239,7 @@ public: void EnterPhase(PhaseFelmyst NextPhase) { - switch(NextPhase) + switch (NextPhase) { case PHASE_GROUND: me->CastStop(SPELL_FOG_BREATH); @@ -267,7 +267,7 @@ public: void HandleFlightSequence() { - switch(uiFlightCount) + switch (uiFlightCount) { case 0: //me->AttackStop(); @@ -416,7 +416,7 @@ public: if (phase == PHASE_GROUND) { - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_BERSERK: DoScriptText(YELL_BERSERK, me); @@ -451,7 +451,7 @@ public: if (phase == PHASE_FLIGHT) { - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_BERSERK: DoScriptText(YELL_BERSERK, me); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 39aa4f6f6f3..8f15878f888 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -389,7 +389,7 @@ public: void GoodEnding() { - switch(TalkSequence) + switch (TalkSequence) { case 1: me->setFaction(35); @@ -411,7 +411,7 @@ public: void BadEnding() { - switch(TalkSequence) + switch (TalkSequence) { case 1: DoScriptText(SAY_EVIL_ENRAGE, me); @@ -491,7 +491,7 @@ public: if (YellTimer <= diff) { - switch(YellSequence) + switch (YellSequence) { case 0: DoScriptText(SAY_GOOD_AGGRO, me); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 674f3ab19ca..47704b42d5a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -278,7 +278,7 @@ public: if (!pInstance) return NULL; - switch(index) + switch (index) { case 0: return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1)); @@ -334,7 +334,7 @@ public: OrbsEmpowered = (OrbsEmpowered+1)%4; ++EmpowerCount; - switch(EmpowerCount) + switch (EmpowerCount) { case 1: DoScriptText(SAY_KALEC_ORB_READY1, me); break; case 2: DoScriptText(SAY_KALEC_ORB_READY2, me); break; @@ -445,7 +445,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case CREATURE_HAND_OF_THE_DECEIVER: summoned->CastSpell(summoned, SPELL_SHADOW_CHANNELING, false); @@ -697,13 +697,13 @@ public: { if (Timer[t] < diff && !TimerIsDeactivated[t]) { - switch(t) + switch (t) { case TIMER_SPEECH: if (SpeechBegins) { SpeechBegins=false; - switch(Phase) + switch (Phase) { case PHASE_NORMAL: speechPhaseEnd=1; @@ -1139,7 +1139,7 @@ public: { if (uiTimer <= diff) { - switch(spell) + switch (spell) { case 0: DoCast(me, SPELL_ARMAGEDDON_VISUAL, true); @@ -1314,7 +1314,7 @@ public: } } - switch(victimClass) { + switch (victimClass) { case CLASS_DRUID: if (uiTimer[1] <= diff) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index c713c053222..50a5c83c370 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -85,8 +85,8 @@ float DarkFiends[8][4] = {1801.98f, 633.62f, 69.74f, 5.71f}, {1830.88f, 629.99f, 69.73f, 3.52f}, {1800.38f, 621.41f, 69.74f, 0.22f}, - {1808.3f , 612.45f, 69.73f, 1.02f}, - {1823.9f , 639.69f, 69.74f, 4.12f}, + {1808.3f, 612.45f, 69.73f, 1.02f}, + {1823.9f, 639.69f, 69.74f, 4.12f}, {1811.85f, 640.46f, 69.73f, 4.97f} }; @@ -95,7 +95,7 @@ float Humanoides[6][5] = {CREATURE_FURY_MAGE, 1780.16f, 666.83f, 71.19f, 5.21f}, {CREATURE_FURY_MAGE, 1847.93f, 600.30f, 71.30f, 2.57f}, {CREATURE_BERSERKER, 1779.97f, 660.64f, 71.19f, 5.28f}, - {CREATURE_BERSERKER, 1786.2f , 661.01f, 71.19f, 4.51f}, + {CREATURE_BERSERKER, 1786.2f, 661.01f, 71.19f, 4.51f}, {CREATURE_BERSERKER, 1845.17f, 602.63f, 71.28f, 2.43f}, {CREATURE_BERSERKER, 1842.91f, 599.93f, 71.23f, 2.44f} }; @@ -145,7 +145,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case CREATURE_DARK_FIENDS: summoned->CastSpell(summoned, SPELL_DARKFIEND_VISUAL, false); @@ -270,7 +270,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case BOSS_ENTROPIUS: me->SetVisible(false); @@ -294,7 +294,7 @@ public: { if (!pInstance) return; - switch(pInstance->GetData(DATA_MURU_EVENT)) + switch (pInstance->GetData(DATA_MURU_EVENT)) { case NOT_STARTED: Reset(); @@ -318,7 +318,7 @@ public: { if (Timer[i] <= diff) { - switch(i) + switch (i) { case TIMER_DARKNESS: if (!DarkFiend) @@ -419,7 +419,7 @@ public: me->GetHomePosition(x, y, z, o); DoTeleportTo(x, y, z); InAction = true; - switch(Spell->Id) + switch (Spell->Id) { case SPELL_OPEN_ALL_PORTALS: DoCastAOE(SPELL_OPEN_PORTAL, false); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index fb412b018f2..10ffb3703e0 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -140,7 +140,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 24850: Kalecgos_Dragon = creature->GetGUID(); break; case 24891: Kalecgos_Human = creature->GetGUID(); break; @@ -160,7 +160,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 188421: ForceField = go->GetGUID(); break; case 188523: KalecgosWall[0] = go->GetGUID(); break; @@ -181,7 +181,7 @@ public: uint32 GetData(uint32 id) { - switch(id) + switch (id) { case DATA_KALECGOS_EVENT: return m_auiEncounter[0]; case DATA_BRUTALLUS_EVENT: return m_auiEncounter[1]; @@ -195,7 +195,7 @@ public: uint64 GetData64(uint32 id) { - switch(id) + switch (id) { case DATA_KALECGOS_DRAGON: return Kalecgos_Dragon; case DATA_KALECGOS_HUMAN: return Kalecgos_Human; @@ -220,7 +220,7 @@ public: void SetData(uint32 id, uint32 data) { - switch(id) + switch (id) { case DATA_KALECGOS_EVENT: { @@ -246,7 +246,7 @@ public: m_auiEncounter[2] = data; break; case DATA_EREDAR_TWINS_EVENT: m_auiEncounter[3] = data; break; case DATA_MURU_EVENT: - switch(data) + switch (data) { case DONE: HandleGameObject(MurusGate[0], true); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index ea1a260b3af..094caaa1ec8 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -105,14 +105,14 @@ class instance_uldaman : public InstanceMapScript case GO_ALTAR_OF_THE_KEEPER_TEMPLE_DOOR: // lock the door uiAltarOfTheKeeperTempleDoor = go->GetGUID(); - if(m_auiEncounter[0] == DONE) + if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go); break; case GO_ARCHAEDAS_TEMPLE_DOOR: uiArchaedasTempleDoor = go->GetGUID(); - if(m_auiEncounter[0] == DONE) + if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go); break; @@ -121,7 +121,7 @@ class instance_uldaman : public InstanceMapScript go->SetUInt32Value(GAMEOBJECT_FLAGS, 33); uiAncientVaultDoor = go->GetGUID(); - if(m_auiEncounter[1] == DONE) + if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; @@ -165,7 +165,7 @@ class instance_uldaman : public InstanceMapScript void BlockGO(uint64 guid) { GameObject* go = instance->GetGameObject(guid); - if(!go) + if (!go) return; go->SetUInt32Value(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); @@ -255,7 +255,7 @@ class instance_uldaman : public InstanceMapScript void ActivateIronaya() { Creature* ironaya = instance->GetCreature(uiIronayaGUID); - if(!ironaya) + if (!ironaya) return; ironaya->setFaction(415); @@ -306,7 +306,7 @@ class instance_uldaman : public InstanceMapScript if (!bKeystoneCheck) return; - if(uiIronayaSealDoorTimer <= diff) + if (uiIronayaSealDoorTimer <= diff) { ActivateIronaya(); @@ -322,17 +322,17 @@ class instance_uldaman : public InstanceMapScript void SetData (uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_ALTAR_DOORS: m_auiEncounter[0] = data; - if(data == DONE) + if (data == DONE) SetDoor(uiAltarOfTheKeeperTempleDoor, true); break; case DATA_ANCIENT_DOOR: m_auiEncounter[1] = data; - if(data == DONE) //archeadas defeat + if (data == DONE) //archeadas defeat { SetDoor(uiArchaedasTempleDoor, true); //re open enter door SetDoor(uiAncientVaultDoor, true); @@ -348,7 +348,7 @@ class instance_uldaman : public InstanceMapScript break; case DATA_MINIONS: - switch(data) + switch (data) { case NOT_STARTED: if (m_auiEncounter[0] == DONE) //if players opened the doors @@ -446,7 +446,7 @@ class instance_uldaman : public InstanceMapScript case 7228: // Ironaya uiIronayaGUID = creature->GetGUID(); - if(m_auiEncounter[2] != DONE) + if (m_auiEncounter[2] != DONE) SetFrozenState (creature); break; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 9933529e59a..9ccf957120d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -155,7 +155,7 @@ class boss_halazzi : public CreatureScript void EnterPhase(PhaseHalazzi NextPhase) { - switch(NextPhase) + switch (NextPhase) { case PHASE_LYNX: case PHASE_ENRAGE: diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index f19652f912d..213b37190ac 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -439,7 +439,7 @@ class boss_hexlord_malacrass : public CreatureScript { uint8 random = urand(0, 2); Unit* target = NULL; - switch(PlayerAbility[PlayerClass][random].target) + switch (PlayerAbility[PlayerClass][random].target) { case ABILITY_TARGET_SELF: target = me; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index ff4fe3f8a06..21e895e26bf 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -206,7 +206,7 @@ class boss_nalorakk : public CreatureScript { if (!inMove) { - switch(MovePhase) + switch (MovePhase) { case 0: if (me->IsWithinDistInMap(who, 50)) @@ -314,7 +314,7 @@ class boss_nalorakk : public CreatureScript if (MovePhase != id) return; - switch(MovePhase) + switch (MovePhase) { case 2: me->SetOrientation(3.1415f*2); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 83feaad071e..f5acbc8d976 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -340,7 +340,7 @@ class boss_zuljin : public CreatureScript void EnterPhase(uint32 NextPhase) { - switch(NextPhase) + switch (NextPhase) { case 0: break; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 35d103f2bb7..806536b7a59 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -116,7 +116,7 @@ class instance_zulaman : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 23578://janalai case 23863://zuljin @@ -129,7 +129,7 @@ class instance_zulaman : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 186303: HalazziDoorGUID = go->GetGUID(); break; case 186304: ZulJinGateGUID = go->GetGUID(); break; @@ -205,7 +205,7 @@ class instance_zulaman : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_NALORAKKEVENT: m_auiEncounter[0] = data; @@ -279,7 +279,7 @@ class instance_zulaman : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_NALORAKKEVENT: return m_auiEncounter[0]; case DATA_AKILZONEVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 12811742f26..10055b1fa01 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -65,7 +65,7 @@ class npc_forest_frog : public CreatureScript if (pInstance) { uint32 cEntry = 0; - switch(rand()%10) + switch (rand()%10) { case 0: cEntry = 24397; break; //Mannuth case 1: cEntry = 24403; break; //Deez diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index fddaf459d18..b0bbc0c6c79 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -178,22 +178,22 @@ class boss_venoxis : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { // thrash is available in all phases case EVENT_THRASH: DoCast(me, SPELL_THRASH, true); - events.ScheduleEvent(EVENT_THRASH, urand(10000,20000)); + events.ScheduleEvent(EVENT_THRASH, urand(10000, 20000)); break; // troll form spells and actions (first part) case EVENT_DISPEL_MAGIC: DoCast(me, SPELL_DISPEL_MAGIC); - events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000,20000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000, 20000), 0, PHASE_ONE); break; case EVENT_RENEW: DoCast(me, SPELL_RENEW); - events.ScheduleEvent(EVENT_RENEW, urand(25000,30000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_RENEW, urand(25000, 30000), 0, PHASE_ONE); break; case EVENT_HOLY_NOVA: _inMeleeRange = 0; @@ -210,17 +210,17 @@ class boss_venoxis : public CreatureScript if (_inMeleeRange >= 3) DoCast(me->getVictim(), SPELL_HOLY_NOVA); - events.ScheduleEvent(EVENT_HOLY_NOVA, urand(45000,75000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_HOLY_NOVA, urand(45000, 75000), 0, PHASE_ONE); break; case EVENT_HOLY_FIRE: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_HOLY_FIRE); - events.ScheduleEvent(EVENT_HOLY_FIRE, urand(45000,60000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_HOLY_FIRE, urand(45000, 60000), 0, PHASE_ONE); break; case EVENT_HOLY_WRATH: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_HOLY_WRATH); - events.ScheduleEvent(EVENT_HOLY_WRATH, urand(45000,60000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_HOLY_WRATH, urand(45000, 60000), 0, PHASE_ONE); break; // @@ -230,12 +230,12 @@ class boss_venoxis : public CreatureScript case EVENT_VENOM_SPIT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_VENOM_SPIT); - events.ScheduleEvent(EVENT_VENOM_SPIT, urand(5000,15000), 0, PHASE_TWO); + events.ScheduleEvent(EVENT_VENOM_SPIT, urand(5000, 15000), 0, PHASE_TWO); break; case EVENT_POISON_CLOUD: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_POISON_CLOUD); - events.ScheduleEvent(EVENT_POISON_CLOUD, urand(15000,20000), 0, PHASE_TWO); + events.ScheduleEvent(EVENT_POISON_CLOUD, urand(15000, 20000), 0, PHASE_TWO); break; case EVENT_PARASITIC_SERPENT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 0da63d38f83..a977699f342 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -65,7 +65,7 @@ class instance_zulgurub : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 11347: m_uiLorKhanGUID = creature->GetGUID(); break; case 11348: m_uiZathGUID = creature->GetGUID(); break; @@ -76,7 +76,7 @@ class instance_zulgurub : public InstanceMapScript void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case DATA_ARLOKK: m_auiEncounter[0] = uiData; @@ -114,7 +114,7 @@ class instance_zulgurub : public InstanceMapScript uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_ARLOKK: return m_auiEncounter[0]; @@ -138,7 +138,7 @@ class instance_zulgurub : public InstanceMapScript uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_LORKHAN: return m_uiLorKhanGUID; diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp index c5d47b60dfd..0ce940723cb 100644 --- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp @@ -71,7 +71,7 @@ class npc_professor_phizzlethorpe : public CreatureScript if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 4:DoScriptText(SAY_PROGRESS_2, me, player);break; case 5:DoScriptText(SAY_PROGRESS_3, me, player);break; diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 6960fed819e..10b7066068b 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -56,7 +56,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -222,7 +222,7 @@ public: spellJudLight = false; spellCommand = false; - switch(me->GetEntry()) + switch (me->GetEntry()) { case CHAMPION_BLOODWRATH: spellFlashLight = true; @@ -417,7 +417,7 @@ public: { CAST_AI(npc_second_trial_paladin::npc_secondTrialAI, paladinSpawn->AI())->Activate(me->GetGUID()); - switch(paladinPhase) + switch (paladinPhase) { case 0: DoScriptText(TEXT_SECOND_TRIAL_1, me); diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 9efe8301e10..655ad4514fe 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -178,7 +178,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: { diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index df8b909976d..38fcf63b090 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -89,7 +89,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 26: DoScriptText(SAY_OOX_AMBUSH, me); @@ -107,7 +107,7 @@ public: void WaypointStart(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 27: for (uint8 i = 0; i < 3; ++i) @@ -284,7 +284,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 1: DoScriptText(SAY_RIN_FREE, me, player); @@ -317,7 +317,7 @@ public: if (Unit* player = GetPlayerForEscort()) { - switch(m_uiPostEventCount) + switch (m_uiPostEventCount) { case 1: DoScriptText(SAY_RIN_PROGRESS_1, me, player); diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp index 7e376b65020..083a27568bd 100644 --- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp @@ -86,7 +86,7 @@ public: if (uiI >= 65 && me->GetUnitMovementFlags() == MOVEMENTFLAG_WALKING) me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - switch(uiI) + switch (uiI) { case 39: SetEscortPaused(true); @@ -115,7 +115,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: me->SetStandState(UNIT_STAND_STATE_SIT); diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index cfcef442c93..32b4fc0e19a 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -141,7 +141,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 1: DoScriptText(SAY_START, me, player);break; case 13: diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index 88f76d47c53..25fa0352548 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -346,7 +346,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 14: SetEscortPaused(true); @@ -387,7 +387,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: if (Creature* pGuard = me->FindNearestCreature(NPC_STORMWIND_ROYAL, 8.0f, true)) @@ -577,7 +577,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 1: SetEscortPaused(true); @@ -605,7 +605,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoScriptText(SAY_QUEST_ACCEPT_ATTACK, me); diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index c1f543fff65..e2a7ea9d3c6 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -123,7 +123,7 @@ public: return; } - switch(m_uiPhase) + switch (m_uiPhase) { case 1: DoScriptText(SAY_COMPLETE, me); diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 2a2becb906f..06c64b76242 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -52,7 +52,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -191,7 +191,7 @@ public: if (who->GetTypeId() == TYPEID_PLAYER) { - switch(me->GetAreaId()) + switch (me->GetAreaId()) { case 199: //felstone if (CAST_PLR(who)->GetQuestStatus(5216) == QUEST_STATUS_INCOMPLETE || @@ -358,7 +358,7 @@ public: case 22: break; case 23: - Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f , 81.99f , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f, 81.99f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); Ughost->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); DoScriptText(SAY_WP_4, Ughost, me); m_uiChatTimer = 4000; diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index da1f666fbab..7c0703d158b 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -83,7 +83,7 @@ public: { if (HasEscortState(STATE_ESCORT_ESCORTING)) { - switch(uiWPHolder) + switch (uiWPHolder) { case 7: DoScriptText(SAY_DS_DOWN_1, me); break; case 8: DoScriptText(SAY_DS_DOWN_2, me); break; @@ -105,7 +105,7 @@ public: uiWPHolder = uiPoint; - switch(uiPoint) + switch (uiPoint) { case 4: SetEquipmentSlots(false, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE, EQUIP_ID_RIFLE); diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp index 89effa01b98..f6d53d2bb51 100644 --- a/src/server/scripts/EasternKingdoms/wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/wetlands.cpp @@ -69,7 +69,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 2: if (me->HasStealthAura()) diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index d1ac2045e61..1a030728218 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -148,7 +148,7 @@ class example_creature : public CreatureScript { me->HandleEmoteCommand(uiTextEmote); - switch(uiTextEmote) + switch (uiTextEmote) { case TEXT_EMOTE_DANCE: DoScriptText(SAY_DANCE, me); diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index fa62563e25d..dfac4321a23 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -202,7 +202,7 @@ class example_escort : public CreatureScript player->PlayerTalkClass->ClearMenus(); npc_escortAI* pEscortAI = CAST_AI(example_escort::example_escortAI, creature->AI()); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index adafc78f33f..7823e84f29a 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -204,7 +204,7 @@ public: bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f); @@ -238,7 +238,7 @@ public: void WaypointReached(uint32 uiPoint) { - switch(uiPoint) + switch (uiPoint) { case 4: SetEscortPaused(true); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 07c7fcf6f27..cf79dfee77d 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -109,7 +109,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FIRE_OF_AKU_MAI_1: m_uiShrine1GUID = go->GetGUID(); @@ -143,7 +143,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case TYPE_GELIHAST: m_auiEncounter[0] = uiData; @@ -213,7 +213,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case TYPE_GELIHAST: return m_auiEncounter[0]; @@ -234,7 +234,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_TWILIGHT_LORD_KELRIS: return m_uiTwilightLordKelrisGUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 5a28f3af333..a7e5f51da98 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -311,7 +311,7 @@ public: void GainSoulCharge(Player* victim) { - switch(victim->getClass()) + switch (victim->getClass()) { case CLASS_PRIEST: case CLASS_PALADIN: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index ef3b2b77406..f681b245a42 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -54,7 +54,7 @@ public: { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: ai->StartEvent(player); @@ -131,7 +131,7 @@ public: player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); ai->DeSpawnVeins();//despawn the alliance veins - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: ai->StartEvent(player); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 1d1b1902188..0754e4a1554 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -361,7 +361,7 @@ void hyjalAI::Reset() EnemyCount = 0; // Set faction properly based on Creature entry - switch(me->GetEntry()) + switch (me->GetEntry()) { case JAINA: Faction = 0; @@ -450,7 +450,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) SpawnLoc[i] = Base[random][i]; } Creature* creature = NULL; - switch(entry) + switch (entry) { case 17906: //GARGOYLE @@ -463,7 +463,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) creature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10, 10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); } break; - case 17907: //FROST_WYRM , + case 17907: //FROST_WYRM, if (FirstBossDead && WaveCount == 1) //summon at gate creature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0], SpawnPointSpecial[SPAWN_WYRM_GATE][1], SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); else @@ -492,7 +492,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); creature->setActive(true); - switch(entry) + switch (entry) { case NECROMANCER: case ABOMINATION: @@ -751,7 +751,7 @@ void hyjalAI::UpdateAI(const uint32 diff) if (DoHide) { DoHide = false; - switch(me->GetEntry()) + switch (me->GetEntry()) { case JAINA: if (pInstance && pInstance->GetData(DATA_ALLIANCE_RETREAT)) @@ -810,7 +810,7 @@ void hyjalAI::UpdateAI(const uint32 diff) IsDummy = true; bRetreat = false; HideNearPos(me->GetPositionX(), me->GetPositionY()); - switch(me->GetEntry()) + switch (me->GetEntry()) { case JAINA://jaina HideNearPos(5037.76f, -1889.71f); @@ -892,7 +892,7 @@ void hyjalAI::UpdateAI(const uint32 diff) Unit* target = NULL; - switch(Spells[i].TargetType) + switch (Spells[i].TargetType) { case TARGETTYPE_SELF: target = me; break; case TARGETTYPE_RANDOM: target = SelectTarget(SELECT_TARGET_RANDOM, 0); break; @@ -1071,7 +1071,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) if (!Teleported) return; Overrun = false;//execute once - switch(faction) + switch (faction) { case 0://alliance for (uint8 i = 0; i < 92; ++i)//summon fires diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 6a7e6f71003..8ca0ba5efd2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -197,7 +197,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { for (uint8 i = 0; i < 4; ++i) AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); - switch(OverrunType) + switch (OverrunType) { case 0: AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]); @@ -257,7 +257,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { for (uint8 i = 0; i < 4; ++i) AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); - switch(OverrunType) + switch (OverrunType) { case 0: AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3, 3), AllianceOverrunWP[1][1]+irand(-3, 3), AllianceOverrunWP[1][2]); @@ -332,7 +332,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { for (uint8 i = 0; i < 6; ++i) AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); - switch(OverrunType) + switch (OverrunType) { case 0: AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 282b0192f57..fcb7126cb6a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -117,7 +117,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 182060: HordeGate = go->GetGUID(); @@ -141,7 +141,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17767: RageWinterchill = creature->GetGUID(); break; case 17808: Anetheron = creature->GetGUID(); break; @@ -156,7 +156,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_RAGEWINTERCHILL: return RageWinterchill; case DATA_ANETHERON: return Anetheron; @@ -173,7 +173,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_RAGEWINTERCHILLEVENT: m_auiEncounter[0] = data; break; case DATA_ANETHERONEVENT: @@ -282,7 +282,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_RAGEWINTERCHILLEVENT: return m_auiEncounter[0]; case DATA_ANETHERONEVENT: return m_auiEncounter[1]; 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 f557354192a..3912ef90c9c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -126,7 +126,7 @@ public: void UpdateAI(const uint32 diff) { - switch(Phase) + switch (Phase) { case COMBAT: //Return since we have no target @@ -195,7 +195,7 @@ public: case OUTRO: if (uiOutroTimer < diff) { - switch(uiOutroStep) + switch (uiOutroStep) { case 1: DoScriptText(SAY_ESCAPE_SPEECH_1, me); 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 678a38ffeca..3aee0ba30d0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -377,7 +377,7 @@ public: if (pInstance) { pInstance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED); - switch(pInstance->GetData(DATA_ARTHAS_EVENT)) + switch (pInstance->GetData(DATA_ARTHAS_EVENT)) { case NOT_STARTED: bStepping = true; @@ -448,7 +448,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: case 1: @@ -575,7 +575,7 @@ public: { if (uiPhaseTimer <= diff) { - switch(uiStep) + switch (uiStep) { //After reset case 0: 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 1837dd33949..46eef1d8bb4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -149,7 +149,7 @@ public: uint8 GetRiftWaveId() { - switch(mRiftPortalCount) + switch (mRiftPortalCount) { case 6: mRiftWaveId = 2; @@ -166,7 +166,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_MEDIVH: if (data == SPECIAL && m_auiEncounter[0] == IN_PROGRESS) @@ -237,7 +237,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_MEDIVH: return m_auiEncounter[0]; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 28f5477fe80..115fa1ededb 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -103,7 +103,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case THRALL_ENTRY: ThrallGUID = creature->GetGUID(); @@ -127,7 +127,7 @@ public: return; } - switch(type) + switch (type) { case TYPE_BARREL_DIVERSION: { @@ -202,7 +202,7 @@ public: uint32 GetData(uint32 data) { - switch(data) + switch (data) { case TYPE_BARREL_DIVERSION: return m_auiEncounter[0]; @@ -222,7 +222,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_THRALL: return ThrallGUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 485c52d0423..4f49c08f16a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -202,7 +202,7 @@ public: { player->PlayerTalkClass->ClearMenus(); InstanceScript* pInstance = creature->GetInstanceScript(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -301,7 +301,7 @@ public: if (!pInstance) return; - switch(i) + switch (i) { case 8: SetRun(false); @@ -513,7 +513,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { //TODO: make Scarloc start into event instead, and not start attack directly case MOB_ENTRY_BARN_GUARDSMAN: @@ -633,7 +633,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 6: DoScriptText(SAY_TA_FREE, me); diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 84923d3def5..1c69e72befe 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -85,7 +85,7 @@ public: return; } - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_WHELP_SPAWNER: Position goPos; @@ -141,7 +141,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case DATA_ONYXIA: m_auiEncounter[0] = uiData; @@ -174,7 +174,7 @@ public: void SetData64(uint32 uiType, uint64 uiData) { - switch(uiType) + switch (uiType) { case DATA_FLOOR_ERUPTION_GUID: FloorEruptionGUID[1] = FloorEruptionGUID[0]; @@ -186,7 +186,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_ONYXIA: return m_auiEncounter[0]; @@ -197,7 +197,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_ONYXIA_GUID: return m_uiOnyxiasGUID; @@ -238,7 +238,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0) { - switch(criteria_id) + switch (criteria_id) { case ACHIEV_CRITERIA_MANY_WHELPS_10_PLAYER: // Criteria for achievement 4403: Many Whelps! Handle It! (10 player) Hatch 50 eggs in 10s case ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER: // Criteria for achievement 4406: Many Whelps! Handle It! (25 player) Hatch 50 eggs in 10s diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 19287d656a8..0082839e38f 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -100,7 +100,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_GONG: uiGongGUID = go->GetGUID(); @@ -118,7 +118,7 @@ public: { uiGongWaves = uiData; - switch(uiGongWaves) + switch (uiGongWaves) { case 9: case 14: @@ -139,7 +139,7 @@ public: uint32 uiCreature = 0; uint8 uiSummonTimes = 0; - switch(uiGongWaves) + switch (uiGongWaves) { case 1: uiCreature = CREATURE_TOMB_FIEND; @@ -186,7 +186,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_GONG_WAVES: return uiGongWaves; @@ -197,7 +197,7 @@ public: uint64 GetData64(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_GONG: return uiGongGUID; } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index a251e6dfdf3..568bf355d06 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -69,7 +69,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 21099: DoorWardGUID = go->GetGUID(); break; } @@ -78,7 +78,7 @@ public: void Update(uint32 /*diff*/) { if (WardKeeperDeath == WARD_KEEPERS_NR) - if(GameObject* pGo = instance->GetGameObject(DoorWardGUID)) + if (GameObject* pGo = instance->GetGameObject(DoorWardGUID)) { pGo->SetUInt32Value(GAMEOBJECT_FLAGS, 33); pGo->SetGoState(GO_STATE_ACTIVE); @@ -87,7 +87,7 @@ public: void SetData(uint32 type, uint32 /*data*/) { - switch(type) + switch (type) { case EVENT_WARD_KEEPER: WardKeeperDeath++; break; } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 697083aa4e7..7b084a3b5fc 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -54,7 +54,7 @@ class boss_kurinnaxx : public CreatureScript _Reset(); _enraged = false; events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000); - events.ScheduleEvent(EVENT_SANDTRAP, urand(5000,15000)); + events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000)); events.ScheduleEvent(EVENT_TRASH, 1000); events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } @@ -91,7 +91,7 @@ class boss_kurinnaxx : public CreatureScript target->CastSpell(target, SPELL_SANDTRAP, true); else if (Unit* victim = me->getVictim()) victim->CastSpell(victim, SPELL_SANDTRAP, true); - events.ScheduleEvent(EVENT_SANDTRAP, urand(5000,15000)); + events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000)); break; case EVENT_WIDE_SLASH: DoCast(me, SPELL_WIDE_SLASH); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 8afdc29b76e..030da10e515 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -152,7 +152,7 @@ class boss_moam : public CreatureScript for (std::list<Unit*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr) DoCast(*itr, SPELL_DRAIN_MANA); - events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000,15000)); + events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000, 15000)); break; }/* case EVENT_WIDE_SLASH: diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 1a939123779..c73843b7a8c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -592,7 +592,7 @@ public: //Get random but only if we have more than one unit on threat list if (temp.size() > 1) - advance (j , rand() % (temp.size() - 1)); + advance (j, rand() % (temp.size() - 1)); return (*j); } @@ -916,7 +916,7 @@ public: void DoAction(const int32 param) { - switch(param) + switch (param) { case ACTION_FLESH_TENTACLE_KILLED: ++FleshTentaclesKilled; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 8a40096bc33..9d83bfea866 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -145,7 +145,7 @@ public: if (DoGetThreat(target)) DoModifyThreatPercent(target, -100); - switch(urand(0, 2)) + switch (urand(0, 2)) { case 0: DoTeleportPlayer(target, -8106.0142f, 1289.2900f, -74.419533f, 5.112f); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index a4d204014da..6a29dab356c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -91,7 +91,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_VEMISDEAD: if (IsBossDied[0]) @@ -119,7 +119,7 @@ public: uint64 GetData64 (uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SKERAM: return SkeramGUID; @@ -137,7 +137,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_VEM_DEATH: IsBossDied[0] = true; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 22973967052..8b4b1df4420 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -158,7 +158,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_END_DOOR: EndDoorGUID = go->GetGUID(); @@ -168,7 +168,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case EVENT_PYRAMID: return PyramidPhase; @@ -178,7 +178,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case ENTRY_ZUMRAH: return ZumrahGUID; @@ -200,7 +200,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case EVENT_PYRAMID: PyramidPhase=data; @@ -322,7 +322,7 @@ public: } bool IsWaveAllDead(){ - for(std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr) + for (std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr) { if (Creature* add = instance->GetCreature((*itr))) { @@ -330,7 +330,7 @@ public: return false; } } - for(std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr) + for (std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr) { if (Creature* add = instance->GetCreature(((*itr)))) { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h index 375e586f13b..f634d593f44 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -24,7 +24,7 @@ enum zfPyramidPhases { PYRAMID_NOT_STARTED, //default PYRAMID_CAGES_OPEN, //happens in GO hello for cages - PYRAMID_ARRIVED_AT_STAIR , //happens in Weegli's movementinform + PYRAMID_ARRIVED_AT_STAIR, //happens in Weegli's movementinform PYRAMID_WAVE_1, PYRAMID_PRE_WAVE_2, PYRAMID_WAVE_2, diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 527d6b3d3e4..58432eb9e01 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -186,7 +186,7 @@ class npc_ruul_snowhoof : public CreatureScript if (!player) return; - switch(i) + switch (i) { case 0: { me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); @@ -319,7 +319,7 @@ class npc_muglash : public CreatureScript { Player* player = GetPlayerForEscort(); - switch(i) + switch (i) { case 0: if (player) @@ -382,7 +382,7 @@ class npc_muglash : public CreatureScript void DoWaveSummon() { - switch(m_uiWaveId) + switch (m_uiWaveId) { case 1: me->SummonCreature(NPC_WRATH_RIDER, m_afFirstNagaCoord[0][0], m_afFirstNagaCoord[0][1], m_afFirstNagaCoord[0][2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index e043f9e05b4..b572d132c26 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -376,7 +376,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(SAY_START, me, player); @@ -479,7 +479,7 @@ public: { Creature* Spark = Unit::GetCreature(*me, SparkGUID); - switch(Step) + switch (Step) { case 0: if (Spark) diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index 3242797d3e7..01325d5bfff 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -238,7 +238,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(SAY_REM_START, me, player); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index f0f27db8095..120f17c1cb6 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -299,7 +299,7 @@ public: if (bYellTimer && uiYellTimer <= uiDiff) { - switch(uiStep) + switch (uiStep) { case 0: DoScriptText(RAND(SAY_QUEST2, SAY_QUEST3, SAY_QUEST4, SAY_QUEST5, SAY_QUEST6), me); diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index 822ac41f1c9..98e1130d3f7 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -146,9 +146,9 @@ public: case 30: DoScriptText(SAY_OOX_AMBUSH, me); me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14f, 2075.87f, 47.77f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_BRUTE , -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_BRUTE, -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33f, 2080.24f, 47.43f, 3.87f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_ALPHA , -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_ALPHA, -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; case 37: DoScriptText(SAY_OOX_END, me); diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index a714f8716ae..b8b8b31ba2c 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -57,7 +57,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -172,7 +172,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -348,7 +348,7 @@ public: void EnterCombat(Unit* who) { uint32 rnd = rand()%2; - switch(rnd) + switch (rnd) { case 0: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_1, me, who); break; case 1: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_2, me, who); break; @@ -402,10 +402,10 @@ public: return; } - switch(CurrWP) + switch (CurrWP) { case 0: - switch(Step) + switch (Step) { case 0: me->Say(CLINTAR_SPIRIT_SAY_START, 0, PlayerGUID); @@ -418,7 +418,7 @@ public: } break; case 6: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); @@ -433,7 +433,7 @@ public: } break; case 15: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); @@ -447,7 +447,7 @@ public: } break; case 16: - switch(Step) + switch (Step) { case 0: DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, me, player); @@ -460,7 +460,7 @@ public: } break; case 20: - switch(Step) + switch (Step) { case 0: { @@ -480,7 +480,7 @@ public: } break; case 24: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); @@ -494,7 +494,7 @@ public: } break; case 25: - switch(Step) + switch (Step) { case 0: DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, me, player); @@ -507,7 +507,7 @@ public: } break; case 40: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2); diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index d0131068c3f..6b7197292dd 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -157,7 +157,7 @@ public: uiEventTimer = 5000; ++uiEventPhase; - switch(uiEventPhase) + switch (uiEventPhase) { case 1: if (Unit* pUnit = Unit::GetUnit(*me, uiPlayerGUID)) diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 000717e1c56..4fbcef167cc 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -37,7 +37,7 @@ EndContentData */ ###*/ #define GOSSIP_DEMITRIAN1 "What do you know of it?" -#define GOSSIP_DEMITRIAN2 "I am listening , Demitrian." +#define GOSSIP_DEMITRIAN2 "I am listening, Demitrian." #define GOSSIP_DEMITRIAN3 "Continue, please." #define GOSSIP_DEMITRIAN4 "A battle?" #define GOSSIP_DEMITRIAN5 "<Nod>" @@ -541,7 +541,7 @@ public: switch (AnimationCount) { case 0: - DoScriptText(ANACHRONOS_SAY_1, me , Fandral); + DoScriptText(ANACHRONOS_SAY_1, me, Fandral); break; case 1: Fandral->SetTarget(me->GetGUID()); @@ -762,7 +762,7 @@ public: case 61: me->GetMotionMaster()->MoveCharge(-8057.1f, 1470.32f, 2.61f, 6); if (player->IsInRange(me, 0, 15)) - player->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD , me); + player->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD, me); break; case 62: me->SetDisplayId(15500); @@ -1181,12 +1181,12 @@ enum WSCreatures NPC_TEMPLAR_WATER = 15211, NPC_TEMPLAR_AIR = 15212, NPC_TEMPLAR_EARTH = 15307, - + NPC_DUKE_FIRE = 15206, NPC_DUKE_WATER = 15207, NPC_DUKE_EARTH = 15208, NPC_DUKE_AIR = 15220, - + NPC_ROYAL_FIRE = 15203, NPC_ROYAL_AIR = 15204, NPC_ROYAL_EARTH = 15205, diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index 132144fce0e..ff6127f336e 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -121,7 +121,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 16: DoScriptText(SAY_AMBUSH, me); diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 0c4b73b8658..549d741459e 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -178,7 +178,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(WHISPER_CUSTODIAN_1, me, player); break; case 1: DoScriptText(WHISPER_CUSTODIAN_2, me, player); break; @@ -435,7 +435,7 @@ public: if (!player) return; - switch(i) { + switch (i) { case 23: me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); @@ -591,7 +591,7 @@ public: return; } - switch(m_uiPhasePostEvent) + switch (m_uiPhasePostEvent) { case 1: DoScriptText(SAY_TOOG_POST_1, me); diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 21b0a5c6ee1..41d64ea5e19 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -134,7 +134,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 16: DoScriptText(SAY_GIL_AT_LAST, me, player); @@ -597,7 +597,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(SAY_STARTUP1, me); @@ -625,7 +625,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 9: DoScriptText(SAY_STARTUP2, me, player); @@ -654,7 +654,7 @@ public: { if (m_uiPostEventTimer <= uiDiff) { - switch(m_uiPostEventCount) + switch (m_uiPostEventCount) { case 0: DoScriptText(SAY_PROGRESS_2, me); diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index fdff6309be3..273396dd904 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -77,7 +77,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(SAY_KAN_START, me); @@ -168,7 +168,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 8: DoScriptText(SAY_LAKO_LOOK_OUT, me); @@ -253,7 +253,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 15: DoScriptText(SAY_WYVERN, me); @@ -302,7 +302,7 @@ public: bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index 05ba6b2234e..51f63ff5a8d 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -283,7 +283,7 @@ public: return; } - switch(m_uiEndEventProgress) + switch (m_uiEndEventProgress) { case 1: DoScriptText(SAY_RIN_END_1, me); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 71f810a6020..efbc2c45e40 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -179,7 +179,7 @@ public: case PHASE_UNDERGROUND: if (uiImpaleTimer <= diff) { - switch(uiImpalePhase) + switch (uiImpalePhase) { case IMPALE_PHASE_TARGET: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 7d35814a8a0..4ea135a2294 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -71,7 +71,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 28684: uiKrikthir = creature->GetGUID(); break; case 28921: uiHadronox = creature->GetGUID(); break; @@ -105,7 +105,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_KRIKTHIR_THE_GATEWATCHER: return uiKrikthir; case DATA_HADRONOX: return uiHadronox; @@ -120,7 +120,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: auiEncounter[0] = data; @@ -149,7 +149,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: return auiEncounter[0]; case DATA_HADRONOX_EVENT: return auiEncounter[1]; 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 2e0e0661cf7..05b8881a322 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -440,7 +440,7 @@ public: if (uiType != POINT_MOTION_TYPE || !pInstance) return; - switch(uiPointId) + switch (uiPointId) { case 1: { 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 347283a891b..c22a5489358 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -397,7 +397,7 @@ public: pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); pGO->SetGoState(GO_STATE_ACTIVE); - switch(pGO->GetEntry()) + switch (pGO->GetEntry()) { case GO_SPHERE1: pInstance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break; case GO_SPHERE2: pInstance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index 352ac2d09e5..e7c4b517cbf 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -94,7 +94,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 29309: Elder_Nadox = creature->GetGUID(); break; case 29308: Prince_Taldaram = creature->GetGUID(); break; @@ -107,7 +107,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 193564: Prince_TaldaramPlatform = go->GetGUID(); if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; @@ -134,7 +134,7 @@ public: void SetData64(uint32 idx, uint64 guid) { - switch(idx) + switch (idx) { case DATA_ADD_JEDOGA_OPFER: JedogaSacrifices = guid; break; case DATA_PL_JEDOGA_TARGET: JedogaTarget = guid; break; @@ -143,7 +143,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_ELDER_NADOX: return Elder_Nadox; case DATA_PRINCE_TALDARAM: return Prince_Taldaram; @@ -176,7 +176,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_ELDER_NADOX_EVENT: m_auiEncounter[0] = data; break; case DATA_PRINCE_TALDARAM_EVENT: @@ -223,7 +223,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_ELDER_NADOX_EVENT: return m_auiEncounter[0]; case DATA_PRINCE_TALDARAM_EVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index d29a05b3b5d..2a1c0bd6e91 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -188,21 +188,21 @@ static Location AcolyteofVesperon = { 3145.68f, 520.71f, 89.7f }; static Location AcolyteofVesperon2 = { 3246.57f, 551.263f, 58.6164f }; Locations TwilightEggs[] = { - {3219.28f, 669.121f , 88.5549f}, - {3221.55f, 682.852f , 90.5361f}, - {3239.77f, 685.94f , 90.3168f}, - {3250.33f, 669.749f , 88.7637f}, - {3246.6f, 642.365f , 84.8752f}, - {3233.68f, 653.117f , 85.7051f} + {3219.28f, 669.121f, 88.5549f}, + {3221.55f, 682.852f, 90.5361f}, + {3239.77f, 685.94f, 90.3168f}, + {3250.33f, 669.749f, 88.7637f}, + {3246.6f, 642.365f, 84.8752f}, + {3233.68f, 653.117f, 85.7051f} }; Locations TwilightEggsSarth[] = { - {3252.73f, 515.762f , 58.5501f}, - {3256.56f, 521.119f , 58.6061f}, - {3255.63f, 527.513f , 58.7568f}, - {3264.90f, 525.865f , 58.6436f}, - {3264.26f, 516.364f , 58.8011f}, - {3257.54f, 502.285f , 58.2077f} + {3252.73f, 515.762f, 58.5501f}, + {3256.56f, 521.119f, 58.6061f}, + {3255.63f, 527.513f, 58.7568f}, + {3264.90f, 525.865f, 58.6436f}, + {3264.26f, 516.364f, 58.8011f}, + {3257.54f, 502.285f, 58.2077f} }; #define TWILIGHT_ACHIEVEMENTS 1 @@ -290,14 +290,14 @@ public: if (pTenebron) { pTenebron->SetHomePosition(3239.07f, 657.235f, 86.8775f, 4.74729f); - if(pTenebron->isAlive()) + if (pTenebron->isAlive()) { if (pTenebron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pTenebron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTenebron->GetMotionMaster()->MoveTargetedHome(); }else { - if(pInstance->GetData(TYPE_TENEBRON_PREKILLED) == false) + if (pInstance->GetData(TYPE_TENEBRON_PREKILLED) == false) { pTenebron->Respawn(); pTenebron->GetMotionMaster()->MoveTargetedHome(); @@ -308,14 +308,14 @@ public: if (pShadron) { pShadron->SetHomePosition(3363.06f, 525.28f, 98.362f, 4.76475f); - if(pShadron->isAlive()) + if (pShadron->isAlive()) { if (pShadron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pShadron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pShadron->GetMotionMaster()->MoveTargetedHome(); }else { - if(pInstance->GetData(TYPE_SHADRON_PREKILLED) == false) + if (pInstance->GetData(TYPE_SHADRON_PREKILLED) == false) { pShadron->Respawn(); pShadron->GetMotionMaster()->MoveTargetedHome(); @@ -326,14 +326,14 @@ public: if (pVesperon) { pVesperon->SetHomePosition(3145.68f, 520.71f, 89.7f, 4.64258f); - if(pVesperon->isAlive()) + if (pVesperon->isAlive()) { if (pVesperon->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pVesperon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pVesperon->GetMotionMaster()->MoveTargetedHome(); }else { - if(pInstance->GetData(TYPE_VESPERON_PREKILLED) == false) + if (pInstance->GetData(TYPE_VESPERON_PREKILLED) == false) { pVesperon->Respawn(); pVesperon->GetMotionMaster()->MoveTargetedHome(); @@ -484,7 +484,7 @@ public: int32 iTextId = 0; - switch(pTemp->GetEntry()) + switch (pTemp->GetEntry()) { case NPC_TENEBRON: iTextId = SAY_SARTHARION_CALL_TENEBRON; @@ -532,13 +532,13 @@ public: Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, pFireCyclonesList, checker); me->VisitNearbyObject(200.0f, searcher); - if(pFireCyclonesList.empty()) + if (pFireCyclonesList.empty()) return; std::list<Creature*>::iterator itr = pFireCyclonesList.begin(); uint32 rnd = rand()%pFireCyclonesList.size(); - for(uint32 i = 0; i < rnd; ++i) + for (uint32 i = 0; i < rnd; ++i) ++itr; (*itr)->CastSpell(target, SPELL_LAVA_STRIKE, true); @@ -586,13 +586,13 @@ public: if (m_uiFlameTsunamiTimer <= uiDiff) { SendFlameTsunami(); - switch(urand(0, 1)) + switch (urand(0, 1)) { 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; @@ -648,7 +648,7 @@ public: { CastLavaStrikeOnTarget(target); - if(urand(0, 5) == 0) + if (urand(0, 5) == 0) DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1, SAY_SARTHARION_SPECIAL_2, SAY_SARTHARION_SPECIAL_3), me); } m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000, 20000)); @@ -780,7 +780,7 @@ struct dummy_dragonAI : public ScriptedAI { me->GetMotionMaster()->Clear(); me->SetInCombatWithZone(); - if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) { me->AddThreat(target, 1.0f); me->Attack(target, true); @@ -837,19 +837,19 @@ struct dummy_dragonAI : public ScriptedAI //in instance script and calculate range to each. GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL, 50.0f); - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_TENEBRON: { iTextId = WHISPER_HATCH_EGGS; if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { - for(uint32 i = 0; i < 6; ++i) + for (uint32 i = 0; i < 6; ++i) me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); } else { - for(uint32 i = 0; i < 6; ++i) + for (uint32 i = 0; i < 6; ++i) me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); } break; @@ -857,10 +857,10 @@ struct dummy_dragonAI : public ScriptedAI case NPC_SHADRON: { iTextId = WHISPER_OPEN_PORTAL; - if(pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) - me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron.x, AcolyteofShadron.y , AcolyteofShadron.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); + if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) + me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron.x, AcolyteofShadron.y, AcolyteofShadron.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); else - me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron2.x, AcolyteofShadron2.y , AcolyteofShadron2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); + me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron2.x, AcolyteofShadron2.y, AcolyteofShadron2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); break; } @@ -869,7 +869,7 @@ struct dummy_dragonAI : public ScriptedAI iTextId = WHISPER_OPEN_PORTAL; if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { - if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) + if (Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y, AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -878,7 +878,7 @@ struct dummy_dragonAI : public ScriptedAI } else { - if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) + if (Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y, AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -909,20 +909,20 @@ struct dummy_dragonAI : public ScriptedAI int32 iTextId = 0; uint32 uiSpellId = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_TENEBRON: iTextId = SAY_TENEBRON_DEATH; uiSpellId = SPELL_POWER_OF_TENEBRON; - if(pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) pInstance->SetData(TYPE_TENEBRON_PREKILLED, 1); break; case NPC_SHADRON: iTextId = SAY_SHADRON_DEATH; uiSpellId = SPELL_POWER_OF_SHADRON; - if(pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) pInstance->SetData(TYPE_SHADRON_PREKILLED, 1); - if(Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f)) + if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f)) { pAcolyte->Kill(pAcolyte); } @@ -930,9 +930,9 @@ struct dummy_dragonAI : public ScriptedAI case NPC_VESPERON: iTextId = SAY_VESPERON_DEATH; uiSpellId = SPELL_POWER_OF_VESPERON; - if(pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) pInstance->SetData(TYPE_VESPERON_PREKILLED, 1); - if(Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f)) + if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f)) { pAcolyte->Kill(pAcolyte); } @@ -967,7 +967,7 @@ struct dummy_dragonAI : public ScriptedAI { if (m_uiMoveNextTimer <= uiDiff) { - if(m_uiWaypointId < MAX_WAYPOINT) + if (m_uiWaypointId < MAX_WAYPOINT) me->GetMotionMaster()->MovePoint(m_uiWaypointId, m_aDragonCommon[m_uiWaypointId].m_fX, m_aDragonCommon[m_uiWaypointId].m_fY, m_aDragonCommon[m_uiWaypointId].m_fZ); @@ -1144,7 +1144,7 @@ public: // Portal Event if (m_uiAcolyteShadronTimer <= uiDiff) { - if(m_bHasPortalOpen) + if (m_bHasPortalOpen) m_uiAcolyteShadronTimer = 10000; else { @@ -1243,7 +1243,7 @@ public: // Portal Event if (m_uiAcolyteVesperonTimer <= uiDiff) { - if(m_bHasPortalOpen) + if (m_bHasPortalOpen) m_uiAcolyteVesperonTimer = 10000; else { @@ -1324,7 +1324,7 @@ public: if (pInstance) { Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON)); - if(Shadron) + if (Shadron) { (CAST_AI(mob_shadron::mob_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false; } @@ -1364,7 +1364,7 @@ public: void UpdateAI(const uint32 uiDiff) { - if(uiDespawnTimer < uiDiff) + if (uiDespawnTimer < uiDiff) { me->SetVisible(false); me->Kill(me); @@ -1459,7 +1459,7 @@ public: void UpdateAI(const uint32 uiDiff) { - if(uiDespawnTimer < uiDiff) + if (uiDespawnTimer < uiDiff) { me->SetVisible(false); me->Kill(me); @@ -1504,7 +1504,7 @@ public: void Reset() { - if(pInstance) + if (pInstance) { me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } @@ -1533,7 +1533,7 @@ public: if (m_uiHatchEggTimer <= uiDiff) { Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON)); - if(Tenebron) + if (Tenebron) (CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false; SpawnWhelps(); } @@ -1590,7 +1590,7 @@ public: Tsunami_Timer = 500; }else Tsunami_Timer -= diff; - if(TsunamiBuff_timer <= diff) + if (TsunamiBuff_timer <= diff) { if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me, NPC_LAVA_BLAZE, 10.0f, true)) LavaBlaze->CastSpell(LavaBlaze, SPELL_FLAME_TSUNAMI_BUFF, true); @@ -1625,8 +1625,8 @@ public: { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->AddAura( 46265 , me ); // Wrong, can't find proper visual - me->AddAura( 69422 , me ); + me->AddAura( 46265, me ); // Wrong, can't find proper visual + me->AddAura( 69422, me ); VoidBlast_Timer = 5000; } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 4c973482784..671c6b8b6d1 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -73,7 +73,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_SARTHARION: m_uiSartharionGUID = creature->GetGUID(); @@ -99,11 +99,11 @@ public: { if (uiType == TYPE_SARTHARION_EVENT) m_auiEncounter[0] = uiData; - else if(uiType == TYPE_TENEBRON_PREKILLED) + else if (uiType == TYPE_TENEBRON_PREKILLED) m_bTenebronKilled = true; - else if(uiType == TYPE_SHADRON_PREKILLED) + else if (uiType == TYPE_SHADRON_PREKILLED) m_bShadronKilled = true; - else if(uiType == TYPE_VESPERON_PREKILLED) + else if (uiType == TYPE_VESPERON_PREKILLED) m_bVesperonKilled = true; } @@ -111,11 +111,11 @@ public: { if (uiType == TYPE_SARTHARION_EVENT) return m_auiEncounter[0]; - else if(uiType == TYPE_TENEBRON_PREKILLED) + else if (uiType == TYPE_TENEBRON_PREKILLED) return m_bTenebronKilled; - else if(uiType == TYPE_SHADRON_PREKILLED) + else if (uiType == TYPE_SHADRON_PREKILLED) return m_bShadronKilled; - else if(uiType == TYPE_VESPERON_PREKILLED) + else if (uiType == TYPE_VESPERON_PREKILLED) return m_bVesperonKilled; return 0; @@ -123,7 +123,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_SARTHARION: return m_uiSartharionGUID; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 2558b03beb6..7e8b8565fc9 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -89,7 +89,7 @@ class boss_baltharus_the_warborn : public CreatureScript void DoAction(int32 const action) { - switch(action) + switch (action) { case ACTION_INTRO_BALTHARUS: if (_introDone) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 3a50838fff9..733af8553e0 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -203,7 +203,7 @@ class spell_saviana_conflagration_init : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(ConflagrationTargetSelector()); + unitList.remove_if (ConflagrationTargetSelector()); uint8 maxSize = uint8(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 6 : 3); if (unitList.size() > maxSize) Trinity::RandomResizeList(unitList, maxSize); 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 139e74ab67e..80a94b5b4fc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -78,7 +78,7 @@ class spell_eadric_radiance : public SpellScriptLoader PrepareSpellScript(spell_eadric_radiance_SpellScript); void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(OrientationCheck(GetCaster())); + unitList.remove_if (OrientationCheck(GetCaster())); } void Register() @@ -317,7 +317,7 @@ public: { me->InterruptNonMeleeSpells(true); uint8 uiTarget = urand(0, 1); - switch(uiTarget) + switch (uiTarget) { case 0: DoCast(me, SPELL_RENEW); @@ -451,7 +451,7 @@ public: { if (uiPoint == 0) { - switch(uiWaypoint) + switch (uiWaypoint) { case 0: me->SetOrientation(5.81f); @@ -470,10 +470,10 @@ public: void SetData(uint32 uiType, uint32 /*uiData*/) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_ARGENT_LIGHWIELDER: - switch(uiType) + switch (uiType) { case 0: AddWaypoint(0, 712.14f, 628.42f, 411.88f); @@ -487,7 +487,7 @@ public: } break; case NPC_ARGENT_MONK: - switch(uiType) + switch (uiType) { case 0: AddWaypoint(0, 713.12f, 632.97f, 411.90f); @@ -501,7 +501,7 @@ public: } break; case NPC_PRIESTESS: - switch(uiType) + switch (uiType) { case 0: AddWaypoint(0, 715.06f, 637.07f, 411.91f); 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 426b41c3f02..55cfef0f160 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -169,7 +169,7 @@ public: } else uiResurrectTimer -= uiDiff; } - switch(uiPhase) + switch (uiPhase) { case PHASE_UNDEAD: case PHASE_SKELETON: @@ -189,7 +189,7 @@ public: DoCastVictim(SPELL_OBLITERATE); uiObliterateTimer = urand(17000, 19000); } else uiObliterateTimer -= uiDiff; - switch(uiPhase) + switch (uiPhase) { case PHASE_UNDEAD: { @@ -273,7 +273,7 @@ public: me->SetHealth(0); me->AddUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); RemoveSummons(); - switch(uiPhase) + switch (uiPhase) { case PHASE_UNDEAD: me->SetDisplayId(MODEL_SKELETON); 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 0c52039ea5d..50cd81ba1c7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -176,7 +176,7 @@ public: void SetData(uint32 uiType, uint32 /*uiData*/) { - switch(uiType) + switch (uiType) { case 1: AddWaypoint(0, 747.36f, 634.07f, 411.572f); @@ -205,7 +205,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 2: if ((pInstance && uiWaypointPath == 3) || uiWaypointPath == 2) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 884da9fc119..415a82651ac 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -109,7 +109,7 @@ public: TeamInInstance = player->GetTeam(); } - switch(creature->GetEntry()) + switch (creature->GetEntry()) { // Champions case VEHICLE_MOKRA_SKILLCRUSHER_MOUNT: @@ -151,7 +151,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_MAIN_GATE: uiMainGateGUID = go->GetGUID(); @@ -165,7 +165,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case DATA_MOVEMENT_DONE: uiMovementDone = uiData; @@ -234,7 +234,7 @@ public: uint32 GetData(uint32 uiData) { - switch(uiData) + switch (uiData) { case BOSS_GRAND_CHAMPIONS: return m_auiEncounter[0]; case BOSS_ARGENT_CHALLENGE_E: return m_auiEncounter[1]; @@ -250,7 +250,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_ANNOUNCER: return uiAnnouncerGUID; case DATA_MAIN_GATE: return uiMainGateGUID; @@ -265,7 +265,7 @@ public: void SetData64(uint32 uiType, uint64 uiData) { - switch(uiType) + switch (uiType) { case DATA_GRAND_CHAMPION_1: uiGrandChampion1GUID = uiData; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index d7c486096bd..6dc0d0365a0 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -135,7 +135,7 @@ public: std::list<uint64> TempList; if (uiLesserChampions == 3 || uiLesserChampions == 6) { - switch(uiLesserChampions) + switch (uiLesserChampions) { case 3: TempList = Champion2List; @@ -187,7 +187,7 @@ public: ++uiSummonTimes; uint32 VEHICLE_TO_SUMMON1 = 0; uint32 VEHICLE_TO_SUMMON2 = 0; - switch(uiBoss) + switch (uiBoss) { case 0: VEHICLE_TO_SUMMON1 = VEHICLE_MOKRA_SKILLCRUSHER_MOUNT; @@ -215,7 +215,7 @@ public: if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1, SpawnPosition)) { - switch(uiSummonTimes) + switch (uiSummonTimes) { case 1: { @@ -273,7 +273,7 @@ public: { if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2, SpawnPosition, TEMPSUMMON_CORPSE_DESPAWN)) { - switch(uiSummonTimes) + switch (uiSummonTimes) { case 1: Champion1List.push_back(pAdd->GetGUID()); @@ -286,7 +286,7 @@ public: break; } - switch(i) + switch (i) { case 0: pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI); @@ -337,7 +337,7 @@ public: { uint8 uiTempBoss = urand(0, 1); - switch(uiTempBoss) + switch (uiTempBoss) { case 0: uiArgentChampion = NPC_EADRIC; @@ -406,7 +406,7 @@ public: if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoSummonGrandChampion(uiSecondBoss); @@ -443,7 +443,7 @@ public: void SummonedCreatureDespawn(Creature* summon) { - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case VEHICLE_DARNASSIA_NIGHTSABER: case VEHICLE_EXODAR_ELEKK: 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 f0c2ca635b2..bc35dad822e 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -104,7 +104,7 @@ enum BossSpells SPELL_SPIKE_TELE = 66170, }; -#define SPELL_PERMAFROST_HELPER RAID_MODE<uint32>(66193,67856,67855,67857) +#define SPELL_PERMAFROST_HELPER RAID_MODE<uint32>(66193, 67856, 67855, 67857) enum SummonActions { 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 7d741cc3226..962ecdff83f 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -226,7 +226,7 @@ public: if (m_uiNetherPowerTimer <= uiDiff) { - me->CastCustomSpell(SPELL_NETHER_POWER, SPELLVALUE_AURA_STACK, RAID_MODE<uint32>(5,10,5,10), me, true); + me->CastCustomSpell(SPELL_NETHER_POWER, SPELLVALUE_AURA_STACK, RAID_MODE<uint32>(5, 10, 5,10), me, true); m_uiNetherPowerTimer = 40*IN_MILLISECONDS; } else m_uiNetherPowerTimer -= 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 51a125d8c79..4824c46deb7 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -158,7 +158,7 @@ public: void MovementInform(uint32 uiType, uint32 uiId) { if (uiType != POINT_MOTION_TYPE) return; - + switch (uiId) { case 0: @@ -661,11 +661,11 @@ public: submergeTimer = 45 * IN_MILLISECONDS; stage = 0; } - + void MovementInform(uint32 uiType, uint32 uiId) { if (uiType != POINT_MOTION_TYPE) return; - + switch (uiId) { case 0: @@ -689,7 +689,7 @@ public: instanceScript->DoUseDoorOrButton(instanceScript->GetData64(GO_MAIN_GATE_DOOR)); boss_jormungarAI::EnterEvadeMode(); } - + void JustReachedHome() { if (instanceScript) 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 ace85756983..dff484a4933 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -81,8 +81,8 @@ enum BossSpells SPELL_DARK_ESSENCE = 65684, SPELL_EMPOWERED_DARK = 65724, SPELL_TWIN_EMPATHY_DARK = 66132, - SPELL_UNLEASHED_DARK = 65808, - + SPELL_UNLEASHED_DARK = 65808, + SPELL_CONTROLLER_PERIODIC = 66149, SPELL_POWER_TWINS = 65879, SPELL_BERSERK = 64238, @@ -408,7 +408,7 @@ public: { m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } - + InstanceScript* m_pInstance; void Reset() { @@ -445,7 +445,7 @@ public: me->SummonCreature(NPC_BULLET_CONTROLLER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN); boss_twin_baseAI::EnterCombat(who); } - + void EnterEvadeMode() { m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); @@ -727,10 +727,10 @@ class spell_powering_up : public SpellScriptLoader { if (pAura->GetStackAmount() == 100) { - if(target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2206, EFFECT_1)) + if (target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2206, EFFECT_1)) target->CastSpell(target, SPELL_EMPOWERED_DARK, true); - if(target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2845, EFFECT_1)) + if (target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2845, EFFECT_1)) target->CastSpell(target, SPELL_EMPOWERED_LIGHT, true); target->RemoveAurasDueToSpell(GetId()); 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 dd772a14b5d..913484cbf77 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 @@ -559,7 +559,7 @@ class npc_tirion_toc : public CreatureScript if (m_pInstance->GetData(TYPE_BEASTS) != DONE) { m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); - + if (Creature* pTemp = me->SummonCreature(NPC_GORMOK, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30*IN_MILLISECONDS)) { pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ()); @@ -625,7 +625,7 @@ class npc_tirion_toc : public CreatureScript pTemp->GetMotionMaster()->MovePoint(2, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ()); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); - + } } m_uiUpdateTimer = 5000; @@ -718,14 +718,14 @@ class npc_tirion_toc : public CreatureScript break; case 4010: DoScriptText(SAY_STAGE_3_02, me); - if(Creature* pTemp = me->SummonCreature(NPC_LIGHTBANE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) + if (Creature* pTemp = me->SummonCreature(NPC_LIGHTBANE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) { pTemp->SetVisible(false); pTemp->SetReactState(REACT_PASSIVE); pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[0].GetPositionX(), TwinValkyrsLoc[0].GetPositionY(), TwinValkyrsLoc[0].GetPositionZ()); pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[1].GetPositionX(), TwinValkyrsLoc[1].GetPositionY(), TwinValkyrsLoc[1].GetPositionZ()); } - if(Creature* pTemp = me->SummonCreature(NPC_DARKBANE, ToCSpawnLoc[2].GetPositionX(), ToCSpawnLoc[2].GetPositionY(), ToCSpawnLoc[2].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) + if (Creature* pTemp = me->SummonCreature(NPC_DARKBANE, ToCSpawnLoc[2].GetPositionX(), ToCSpawnLoc[2].GetPositionY(), ToCSpawnLoc[2].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) { pTemp->SetVisible(false); pTemp->SetReactState(REACT_PASSIVE); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 3dcc620c87a..48616d8e6e4 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -100,7 +100,7 @@ class boss_dred : public CreatureScript if (uiGrievousBiteTimer <= diff) { - DoCastVictim(SPELL_GRIEVOUS_BITE , false); + DoCastVictim(SPELL_GRIEVOUS_BITE, false); uiGrievousBiteTimer = 20000; } else diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 6c4920f7744..c2217f0cb23 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -90,7 +90,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_NOVOS_CRYSTAL_1: uiNovosCrystal1 = go->GetGUID(); @@ -109,7 +109,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_TROLLGORE: uiTrollgore = creature->GetGUID(); @@ -128,7 +128,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_TROLLGORE: return uiTrollgore; case DATA_NOVOS: return uiNovos; @@ -145,7 +145,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_TROLLGORE_EVENT: m_auiEncounter[0] = data; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 5c3249949b8..eacb800f15a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -143,7 +143,7 @@ class boss_bronjahm : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_MAGIC_BANE: DoCastVictim(SPELL_MAGIC_S_BANE); @@ -377,7 +377,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader void FilterTargetsInitial(std::list<Unit*>& unitList) { - unitList.remove_if(DistanceCheck(GetCaster())); + unitList.remove_if (DistanceCheck(GetCaster())); sharedUnitList = unitList; } 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 51b240976c9..adbe59555b6 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 @@ -261,7 +261,7 @@ class boss_devourer_of_souls : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_PHANTOM_BLAST: DoCastVictim(SPELL_PHANTOM_BLAST); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index e337050a5a2..9a37465fc1b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -173,7 +173,7 @@ public: void DoAction(const int32 actionId) { - switch(actionId) + switch (actionId) { case ACTION_INTRO: { @@ -193,7 +193,7 @@ public: return; events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_INTRO_1: DoScriptText(SAY_SYLVANAS_INTRO_1, me); @@ -254,7 +254,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -299,7 +299,7 @@ public: void DoAction(const int32 actionId) { - switch(actionId) + switch (actionId) { case ACTION_INTRO: { @@ -319,7 +319,7 @@ public: return; events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_INTRO_1: DoScriptText(SAY_JAINA_INTRO_1, me); @@ -391,7 +391,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -446,7 +446,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SPITE: DoCastVictim(SPELL_SPITE); @@ -502,7 +502,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_VEIL_OF_SHADOWS: DoCastVictim(SPELL_VEIL_OF_SHADOWS); @@ -560,7 +560,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHROUD_OF_RUNES: DoCast(me, SPELL_SHROUD_OF_RUNES); @@ -617,7 +617,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_FROST_NOVA: DoCast(me, SPELL_FROST_NOVA); @@ -677,7 +677,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BONE_VOLLEY: DoCastAOE(SPELL_BONE_VOLLEY); @@ -743,7 +743,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_RAISE_DEAD: DoCast(me, SPELL_RAISE_DEAD); @@ -816,7 +816,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_RAISE_DEAD: DoCast(me, SPELL_RAISE_DEAD); @@ -883,7 +883,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SOUL_STRIKE: DoCast(me->getVictim(), SPELL_SOUL_STRIKE); 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 f4bb4a9f72c..1f79f53ca86 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -230,7 +230,7 @@ public: void DoAction(const int32 actionId) { - switch(actionId) + switch (actionId) { case ACTION_START_INTRO: events.ScheduleEvent(EVENT_START_INTRO, 0); @@ -244,7 +244,7 @@ public: void UpdateAI(const uint32 diff) { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_START_INTRO: me->GetMotionMaster()->MovePoint(0, MoveThronePos); @@ -664,7 +664,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHADOW_WORD_PAIN: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) @@ -747,7 +747,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_FIREBALL: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) @@ -847,7 +847,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHADOW_STEP: DoCast(SPELL_SHADOW_STEP); @@ -917,7 +917,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SPECTRAL_STRIKE: DoCast(me->getVictim(), SPELL_SPECTRAL_STRIKE); @@ -983,7 +983,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHOOT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) 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 c34f64df816..8381ead167d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -104,7 +104,7 @@ struct boss_horAI : ScriptedAI void DoAction(const int32 actionID) { - switch(actionID) + switch (actionID) { case ACTION_ENTER_COMBAT: // called by InstanceScript when boss shall enter in combat. // Just in case. Should have been done by InstanceScript diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index f86acaf623a..8e7155603eb 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -157,7 +157,7 @@ public: if (Player* player = players.begin()->getSource()) uiTeamInInstance = player->GetTeam(); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_FALRIC: uiFalric = creature->GetGUID(); @@ -180,7 +180,7 @@ public: void OnGameObjectCreate(GameObject* go) { // TODO: init state depending on encounters - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FROSTMOURNE: uiFrostmourne = go->GetGUID(); @@ -221,7 +221,7 @@ public: if (uiWaveCount && data == NOT_STARTED) DoWipe(); - switch(type) + switch (type) { case DATA_FALRIC_EVENT: uiEncounter[0] = data; @@ -244,7 +244,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_FALRIC_EVENT: return uiEncounter[0]; case DATA_MARWYN_EVENT: return uiEncounter[1]; @@ -258,7 +258,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_FALRIC: return uiFalric; case DATA_MARWYN: return uiMarwyn; @@ -320,7 +320,7 @@ public: DoUpdateWorldState(WORLD_STATE_HOR, 1); DoUpdateWorldState(WORLD_STATE_HOR_WAVE_COUNT, uiWaveCount); - switch(uiWaveCount) + switch (uiWaveCount) { case 1: case 2: @@ -407,7 +407,7 @@ public: events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_NEXT_WAVE: uiWaveCount++; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 2bf8876572f..29a89328336 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -162,7 +162,7 @@ class instance_pit_of_saron : public InstanceMapScript switch (type) { case DATA_GARFROST: - if(state == DONE) + if (state == DONE) { if (Creature* summoner = instance->GetCreature(_garfrostGUID)) { 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 fa573408d3c..034bfafe8b0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -192,7 +192,7 @@ class mob_wrathbone_laborer : public CreatureScript while (uint32 eventId = _events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BLINDING_DIRT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 10.0f, true)) diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 945239cc594..690b0f0a35e 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -138,7 +138,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case CREATURE_SLAD_RAN: uiSladRan = creature->GetGUID(); break; case CREATURE_MOORABI: uiMoorabi = creature->GetGUID(); break; @@ -154,7 +154,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 192518: uiSladRanAltar = go->GetGUID(); @@ -253,7 +253,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_SLAD_RAN_EVENT: m_auiEncounter[0] = data; @@ -317,7 +317,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_SLAD_RAN_EVENT: return m_auiEncounter[0]; @@ -338,7 +338,7 @@ public: uint64 GetData64(uint32 type) { - switch(type) + switch (type) { case DATA_SLAD_RAN_ALTAR: return uiSladRanAltar; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 332c52f55b6..559c9ae6aa9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -657,7 +657,7 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader void FilterTargets(std::list<Unit*>& targets) { uint32 targetCount = (targets.size() + 2) / 3; - targets.remove_if(BloodboltHitCheck(static_cast<LanaThelAI*>(GetCaster()->GetAI()))); + targets.remove_if (BloodboltHitCheck(static_cast<LanaThelAI*>(GetCaster()->GetAI()))); Trinity::RandomResizeList(targets, targetCount); // mark targets now, effect hook has missile travel time delay (might cast next in that time) for (std::list<Unit*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) @@ -694,7 +694,7 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); + unitList.remove_if (Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); bool remove = true; std::list<Unit*>::const_iterator itrEnd = unitList.end(), itr, itr2; @@ -780,7 +780,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); + unitList.remove_if (Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); unitList.push_back(GetCaster()); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index cb7c25e152b..4703e827522 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -719,7 +719,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript float x, y, z; deathbringer->GetClosePoint(x, y, z, deathbringer->GetObjectSize()); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(POINT_CORPSE , x, y, z); + me->GetMotionMaster()->MovePoint(POINT_CORPSE, x, y, z); } break; case EVENT_OUTRO_HORDE_5: // move diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 24738fe0155..58ae5f48797 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -490,7 +490,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader { // remove targets with this aura already // tank is not on this list - targets.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); + targets.remove_if (Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); if (targets.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 65edd4cca37..dca53f1a5e7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1020,7 +1020,7 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(UnchainedMagicTargetSelector()); + unitList.remove_if (UnchainedMagicTargetSelector()); uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 5 : 2); if (unitList.size() > maxSize) Trinity::RandomResizeList(unitList, maxSize); @@ -1214,7 +1214,7 @@ class spell_sindragosa_collision_filter : public SpellScriptLoader { std::list<Creature*> tombs; GetCreatureListWithEntryInGrid(tombs, GetCaster(), NPC_ICE_TOMB, 200.0f); - unitList.remove_if(FrostBombTargetSelector(GetCaster(), tombs)); + unitList.remove_if (FrostBombTargetSelector(GetCaster(), tombs)); } void Register() @@ -1353,7 +1353,7 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader std::list<Creature*> unitList; GetCreatureListWithEntryInGrid(unitList, GetCaster(), NPC_FROSTWING_WHELP, 150.0f); if (Creature* creature = GetCaster()->ToCreature()) - unitList.remove_if(OrderWhelpTargetSelector(creature)); + unitList.remove_if (OrderWhelpTargetSelector(creature)); SelectRandomContainerElement(unitList)->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 8b2153b2006..5f62c2b5424 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -1187,7 +1187,7 @@ class spell_dreamwalker_summoner : public SpellScriptLoader void FilterTargets(std::list<Unit*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); + targets.remove_if (Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); if (targets.empty()) return; @@ -1236,7 +1236,7 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader std::list<Creature*> summoners; GetCreatureListWithEntryInGrid(summoners, caster, NPC_WORLD_TRIGGER, 100.0f); - summoners.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); + summoners.remove_if (Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); Trinity::RandomResizeList(summoners, 2); if (summoners.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 25e77fb4506..01fe08f31e2 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1824,7 +1824,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { // Select valid targets for jump - unitList.remove_if(DeathPlagueTargetSelector(GetCaster())); + unitList.remove_if (DeathPlagueTargetSelector(GetCaster())); if (!unitList.empty()) { Unit* target = SelectRandomContainerElement(unitList); @@ -1913,7 +1913,7 @@ class spell_svalna_revive_champion : public SpellScriptLoader void RemoveAliveTarget(std::list<Unit*>& unitList) { - unitList.remove_if(AliveCheck()); + unitList.remove_if (AliveCheck()); Trinity::RandomResizeList(unitList, 2); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 41705ca0e78..d38af614bc0 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -50,7 +50,7 @@ DoorData const doorData[] = {GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR, DATA_SINDRAGOSA, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, {GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM, BOUNDARY_SE }, {GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM, BOUNDARY_SW }, - {0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE},// END + {0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE}, // END }; // this doesnt have to only store questgivers, also can be used for related quest spawns diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 29e4ac70e21..c2107e88b2e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -149,7 +149,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_IMPALE: //Cast Impale on a random target diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 5bd675ea0ba..0462f669d88 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -197,7 +197,7 @@ public: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); me->SetSpeed(MOVE_RUN, me->GetSpeedRate(MOVE_RUN), true); - switch(id) + switch (id) { case HORSEMEN_THANE: me->GetMotionMaster()->MovePoint(0, WaypointPositions[0]); @@ -347,7 +347,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_MARK: if (!(rand()%5)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index e340e1d213b..1849849d907 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -101,7 +101,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_WOUND: DoCast(me->getVictim(), SPELL_MORTAL_WOUND); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 2a93d170318..bbf5b669494 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -278,7 +278,7 @@ class boss_gothik : public CreatureScript } else { - switch(entry) + switch (entry) { case MOB_LIVE_TRAINEE: { @@ -346,7 +346,7 @@ class boss_gothik : public CreatureScript void SpellHit(Unit* /*caster*/, SpellInfo const* spell) { uint32 spellId = 0; - switch(spell->Id) + switch (spell->Id) { case SPELL_INFORM_LIVE_TRAINEE: spellId = SPELL_INFORM_DEAD_TRAINEE; break; case SPELL_INFORM_LIVE_KNIGHT: spellId = SPELL_INFORM_DEAD_KNIGHT; break; @@ -360,7 +360,7 @@ class boss_gothik : public CreatureScript } } - void DamageTaken(Unit* /*who*/ , uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) { if (!phaseTwo) damage = 0; @@ -371,7 +371,7 @@ class boss_gothik : public CreatureScript if (!me->isInCombat()) return; - switch(spell->Id) + switch (spell->Id) { case SPELL_INFORM_DEAD_TRAINEE: DoSummon(MOB_DEAD_TRAINEE, target, 0); @@ -405,7 +405,7 @@ class boss_gothik : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SUMMON: if (waves[waveCount].entry) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 6bb0675b7fc..3badccd3a80 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -77,7 +77,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_CLOUD: DoCastAOE(SPELL_POISON_CLOUD); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index c214141cd32..bb8a0909df4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -132,7 +132,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_DISRUPT: DoCastAOE(SPELL_SPELL_DISRUPTION); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 0740746db4a..7307fad3701 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -396,7 +396,7 @@ public: { while (uint32 eventId = events.GetEvent()) { - switch(eventId) + switch (eventId) { case EVENT_WASTE: DoSummon(NPC_WASTE, Pos[RAND(0, 3, 6, 9)]); @@ -491,7 +491,7 @@ public: if (uint32 eventId = events.GetEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BOLT: DoCastVictim(RAID_MODE(SPELL_FROST_BOLT, H_SPELL_FROST_BOLT)); @@ -540,7 +540,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, NotCharmedTargetSelector())) { - switch(player->getClass()) + switch (player->getClass()) { case CLASS_DRUID: if (urand(0, 1)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 8159765d9e9..6db29be8fbd 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -67,7 +67,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_AURA: DoCastAOE(SPELL_NECROTIC_AURA); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 9384eb04bc8..e98b004f9e9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -98,7 +98,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_WRAP: // TODO : Add missing text diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index ca85034d36f..04627981ef3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -149,7 +149,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_CURSE: DoCastAOE(SPELL_CURSE_PLAGUEBRINGER); @@ -178,7 +178,7 @@ public: return; case EVENT_WAVE: DoScriptText(SAY_SUMMON, me); - switch(balconyCount) + switch (balconyCount) { case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break; case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1, 2)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 9e87ed06069..10f1b809694 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -107,7 +107,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_HATEFUL: { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 0d8c993ffa6..7adc17cc852 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -107,7 +107,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_STRIKE: DoCast(me->getVictim(), SPELL_UNBALANCING_STRIKE); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index c39072ae2d1..ce9f55ae0b6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -244,7 +244,7 @@ public: { while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BERSERK: DoScriptText(EMOTE_ENRAGE, me); @@ -288,7 +288,7 @@ public: { if (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_LIFTOFF: me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 9859cd758df..b8058afe488 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -151,7 +151,7 @@ public: void DoAction(const int32 action) { - switch(action) + switch (action) { case ACTION_FEUGEN_RESET: checkFeugenAlive = true; @@ -229,7 +229,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHIFT: DoCastAOE(SPELL_POLARITY_SHIFT); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index f08e0ccb5cf..db9fbc5a0a1 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -169,7 +169,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 15989: SapphironGUID = creature->GetGUID(); return; case 15953: uiFaerlina = creature->GetGUID(); return; @@ -265,7 +265,7 @@ public: void SetData(uint32 id, uint32 value) { - switch(id) + switch (id) { case DATA_HEIGAN_ERUPT: HeiganErupt(value); @@ -316,7 +316,7 @@ public: uint64 GetData64(uint32 id) { - switch(id) + switch (id) { case DATA_FAERLINA: return uiFaerlina; @@ -386,7 +386,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscvalue1 = 0*/) { - switch(criteria_id) + switch (criteria_id) { case 7600: // Criteria for achievement 2176: And They Would All Go Down Together 15sec of each other 10-man if (Difficulty(instance->GetSpawnMode()) == RAID_DIFFICULTY_10MAN_NORMAL && (maxHorsemenDiedTime - minHorsemenDiedTime) < 15) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 46bf017eb42..282e6b3eb98 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -149,7 +149,7 @@ enum MalygosSays #define MAX_HOVER_DISK_WAYPOINTS 18 -// Sniffed data (x,y,z) +// Sniffed data (x, y,z) const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = { {782.9821f, 1296.652f, 282.1114f, 0.0f}, @@ -174,7 +174,7 @@ const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = #define GROUND_Z 268 -// Source: Sniffs (x,y,z) +// Source: Sniffs (x, y,z) #define MALYGOS_MAX_WAYPOINTS 16 const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] = { @@ -1049,7 +1049,7 @@ public: { MakePlayerEnter(); _entered = true; - } else + } else _timer -= diff; } } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 88fe98e8370..0568bb13a8e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -162,7 +162,7 @@ class boss_anomalus : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) Rift->AI()->AttackStart(target); uiChaoticRiftGUID = Rift->GetGUID(); - DoScriptText(SAY_RIFT , me); + DoScriptText(SAY_RIFT, me); } } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 30fd0695a9f..d2130a4bada 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -151,7 +151,7 @@ public: uint32 GetData(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MAGUS_TELESTRA_EVENT: return m_auiEncounter[0]; case DATA_ANOMALUS_EVENT: return m_auiEncounter[1]; @@ -218,7 +218,7 @@ public: uint64 GetData64(uint32 uiIdentifier) { - switch(uiIdentifier) + switch (uiIdentifier) { case DATA_ANOMALUS: return Anomalus; case DATA_KERISTRASZA: return Keristrasza; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index da8a6552ed3..df606f61d57 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -65,7 +65,7 @@ enum Actions ACTION_SET_NORMAL_EVENTS = 1 }; -/*Ruby Drake , +/*Ruby Drake, (npc 27756) (item 37860) (summoned by spell Ruby Essence = 37860 ---> Call Amber Drake == 49462 ---> Summon 27756) */ diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 88eda112e52..22aaa74a174 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -175,7 +175,7 @@ public: void SetPosition(uint8 i) { - switch(i) + switch (i) { case 0: x = me->GetPositionX() + 4; @@ -300,7 +300,7 @@ public: void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) { - switch(pSpell->Id) + switch (pSpell->Id) { case SPELL_SUMMON_MENAGERIE: me->SetHomePosition(968.66f, 1042.53f, 527.32f, 0.077f); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 14acfbec03d..a2db75d1600 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -99,7 +99,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_DRAKOS: drakosGUID = creature->GetGUID(); @@ -170,7 +170,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_UROM_PLATAFORM: platformUrom = data; @@ -180,7 +180,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_UROM_PLATAFORM: return platformUrom; // used by condition system @@ -192,7 +192,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_DRAKOS: return drakosGUID; case DATA_VAROS: return varosGUID; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 765a7674823..f8839aa0028 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -58,10 +58,10 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_VERDISA: //Verdisa - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: if (!HAS_ESSENCE(player)) @@ -91,7 +91,7 @@ public: } break; case NPC_BELGARISTRASZ: //Belgaristrasz - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: if (!HAS_ESSENCE(player)) @@ -121,7 +121,7 @@ public: } break; case NPC_ETERNOS: //Eternos - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: if (!HAS_ESSENCE(player)) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index b44ab3820fc..c091906d490 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -194,7 +194,7 @@ public: //TODO: remove when removal is done by the core void DoRemoveStanceAura(uint8 uiStance) { - switch(uiStance) + switch (uiStance) { case STANCE_DEFENSIVE: me->RemoveAurasDueToSpell(SPELL_DEFENSIVE_STANCE); @@ -230,7 +230,7 @@ public: m_uiStance = uiTempStance; - switch(m_uiStance) + switch (m_uiStance) { case STANCE_DEFENSIVE: DoScriptText(SAY_DEFENSIVE_STANCE, me); @@ -258,7 +258,7 @@ public: else m_uiChangeStance_Timer -= uiDiff; - switch(m_uiStance) + switch (m_uiStance) { case STANCE_DEFENSIVE: { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 04b09da1ca2..4e386ff9c17 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -204,7 +204,7 @@ public: // Health check if (HealthBelowPct(100 - 25 * m_uiHealthAmountModifier)) { - switch(m_uiHealthAmountModifier) + switch (m_uiHealthAmountModifier) { case 1: DoScriptText(SAY_75HEALTH, me); break; case 2: DoScriptText(SAY_50HEALTH, me); break; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 0fefb28e9ab..8d7731b3eee 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -78,7 +78,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_BJARNGRIM: m_uiGeneralBjarngrimGUID = creature->GetGUID(); @@ -97,7 +97,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_BJARNGRIM_DOOR: m_uiBjarngrimDoorGUID = go->GetGUID(); @@ -135,7 +135,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case TYPE_BJARNGRIM: if (uiData == DONE) @@ -175,7 +175,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case TYPE_BJARNGRIM: return m_auiEncounter[0]; @@ -191,7 +191,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_BJARNGRIM: return m_uiGeneralBjarngrimGUID; 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 044c01b6687..e5f3cfd7229 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -348,7 +348,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 7: if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) @@ -380,7 +380,7 @@ public: void SpawnDwarf(uint32 uiType) { - switch(uiType) + switch (uiType) { case 1: { @@ -439,7 +439,7 @@ public: { if (uiPhaseTimer <= uiDiff) { - switch(uiStep) + switch (uiStep) { case 1: if (pInstance) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 9285d852404..e46a7dae107 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -91,7 +91,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case CREATURE_MAIDEN: uiMaidenOfGrief = creature->GetGUID(); break; case CREATURE_KRYSTALLUS: uiKrystallus = creature->GetGUID(); break; @@ -105,7 +105,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ABEDNEUM: uiAbedneumGo = go->GetGUID(); @@ -154,7 +154,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_MAIDEN_OF_GRIEF_EVENT: m_auiEncounter[1] = data; @@ -187,7 +187,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_KRYSTALLUS_EVENT: return m_auiEncounter[0]; case DATA_MAIDEN_OF_GRIEF_EVENT: return m_auiEncounter[1]; @@ -200,7 +200,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MAIDEN_OF_GRIEF: return uiMaidenOfGrief; case DATA_KRYSTALLUS: return uiKrystallus; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 244c6a579a2..2c99b4d7246 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -229,7 +229,7 @@ public: { if (uiPhase_timer <= diff) { - switch(uiStep) + switch (uiStep) { case 1: DoScriptText(SAY_SUMMON_1, me); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index 828cf65beec..2e2ca25385c 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -653,7 +653,7 @@ class boss_stormcaller_brundir : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BERSERK: DoScriptText(SAY_BRUNDIR_BERSERK, me); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index 685870d6d44..bcc417c50cd 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -121,7 +121,7 @@ class boss_auriaya : public CreatureScript void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO,me); + DoScriptText(SAY_AGGRO, me); events.ScheduleEvent(EVENT_SCREECH, urand(45000, 65000)); events.ScheduleEvent(EVENT_BLAST, urand(20000, 25000)); @@ -332,8 +332,8 @@ class npc_sanctum_sentry : public CreatureScript void Reset() { - events.ScheduleEvent(EVENT_RIP, urand(4000,8000)); - events.ScheduleEvent(EVENT_POUNCE, urand(12000,15000)); + events.ScheduleEvent(EVENT_RIP, urand(4000, 8000)); + events.ScheduleEvent(EVENT_POUNCE, urand(12000, 15000)); } void EnterCombat(Unit* /*who*/) @@ -366,7 +366,7 @@ class npc_sanctum_sentry : public CreatureScript me->AI()->AttackStart(target); DoCast(target, SPELL_SAVAGE_POUNCE); } - events.ScheduleEvent(EVENT_POUNCE, urand(12000,17000)); + events.ScheduleEvent(EVENT_POUNCE, urand(12000, 17000)); break; default: break; @@ -492,7 +492,7 @@ class spell_auriaya_strenght_of_the_pack : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(SanctumSentryCheck()); + unitList.remove_if (SanctumSentryCheck()); } void Register() @@ -518,7 +518,7 @@ class spell_auriaya_sentinel_blast : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(PlayerOrPetCheck()); + unitList.remove_if (PlayerOrPetCheck()); } void Register() diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index aa9516d479f..9272aa03c41 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -655,7 +655,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript if (NapalmTimer <= diff) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if(CanAIAttack(target)) + if (CanAIAttack(target)) DoCast(target, SPELL_NAPALM, true); NapalmTimer = 5000; @@ -1229,7 +1229,7 @@ public: //bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction) //{ // player->PlayerTalkClass->ClearMenus(); - // switch(uiAction) + // switch (uiAction) // { // case GOSSIP_ACTION_INFO_DEF+1: // if (player) @@ -1660,7 +1660,7 @@ class spell_pursue : public SpellScriptLoader void FilterTargets(std::list<Unit*>& targets) { - targets.remove_if(FlameLeviathanPursuedTargetSelector(GetCaster())); + targets.remove_if (FlameLeviathanPursuedTargetSelector(GetCaster())); if (targets.empty()) if (Creature* caster = GetCaster()->ToCreature()) caster->AI()->EnterEvadeMode(); @@ -1673,7 +1673,7 @@ class spell_pursue : public SpellScriptLoader return; caster->AI()->AttackStart(GetHitUnit()); // Chase target - + for (SeatMap::const_iterator itr = caster->GetVehicleKit()->Seats.begin(); itr != caster->GetVehicleKit()->Seats.end(); ++itr) { if (IS_PLAYER_GUID(itr->second.Passenger)) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 2331cc9a68c..b8876ae577a 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -398,9 +398,9 @@ class npc_scorch_ground : public CreatureScript { if (_heat) { - if(_heatTimer <= uiDiff) + if (_heatTimer <= uiDiff) { - Creature* construct = me->GetCreature(*me , _constructGUID); + Creature* construct = me->GetCreature(*me, _constructGUID); if (construct && !construct->HasAura(SPELL_MOLTEN)) { me->AddAura(SPELL_HEAT, construct); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index bdabaddfcf9..5da1c485986 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -270,7 +270,7 @@ class boss_kologarn : public CreatureScript break; case EVENT_STONE_SHOUT: DoCast(SPELL_STONE_SHOUT); - events.ScheduleEvent(EVENT_STONE_SHOUT, 2 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_STONE_SHOUT, 2 * IN_MILLISECONDS); break; case EVENT_ENRAGE: DoCast(SPELL_BERSERK); @@ -352,7 +352,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) {} @@ -391,7 +391,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader void FilterTargetsInitial(std::list<Unit*>& unitList) { // Remove "main tank" and non-player targets - unitList.remove_if(StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->getVictim())); + unitList.remove_if (StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->getVictim())); // Maximum affected targets per difficulty mode uint32 maxTargets = 1; if (GetSpellInfo()->Id == 63981) @@ -601,7 +601,7 @@ class spell_kologarn_stone_shout : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(PlayerOrPetCheck()); + unitList.remove_if (PlayerOrPetCheck()); } void Register() diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index c58f2a24b9c..ae803b24642 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -947,7 +947,7 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(PlayerOrPetCheck()); + unitList.remove_if (PlayerOrPetCheck()); } void Register() diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index 251a18e98f2..9e577ec4319 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -23,7 +23,7 @@ static DoorData const doorData[] = { { GO_LEVIATHAN_DOOR, BOSS_LEVIATHAN, DOOR_TYPE_ROOM, BOUNDARY_S }, - { GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S }, + { GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S }, { 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }, }; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h index cff57563843..4eaed6c9fad 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h @@ -169,7 +169,7 @@ enum UlduarData { // Collosus (Leviathan) DATA_COLOSSUS = 20, - + // Razorscale DATA_EXPEDITION_COMMANDER, DATA_RAZORSCALE_CONTROL, 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 4e6a6fb72c5..b3e12415fdc 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 @@ -309,10 +309,10 @@ public: void Reset() { me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_HOVER); - me->SetSpeed(MOVE_SWIM , 1.0f); - me->SetSpeed(MOVE_RUN , 1.0f); - me->SetSpeed(MOVE_WALK , 1.0f); - //me->SetSpeed(MOVE_FLIGHT , 1.0f); + me->SetSpeed(MOVE_SWIM, 1.0f); + me->SetSpeed(MOVE_RUN, 1.0f); + me->SetSpeed(MOVE_WALK, 1.0f); + //me->SetSpeed(MOVE_FLIGHT, 1.0f); me->GetPosition(x, y, z); DoTeleportTo(x+1, y, z+30); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 639ff4e07d3..029ebbfe8bc 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -219,11 +219,11 @@ public: DoScriptText(SAY_SKELETONS, me); for (uint8 i = 0; i < 5; ++i) { - Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); + Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1], SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); if (Skeleton) { Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY() , me->GetPositionZ()); + Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); Skeleton->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Skeleton); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index b8e595a3452..89bad9e7068 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -124,7 +124,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 23953: Keleseth = creature->GetGUID(); break; case 24201: Dalronn = creature->GetGUID(); break; @@ -135,7 +135,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { //door and object id case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); @@ -165,7 +165,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_PRINCEKELESETH: return Keleseth; case DATA_DALRONN: return Dalronn; @@ -178,7 +178,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_PRINCEKELESETH_EVENT: m_auiEncounter[0] = data; @@ -246,7 +246,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_PRINCEKELESETH_EVENT: return m_auiEncounter[0]; case DATA_SKARVALD_DALRONN_EVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index cbdb1743e3e..34041445266 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -56,7 +56,7 @@ public: { if (pInstance) { - switch(fm_Type) + switch (fm_Type) { case 1: pInstance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE); @@ -76,7 +76,7 @@ public: if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) { - switch(fm_Type) + switch (fm_Type) { case 1: pInstance->SetData(EVENT_FORGE_1, DONE); @@ -96,7 +96,7 @@ public: if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) { - switch(fm_Type) + switch (fm_Type) { case 1: pInstance->SetData(EVENT_FORGE_1, IN_PROGRESS); @@ -109,7 +109,7 @@ public: break; } } - me->SetUInt32Value(UNIT_NPC_EMOTESTATE , EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); } uint8 GetForgeMasterType() diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index c93b9c7bda6..e0164f46bd8 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -780,7 +780,7 @@ public: if (currentPhase<5&¤tPhase >= 0) { Creature* pNext = NULL; - switch(currentPhase) + switch (currentPhase) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; @@ -811,7 +811,7 @@ public: if (id > 4) return; Creature* pNext = NULL; - switch(id) + switch (id) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 325dd67443f..1de46ca9de3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -286,7 +286,7 @@ public: Phase = SKADI; me->SetFlying(false); me->Unmount(); - if(Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) + if (Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) { pGrauf->GetMotionMaster()->MoveFall(0); pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); @@ -304,7 +304,7 @@ public: void UpdateAI(const uint32 diff) { - switch(Phase) + switch (Phase) { case FLYING: if (!UpdateVictim()) @@ -340,7 +340,7 @@ public: if (m_uiMovementTimer <= diff) { - switch(m_uiWaypointId) + switch (m_uiWaypointId) { case 0: me->GetMotionMaster()->MovePoint(0, Location[1].GetPositionX(), Location[1].GetPositionY(), Location[1].GetPositionZ()); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index e021936fcc4..4bfd2d53761 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -219,7 +219,7 @@ public: pTemp->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true); pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); pTemp->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - switch(m_uiActiveOrder[m_uiActivedNumber]) + switch (m_uiActiveOrder[m_uiActivedNumber]) { case 0: m_bIsActiveWithBJORN = true; break; case 1: m_bIsActiveWithHALDOR = true; break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index 2eff50c1f8e..5cc68e20f9f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -104,7 +104,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case BOSS_SVALA_SORROWGRAVE: uiSvalaSorrowgrave = creature->GetGUID(); break; case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = creature->GetGUID(); break; @@ -121,7 +121,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case ENTRY_SKADI_THE_RUTHLESS_DOOR: uiSkadiTheRuthlessDoor = go->GetGUID(); @@ -144,7 +144,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_SVALA_SORROWGRAVE_EVENT: m_auiEncounter[0] = data; @@ -176,7 +176,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_SVALA_SORROWGRAVE_EVENT: return m_auiEncounter[0]; case DATA_GORTOK_PALEHOOF_EVENT: return m_auiEncounter[1]; @@ -188,7 +188,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SVALA_SORROWGRAVE: return uiSvalaSorrowgrave; case DATA_GORTOK_PALEHOOF: return uiGortokPalehoof; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 562a5930535..1bf13ffd5ce 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -157,7 +157,7 @@ public: if (!me->isAlive()) return; - switch(param) + switch (param) { case ACTION_WATER_ELEMENT_HIT: me->ModifyHealth(int32(me->CountPctFromMaxHealth(1))); @@ -371,7 +371,7 @@ public: { if (Creature* pIchoron = Unit::GetCreature(*me, pInstance->GetData64(DATA_ICHORON))) { - if (me->IsWithinDist(pIchoron, 2.0f , false)) + if (me->IsWithinDist(pIchoron, 2.0f, false)) { if (pIchoron->AI()) pIchoron->AI()->DoAction(ACTION_WATER_ELEMENT_HIT); diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 1af9063a71b..a49462813f2 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -99,7 +99,7 @@ public: void DespawnSphere() { std::list<Creature*> assistList; - GetCreatureListWithEntryInGrid(assistList, me, NPC_ETHEREAL_SPHERE , 150.0f); + GetCreatureListWithEntryInGrid(assistList, me, NPC_ETHEREAL_SPHERE, 150.0f); if (assistList.empty()) return; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index b6e40f21c6e..ad295ec1a9a 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -228,7 +228,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case CREATURE_XEVOZZ: uiXevozz = creature->GetGUID(); @@ -273,7 +273,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_EREKEM_GUARD_1_DOOR: uiErekemLeftGuardCell = go->GetGUID(); @@ -311,7 +311,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_1ST_BOSS_EVENT: UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, CREATURE_EREKEM, NULL); @@ -354,13 +354,13 @@ public: NpcAtDoorCastingList.push_back(data); break; case DATA_NPC_PRESENCE_AT_DOOR_REMOVE: - if(!NpcAtDoorCastingList.empty()) + if (!NpcAtDoorCastingList.empty()) NpcAtDoorCastingList.pop_back(); break; case DATA_MAIN_DOOR: if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor)) { - switch(data) + switch (data) { case GO_STATE_ACTIVE: pMainDoor->SetGoState(GO_STATE_ACTIVE); @@ -375,7 +375,7 @@ public: } break; case DATA_START_BOSS_ENCOUNTER: - switch(uiWaveCount) + switch (uiWaveCount) { case 6: StartBossEncounter(uiFirstBoss); @@ -404,7 +404,7 @@ public: void SetData64(uint32 type, uint64 data) { - switch(type) + switch (type) { case DATA_ADD_TRASH_MOB: trashMobs.insert(data); @@ -417,7 +417,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_1ST_BOSS_EVENT: return m_auiEncounter[0]; case DATA_2ND_BOSS_EVENT: return m_auiEncounter[1]; @@ -438,7 +438,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MORAGG: return uiMoragg; case DATA_EREKEM: return uiErekem; @@ -470,7 +470,7 @@ public: { SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1, 5))%6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) - if(Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, PortalLocation[GetData(DATA_PORTAL_LOCATION)], TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, PortalLocation[GetData(DATA_PORTAL_LOCATION)], TEMPSUMMON_CORPSE_DESPAWN)) uiTeleportationPortal = portal->GetGUID(); } @@ -478,7 +478,7 @@ public: { Creature* pBoss = NULL; - switch(uiBoss) + switch (uiBoss) { case BOSS_MORAGG: HandleGameObject(uiMoraggCell, bForceRespawn); @@ -565,14 +565,14 @@ public: DoUpdateWorldState(WORLD_STATE_VH, 1); DoUpdateWorldState(WORLD_STATE_VH_WAVE_COUNT, uiWaveCount); - switch(uiWaveCount) + switch (uiWaveCount) { case 6: if (uiFirstBoss == 0) uiFirstBoss = urand(1, 6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { - if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) uiSaboteurPortal = pPortal->GetGUID(); if (Creature* pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false); @@ -586,7 +586,7 @@ public: } while (uiSecondBoss == uiFirstBoss); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { - if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) uiSaboteurPortal = pPortal->GetGUID(); if (Creature* pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false); @@ -733,7 +733,7 @@ public: { if (uiCyanigosaEventTimer <= diff) { - switch(uiCyanigosaEventPhase) + switch (uiCyanigosaEventPhase) { case 1: pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false); @@ -766,9 +766,9 @@ public: if (GetData(DATA_NPC_PRESENCE_AT_DOOR) && uiMainEventPhase == IN_PROGRESS) { // if door integrity is > 0 then decrase it's integrity state - if(GetData(DATA_DOOR_INTEGRITY)) + if (GetData(DATA_DOOR_INTEGRITY)) { - if(uiDoorSpellTimer < diff) + if (uiDoorSpellTimer < diff) { SetData(DATA_DOOR_INTEGRITY, GetData(DATA_DOOR_INTEGRITY)-1); uiDoorSpellTimer =2000; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 819681e1ef2..3270941ba3e 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -256,7 +256,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -347,7 +347,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoScriptText(SAY_SINCLARI_1, me); @@ -449,30 +449,30 @@ public: void WaypointReached(uint32 uiWPointId) { - switch(uiBoss) + switch (uiBoss) { case 1: - if(uiWPointId == 2) + if (uiWPointId == 2) FinishPointReached(); break; case 2: - if(uiWPointId == 2) + if (uiWPointId == 2) FinishPointReached(); break; case 3: - if(uiWPointId == 1) + if (uiWPointId == 1) FinishPointReached(); break; case 4: - if(uiWPointId == 0) + if (uiWPointId == 0) FinishPointReached(); break; case 5: - if(uiWPointId == 0) + if (uiWPointId == 0) FinishPointReached(); break; case 6: - if(uiWPointId == 4) + if (uiWPointId == 4) FinishPointReached(); break; } @@ -485,23 +485,23 @@ public: npc_escortAI::UpdateAI(diff); - if(!bHasGotMovingPoints) + if (!bHasGotMovingPoints) { bHasGotMovingPoints = true; - switch(uiBoss) + switch (uiBoss) { case 1: - for(int i=0;i<3;i++) + for (int i=0;i<3;i++) AddWaypoint(i, SaboteurFinalPos1[i][0], SaboteurFinalPos1[i][1], SaboteurFinalPos1[i][2], 0); me->SetHomePosition(SaboteurFinalPos1[2][0], SaboteurFinalPos1[2][1], SaboteurFinalPos1[2][2], 4.762346f); break; case 2: - for(int i=0;i<3;i++) + for (int i=0;i<3;i++) AddWaypoint(i, SaboteurFinalPos2[i][0], SaboteurFinalPos2[i][1], SaboteurFinalPos2[i][2], 0); me->SetHomePosition(SaboteurFinalPos2[2][0], SaboteurFinalPos2[2][1], SaboteurFinalPos2[2][2], 1.862674f); break; case 3: - for(int i=0;i<2;i++) + for (int i=0;i<2;i++) AddWaypoint(i, SaboteurFinalPos3[i][0], SaboteurFinalPos3[i][1], SaboteurFinalPos3[i][2], 0); me->SetHomePosition(SaboteurFinalPos3[1][0], SaboteurFinalPos3[1][1], SaboteurFinalPos3[1][2], 5.500638f); break; @@ -514,7 +514,7 @@ public: me->SetHomePosition(SaboteurFinalPos5[0], SaboteurFinalPos5[1], SaboteurFinalPos5[2], 1.100841f); break; case 6: - for(int i=0;i<5;i++) + for (int i=0;i<5;i++) AddWaypoint(i, SaboteurFinalPos6[i][0], SaboteurFinalPos6[i][1], SaboteurFinalPos6[i][2], 0); me->SetHomePosition(SaboteurFinalPos6[4][0], SaboteurFinalPos6[4][1], SaboteurFinalPos6[4][2], 0.983031f); break; @@ -590,7 +590,7 @@ public: if ((uiWaveCount == 6) || (uiWaveCount == 12)) //Don't spawn mobs on boss encounters return; - switch(uiTypeOfMobsPortal) + switch (uiTypeOfMobsPortal) { // spawn elite mobs and then set portals visibility to make it look like it dissapeard case 0: @@ -692,7 +692,7 @@ struct violet_hold_trashAI : public npc_escortAI void WaypointReached(uint32 uiPointId) { - switch(portalLocationID) + switch (portalLocationID) { case 0: if (uiPointId == 5) @@ -729,46 +729,46 @@ struct violet_hold_trashAI : public npc_escortAI if (!bHasGotMovingPoints) { bHasGotMovingPoints = true; - switch(portalLocationID) + switch (portalLocationID) { case 0: - for(int i=0;i<6;i++) + for (int i=0;i<6;i++) AddWaypoint(i, FirstPortalWPs[i][0]+irand(-1, 1), FirstPortalWPs[i][1]+irand(-1, 1), FirstPortalWPs[i][2]+irand(-1, 1), 0); me->SetHomePosition(FirstPortalWPs[5][0], FirstPortalWPs[5][1], FirstPortalWPs[5][2], 3.149439f); break; case 1: secondPortalRouteID = urand(0, 1); - switch(secondPortalRouteID) + switch (secondPortalRouteID) { case 0: - for(int i=0;i<9;i++) + for (int i=0;i<9;i++) AddWaypoint(i, SecondPortalFirstWPs[i][0]+irand(-1, 1), SecondPortalFirstWPs[i][1]+irand(-1, 1), SecondPortalFirstWPs[i][2], 0); me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1, 1), SecondPortalFirstWPs[8][1]+irand(-1, 1), SecondPortalFirstWPs[8][2]+irand(-1, 1), 3.149439f); break; case 1: - for(int i=0;i<8;i++) + for (int i=0;i<8;i++) AddWaypoint(i, SecondPortalSecondWPs[i][0]+irand(-1, 1), SecondPortalSecondWPs[i][1]+irand(-1, 1), SecondPortalSecondWPs[i][2], 0); me->SetHomePosition(SecondPortalSecondWPs[7][0], SecondPortalSecondWPs[7][1], SecondPortalSecondWPs[7][2], 3.149439f); break; } break; case 2: - for(int i=0;i<8;i++) + for (int i=0;i<8;i++) AddWaypoint(i, ThirdPortalWPs[i][0]+irand(-1, 1), ThirdPortalWPs[i][1]+irand(-1, 1), ThirdPortalWPs[i][2], 0); me->SetHomePosition(ThirdPortalWPs[7][0], ThirdPortalWPs[7][1], ThirdPortalWPs[7][2], 3.149439f); break; case 3: - for(int i=0;i<9;i++) + for (int i=0;i<9;i++) AddWaypoint(i, FourthPortalWPs[i][0]+irand(-1, 1), FourthPortalWPs[i][1]+irand(-1, 1), FourthPortalWPs[i][2], 0); me->SetHomePosition(FourthPortalWPs[8][0], FourthPortalWPs[8][1], FourthPortalWPs[8][2], 3.149439f); break; case 4: - for(int i=0;i<6;i++) + for (int i=0;i<6;i++) AddWaypoint(i, FifthPortalWPs[i][0]+irand(-1, 1), FifthPortalWPs[i][1]+irand(-1, 1), FifthPortalWPs[i][2], 0); me->SetHomePosition(FifthPortalWPs[5][0], FifthPortalWPs[5][1], FifthPortalWPs[5][2], 3.149439f); break; case 5: - for(int i=0;i<4;i++) + for (int i=0;i<4;i++) AddWaypoint(i, SixthPoralWPs[i][0]+irand(-1, 1), SixthPoralWPs[i][1]+irand(-1, 1), SixthPoralWPs[i][2], 0); me->SetHomePosition(SixthPoralWPs[3][0], SixthPoralWPs[3][1], SixthPoralWPs[3][2], 3.149439f); break; diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 5c7dc9abfda..c0fbbae1980 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -739,7 +739,7 @@ public: { if (IntroTimer <= diff) { - switch(IntroPhase) + switch (IntroPhase) { case 1: //DoScriptText(SAY_WP_1_LUR_START, me); @@ -1021,7 +1021,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 3: SetEscortPaused(true); @@ -1861,7 +1861,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 10: me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); @@ -1962,7 +1962,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 29: if (player) @@ -2282,7 +2282,7 @@ public: std::list<Creature*> orbList; GetCreatureListWithEntryInGrid(orbList, me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f); - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_WARMAGE_HOLLISTER: { @@ -2440,10 +2440,10 @@ public: { if (uiEventTimer && uiEventTimer <= uiDiff) { - switch(uiEventPhase) + switch (uiEventPhase) { case 1: - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); @@ -2464,7 +2464,7 @@ public: } break; case 2: - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: DoScriptText(SAY_HIDDEN_CULTIST_4, me); @@ -2510,7 +2510,7 @@ public: uint32 uiGossipText = 0; const char* charGossipItem; - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_TOM_HEGGER: uiGossipText = GOSSIP_TEXT_TOM_HEGGER; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index d7b90fc4a44..80d1bf4b3c3 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -68,7 +68,7 @@ public: if (player->GetQuestStatus(QUEST_CHILDREN_OF_URSOC) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_THE_BEAR_GODS_OFFSPRING) == QUEST_STATUS_INCOMPLETE) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_ORSONN: if (!player->GetReqKillOrCastCurrentCount(QUEST_CHILDREN_OF_URSOC, NPC_ORSONN_CREDIT) || !player->GetReqKillOrCastCurrentCount(QUEST_THE_BEAR_GODS_OFFSPRING, NPC_ORSONN_CREDIT)) @@ -96,7 +96,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -351,7 +351,7 @@ public: { if (Creature* Emily = GetClosestCreatureWithEntry(me, NPC_EMILY, 50.0f)) { - switch(Who->GetEntry()) + switch (Who->GetEntry()) { case NPC_HUNGRY_WORG: DoScriptText(SAY_WORGHAGGRO2, Emily); @@ -527,7 +527,7 @@ public: { if (m_uiTimer <= uiDiff) { - switch(m_uiPhase) + switch (m_uiPhase) { case 1: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_LOOT); @@ -601,7 +601,7 @@ public: { caster->ToPlayer()->KilledMonsterCredit(CREDIT_NPC, 0); DoScriptText(RAND(RANDOM_SAY_1, RANDOM_SAY_2, RANDOM_SAY_3), caster); - if(me->IsStandState()) + if (me->IsStandState()) me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); else { diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 1fceeb0303d..aa391712ad1 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -102,7 +102,7 @@ public: Player* player = GetPlayerForEscort(); if (!player) return; - switch(i) + switch (i) { case 1: me->SetReactState(REACT_AGGRESSIVE); @@ -306,7 +306,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MG_II, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 9ca2a2a5349..c84228b99a4 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -78,7 +78,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -311,7 +311,7 @@ public: uiCast = true; Creature* target = NULL; - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_PRIESTESS_ALORAH: target = me->FindNearestCreature(NPC_EYDIS_DARKBANE, 10.0f); @@ -413,7 +413,7 @@ public: { owner->ToPlayer()->KilledMonsterCredit(NPC_GEIST_RETURN_BUNNY_KC, 0); who->ToCreature()->DisappearAndDie(); - + } } } diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 54d54d5a493..269ff05090e 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -36,7 +36,7 @@ class npc_four_car_garage : public CreatureScript { uint32 spellId = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_DEMOLISHER: spellId = SPELL_DRIVING_CREDIT_DEMOLISHER; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index dc0b3c0e032..5d38bcf9f16 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -77,7 +77,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 1: SetRun(); break; case 10: @@ -210,7 +210,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_VEKJIK_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index fdd9c626ac1..687f7945e4c 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -507,12 +507,12 @@ public: player->PrepareQuestMenu(creature->GetGUID()); //Trainer Menu - if( creature->isTrainer() ) + if ( creature->isTrainer() ) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //Vendor Menu - if( creature->isVendor() ) - if(player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) + if ( creature->isVendor() ) + if (player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); @@ -522,7 +522,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_TRAIN: player->GetSession()->SendTrainerList(creature->GetGUID()); @@ -769,7 +769,7 @@ class npc_hyldsmeet_protodrake : public CreatureScript else _accessoryRespawnTimer -= diff; } - + private: uint32 _accessoryRespawnTimer; Vehicle* _vehicleKit; diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 6667a7751e1..bf742a4602f 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -371,10 +371,10 @@ public: bRemoveFlag = true; me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); - switch(uiId) + switch (uiId) { case 1: - switch(uiValue) + switch (uiValue) { case QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON: DoScriptText(SAY_QUEST_ACCEPT_TUSKARRMAGEDON, me); @@ -425,7 +425,7 @@ public: if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: if (Creature* summon = me->SummonCreature(NPC_ORINOKO_TUSKBREAKER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) @@ -656,7 +656,7 @@ public: if (!bSummoned && !HealthAbovePct(50)) { - DoScriptText(SAY_CALL_FOR_HELP , me); + 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)) @@ -669,7 +669,7 @@ public: void JustSummoned(Creature* summon) { - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case NPC_WHISKER: summon->AI()->AttackStart(me->getVictim()); @@ -743,7 +743,7 @@ public: void WaypointReached(uint32 uiI) { - switch(uiI) + switch (uiI) { case 6: me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0); @@ -937,7 +937,7 @@ public: void WaypointReached(uint32 uiI) { - switch(uiI) + switch (uiI) { case 7: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); @@ -1316,7 +1316,7 @@ public: { if (m_uiTimer <= uiDiff) { - switch(m_uiPhase) + switch (m_uiPhase) { case 1: // say random text diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 2cfedc14b14..b78811ce6a0 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -120,11 +120,11 @@ void OPvPCapturePointEP_EWT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_EWT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_EWT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_EWT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_EWT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_EWT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_EWT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_EWT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_EWT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_EWT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_EWT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_EWT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player* player) @@ -269,11 +269,11 @@ void OPvPCapturePointEP_NPT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_NPT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_NPT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_NPT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_NPT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_NPT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_NPT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_NPT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_NPT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_NPT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_NPT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_NPT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player* player) @@ -319,7 +319,7 @@ OPvPCapturePointEP_CGT::OPvPCapturePointEP_CGT(OutdoorPvP* pvp) void OPvPCapturePointEP_CGT::ChangeState() { // if changing from controlling alliance to horde or vice versa - if( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) + if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_CGT, 0); @@ -401,11 +401,11 @@ void OPvPCapturePointEP_CGT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_CGT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_CGT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_CGT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_CGT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_CGT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_CGT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_CGT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_CGT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_CGT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_CGT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_CGT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player* player) @@ -540,11 +540,11 @@ void OPvPCapturePointEP_PWT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_PWT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_PWT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_PWT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_PWT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_PWT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_PWT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_PWT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_PWT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_PWT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_PWT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_PWT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player* player) @@ -579,7 +579,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) Creature* c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]); //Spawn flight master as friendly to capturing team c->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 55 : 68)); - if(c) + if (c) { GossipOption gso; gso.Action = GOSSIP_OPTION_OUTDOORPVP; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 343027a02c8..a868e46b890 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -166,7 +166,7 @@ void OutdoorPvPHP::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointHP::ChangeState() { uint32 field = 0; - switch(m_OldState) + switch (m_OldState) { case OBJECTIVESTATE_NEUTRAL: field = HP_MAP_N[m_TowerType]; @@ -205,7 +205,7 @@ void OPvPCapturePointHP::ChangeState() } uint32 artkit = 21; uint32 artkit2 = HP_TowerArtKit_N[m_TowerType]; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_NEUTRAL: field = HP_MAP_N[m_TowerType]; @@ -282,7 +282,7 @@ void OPvPCapturePointHP::SendChangePhase() void OPvPCapturePointHP::FillInitialWorldStates(WorldPacket &data) { - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: case OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 17a5e9940be..c081f0970f2 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -46,7 +46,7 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount() uint32 cnt = 0; for (std::map<uint32, uint64>::iterator itr = m_Creatures.begin(); itr != m_Creatures.end(); ++itr) { - switch(itr->first) + switch (itr->first) { case NA_NPC_GUARD_01: case NA_NPC_GUARD_02: @@ -335,7 +335,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* player, uint32 spellId, GameO std::vector<uint32> nodes; nodes.resize(2); bool retval = false; - switch(spellId) + switch (spellId) { case NA_SPELL_FLY_NORTH: nodes[0] = FlightPathStartNodes[NA_ROOST_N]; @@ -423,7 +423,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, uint64 guid) int32 add = -1; int32 add2 = -1; - switch(retval) + switch (retval) { case NA_DESTROYED_ROOST_S: del = NA_DESTROYED_ROOST_S; @@ -569,7 +569,7 @@ bool OPvPCapturePointNA::Update(uint32 diff) void OPvPCapturePointNA::ChangeState() { uint32 artkit = 21; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_NEUTRAL: m_HalaaState = HALAA_N; @@ -621,16 +621,16 @@ void OPvPCapturePointNA::SendChangePhase() void OPvPCapturePointNA::UpdateHalaaWorldState() { - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL , uint32(bool(m_HalaaState & HALAA_N))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A , uint32(bool(m_HalaaState & HALAA_N_A))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H , uint32(bool(m_HalaaState & HALAA_N_H))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE , uint32(bool(m_HalaaState & HALAA_H))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE , uint32(bool(m_HalaaState & HALAA_A))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, uint32(bool(m_HalaaState & HALAA_N))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, uint32(bool(m_HalaaState & HALAA_N_A))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, uint32(bool(m_HalaaState & HALAA_N_H))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE, uint32(bool(m_HalaaState & HALAA_H))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, uint32(bool(m_HalaaState & HALAA_A))); } void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost) { - switch(roost) + switch (roost) { case NA_ROOST_S: m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE))); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 88a820f4492..7727f761588 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -83,7 +83,7 @@ void OutdoorPvPSI::HandlePlayerLeaveZone(Player* player, uint32 zone) bool OutdoorPvPSI::HandleAreaTrigger(Player* player, uint32 trigger) { - switch(trigger) + switch (trigger) { case SI_AREATRIGGER_A: if (player->GetTeam() == ALLIANCE && player->HasAura(SI_SILITHYST_FLAG)) @@ -144,7 +144,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId) if (spellId == SI_SILITHYST_FLAG) { // if it was dropped away from the player's turn-in point, then create a silithyst mound, if it was dropped near the areatrigger, then it was dispelled by the outdoorpvp, so do nothing - switch(player->GetTeam()) + switch (player->GetTeam()) { case ALLIANCE: { @@ -192,7 +192,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId) delete go; return true; } - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, player->GetPhaseMask() , player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, player->GetPhaseMask(), player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) { delete go; } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 6b9c0500fc4..56895951665 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -287,7 +287,7 @@ void OPvPCapturePointTF::ChangeState() uint32 artkit = 21; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 2866a341903..7d15f1edc40 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -88,7 +88,7 @@ void OPvPCapturePointZM_Beacon::ChangeState() sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType])); } - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: { @@ -294,7 +294,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) return; m_BothControllingFaction = controlling_faction; - switch(controlling_faction) + switch (controlling_faction) { case ALLIANCE: // if ally already controls the gy and taken back both beacons, return, nothing to do for us @@ -376,7 +376,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player* player, uint64 gui bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*player*/, uint32 spellId) { - switch(spellId) + switch (spellId) { case ZM_BATTLE_STANDARD_A: m_FlagCarrierGUID = 0; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 55aca9695cd..068875924f2 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -74,7 +74,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_IKISSDOOREVENT: if (data == DONE) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 3288c1336e9..f5b113cfff5 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -82,7 +82,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case REFECTORY_DOOR: m_uiRefectoryDoorGUID = go->GetGUID(); @@ -99,7 +99,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 18732: m_uiGrandmasterVorpil = creature->GetGUID(); @@ -116,7 +116,7 @@ public: void SetData(uint32 type, uint32 uiData) { - switch(type) + switch (type) { case TYPE_HELLMAW: m_auiEncounter[0] = uiData; @@ -179,7 +179,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_HELLMAW: return m_auiEncounter[0]; case TYPE_OVERSEER: return m_auiEncounter[1]; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index e873f31d03c..612065d5ee6 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -635,7 +635,7 @@ public: void EnterPhase(PhaseIllidan NextPhase) { DoZoneInCombat(); - switch(NextPhase) + switch (NextPhase) { case PHASE_NORMAL: case PHASE_NORMAL_2: @@ -790,7 +790,7 @@ public: void HandleFlightSequence() { - switch(FlightCount) + switch (FlightCount) { case 1://lift off me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); @@ -915,7 +915,7 @@ public: SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); } - switch(TransformCount) + switch (TransformCount) { case 2: DoResetThreat(); @@ -959,7 +959,7 @@ public: } } - switch(Phase) + switch (Phase) { case PHASE_NORMAL: if (HealthBelowPct(65)) @@ -999,7 +999,7 @@ public: if (Phase == PHASE_NORMAL || Phase == PHASE_NORMAL_2 || (Phase == PHASE_NORMAL_MAIEV && !me->HasAura(SPELL_CAGED))) { - switch(Event) + switch (Event) { //PHASE_NORMAL case EVENT_BERSERK: @@ -1073,7 +1073,7 @@ public: if (Phase == PHASE_FLIGHT) { - switch(Event) + switch (Event) { case EVENT_FIREBALL: DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_FIREBALL); @@ -1106,7 +1106,7 @@ public: if (Phase == PHASE_DEMON) { - switch(Event) + switch (Event) { case EVENT_SHADOW_BLAST: me->GetMotionMaster()->Clear(false); @@ -1219,7 +1219,7 @@ public: void EnterPhase(PhaseIllidan NextPhase)//This is in fact Illidan's phase. { - switch(NextPhase) + switch (NextPhase) { case PHASE_TALK_SEQUENCE: if (Timer[EVENT_MAIEV_STEALTH]) @@ -1298,7 +1298,7 @@ public: else Timer[i] -= diff; } - switch(Event) + switch (Event) { case EVENT_MAIEV_STEALTH: { @@ -1541,7 +1541,7 @@ public: { if (!pInstance) return; - switch(NextPhase) + switch (NextPhase) { case PHASE_CHANNEL: BeginChannel(); @@ -1603,7 +1603,7 @@ public: void HandleTalkSequence() { - switch(TalkCount) + switch (TalkCount) { case 0: if (GETCRE(Illidan, IllidanGUID)) @@ -1638,7 +1638,7 @@ public: return; } - switch(ChannelCount) + switch (ChannelCount) { case 0: // channel failed me->InterruptNonMeleeSpells(true); @@ -1686,7 +1686,7 @@ public: void HandleWalkSequence() { - switch(WalkCount) + switch (WalkCount) { case 6: for (uint8 i = 0; i < 2; ++i) @@ -1734,7 +1734,7 @@ public: if (Event) { - switch(Phase) + switch (Phase) { case PHASE_CHANNEL: if (JustCreated) @@ -1872,7 +1872,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* summon) { Summons.Summon(summon); - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case PARASITIC_SHADOWFIEND: { @@ -1918,7 +1918,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence() { - switch(TalkCount) + switch (TalkCount) { case 0: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 9311e1e6744..4d79098689c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -196,7 +196,7 @@ public: BeamTimer = 9000; - switch(CurrentBeam) + switch (CurrentBeam) { case 0: DoCast(target, SPELL_BEAM_SINISTER); 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 813deacf7a2..746ad9aa7ff 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -256,7 +256,7 @@ public: if (Timer <= diff) { - switch(Counter) + switch (Counter) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); // I R ANNNGRRRY! 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 852f69597b9..04646fb10bc 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -673,7 +673,7 @@ public: if (type != POINT_MOTION_TYPE) return; - switch(id) + switch (id) { case 0: ++WayPointId; break; @@ -803,7 +803,7 @@ public: { if (SoulRetrieveTimer <= diff) { - switch(EndingTalkCount) + switch (EndingTalkCount) { case 0: me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index ce4d7745a68..4b235906505 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -200,7 +200,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 080d26b7c49..c017b943954 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -154,7 +154,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHIELD: DoCast(me, SPELL_TIDAL_SHIELD, true); diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 4feca05c111..d578b62c24b 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -142,7 +142,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 22887: Najentus = creature->GetGUID(); break; case 23089: Akama = creature->GetGUID(); break; @@ -161,7 +161,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards) if (m_auiEncounter[0] == DONE)HandleGameObject(0, true, go);break; @@ -190,7 +190,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_HIGHWARLORDNAJENTUS: return Najentus; case DATA_AKAMA: return Akama; @@ -216,7 +216,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_HIGHWARLORDNAJENTUSEVENT: if (data == DONE) @@ -298,7 +298,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_HIGHWARLORDNAJENTUSEVENT: return m_auiEncounter[0]; case DATA_SUPREMUSEVENT: return m_auiEncounter[1]; 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 1433859dfe1..6564972fd46 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -727,7 +727,7 @@ public: Unit* pUnit = NULL; if (pInstance) { - switch(rand()%4) + switch (rand()%4) { case 0: pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESS)); 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 0f27d5e7a9d..2820a2fdef2 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 @@ -307,7 +307,7 @@ public: { uint32 mark_spell = 0; - switch(MarkOfHydross_Count) + switch (MarkOfHydross_Count) { case 0: mark_spell = SPELL_MARK_OF_HYDROSS1; break; case 1: mark_spell = SPELL_MARK_OF_HYDROSS2; break; 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 817c38fef2e..19fdc454de3 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -884,7 +884,7 @@ public: }; //Coilfang Strider -//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds , for 5 seconds and increasing their movement speed by 150% during the fear. +//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds, for 5 seconds and increasing their movement speed by 150% during the fear. class mob_coilfang_strider : public CreatureScript { public: @@ -992,7 +992,7 @@ public: { uint32 identifier; uint8 channel_identifier; - switch(gObj->GetEntry()) + switch (gObj->GetEntry()) { case 185052: identifier = DATA_SHIELDGENERATOR1; 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 a30b46c2346..da36f70a339 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -157,7 +157,7 @@ public: void ApplyWateryGrave(Unit* player, uint8 i) { - switch(i) + switch (i) { case 0: player->CastSpell(player, SPELL_WATERY_GRAVE_1, true); break; case 1: player->CastSpell(player, SPELL_WATERY_GRAVE_2, true); break; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 88496899bb1..32468cca606 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -108,7 +108,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17797: ThespiaGUID = creature->GetGUID(); break; case 17796: MekgineerGUID = creature->GetGUID(); break; @@ -118,7 +118,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case MAIN_CHAMBERS_DOOR: MainChambersDoor = go->GetGUID(); break; case ACCESS_PANEL_HYDRO: AccessPanelHydro = go->GetGUID(); break; @@ -128,7 +128,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_HYDROMANCER_THESPIA: if (data == SPECIAL) @@ -168,7 +168,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_HYDROMANCER_THESPIA: return m_auiEncounter[0]; @@ -184,7 +184,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_THESPIA: return ThespiaGUID; diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 79b6be51d5c..b0dbdcb94da 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -84,7 +84,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 18835: KigglerTheCrazed = creature->GetGUID(); break; case 18836: BlindeyeTheSeer = creature->GetGUID(); break; @@ -96,7 +96,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 184468: MaulgarDoor = go->GetGUID(); @@ -117,7 +117,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MAULGAREVENT_TANK: return MaulgarEvent_Tank; case DATA_KIGGLERTHECRAZED: return KigglerTheCrazed; @@ -133,7 +133,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_MAULGAREVENT: if (data == DONE) HandleGameObject(MaulgarDoor, true); @@ -150,7 +150,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_MAULGAREVENT: return m_auiEncounter[0]; case DATA_GRUULEVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 8c15bbace2d..3a10da0f454 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -92,7 +92,7 @@ class instance_blood_furnace : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17381: The_MakerGUID = creature->GetGUID(); @@ -141,7 +141,7 @@ class instance_blood_furnace : public InstanceMapScript uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_THE_MAKER: return The_MakerGUID; case DATA_BROGGOK: return BroggokGUID; @@ -167,7 +167,7 @@ class instance_blood_furnace : public InstanceMapScript void SetData(uint32 /*type*/, uint32 data) { - switch(data) + switch (data) { case TYPE_THE_MAKER_EVENT: m_auiEncounter[0] = data; break; case TYPE_BROGGOK_EVENT: m_auiEncounter[1] = data; break; @@ -190,7 +190,7 @@ class instance_blood_furnace : public InstanceMapScript uint32 GetData(uint32 data) { - switch(data) + switch (data) { case TYPE_THE_MAKER_EVENT: return m_auiEncounter[0]; case TYPE_BROGGOK_EVENT: return m_auiEncounter[1]; 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 6661bf2ee15..1fd1094494d 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 @@ -397,7 +397,7 @@ class boss_vazruden_the_herald : public CreatureScript void UpdateAI(const uint32 diff) { - switch(phase) + switch (phase) { case 0: // circle around the platform return; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index ba6969acc2c..1436c664e9f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -53,7 +53,7 @@ class instance_ramparts : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 185168: m_uiChestNGUID = go->GetGUID(); @@ -68,7 +68,7 @@ class instance_ramparts : public InstanceMapScript { sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u", uiType, uiData); - switch(uiType) + switch (uiType) { case TYPE_VAZRUDEN: if (uiData == DONE && m_auiEncounter[1] == DONE && !spawned) diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 0c346f68422..cd463376ee9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -86,7 +86,7 @@ class instance_magtheridons_lair : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17257: MagtheridonGUID = creature->GetGUID(); @@ -99,7 +99,7 @@ class instance_magtheridons_lair : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 181713: go->SetUInt32Value(GAMEOBJECT_FLAGS, 0); @@ -121,7 +121,7 @@ class instance_magtheridons_lair : public InstanceMapScript uint64 GetData64(uint32 type) { - switch(type) + switch (type) { case DATA_MAGTHERIDON: return MagtheridonGUID; @@ -131,7 +131,7 @@ class instance_magtheridons_lair : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_MAGTHERIDON_EVENT: m_auiEncounter[0] = data; @@ -141,7 +141,7 @@ class instance_magtheridons_lair : public InstanceMapScript HandleGameObject(DoorGUID, true); break; case DATA_CHANNELER_EVENT: - switch(data) + switch (data) { case NOT_STARTED: // Reset all channelers once one is reset. if (m_auiEncounter[1] != NOT_STARTED) 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 5d7d7883ce0..f4f6a6fb221 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -281,7 +281,7 @@ class boss_warbringer_omrogg : public CreatureScript Unit* source = (pLeftHead->GetEntry() == Killing[ikilling].creature ? pLeftHead : pRightHead); - switch(ikilling) + switch (ikilling) { case 0: DoScriptText(Killing[ikilling].id, source); 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 5b91bb8e9e6..4f837870612 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 @@ -115,7 +115,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case MOB_HEARTHEN_GUARD: case MOB_SHARPSHOOTER_GUARD: diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 3fb98f8b17e..b70ad851536 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -55,7 +55,7 @@ class instance_shattered_halls : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case DOOR_NETHEKURSE: nethekurseDoorGUID = go->GetGUID(); @@ -65,7 +65,7 @@ class instance_shattered_halls : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 16807: nethekurseGUID = creature->GetGUID(); @@ -75,7 +75,7 @@ class instance_shattered_halls : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_NETHEKURSE: m_auiEncounter[0] = data; @@ -88,7 +88,7 @@ class instance_shattered_halls : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_NETHEKURSE: return m_auiEncounter[0]; @@ -100,7 +100,7 @@ class instance_shattered_halls : public InstanceMapScript uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_NETHEKURSE: return nethekurseGUID; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 37404b348db..9ca982a940c 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -246,7 +246,7 @@ class boss_alar : public CreatureScript AfterMoving = false; } - switch(WaitEvent) + switch (WaitEvent) { case WE_PLATFORM: Platforms_Move_Timer = 30000+rand()%5000; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 592c2a1190d..2692d6f12da 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -477,7 +477,7 @@ class boss_kaelthas : public CreatureScript Creature* Advisor = NULL; //Subphase switch - switch(PhaseSubphase) + switch (PhaseSubphase) { //Subphase 1 - Start case 0: diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 8af59582a18..2ac4f49d995 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -85,7 +85,7 @@ class instance_the_eye : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 20064: ThaladredTheDarkener = creature->GetGUID(); @@ -113,7 +113,7 @@ class instance_the_eye : public InstanceMapScript uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_THALADREDTHEDARKENER: return ThaladredTheDarkener; case DATA_LORDSANGUINAR: return LordSanguinar; @@ -128,7 +128,7 @@ class instance_the_eye : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_ALAREVENT: AlarEventPhase = data; @@ -151,7 +151,7 @@ class instance_the_eye : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_ALAREVENT: return AlarEventPhase; case DATA_HIGHASTROMANCERSOLARIANEVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index e2a12c350b6..883585c0c2a 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -58,7 +58,7 @@ class instance_mechanar : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_NETHERMANCER_EVENT: return m_auiEncounter[0]; } @@ -73,7 +73,7 @@ class instance_mechanar : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_NETHERMANCER_EVENT: m_auiEncounter[0] = data; break; } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index adf71c8a25b..eeb2f069ed7 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -146,7 +146,7 @@ class npc_millhouse_manastorm : public CreatureScript { if (Phase < 8) { - switch(Phase) + switch (Phase) { case 1: DoScriptText(SAY_INTRO_1, me); @@ -371,7 +371,7 @@ class npc_warden_mellichar : public CreatureScript me->InterruptNonMeleeSpells(true); me->RemoveAurasByType(SPELL_AURA_DUMMY); - switch(Phase) + switch (Phase) { case 2: DoCast(me, SPELL_TARGET_ALPHA); @@ -420,7 +420,7 @@ class npc_warden_mellichar : public CreatureScript if (Phase != 7) DoCast(me, SPELL_TARGET_OMEGA); - switch(Phase) + switch (Phase) { case 2: switch (urand(0, 1)) @@ -471,7 +471,7 @@ class npc_warden_mellichar : public CreatureScript } if (CanProgress()) { - switch(Phase) + switch (Phase) { case 1: DoScriptText(YELL_INTRO2, me); 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 f3310035f8d..cf81f7fb1ba 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -163,7 +163,7 @@ class boss_harbinger_skyriss : public CreatureScript if (Intro_Timer <= diff) { - switch(Intro_Phase) + switch (Intro_Phase) { case 1: DoScriptText(SAY_INTRO, me); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index eef84ad093e..25956fde3d2 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -100,7 +100,7 @@ class instance_arcatraz : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case CONTAINMENT_CORE_SECURITY_FIELD_ALPHA: Containment_Core_Security_Field_AlphaGUID = go->GetGUID(); break; case CONTAINMENT_CORE_SECURITY_FIELD_BETA: Containment_Core_Security_Field_BetaGUID = go->GetGUID(); break; @@ -122,7 +122,7 @@ class instance_arcatraz : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_ZEREKETH: m_auiEncounter[0] = data; @@ -204,7 +204,7 @@ class instance_arcatraz : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_HARBINGERSKYRISS: return m_auiEncounter[3]; case TYPE_WARDEN_1: return m_auiEncounter[4]; @@ -218,7 +218,7 @@ class instance_arcatraz : public InstanceMapScript uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_MELLICHAR: return MellicharGUID; case DATA_SPHERE_SHIELD: return GoSphereGUID; 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 e130512f08c..64fea1c41e5 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 @@ -93,7 +93,7 @@ class boss_high_botanist_freywinn : public CreatureScript void DoSummonSeedling() { - switch(rand()%4) + switch (rand()%4) { case 0: DoCast(me, SPELL_PLANT_WHITE); break; case 1: DoCast(me, SPELL_PLANT_GREEN); break; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 872421f7561..43078c48537 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -86,7 +86,7 @@ class boss_laj : public CreatureScript void DoTransform() { - switch(rand()%5) + switch (rand()%5) { case 0: me->SetDisplayId(MODEL_DEFAULT); @@ -133,7 +133,7 @@ class boss_laj : public CreatureScript void DoSummons() { - switch(rand()%4) + switch (rand()%4) { case 0: DoCast(me, SPELL_SUMMON_LASHER_1, true); 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 1acc75981e0..2bf4abbcb96 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -101,7 +101,7 @@ class mob_warp_splinter_treant : public CreatureScript if (me->IsWithinMeleeRange(Warp, 2.5f)) { int32 CurrentHP_Treant = (int32)me->GetHealth(); - Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0 , 0, me->GetGUID()); + Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0, 0, me->GetGUID()); me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return; } diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index 8ea12b48a07..60495d4e0ac 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -194,7 +194,7 @@ public: { if (NihilSpeech_Timer <= diff) { - switch(NihilSpeech_Phase) + switch (NihilSpeech_Phase) { case 0: DoScriptText(SAY_NIHIL_1, me); @@ -389,7 +389,7 @@ public: { if (player->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE) { - switch(pGo->GetEntry()) + switch (pGo->GetEntry()) { case LEGION_OBELISK_ONE: obelisk_one = true; @@ -452,7 +452,7 @@ public: { npc_bloodmaul_brutebaneAI(Creature* creature) : ScriptedAI(creature) { - if(Creature* Ogre = me->FindNearestCreature(NPC_OGRE_BRUTE, 50, true)) + if (Creature* Ogre = me->FindNearestCreature(NPC_OGRE_BRUTE, 50, true)) { Ogre->SetReactState(REACT_DEFENSIVE); Ogre->GetMotionMaster()->MovePoint(1, me->GetPositionX()-1, me->GetPositionY()+1, me->GetPositionZ()); diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index defc3cf90f6..2f725e78666 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -113,9 +113,9 @@ class boss_doomlord_kazzak : public CreatureScript if (me->HasUnitState(UNIT_STAT_CASTING)) return; - while(uint32 eventId = _events.ExecuteEvent()) + while (uint32 eventId = _events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHADOW_VOLLEY: DoCastVictim(SPELL_SHADOWVOLLEY); diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index 8143ac528b5..5cb84eb1303 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -106,9 +106,9 @@ class boss_doomwalker : public CreatureScript if (me->HasUnitState(UNIT_STAT_CASTING)) return; - while(uint32 eventId = _events.ExecuteEvent()) + while (uint32 eventId = _events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_ENRAGE: if (!HealthAbovePct(20)) diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 430754c10d6..699a1ef49bc 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -183,7 +183,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(EMOTE_WOLF_LIFT_HEAD, me); @@ -277,7 +277,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TRACY_PROUDWELL_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -334,7 +334,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index ad30ab32e92..3a060cf107f 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -613,7 +613,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 7: DoScriptText(SAY_MAG_MORE, me); diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index 13dc8508d62..5b2350369f0 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -117,7 +117,7 @@ public: Unit* p = Unit::GetUnit((*me), someplayer); if (p && p->GetTypeId() == TYPEID_PLAYER) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: CAST_PLR(p)->FailQuest(10299); @@ -148,7 +148,7 @@ public: void DoWaveSpawnForCreature(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: if (rand()%2) @@ -202,7 +202,7 @@ public: } void DoFinalSpawnForCreature(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2946.52f, 4201.42f, 163.47f, 3.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); @@ -237,7 +237,7 @@ public: { if (Event_Timer <= diff) { - switch(Phase) + switch (Phase) { case 1: if (someplayer) @@ -317,7 +317,7 @@ public: Creature* manaforge = NULL; - switch(pGo->GetAreaId()) + switch (pGo->GetAreaId()) { case 3726: //b'naar if ((player->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && @@ -565,7 +565,7 @@ public: break; //Phase 6 case 6: - switch(PhaseSubphase) + switch (PhaseSubphase) { //Subphase 1: Turn Dawnforge and Ardonis case 0: @@ -584,7 +584,7 @@ public: break; //Phase 7 Pathaleons say 3 Sentence, every sentence need a subphase case 7: - switch(PhaseSubphase) + switch (PhaseSubphase) { //Subphase 1 case 0: @@ -903,7 +903,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 3: //first spawn me->SummonCreature(SPAWN_FIRST, 2449.67f, 2183.11f, 96.85f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 1666cfa78e2..b16166ed904 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -771,7 +771,7 @@ public: return 0; } - switch(Step) + switch (Step) { case 0: return 0; break; case 1: me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f); return 9000; break; @@ -950,7 +950,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 13: DoScriptText(SAY_WIL_PROGRESS1, me, player); @@ -1215,7 +1215,7 @@ public: AnimationTimer = TorlothAnim[AnimationCount].Timer; - switch(AnimationCount) + switch (AnimationCount) { case 0: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); @@ -1295,7 +1295,7 @@ public: void JustDied(Unit* slayer) { if (slayer) - switch(slayer->GetTypeId()) + switch (slayer->GetTypeId()) { case TYPEID_UNIT: if (Unit* owner = slayer->GetOwner()) @@ -1749,7 +1749,7 @@ public: uint32 entry = 0; uint32 credit = 0; - switch(me->GetEntry()) { + switch (me->GetEntry()) { case ENTRY_ENRAGED_FIRE_SPIRIT: entry = ENTRY_FIERY_SOUL; //credit = SPELL_FIERY_SOUL_CAPTURED_CREDIT; diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index 35ef9ae820b..f2aa9fe5786 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -330,7 +330,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(SAY1, me, player); break; case 4: DoScriptText(WHISP1, me, player); break; @@ -449,7 +449,7 @@ public: { Player* player = Unit::GetPlayer(*me, PlayerGUID); - switch(Step) + switch (Step) { case 0:{ me->SetInFront(player); Unit* Creepjack = me->FindNearestCreature(NPC_CREEPJACK, 20); @@ -632,7 +632,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 785f476b9ab..ab3cd88ce3a 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -210,7 +210,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 8: player->AreaExploredOrEventHappens(10898); @@ -474,7 +474,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: { @@ -551,7 +551,7 @@ public: bool OnGossipSelect(Player* player, GameObject* pGo, uint32 uiSender, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiSender) + switch (uiSender) { case GOSSIP_SENDER_MAIN: SendActionMenu(player, pGo, uiAction); break; } @@ -574,7 +574,7 @@ public: void SendActionMenu(Player* player, GameObject* /*pGo*/, uint32 uiAction) { - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: player->CastSpell(player, 40642, false); @@ -676,7 +676,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 3: me->SummonCreature(NPC_CABAL_SKRIMISHER, -2795.99f, 5420.33f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 62d0893f014..ddffcb53e61 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -328,7 +328,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 4: DoScriptText(SAY_AMBUSH1, me, player); @@ -407,7 +407,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, creature->GetGUID()); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 0245888e92e..86b92eebfe3 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -168,9 +168,9 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader SpellInfo const* talentSpell = sSpellMgr->GetSpellInfo(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); amount = talentSpell->Effects[EFFECT_0].CalcValue(GetCaster()); Unit* caster = GetCaster(); - if(!caster) + if (!caster) return; - if(Player* player = caster->ToPlayer()) + if (Player* player = caster->ToPlayer()) amount += int32(2 * player->GetTotalAttackPowerValue(BASE_ATTACK)); } @@ -607,7 +607,7 @@ public: } }; -// 50391,50392 Improved Unholy Presence +// 50391, 50392 Improved Unholy Presence class spell_dk_improved_unholy_presence : public SpellScriptLoader { public: @@ -632,7 +632,7 @@ public: { // Not listed as any effect, only base points set in dbc int32 basePoints0 = aurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue(); - target->CastCustomSpell(target, DK_SPELL_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &basePoints0 , &basePoints0, &basePoints0, true, 0, aurEff); + target->CastCustomSpell(target, DK_SPELL_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &basePoints0, &basePoints0, &basePoints0, true, 0, aurEff); } } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index f90fe53a9e2..f0b48a5ad90 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -102,7 +102,7 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader bool CheckAreaTarget(Unit* target) { - switch(target->GetEntry()) + switch (target->GetEntry()) { // alliance case 14762: // Dun Baldar North Marshal @@ -1226,7 +1226,7 @@ class spell_gen_launch : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* player = GetHitPlayer()) - player->AddAura(SPELL_LAUNCH_NO_FALLING_DAMAGE,player); // prevents falling damage + player->AddAura(SPELL_LAUNCH_NO_FALLING_DAMAGE, player); // prevents falling damage } void Launch() @@ -1241,10 +1241,10 @@ class spell_gen_launch : public SpellScriptLoader // There is no spell for this, the following calculation was based on void Spell::CalculateJumpSpeeds float speedZ = 10.0f; - float dist = position->GetExactDist2d(player->GetPositionX(),player->GetPositionY()); + float dist = position->GetExactDist2d(player->GetPositionX(), player->GetPositionY()); float speedXY = dist; - player->GetMotionMaster()->MoveJump(position->GetPositionX(),position->GetPositionY(),position->GetPositionZ(),speedXY,speedZ); + player->GetMotionMaster()->MoveJump(position->GetPositionX(), position->GetPositionY(), position->GetPositionZ(), speedXY, speedZ); } } @@ -1324,8 +1324,8 @@ public: PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript) void HandleDummy(SpellEffIndex effIndex) - { - + { + if (Player* player = GetCaster()->ToPlayer()) { @@ -1344,7 +1344,7 @@ public: // EFFECT_INDEX_2 most likely update at war state, we already handle this in SetReputation } - + } void Register() diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index baa998f9487..2346a30640c 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1108,7 +1108,7 @@ class spell_magic_eater_food : public SpellScriptLoader target->CastSpell(target, SPELL_WELL_FED_3, true); break; case 4: - target->CastSpell(target, SPELL_WELL_FED_4, true); + target->CastSpell(target, SPELL_WELL_FED_4, true); break; case 5: target->CastSpell(target, SPELL_WELL_FED_5, true); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index f07a13bf7db..84df4418078 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -141,7 +141,7 @@ public: if (Unit* unitTarget = GetHitUnit()) { uint32 spell_id = 0; - switch(unitTarget->getClass()) + switch (unitTarget->getClass()) { case CLASS_DRUID: spell_id = SPELL_BLESSING_OF_LOWER_CITY_DRUID; break; case CLASS_PALADIN: spell_id = SPELL_BLESSING_OF_LOWER_CITY_PALADIN; break; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 83281a9c93f..07b8a79691a 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -131,7 +131,7 @@ class spell_pri_mind_sear : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); + unitList.remove_if (Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); } void Register() diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 6fbd33fe81b..6ae9577070e 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -648,7 +648,7 @@ public: Unit* target = GetTarget(); if (Player* player = caster->GetCharmerOrOwnerPlayerOrPlayerItself()) { - switch(target->GetEntry()) + switch (target->GetEntry()) { case NPC_FROSTWORG: target->CastSpell(player, SPELL_FROSTWORG_CREDIT, true); @@ -707,7 +707,7 @@ public: Unit* pCaster = GetCaster(); if (Player* player = pCaster->ToPlayer()) { - if(Creature* target = GetHitCreature()) + if (Creature* target = GetHitCreature()) { player->CastSpell(player, SPELL_TRIGGER_AID_OF_THE_EARTHEN, true, NULL); player->KilledMonsterCredit(NPC_FALLEN_EARTHEN_DEFENDER, 0); @@ -948,7 +948,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader */ enum eBattleStandard { - NPC_KING_OF_THE_MOUNTAINT_KC = 31766, + NPC_KING_OF_THE_MOUNTAINT_KC = 31766, }; class spell_q13280_13283_plant_battle_standard: public SpellScriptLoader { @@ -959,11 +959,11 @@ public: { PrepareSpellScript(spell_q13280_13283_plant_battle_standard_SpellScript) void HandleDummy(SpellEffIndex /*effIndex*/) - { + { Unit* caster = GetCaster(); if (caster->IsVehicle()) if (Unit* player = caster->GetVehicleKit()->GetPassenger(0)) - player->ToPlayer()->KilledMonsterCredit(NPC_KING_OF_THE_MOUNTAINT_KC,0); + player->ToPlayer()->KilledMonsterCredit(NPC_KING_OF_THE_MOUNTAINT_KC, 0); } void Register() diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index ff389f41075..76dac9b59f1 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -250,7 +250,7 @@ class spell_sha_bloodlust : public SpellScriptLoader void RemoveInvalidTargets(std::list<Unit*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SHAMAN_SPELL_SATED)); + targets.remove_if (Trinity::UnitAuraCheck(true, SHAMAN_SPELL_SATED)); } void ApplyDebuff() @@ -291,7 +291,7 @@ class spell_sha_heroism : public SpellScriptLoader void RemoveInvalidTargets(std::list<Unit*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SHAMAN_SPELL_EXHAUSTION)); + targets.remove_if (Trinity::UnitAuraCheck(true, SHAMAN_SPELL_EXHAUSTION)); } void ApplyDebuff() diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 49fe2f2870c..6c54d130e53 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -68,7 +68,7 @@ class AreaTrigger_at_aldurthar_gate : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) { - switch(trigger->id) + switch (trigger->id) { case TRIGGER_SOUTH: player->KilledMonsterCredit(NPC_SOUTH_GATE, 0); break; case TRIGGER_CENTRAL: player->KilledMonsterCredit(NPC_CENTRAL_GATE, 0); break; @@ -205,7 +205,7 @@ class AreaTrigger_at_warsong_farms : public AreaTriggerScript { if (!player->isDead() && player->GetQuestStatus(QUEST_THE_WARSONG_FARMS) == QUEST_STATUS_INCOMPLETE) { - switch(trigger->id) + switch (trigger->id) { case AT_SLAUGHTERHOUSE: player->KilledMonsterCredit(NPC_CREDIT_SLAUGHTERHOUSE, 0); break; case AT_GRAINERY: player->KilledMonsterCredit(NPC_CREDIT_GRAINERY, 0); break; @@ -305,7 +305,7 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript WorldLocation pPosition; - switch(trigger->id) + switch (trigger->id) { case 5332: case 5338: @@ -357,7 +357,7 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript if (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && !player->isDead() && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED) { - switch(trigger->id) + switch (trigger->id) { case AT_SHOLAZAR: player->CastSpell(player, SPELL_SHOLAZAR_TO_UNGORO_TELEPORT, false); break; case AT_UNGORO: player->CastSpell(player, SPELL_UNGORO_TO_SHOLAZAR_TELEPORT, false); break; diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index b6030c62df4..e5c584df6e1 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -122,7 +122,7 @@ struct emerald_dragonAI : public WorldBossAI // Despawntime is 2 minutes, so reschedule it for new cast after 2 minutes + a minor "random time" (30 seconds at max) DoCast(me, SPELL_SEEPING_FOG_LEFT, true); DoCast(me, SPELL_SEEPING_FOG_RIGHT, true); - events.ScheduleEvent(EVENT_SEEPING_FOG, urand(120000,150000)); + events.ScheduleEvent(EVENT_SEEPING_FOG, urand(120000, 150000)); break; case EVENT_NOXIOUS_BREATH: // Noxious Breath is cast on random intervals, no less than 7.5 seconds between @@ -241,7 +241,7 @@ class spell_dream_fog_sleep : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(DreamFogTargetSelector()); + unitList.remove_if (DreamFogTargetSelector()); } void Register() @@ -292,7 +292,7 @@ class spell_mark_of_nature : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(MarkOfNatureTargetSelector()); + unitList.remove_if (MarkOfNatureTargetSelector()); } void HandleEffect(SpellEffIndex effIndex) diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index 07b6840b6c6..0592a452211 100755 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -68,7 +68,7 @@ public: void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Group* group) { //! NOTE: - //! LANG_ADDON can only be sent by client in "PARTY", "RAID", "GUILD", "BATTLEGROUND", "WHISPER" + //! LANG_ADDON can only be sent by client in "PARTY", "RAID", "GUILD", "BATTLEGROUND", "WHISPER" switch (type) { case CHAT_MSG_PARTY: @@ -126,7 +126,7 @@ public: void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Guild* guild) { - switch(type) + switch (type) { case CHAT_MSG_GUILD: if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_GUILD)) diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 0bda63b4177..aa272d8157b 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -317,7 +317,7 @@ public: { uint32 Spell = 0; - switch(pFaction->faction) + switch (pFaction->faction) { case 1011: Spell = SPELL_REP_LC; break; case 935: Spell = SPELL_REP_SHAT; break; @@ -434,7 +434,7 @@ public: float fX, fY, fZ; pGO->GetClosePoint(fX, fY, fZ, pGO->GetObjectSize(), INTERACTION_DISTANCE); - switch(pGO->GetEntry()) + switch (pGO->GetEntry()) { case GO_SHRINE_HAWK: BirdEntry = NPC_HAWK_GUARD; @@ -566,7 +566,7 @@ public: bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_BEAST, false); @@ -625,7 +625,7 @@ public: bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_SORCERER, false); @@ -675,7 +675,7 @@ public: bool OnGossipHello(Player* player, GameObject* pGO) { - switch(pGO->GetEntry()) + switch (pGO->GetEntry()) { case MATRIX_PUNCHOGRAPH_3005_A: if (player->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1)) @@ -853,7 +853,7 @@ public: pPrisoner->DisappearAndDie(); player->KilledMonsterCredit(NPC_EBON_BLADE_PRISONER_HUMAN, 0); - switch(pPrisoner->GetEntry()) + switch (pPrisoner->GetEntry()) { case NPC_EBON_BLADE_PRISONER_HUMAN: player->CastSpell(player, SPELL_SUMMON_BLADE_KNIGHT_H, true); diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index a40405d3021..f869138d58f 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -194,7 +194,7 @@ public: void DoReplyToTextEmote(uint32 emote) { - switch(emote) + switch (emote) { case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; @@ -207,7 +207,7 @@ public: void ReceiveEmote(Player* player, uint32 textEmote) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_STORMWIND_CITY_GUARD: case NPC_STORMWIND_CITY_PATROLLER: diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index f8095ba9c1e..c7dfd6355ef 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -54,7 +54,7 @@ public: bool disabled = false; //for special scripts - switch(itemId) + switch (itemId) { case 24538: if (player->GetAreaId() != 3628) @@ -418,7 +418,7 @@ public: } else player->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL); } else - player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW , pItem, NULL); + player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL); return true; } }; diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index af3544d2bd3..149e1e455aa 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -426,7 +426,7 @@ public: void SendActionMenu(Player* player, Creature* creature, uint32 uiAction) { - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -510,7 +510,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiSender) + switch (uiSender) { case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break; case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break; @@ -601,7 +601,7 @@ public: void SendActionMenu(Player* player, Creature* creature, uint32 uiAction) { - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -669,7 +669,7 @@ public: { if (uiAction) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 11191: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction); @@ -1103,7 +1103,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiSender) + switch (uiSender) { case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break; case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break; diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 3bf33066189..ff83b0c1ec5 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -68,7 +68,7 @@ public: if (creature->isQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17435: // Azuremyst Isle - Susurrus if (player->HasItemCount(23843, 1, true)) @@ -189,7 +189,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506. diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 392e20734a8..a5e5b467fc7 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -193,7 +193,7 @@ public: if (!lastSpawnedGuard) SpawnedGUID = 0; - switch(SpawnAssoc->spawnType) + switch (SpawnAssoc->spawnType) { case SPAWNTYPE_ALARMBOT: { @@ -348,7 +348,7 @@ public: void ReceiveEmote(Player* player, uint32 emote) { - switch(emote) + switch (emote) { case TEXT_EMOTE_CHICKEN: if (player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand() % 30 == 1) @@ -455,7 +455,7 @@ public: WorldPacket data; me->BuildHeartBeatMsg(&data); me->SendMessageToSet(&data, true); - switch(emote) + switch (emote) { case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); @@ -598,7 +598,7 @@ public: PatientDiedCount = 0; PatientSavedCount = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case DOCTOR_ALLIANCE: for (uint8 i = 0; i < ALLIANCE_COORDS; ++i) @@ -826,7 +826,7 @@ void npc_doctor::npc_doctorAI::UpdateAI(uint32 const diff) std::vector<Location*>::iterator itr = Coordinates.begin() + rand() % Coordinates.size(); uint32 patientEntry = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case DOCTOR_ALLIANCE: patientEntry = AllianceSoldierId[rand() % 3]; @@ -944,7 +944,7 @@ public: if (Player* player = caster->ToPlayer()) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case ENTRY_SHAYA: if (player->GetQuestStatus(QUEST_MOON) == QUEST_STATUS_INCOMPLETE) @@ -1052,7 +1052,7 @@ public: { if (Unit* unit = Unit::GetUnit(*me, CasterGUID)) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case ENTRY_SHAYA: DoScriptText(SAY_SHAYA_GOODBYE, me, unit); @@ -1313,7 +1313,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -1417,7 +1417,7 @@ public: void SendAction(Player* player, Creature* creature, uint32 action) { - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -1464,7 +1464,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(sender) + switch (sender) { case GOSSIP_SENDER_MAIN: SendAction(player, creature, action); @@ -1706,7 +1706,7 @@ public: //Add delta to make them not all hit the same time uint32 delta = (rand() % 7) * 100; me->SetStatFloatValue(UNIT_FIELD_BASEATTACKTIME, float(Info->baseattacktime + delta)); - me->SetStatFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER , float(Info->attackpower)); + me->SetStatFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER, float(Info->attackpower)); // Start attacking attacker of owner on first ai update after spawn - move in line of sight may choose better target if (!me->getVictim() && me->isSummon()) @@ -2211,7 +2211,7 @@ public: player->PlayerTalkClass->ClearMenus(); bool roll = urand(0, 1); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Borean Tundra player->CLOSE_GOSSIP_MENU(); @@ -2283,7 +2283,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->PlayerTalkClass->SendGossipMenu(TEXT_PETINFO, creature->GetGUID()); @@ -2383,7 +2383,7 @@ public: bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -2542,7 +2542,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -2608,7 +2608,7 @@ public: bool noXPGain = player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN); bool doSwitch = false; - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1://xp off { diff --git a/src/server/shared/Common.cpp b/src/server/shared/Common.cpp index 3cd76181b3b..68b5a62b963 100755 --- a/src/server/shared/Common.cpp +++ b/src/server/shared/Common.cpp @@ -33,7 +33,7 @@ char const* localeNames[TOTAL_LOCALES] = { LocaleConstant GetLocaleByName(const std::string& name) { for (uint32 i = 0; i < TOTAL_LOCALES; ++i) - if(name==localeNames[i]) + if (name==localeNames[i]) return LocaleConstant(i); return LOCALE_enUS; // including enGB case diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index 004a013da96..ffecf020d24 100755 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -20,7 +20,7 @@ #define TRINITYCORE_COMMON_H // config.h needs to be included 1st -// TODO this thingy looks like hack , but its not, need to +// TODO this thingy looks like hack, but its not, need to // make separate header however, because It makes mess here. #ifdef HAVE_CONFIG_H // Remove Some things that we will define diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp index 82ca9146c75..6149a680594 100755 --- a/src/server/shared/Cryptography/BigNumber.cpp +++ b/src/server/shared/Cryptography/BigNumber.cpp @@ -42,7 +42,7 @@ BigNumber::BigNumber(uint32 val) BigNumber::~BigNumber() { BN_free(_bn); - if(_array) delete[] _array; + if (_array) delete[] _array; } void BigNumber::SetDword(uint32 val) diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h index fbf31bb092e..b580048ed45 100755 --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -143,7 +143,7 @@ class DBCStorage if (!fields) fields = result->Fetch(); - if(sql->indexPos >= 0) + if (sql->indexPos >= 0) { uint32 id = fields[sql->sqlIndexPos].GetUInt32(); if (indexTable.asT[id]) @@ -162,7 +162,7 @@ class DBCStorage { if ((*sql->formatString)[columnNumber] == FT_SQL_ABSENT) { - switch(fmt[columnNumber]) + switch (fmt[columnNumber]) { case FT_FLOAT: *((float*)(&sqlDataTable[offset]))= 0.0f; @@ -187,7 +187,7 @@ class DBCStorage else if ((*sql->formatString)[columnNumber] == FT_SQL_PRESENT) { bool validSqlColumn = true; - switch(fmt[columnNumber]) + switch (fmt[columnNumber]) { case FT_FLOAT: *((float*)(&sqlDataTable[offset]))=fields[sqlColumnNumber].GetFloat(); @@ -243,7 +243,7 @@ class DBCStorage DBCFileLoader dbc; // Check if load was successful, only then continue - if(!dbc.Load(fn, fmt)) + if (!dbc.Load(fn, fmt)) return false; stringPoolList.push_back(dbc.AutoProduceStrings(fmt, (char*)dataTable)); @@ -261,7 +261,7 @@ class DBCStorage delete[] ((char*)dataTable); dataTable = NULL; - while(!stringPoolList.empty()) + while (!stringPoolList.empty()) { delete[] stringPoolList.front(); stringPoolList.pop_front(); diff --git a/src/server/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h index f360128d367..5e8ddfe4cde 100755 --- a/src/server/shared/Database/DatabaseEnv.h +++ b/src/server/shared/Database/DatabaseEnv.h @@ -31,7 +31,7 @@ #define _LIKE_ "LIKE" #define _TABLE_SIM_ "`" -#define _CONCAT3_(A, B, C) "CONCAT( " A " , " B " , " C " )" +#define _CONCAT3_(A, B, C) "CONCAT( " A ", " B ", " C " )" #define _OFFSET_ "LIMIT %d, 1" #include "Implementation/LoginDatabase.h" diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 68fc7ba9c0a..816dc25f1b3 100755 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -29,7 +29,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_GET_GUID_BY_NAME, "SELECT guid FROM characters WHERE name = ?", CONNECTION_SYNCH); PREPARE_STATEMENT(CHAR_GET_CHECK_NAME, "SELECT 1 FROM characters WHERE name = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_GET_SUM_CHARS, "SELECT COUNT(guid) FROM characters WHERE account = ?", CONNECTION_ASYNC); - PREPARE_STATEMENT(CHAR_GET_CHAR_CREATE_INFO, "SELECT level, race, class FROM characters WHERE account = ? LIMIT 0,?", CONNECTION_ASYNC); + PREPARE_STATEMENT(CHAR_GET_CHAR_CREATE_INFO, "SELECT level, race, class FROM characters WHERE account = ? LIMIT 0, ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_ADD_BAN, "INSERT INTO character_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SET_NOT_BANNED, "UPDATE character_banned SET active = 0 WHERE guid = ? AND active != 0", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_GET_BANINFO, "SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate, banreason, bannedby FROM character_banned WHERE guid = ? ORDER BY bandate ASC", CONNECTION_SYNCH) @@ -227,7 +227,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() // Game event saves PREPARE_STATEMENT(CHAR_DEL_GAME_EVENT_SAVE, "DELETE FROM game_event_save WHERE eventEntry = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_ADD_GAME_EVENT_SAVE, "INSERT INTO game_event_save (eventEntry, state, next_start) VALUES (?, ? , ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_ADD_GAME_EVENT_SAVE, "INSERT INTO game_event_save (eventEntry, state, next_start) VALUES (?, ?, ?)", CONNECTION_ASYNC) // Game event condition saves PREPARE_STATEMENT(CHAR_DEL_ALL_GAME_EVENT_CONDITION_SAVE, "DELETE FROM game_event_condition_save WHERE eventEntry = ?", CONNECTION_ASYNC) diff --git a/src/server/shared/Debugging/Errors.h b/src/server/shared/Debugging/Errors.h index bee4b556f2e..cfa1452864f 100755 --- a/src/server/shared/Debugging/Errors.h +++ b/src/server/shared/Debugging/Errors.h @@ -24,9 +24,9 @@ #include <ace/Stack_Trace.h> #define WPAssert( assertion ) { if (!(assertion)) { ACE_Stack_Trace st; sLog->outError( "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", __FILE__, __LINE__, __FUNCTION__, #assertion, st.c_str()); assert( #assertion &&0 ); ((void(*)())NULL)();} } -#define WPError( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); } -#define WPWarning( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); } -#define WPFatal( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "\n%s:%i in %s FATAL ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( #assertion &&0 ); abort(); } +#define WPError( assertion, errmsg ) if ( ! (assertion) ) { sLog->outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); } +#define WPWarning( assertion, errmsg ) if ( ! (assertion) ) { sLog->outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); } +#define WPFatal( assertion, errmsg ) if ( ! (assertion) ) { sLog->outError( "\n%s:%i in %s FATAL ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( #assertion &&0 ); abort(); } #define ASSERT WPAssert #endif diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp index c2c3ec95e93..63648f66e29 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.cpp +++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp @@ -399,7 +399,7 @@ void WheatyExceptionReport::printTracesForAllThreads() } CloseHandle(threadHandle); } - } while(Thread32Next(hThreadSnap, &te32)); + } while (Thread32Next(hThreadSnap, &te32)); // Don't forget to clean up the snapshot object. CloseHandle(hThreadSnap); @@ -470,7 +470,7 @@ PEXCEPTION_POINTERS pExceptionInfo) _tprintf(_T("RAX:%016I64X\r\nRBX:%016I64X\r\nRCX:%016I64X\r\nRDX:%016I64X\r\nRSI:%016I64X\r\nRDI:%016I64X\r\n") _T("R8: %016I64X\r\nR9: %016I64X\r\nR10:%016I64X\r\nR11:%016I64X\r\nR12:%016I64X\r\nR13:%016I64X\r\nR14:%016I64X\r\nR15:%016I64X\r\n") , pCtx->Rax, pCtx->Rbx, pCtx->Rcx, pCtx->Rdx, - pCtx->Rsi, pCtx->Rdi , pCtx->R9, pCtx->R10, pCtx->R11, pCtx->R12, pCtx->R13, pCtx->R14, pCtx->R15); + pCtx->Rsi, pCtx->Rdi, pCtx->R9, pCtx->R10, pCtx->R11, pCtx->R12, pCtx->R13, pCtx->R14, pCtx->R15); _tprintf(_T("CS:RIP:%04X:%016I64X\r\n"), pCtx->SegCs, pCtx->Rip); _tprintf(_T("SS:RSP:%04X:%016X RBP:%08X\r\n"), pCtx->SegSs, pCtx->Rsp, pCtx->Rbp); diff --git a/src/server/shared/Debugging/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h index cc77a598e67..8ade80ca47b 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.h +++ b/src/server/shared/Debugging/WheatyExceptionReport.h @@ -100,7 +100,7 @@ class WheatyExceptionReport static bool FormatSymbolValue(PSYMBOL_INFO, STACKFRAME *, char * pszBuffer, unsigned cbBuffer); - static char * DumpTypeIndex(char *, DWORD64, DWORD, unsigned, DWORD_PTR, bool & , char*); + static char * DumpTypeIndex(char *, DWORD64, DWORD, unsigned, DWORD_PTR, bool &, char*); static char * FormatOutputValue(char * pszCurrBuffer, BasicType basicType, DWORD64 length, PVOID pAddress); diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h index 95e7261405d..19a2bb1c8cf 100755 --- a/src/server/shared/Dynamic/LinkedList.h +++ b/src/server/shared/Dynamic/LinkedList.h @@ -51,7 +51,7 @@ class LinkedListElement void delink() { - if(isInList()) + if (isInList()) { iNext->iPrev = iPrev; iPrev->iNext = iNext; iNext = NULL; iPrev = NULL; } @@ -112,11 +112,11 @@ class LinkedListHead uint32 getSize() const { - if(!iSize) + if (!iSize) { uint32 result = 0; LinkedListElement const* e = getFirst(); - while(e) + while (e) { ++result; e = e->next(); diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h index da8cf518de5..ab56de9bc24 100755 --- a/src/server/shared/Dynamic/LinkedReference/RefManager.h +++ b/src/server/shared/Dynamic/LinkedReference/RefManager.h @@ -43,7 +43,7 @@ template <class TO, class FROM> class RefManager : public LinkedListHead void clearReferences() { LinkedListElement* ref; - while((ref = getFirst()) != NULL) + while ((ref = getFirst()) != NULL) { ((Reference<TO, FROM>*) ref)->invalidate(); ref->delink(); // the delink might be already done by invalidate(), but doing it here again does not hurt and insures an empty list diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h index 8570b3e1f1f..fd5ce8fc25b 100755 --- a/src/server/shared/Dynamic/LinkedReference/Reference.h +++ b/src/server/shared/Dynamic/LinkedReference/Reference.h @@ -45,9 +45,9 @@ template <class TO, class FROM> class Reference : public LinkedListElement void link(TO* toObj, FROM* fromObj) { assert(fromObj); // fromObj MUST not be NULL - if(isValid()) + if (isValid()) unlink(); - if(toObj != NULL) + if (toObj != NULL) { iRefTo = toObj; iRefFrom = fromObj; diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index da255d40e86..db5e28eff8f 100755 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -46,9 +46,9 @@ class ObjectRegistry bool InsertItem(T *obj, Key key, bool override = false) { typename RegistryMapType::iterator iter = i_registeredObjects.find(key); - if( iter != i_registeredObjects.end() ) + if ( iter != i_registeredObjects.end() ) { - if( !override ) + if ( !override ) return false; delete iter->second; i_registeredObjects.erase(iter); @@ -62,9 +62,9 @@ class ObjectRegistry void RemoveItem(Key key, bool delete_object = true) { typename RegistryMapType::iterator iter = i_registeredObjects.find(key); - if( iter != i_registeredObjects.end() ) + if ( iter != i_registeredObjects.end() ) { - if( delete_object ) + if ( delete_object ) delete iter->second; i_registeredObjects.erase(iter); } diff --git a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h index 9b43e325806..7b03f8503b5 100755 --- a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h @@ -101,7 +101,7 @@ namespace Trinity template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<TypeList<H, T> >&elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake) { CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl, fake); - if(!t) + if (!t) t = Find(elements._TailElement, hdl, fake); return t; @@ -136,7 +136,7 @@ namespace Trinity template<class SPECIFIC_TYPE> bool Remove(ContainerMapList<SPECIFIC_TYPE> &elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl) { typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE> >::iterator iter = elements._element.find(hdl); - if( iter != elements._element.end() ) + if ( iter != elements._element.end() ) { elements._element.erase(iter); return true; diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 04139db4456..56c02a8e77b 100755 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -38,11 +38,11 @@ Log::Log() : Log::~Log() { - if( logfile != NULL ) + if ( logfile != NULL ) fclose(logfile); logfile = NULL; - if( gmLogfile != NULL ) + if ( gmLogfile != NULL ) fclose(gmLogfile); gmLogfile = NULL; @@ -50,7 +50,7 @@ Log::~Log() fclose(charLogfile); charLogfile = NULL; - if( dberLogfile != NULL ) + if ( dberLogfile != NULL ) fclose(dberLogfile); dberLogfile = NULL; @@ -129,20 +129,20 @@ void Log::Initialize() InitColors(ConfigMgr::GetStringDefault("LogColors", "")); m_gmlog_per_account = ConfigMgr::GetBoolDefault("GmLogPerAccount", false); - if(!m_gmlog_per_account) + if (!m_gmlog_per_account) gmLogfile = openLogFile("GMLogFile", "GmLogTimestamp", "a"); else { // GM log settings for per account case m_gmlog_filename_format = ConfigMgr::GetStringDefault("GMLogFile", ""); - if(!m_gmlog_filename_format.empty()) + if (!m_gmlog_filename_format.empty()) { bool m_gmlog_timestamp = ConfigMgr::GetBoolDefault("GmLogTimestamp", false); size_t dot_pos = m_gmlog_filename_format.find_last_of("."); - if(dot_pos!=m_gmlog_filename_format.npos) + if (dot_pos!=m_gmlog_filename_format.npos) { - if(m_gmlog_timestamp) + if (m_gmlog_timestamp) m_gmlog_filename_format.insert(dot_pos, m_logsTimestamp); m_gmlog_filename_format.insert(dot_pos, "_#%u"); @@ -151,7 +151,7 @@ void Log::Initialize() { m_gmlog_filename_format += "_#%u"; - if(m_gmlog_timestamp) + if (m_gmlog_timestamp) m_gmlog_filename_format += m_logsTimestamp; } @@ -199,13 +199,13 @@ void Log::ReloadConfig() FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFlag, char const* mode) { std::string logfn=ConfigMgr::GetStringDefault(configFileName, ""); - if(logfn.empty()) + if (logfn.empty()) return NULL; - if(configTimeStampFlag && ConfigMgr::GetBoolDefault(configTimeStampFlag, false)) + if (configTimeStampFlag && ConfigMgr::GetBoolDefault(configTimeStampFlag, false)) { size_t dot_pos = logfn.find_last_of("."); - if(dot_pos!=logfn.npos) + if (dot_pos!=logfn.npos) logfn.insert(dot_pos, m_logsTimestamp); else logfn += m_logsTimestamp; @@ -216,7 +216,7 @@ FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFl FILE* Log::openGmlogPerAccount(uint32 account) { - if(m_gmlog_filename_format.empty()) + if (m_gmlog_filename_format.empty()) return NULL; char namebuf[TRINITY_PATH_MAX]; @@ -239,7 +239,7 @@ void Log::outTimestamp(FILE* file) void Log::InitColors(const std::string& str) { - if(str.empty()) + if (str.empty()) { m_colored = false; return; @@ -253,10 +253,10 @@ void Log::InitColors(const std::string& str) { ss >> color[i]; - if(!ss) + if (!ss) return; - if(color[i] < 0 || color[i] >= Colors) + if (color[i] < 0 || color[i] >= Colors) return; } @@ -412,7 +412,7 @@ void Log::outString(const char * str, ...) ResetColor(true); printf("\n"); - if(logfile) + if (logfile) { outTimestamp(logfile); va_start(ap, str); @@ -715,7 +715,7 @@ void Log::outDebugInLine(const char * str, ...) vutf8printf(stdout, str, &ap); va_end(ap); - //if(m_colored) + //if (m_colored) // ResetColor(true); if (logfile) @@ -772,7 +772,7 @@ void Log::outDebug(DebugLogFilters f, const char * str, ...) va_end(ap2); } - if( m_logLevel > LOGL_DETAIL ) + if ( m_logLevel > LOGL_DETAIL ) { if (m_colored) SetColor(true, m_colors[LOGL_DEBUG]); @@ -782,7 +782,7 @@ void Log::outDebug(DebugLogFilters f, const char * str, ...) vutf8printf(stdout, str, &ap); va_end(ap); - if(m_colored) + if (m_colored) ResetColor(true); printf( "\n" ); @@ -817,7 +817,7 @@ void Log::outStaticDebug(const char * str, ...) va_end(ap2); } - if( m_logLevel > LOGL_DETAIL ) + if ( m_logLevel > LOGL_DETAIL ) { if (m_colored) SetColor(true, m_colors[LOGL_DEBUG]); @@ -827,7 +827,7 @@ void Log::outStaticDebug(const char * str, ...) vutf8printf(stdout, str, &ap); va_end(ap); - if(m_colored) + if (m_colored) ResetColor(true); printf( "\n" ); diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 4db410d3876..08318aa7a5b 100755 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -270,7 +270,7 @@ class ByteBuffer void read_skip(size_t skip) { - if(_rpos + skip > size()) + if (_rpos + skip > size()) throw ByteBufferException(false, _rpos, skip, size()); _rpos += skip; } @@ -284,7 +284,7 @@ class ByteBuffer template <typename T> T read(size_t pos) const { - if(pos + sizeof(T) > size()) + if (pos + sizeof(T) > size()) throw ByteBufferException(false, pos, sizeof(T), size()); T val = *((T const*)&_storage[pos]); EndianConvert(val); @@ -293,7 +293,7 @@ class ByteBuffer void read(uint8 *dest, size_t len) { - if(_rpos + len > size()) + if (_rpos + len > size()) throw ByteBufferException(false, _rpos, len, size()); memcpy(dest, &_storage[_rpos], len); _rpos += len; @@ -301,7 +301,7 @@ class ByteBuffer void readPackGUID(uint64& guid) { - if(rpos() + 1 > size()) + if (rpos() + 1 > size()) throw ByteBufferException(false, _rpos, 1, size()); guid = 0; @@ -311,9 +311,9 @@ class ByteBuffer for (int i = 0; i < 8; ++i) { - if(guidmark & (uint8(1) << i)) + if (guidmark & (uint8(1) << i)) { - if(rpos() + 1 > size()) + if (rpos() + 1 > size()) throw ByteBufferException(false, _rpos, 1, size()); uint8 bit; @@ -371,7 +371,7 @@ class ByteBuffer void append(const ByteBuffer& buffer) { - if(buffer.wpos()) + if (buffer.wpos()) append(buffer.contents(), buffer.wpos()); } @@ -390,9 +390,9 @@ class ByteBuffer uint8 packGUID[8+1]; packGUID[0] = 0; size_t size = 1; - for(uint8 i = 0;guid != 0;++i) + for (uint8 i = 0;guid != 0;++i) { - if(guid & 0xFF) + if (guid & 0xFF) { packGUID[0] |= uint8(1 << i); packGUID[size] = uint8(guid & 0xFF); @@ -406,14 +406,14 @@ class ByteBuffer void put(size_t pos, const uint8 *src, size_t cnt) { - if(pos + cnt > size()) + if (pos + cnt > size()) throw ByteBufferException(true, pos, cnt, size()); memcpy(&_storage[pos], src, cnt); } void print_storage() const { - if(!sLog->IsOutDebug()) // optimize disabled debug output + if (!sLog->IsOutDebug()) // optimize disabled debug output return; sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE_SIZE: %lu", (unsigned long)size() ); @@ -424,7 +424,7 @@ class ByteBuffer void textlike() const { - if(!sLog->IsOutDebug()) // optimize disabled debug output + if (!sLog->IsOutDebug()) // optimize disabled debug output return; sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE_SIZE: %lu", (unsigned long)size() ); @@ -435,7 +435,7 @@ class ByteBuffer void hexlike() const { - if(!sLog->IsOutDebug()) // optimize disabled debug output + if (!sLog->IsOutDebug()) // optimize disabled debug output return; uint32 j = 1, k = 1; @@ -510,7 +510,7 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::vector<T> &v) uint32 vsize; b >> vsize; v.clear(); - while(vsize--) + while (vsize--) { T t; b >> t; @@ -536,7 +536,7 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::list<T> &v) uint32 vsize; b >> vsize; v.clear(); - while(vsize--) + while (vsize--) { T t; b >> t; @@ -562,7 +562,7 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::map<K, V> &m) uint32 msize; b >> msize; m.clear(); - while(msize--) + while (msize--) { K k; V v; diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h index 72a916eb295..92eab440684 100755 --- a/src/server/shared/Threading/LockedQueue.h +++ b/src/server/shared/Threading/LockedQueue.h @@ -91,7 +91,7 @@ namespace ACE_Based return false; result = _queue.front(); - if(!check.Process(result)) + if (!check.Process(result)) return false; _queue.pop_front(); diff --git a/src/server/shared/Threading/Threading.cpp b/src/server/shared/Threading/Threading.cpp index 9b72d0f1499..7e22f1afdae 100755 --- a/src/server/shared/Threading/Threading.cpp +++ b/src/server/shared/Threading/Threading.cpp @@ -45,14 +45,14 @@ ThreadPriority::ThreadPriority() ASSERT (!_tmp.empty()); - if(_tmp.size() >= MAXPRIORITYNUM) + if (_tmp.size() >= MAXPRIORITYNUM) { const size_t max_pos = _tmp.size(); size_t min_pos = 1; size_t norm_pos = 0; for (size_t i = 0; i < max_pos; ++i) { - if(_tmp[i] == ACE_THR_PRI_OTHER_DEF) + if (_tmp[i] == ACE_THR_PRI_OTHER_DEF) { norm_pos = i + 1; break; @@ -65,7 +65,7 @@ ThreadPriority::ThreadPriority() //into ¹ piesces const size_t _divider = 4; size_t _div = (norm_pos - min_pos) / _divider; - if(_div == 0) + if (_div == 0) _div = 1; min_pos = (norm_pos - 1); @@ -74,7 +74,7 @@ ThreadPriority::ThreadPriority() m_priority[Lowest] = _tmp[min_pos -= _div ]; _div = (max_pos - norm_pos) / _divider; - if(_div == 0) + if (_div == 0) _div = 1; min_pos = norm_pos - 1; @@ -86,10 +86,10 @@ ThreadPriority::ThreadPriority() int ThreadPriority::getPriority(Priority p) const { - if(p < Idle) + if (p < Idle) p = Idle; - if(p > Realtime) + if (p > Realtime) p = Realtime; return m_priority[p]; @@ -204,14 +204,14 @@ ACE_hthread_t Thread::currentHandle() Thread * Thread::current() { Thread * _thread = m_ThreadStorage.ts_object(); - if(!_thread) + if (!_thread) { _thread = new Thread(); _thread->m_iThreadId = Thread::currentId(); _thread->m_hThreadHandle = Thread::currentHandle(); Thread * _oldValue = m_ThreadStorage.ts_object(_thread); - if(_oldValue) + if (_oldValue) delete _oldValue; } diff --git a/src/server/shared/Threading/Threading.h b/src/server/shared/Threading/Threading.h index 0d327d5abaa..89550ec996f 100755 --- a/src/server/shared/Threading/Threading.h +++ b/src/server/shared/Threading/Threading.h @@ -36,7 +36,7 @@ namespace ACE_Based void incReference() { ++m_refs; } void decReference() { - if(!--m_refs) + if (!--m_refs) delete this; } private: diff --git a/src/server/shared/Utilities/EventProcessor.cpp b/src/server/shared/Utilities/EventProcessor.cpp index 3f9123b3e46..56dcad2516b 100755 --- a/src/server/shared/Utilities/EventProcessor.cpp +++ b/src/server/shared/Utilities/EventProcessor.cpp @@ -71,17 +71,17 @@ void EventProcessor::KillAllEvents(bool force) i_old->second->to_Abort = true; i_old->second->Abort(m_time); - if(force || i_old->second->IsDeletable()) + if (force || i_old->second->IsDeletable()) { delete i_old->second; - if(!force) // need per-element cleanup + if (!force) // need per-element cleanup m_events.erase (i_old); } } // fast clear event list (in force case) - if(force) + if (force) m_events.clear(); } diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp index f768a3ab68c..cd623c62132 100755 --- a/src/server/shared/Utilities/ServiceWin32.cpp +++ b/src/server/shared/Utilities/ServiceWin32.cpp @@ -80,7 +80,7 @@ bool WinServiceInstall() if (service) { advapi32 = GetModuleHandle("ADVAPI32.DLL"); - if(!advapi32) + if (!advapi32) { CloseServiceHandle(service); CloseServiceHandle(serviceControlManager); @@ -232,7 +232,7 @@ void WINAPI ServiceMain(DWORD argc, char *argv[]) m_ServiceStatus = 1; argc = 1; - main(argc , argv); + main(argc, argv); // service was stopped serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 7d3a6f7ed58..187258e41b3 100755 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -128,9 +128,9 @@ void stripLineInvisibleChars(std::string &str) bool space = false; for (size_t pos = 0; pos < str.size(); ++pos) { - if(invChars.find(str[pos])!=std::string::npos) + if (invChars.find(str[pos])!=std::string::npos) { - if(!space) + if (!space) { str[wpos++] = ' '; space = true; @@ -138,7 +138,7 @@ void stripLineInvisibleChars(std::string &str) } else { - if(wpos!=pos) + if (wpos!=pos) str[wpos++] = str[pos]; else ++wpos; @@ -146,9 +146,9 @@ void stripLineInvisibleChars(std::string &str) } } - if(wpos < str.size()) + if (wpos < str.size()) str.erase(wpos, str.size()); - if(str.find("|TInterface")!=std::string::npos) + if (str.find("|TInterface")!=std::string::npos) str.clear(); } @@ -161,15 +161,15 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText, bool hoursOnly) uint64 days = timeInSecs / DAY; std::ostringstream ss; - if(days) + if (days) ss << days << (shortText ? "d " : " Day(s) "); - if(hours || hoursOnly) + if (hours || hoursOnly) ss << hours << (shortText ? "h " : " Hour(s) "); - if(!hoursOnly) + if (!hoursOnly) { - if(minutes) + if (minutes) ss << minutes << (shortText ? "m " : " Minute(s) "); - if(secs || (!days && !hours && !minutes) ) + if (secs || (!days && !hours && !minutes) ) ss << secs << (shortText ? "s" : " Second(s)."); } @@ -184,14 +184,14 @@ uint32 TimeStringToSecs(const std::string& timestring) for (std::string::const_iterator itr = timestring.begin(); itr != timestring.end(); ++itr) { - if(isdigit(*itr)) + if (isdigit(*itr)) { buffer*=10; buffer+= (*itr)-'0'; } else { - switch(*itr) + switch (*itr) { case 'd': multiplier = DAY; break; case 'h': multiplier = HOUR; break; @@ -225,7 +225,7 @@ std::string TimeToTimestampStr(time_t t) /// Check if the string is a valid ip address representation bool IsIPAddress(char const* ipaddress) { - if(!ipaddress) + if (!ipaddress) return false; // Let the big boys do it. @@ -270,7 +270,7 @@ void utf8truncate(std::string& utf8str, size_t len) try { size_t wlen = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size()); - if(wlen <= len) + if (wlen <= len) return; std::wstring wstr; @@ -291,9 +291,9 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) try { size_t len = utf8::distance(utf8str, utf8str+csize); - if(len > wsize) + if (len > wsize) { - if(wsize > 0) + if (wsize > 0) wstr[0] = L'\0'; wsize = 0; return false; @@ -305,7 +305,7 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) } catch(std::exception) { - if(wsize > 0) + if (wsize > 0) wstr[0] = L'\0'; wsize = 0; return false; @@ -384,7 +384,7 @@ typedef wchar_t const* const* wstrlist; std::wstring GetMainPartOfName(std::wstring wname, uint32 declension) { // supported only Cyrillic cases - if(wname.size() < 1 || !isCyrillicCharacter(wname[0]) || declension > 5) + if (wname.size() < 1 || !isCyrillicCharacter(wname[0]) || declension > 5) return wname; // Important: end length must be <= MAX_INTERNAL_PLAYER_NAME-MAX_PLAYER_NAME (3 currently) @@ -419,7 +419,7 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension) { size_t len = size_t((*itr)[-1]); // get length from string size field - if(wname.substr(wname.size()-len, len)==*itr) + if (wname.substr(wname.size()-len, len)==*itr) return wname.substr(0, wname.size()-len); } @@ -430,7 +430,7 @@ bool utf8ToConsole(const std::string& utf8str, std::string& conStr) { #if PLATFORM == PLATFORM_WINDOWS std::wstring wstr; - if(!Utf8toWStr(utf8str, wstr)) + if (!Utf8toWStr(utf8str, wstr)) return false; conStr.resize(wstr.size()); @@ -462,13 +462,13 @@ bool Utf8FitTo(const std::string& str, std::wstring search) { std::wstring temp; - if(!Utf8toWStr(str, temp)) + if (!Utf8toWStr(str, temp)) return false; // converting to lower case wstrToLower( temp ); - if(temp.find(search) == std::wstring::npos) + if (temp.find(search) == std::wstring::npos) return false; return true; @@ -509,7 +509,7 @@ void hexEncodeByteArray(uint8* bytes, uint32 arrayLen, std::string& result) { unsigned char nibble = 0x0F & (bytes[i]>>((1-j)*4)); char encodedNibble; - if(nibble < 0x0A) + if (nibble < 0x0A) encodedNibble = '0'+nibble; else encodedNibble = 'A'+nibble-0x0A; diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index a91bfe3faa5..8ded45a7bb6 100755 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -188,60 +188,60 @@ void utf8truncate(std::string& utf8str, size_t len); inline bool isBasicLatinCharacter(wchar_t wchar) { - if(wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z + if (wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z return true; - if(wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z + if (wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z return true; return false; } inline bool isExtendedLatinCharacter(wchar_t wchar) { - if(isBasicLatinCharacter(wchar)) + if (isBasicLatinCharacter(wchar)) return true; - if(wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS + if (wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS return true; - if(wchar >= 0x00D8 && wchar <= 0x00DF) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN + if (wchar >= 0x00D8 && wchar <= 0x00DF) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN return true; - if(wchar == 0x00DF) // LATIN SMALL LETTER SHARP S + if (wchar == 0x00DF) // LATIN SMALL LETTER SHARP S return true; - if(wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS + if (wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS return true; - if(wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN + if (wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN return true; - if(wchar >= 0x0100 && wchar <= 0x012F) // LATIN CAPITAL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK + if (wchar >= 0x0100 && wchar <= 0x012F) // LATIN CAPITAL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK return true; - if(wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S + if (wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S return true; return false; } inline bool isCyrillicCharacter(wchar_t wchar) { - if(wchar >= 0x0410 && wchar <= 0x044F) // CYRILLIC CAPITAL LETTER A - CYRILLIC SMALL LETTER YA + if (wchar >= 0x0410 && wchar <= 0x044F) // CYRILLIC CAPITAL LETTER A - CYRILLIC SMALL LETTER YA return true; - if(wchar == 0x0401 || wchar == 0x0451) // CYRILLIC CAPITAL LETTER IO, CYRILLIC SMALL LETTER IO + if (wchar == 0x0401 || wchar == 0x0451) // CYRILLIC CAPITAL LETTER IO, CYRILLIC SMALL LETTER IO return true; return false; } inline bool isEastAsianCharacter(wchar_t wchar) { - if(wchar >= 0x1100 && wchar <= 0x11F9) // Hangul Jamo + if (wchar >= 0x1100 && wchar <= 0x11F9) // Hangul Jamo return true; - if(wchar >= 0x3041 && wchar <= 0x30FF) // Hiragana + Katakana + if (wchar >= 0x3041 && wchar <= 0x30FF) // Hiragana + Katakana return true; - if(wchar >= 0x3131 && wchar <= 0x318E) // Hangul Compatibility Jamo + if (wchar >= 0x3131 && wchar <= 0x318E) // Hangul Compatibility Jamo return true; - if(wchar >= 0x31F0 && wchar <= 0x31FF) // Katakana Phonetic Ext. + if (wchar >= 0x31F0 && wchar <= 0x31FF) // Katakana Phonetic Ext. return true; - if(wchar >= 0x3400 && wchar <= 0x4DB5) // CJK Ideographs Ext. A + if (wchar >= 0x3400 && wchar <= 0x4DB5) // CJK Ideographs Ext. A return true; - if(wchar >= 0x4E00 && wchar <= 0x9FC3) // Unified CJK Ideographs + if (wchar >= 0x4E00 && wchar <= 0x9FC3) // Unified CJK Ideographs return true; - if(wchar >= 0xAC00 && wchar <= 0xD7A3) // Hangul Syllables + if (wchar >= 0xAC00 && wchar <= 0xD7A3) // Hangul Syllables return true; - if(wchar >= 0xFF01 && wchar <= 0xFFEE) // Halfwidth forms + if (wchar >= 0xFF01 && wchar <= 0xFFEE) // Halfwidth forms return true; return false; } @@ -273,7 +273,7 @@ inline bool isNumericOrSpace(wchar_t wchar) inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isBasicLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isBasicLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } @@ -281,7 +281,7 @@ inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace) inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isExtendedLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isExtendedLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } @@ -289,7 +289,7 @@ inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace) inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isCyrillicCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isCyrillicCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } @@ -297,29 +297,29 @@ inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace) inline bool isEastAsianString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isEastAsianCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isEastAsianCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } inline wchar_t wcharToUpper(wchar_t wchar) { - if(wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z + if (wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z return wchar_t(uint16(wchar)-0x0020); - if(wchar == 0x00DF) // LATIN SMALL LETTER SHARP S + if (wchar == 0x00DF) // LATIN SMALL LETTER SHARP S return wchar_t(0x1E9E); - if(wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS + if (wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS return wchar_t(uint16(wchar)-0x0020); - if(wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN + if (wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN return wchar_t(uint16(wchar)-0x0020); - if(wchar >= 0x0101 && wchar <= 0x012F) // LATIN SMALL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK (only %2=1) + if (wchar >= 0x0101 && wchar <= 0x012F) // LATIN SMALL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK (only %2=1) { - if(wchar % 2 == 1) + if (wchar % 2 == 1) return wchar_t(uint16(wchar)-0x0001); } - if(wchar >= 0x0430 && wchar <= 0x044F) // CYRILLIC SMALL LETTER A - CYRILLIC SMALL LETTER YA + if (wchar >= 0x0430 && wchar <= 0x044F) // CYRILLIC SMALL LETTER A - CYRILLIC SMALL LETTER YA return wchar_t(uint16(wchar)-0x0020); - if(wchar == 0x0451) // CYRILLIC SMALL LETTER IO + if (wchar == 0x0451) // CYRILLIC SMALL LETTER IO return wchar_t(0x0401); return wchar; @@ -332,22 +332,22 @@ inline wchar_t wcharToUpperOnlyLatin(wchar_t wchar) inline wchar_t wcharToLower(wchar_t wchar) { - if(wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z + if (wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z return wchar_t(uint16(wchar)+0x0020); - if(wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS + if (wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS return wchar_t(uint16(wchar)+0x0020); - if(wchar >= 0x00D8 && wchar <= 0x00DE) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN + if (wchar >= 0x00D8 && wchar <= 0x00DE) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN return wchar_t(uint16(wchar)+0x0020); - if(wchar >= 0x0100 && wchar <= 0x012E) // LATIN CAPITAL LETTER A WITH MACRON - LATIN CAPITAL LETTER I WITH OGONEK (only %2=0) + if (wchar >= 0x0100 && wchar <= 0x012E) // LATIN CAPITAL LETTER A WITH MACRON - LATIN CAPITAL LETTER I WITH OGONEK (only %2=0) { - if(wchar % 2 == 0) + if (wchar % 2 == 0) return wchar_t(uint16(wchar)+0x0001); } - if(wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S + if (wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S return wchar_t(0x00DF); - if(wchar == 0x0401) // CYRILLIC CAPITAL LETTER IO + if (wchar == 0x0401) // CYRILLIC CAPITAL LETTER IO return wchar_t(0x0451); - if(wchar >= 0x0410 && wchar <= 0x042F) // CYRILLIC CAPITAL LETTER A - CYRILLIC CAPITAL LETTER YA + if (wchar >= 0x0410 && wchar <= 0x042F) // CYRILLIC CAPITAL LETTER A - CYRILLIC CAPITAL LETTER YA return wchar_t(uint16(wchar)+0x0020); return wchar; diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index 794f79f536d..cf5ad79f878 100755 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -532,7 +532,7 @@ bool ChatHandler::HandleServerSetDiffTimeCommand(const char *args) bool ChatHandler::HandleServerToggleQueryLogging(const char* /* args */) { sLog->SetSQLDriverQueryLogging(!sLog->GetSQLDriverQueryLogging()); - if(sLog->GetSQLDriverQueryLogging()) + if (sLog->GetSQLDriverQueryLogging()) PSendSysMessage(LANG_SQLDRIVER_QUERY_LOGGING_ENABLED); else PSendSysMessage(LANG_SQLDRIVER_QUERY_LOGGING_DISABLED); diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 85f10e0cf9b..1ce247d9249 100755 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -75,7 +75,7 @@ extern int main(int argc, char **argv) ///- Command line parsing to get the configuration file name char const* cfg_file = _TRINITY_CORE_CONFIG; int c = 1; - while( c < argc ) + while ( c < argc ) { if (strcmp(argv[c], "-c") == 0) { diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index e16494bdeac..5260140fef0 100755 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -128,7 +128,7 @@ int Master::Run() sLog->outString(" ______ __"); sLog->outString("/\\__ _\\ __ __/\\ \\__"); - sLog->outString("\\/_/\\ \\/ _ __ /\\_\\ ___ /\\_\\ \\ ,_\\ __ __"); + sLog->outString("\\/_/\\ \\/ _ __ /\\_\\ ___ /\\_\\ \\, _\\ __ __"); sLog->outString(" \\ \\ \\/\\`'__\\/\\ \\ /' _ `\\/\\ \\ \\ \\/ /\\ \\/\\ \\"); sLog->outString(" \\ \\ \\ \\ \\/ \\ \\ \\/\\ \\/\\ \\ \\ \\ \\ \\_\\ \\ \\_\\ \\"); sLog->outString(" \\ \\_\\ \\_\\ \\ \\_\\ \\_\\ \\_\\ \\_\\ \\__\\\\/`____ \\"); diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp index 9c31c189822..71d4d1df035 100755 --- a/src/server/worldserver/RemoteAccess/RASocket.cpp +++ b/src/server/worldserver/RemoteAccess/RASocket.cpp @@ -349,7 +349,7 @@ int RASocket::svc(void) if (send(std::string(sWorld->GetMotd()) + "\r\n") == -1) return -1; - for(;;) + for (;;) { // show prompt const char* tc_prompt = "TC> "; diff --git a/src/server/worldserver/TCSoap/TCSoap.cpp b/src/server/worldserver/TCSoap/TCSoap.cpp index 67c54e7e011..fa7c34cffbf 100755 --- a/src/server/worldserver/TCSoap/TCSoap.cpp +++ b/src/server/worldserver/TCSoap/TCSoap.cpp @@ -83,25 +83,25 @@ int ns1__executeCommand(soap* soap, char* command, char** result) } uint32 accountId = AccountMgr::GetId(soap->userid); - if(!accountId) + if (!accountId) { sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: Client used invalid username '%s'", soap->userid); return 401; } - if(!AccountMgr::CheckPassword(accountId, soap->passwd)) + if (!AccountMgr::CheckPassword(accountId, soap->passwd)) { sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: invalid password for account '%s'", soap->userid); return 401; } - if(AccountMgr::GetSecurity(accountId) < SEC_ADMINISTRATOR) + if (AccountMgr::GetSecurity(accountId) < SEC_ADMINISTRATOR) { sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: %s's gmlevel is too low", soap->userid); return 403; } - if(!command || !*command) + if (!command || !*command) return soap_sender_fault(soap, "Command mustn't be empty", "The supplied command was an empty string"); sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: got command '%s'", command); @@ -117,7 +117,7 @@ int ns1__executeCommand(soap* soap, char* command, char** result) // wait for callback to complete command int acc = connection.pendingCommands.acquire(); - if(acc) + if (acc) { sLog->outError("TCSoap: Error while acquiring lock, acc = %i, errno = %u", acc, errno); } @@ -125,7 +125,7 @@ int ns1__executeCommand(soap* soap, char* command, char** result) // alright, command finished char* printBuffer = soap_strdup(soap, connection.m_printBuffer.c_str()); - if(connection.hasCommandSucceeded()) + if (connection.hasCommandSucceeded()) { *result = printBuffer; return SOAP_OK; |