diff options
Diffstat (limited to 'src')
46 files changed, 180 insertions, 180 deletions
diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp index bbf034e0ac4..dd7201ecf52 100644 --- a/src/game/ArenaTeam.cpp +++ b/src/game/ArenaTeam.cpp @@ -300,7 +300,7 @@ void ArenaTeam::DelMember(uint64 guid) { player->GetSession()->SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, GetName(), "", 0); // delete all info regarding this team - for(uint32 i = 0; i < ARENA_TEAM_END; ++i) + for (uint32 i = 0; i < ARENA_TEAM_END; ++i) player->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot() * ARENA_TEAM_END) + i, 0); sLog.outArena("Player: %s [GUID: %u] left arena team type: %u [Id: %u].", player->GetName(), player->GetGUIDLow(), GetType(), GetId()); } diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index 93cd6ed4277..9d5e01f0014 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -192,7 +192,7 @@ GroupQueueInfo * BattleGroundQueue::AddGroup(Player *leader, Group* grp, BattleG //ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_Lock); if (grp) { - for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { Player *member = itr->getSource(); if(!member) @@ -227,10 +227,10 @@ GroupQueueInfo * BattleGroundQueue::AddGroup(Player *leader, Group* grp, BattleG uint32 q_min_level = backetEntry->minLevel; uint32 q_max_level = backetEntry->maxLevel; GroupsQueueType::const_iterator itr; - for(itr = m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].begin(); itr != m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].end(); ++itr) + for (itr = m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].begin(); itr != m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].end(); ++itr) if (!(*itr)->IsInvitedToBGInstanceGUID) qAlliance += (*itr)->Players.size(); - for(itr = m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_HORDE].begin(); itr != m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_HORDE].end(); ++itr) + for (itr = m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_HORDE].begin(); itr != m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_HORDE].end(); ++itr) if (!(*itr)->IsInvitedToBGInstanceGUID) qHorde += (*itr)->Players.size(); @@ -332,7 +332,7 @@ void BattleGroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCou //they leave groupinfo so we can't use its players size to find out index for (uint32 j = index; j < BG_QUEUE_GROUP_TYPES_COUNT; j += BG_QUEUE_NORMAL_ALLIANCE) { - for(group_itr_tmp = m_QueuedGroups[bracket_id_tmp][j].begin(); group_itr_tmp != m_QueuedGroups[bracket_id_tmp][j].end(); ++group_itr_tmp) + for (group_itr_tmp = m_QueuedGroups[bracket_id_tmp][j].begin(); group_itr_tmp != m_QueuedGroups[bracket_id_tmp][j].end(); ++group_itr_tmp) { if ((*group_itr_tmp) == group) { @@ -598,10 +598,10 @@ bool BattleGroundQueue::CheckPremadeMatch(BattleGroundBracketId bracket_id, uint //start premade match //if groups aren't invited GroupsQueueType::const_iterator ali_group, horde_group; - for( ali_group = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].begin(); ali_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++ali_group) + for ( ali_group = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].begin(); ali_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++ali_group) if (!(*ali_group)->IsInvitedToBGInstanceGUID) break; - for( horde_group = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].begin(); horde_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end(); ++horde_group) + for ( horde_group = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].begin(); horde_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end(); ++horde_group) if (!(*horde_group)->IsInvitedToBGInstanceGUID) break; @@ -614,7 +614,7 @@ bool BattleGroundQueue::CheckPremadeMatch(BattleGroundBracketId bracket_id, uint GroupsQueueType::const_iterator itr; for (uint32 i = 0; i < BG_TEAMS_COUNT; i++) { - for(itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin(); itr != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++itr) + for (itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin(); itr != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++itr) { //if itr can join BG and player count is less that maxPlayers, then add group to selectionpool if (!(*itr)->IsInvitedToBGInstanceGUID && !m_SelectionPools[i].AddGroup((*itr), maxPlayers)) @@ -654,7 +654,7 @@ bool BattleGroundQueue::CheckNormalMatch(BattleGround* bg_template, BattleGround for (uint32 i = 0; i < BG_TEAMS_COUNT; i++) { itr_team[i] = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin(); - for(; itr_team[i] != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++(itr_team[i])) + for (; itr_team[i] != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++(itr_team[i])) { if (!(*(itr_team[i]))->IsInvitedToBGInstanceGUID) { @@ -673,7 +673,7 @@ bool BattleGroundQueue::CheckNormalMatch(BattleGround* bg_template, BattleGround { //we will try to invite more groups to team with less players indexed by j ++(itr_team[j]); //this will not cause a crash, because for cycle above reached break; - for(; itr_team[j] != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + j].end(); ++(itr_team[j])) + for (; itr_team[j] != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + j].end(); ++(itr_team[j])) { if (!(*(itr_team[j]))->IsInvitedToBGInstanceGUID) if (!m_SelectionPools[j].AddGroup(*(itr_team[j]), m_SelectionPools[(j + 1) % BG_TEAMS_COUNT].GetPlayerCount())) @@ -710,7 +710,7 @@ bool BattleGroundQueue::CheckSkirmishForSameFaction(BattleGroundBracketId bracke GroupQueueInfo* ginfo = m_SelectionPools[teamIndex].SelectedGroups.back(); //set itr_team to group that was added to selection pool latest GroupsQueueType::iterator itr_team = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].begin(); - for(; itr_team != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr_team) + for (; itr_team != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr_team) if (ginfo == *itr_team) break; if (itr_team == m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end()) @@ -718,7 +718,7 @@ bool BattleGroundQueue::CheckSkirmishForSameFaction(BattleGroundBracketId bracke GroupsQueueType::iterator itr_team2 = itr_team; ++itr_team2; //invite players to other selection pool - for(; itr_team2 != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr_team2) + for (; itr_team2 != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr_team2) { //if selection pool is full then break; if (!(*itr_team2)->IsInvitedToBGInstanceGUID && !m_SelectionPools[otherTeam].AddGroup(*itr_team2, minPlayersPerTeam)) @@ -737,7 +737,7 @@ bool BattleGroundQueue::CheckSkirmishForSameFaction(BattleGroundBracketId bracke //remove team from old queue GroupsQueueType::iterator itr2 = itr_team; ++itr2; - for(; itr2 != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr2) + for (; itr2 != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr2) { if (*itr2 == *itr) { @@ -946,7 +946,7 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BattleGroundBracketI { // take the group that joined first itr_team[i] = m_QueuedGroups[bracket_id][i].begin(); - for(; itr_team[i] != m_QueuedGroups[bracket_id][i].end(); ++(itr_team[i])) + for (; itr_team[i] != m_QueuedGroups[bracket_id][i].end(); ++(itr_team[i])) { // if group match conditions, then add it to pool if( !(*itr_team[i])->IsInvitedToBGInstanceGUID @@ -967,7 +967,7 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BattleGroundBracketI { itr_team[BG_TEAM_ALLIANCE] = itr_team[BG_TEAM_HORDE]; ++itr_team[BG_TEAM_ALLIANCE]; - for(; itr_team[BG_TEAM_ALLIANCE] != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end(); ++(itr_team[BG_TEAM_ALLIANCE])) + for (; itr_team[BG_TEAM_ALLIANCE] != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end(); ++(itr_team[BG_TEAM_ALLIANCE])) { if( !(*itr_team[BG_TEAM_ALLIANCE])->IsInvitedToBGInstanceGUID && (((*itr_team[BG_TEAM_ALLIANCE])->ArenaTeamRating >= arenaMinRating && (*itr_team[BG_TEAM_ALLIANCE])->ArenaTeamRating <= arenaMaxRating) @@ -983,7 +983,7 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BattleGroundBracketI { itr_team[BG_TEAM_HORDE] = itr_team[BG_TEAM_ALLIANCE]; ++itr_team[BG_TEAM_HORDE]; - for(; itr_team[BG_TEAM_HORDE] != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++(itr_team[BG_TEAM_HORDE])) + for (; itr_team[BG_TEAM_HORDE] != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++(itr_team[BG_TEAM_HORDE])) { if( !(*itr_team[BG_TEAM_HORDE])->IsInvitedToBGInstanceGUID && (((*itr_team[BG_TEAM_HORDE])->ArenaTeamRating >= arenaMinRating && (*itr_team[BG_TEAM_HORDE])->ArenaTeamRating <= arenaMaxRating) @@ -1221,8 +1221,8 @@ void BattleGroundMgr::Update(uint32 diff) { // forced update for rated arenas (scan all, but skipped non rated) sLog.outDebug("BattleGroundMgr: UPDATING ARENA QUEUES"); - for(int qtype = BATTLEGROUND_QUEUE_2v2; qtype <= BATTLEGROUND_QUEUE_5v5; ++qtype) - for(int bracket = BG_BRACKET_ID_FIRST; bracket < MAX_BATTLEGROUND_BRACKETS; ++bracket) + for (int qtype = BATTLEGROUND_QUEUE_2v2; qtype <= BATTLEGROUND_QUEUE_5v5; ++qtype) + for (int bracket = BG_BRACKET_ID_FIRST; bracket < MAX_BATTLEGROUND_BRACKETS; ++bracket) m_BattleGroundQueues[qtype].Update( BATTLEGROUND_AA, BattleGroundBracketId(bracket), BattleGroundMgr::BGArenaType(BattleGroundQueueTypeId(qtype)), true, 0); @@ -1508,7 +1508,7 @@ uint32 BattleGroundMgr::CreateClientVisibleInstanceId(BattleGroundTypeId bgTypeI // the following works, because std::set is default ordered with "<" // the optimalization would be to use as bitmask std::vector<uint32> - but that would only make code unreadable uint32 lastId = 0; - for(std::set<uint32>::iterator itr = m_ClientBattleGroundIds[bgTypeId][bracket_id].begin(); itr != m_ClientBattleGroundIds[bgTypeId][bracket_id].end();) + for (std::set<uint32>::iterator itr = m_ClientBattleGroundIds[bgTypeId][bracket_id].begin(); itr != m_ClientBattleGroundIds[bgTypeId][bracket_id].end();) { if( (++lastId) != *itr) //if there is a gap between the ids, we will break.. break; @@ -1871,7 +1871,7 @@ void BattleGroundMgr::BuildBattleGroundListPacket(WorldPacket *data, const uint6 if(PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgTemplate->GetMapId(),plr->getLevel())) { BattleGroundBracketId bracketId = bracketEntry->GetBracketId(); - for(std::set<uint32>::iterator itr = m_ClientBattleGroundIds[bgTypeId][bracketId].begin(); itr != m_ClientBattleGroundIds[bgTypeId][bracketId].end();++itr) + for (std::set<uint32>::iterator itr = m_ClientBattleGroundIds[bgTypeId][bracketId].begin(); itr != m_ClientBattleGroundIds[bgTypeId][bracketId].end();++itr) { *data << uint32(*itr); ++count; diff --git a/src/game/BattleGroundRV.cpp b/src/game/BattleGroundRV.cpp index 06b96f4423c..3815cdf20c6 100644 --- a/src/game/BattleGroundRV.cpp +++ b/src/game/BattleGroundRV.cpp @@ -68,7 +68,7 @@ void BattleGroundRV::Update(uint32 diff) setState(BG_RV_STATE_OPEN_PILARS); break; case BG_RV_STATE_OPEN_PILARS: - for(i = BG_RV_OBJECT_PILAR_1; i <= BG_RV_OBJECT_PULLEY_2; ++i) + for (i = BG_RV_OBJECT_PILAR_1; i <= BG_RV_OBJECT_PULLEY_2; ++i) DoorOpen(i); setTimer(BG_RV_PILAR_TO_FIRE_TIMER); setState(BG_RV_STATE_OPEN_FIRE); @@ -81,7 +81,7 @@ void BattleGroundRV::Update(uint32 diff) break; case BG_RV_STATE_CLOSE_PILARS: uint32 i; - for(i = BG_RV_OBJECT_PILAR_1; i <= BG_RV_OBJECT_PULLEY_2; ++i) + for (i = BG_RV_OBJECT_PILAR_1; i <= BG_RV_OBJECT_PULLEY_2; ++i) DoorOpen(i); setTimer(BG_RV_PILAR_TO_FIRE_TIMER); setState(BG_RV_STATE_CLOSE_FIRE); diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp index 33630f340df..d896aa29b1f 100644 --- a/src/game/BattleGroundSA.cpp +++ b/src/game/BattleGroundSA.cpp @@ -44,7 +44,7 @@ void BattleGroundSA::Reset() { TotalTime = 0; attackers = ( (urand(0,1)) ? TEAM_ALLIANCE : TEAM_HORDE); - for(uint8 i = 0; i <= 5; i++) + for (uint8 i = 0; i <= 5; i++) GateStatus[i] = BG_SA_GATE_OK; ShipsStarted = false; status = BG_SA_WARMUP; @@ -61,19 +61,19 @@ bool BattleGroundSA::ResetObjs() uint32 defF = BG_SA_Factions[attackers ? TEAM_ALLIANCE : TEAM_HORDE]; - for(uint8 i = 0; i <BG_SA_MAXOBJ; i++) + for (uint8 i = 0; i <BG_SA_MAXOBJ; i++) DelObject(i); - for(uint8 i = 0; i < BG_SA_MAXNPC; i++) + for (uint8 i = 0; i < BG_SA_MAXNPC; i++) DelCreature(i); - for(uint8 i = BG_SA_MAXNPC; i < BG_SA_MAXNPC + BG_SA_MAX_GY; i++) + for (uint8 i = BG_SA_MAXNPC; i < BG_SA_MAXNPC + BG_SA_MAX_GY; i++) DelCreature(i); - for(uint8 i = 0; i < 6; i++) + for (uint8 i = 0; i < 6; i++) GateStatus[i] = BG_SA_GATE_OK; - for(uint8 i = 0; i < BG_SA_CENTRAL_FLAG; i++) + for (uint8 i = 0; i < BG_SA_CENTRAL_FLAG; i++) { if(!AddObject(i,BG_SA_ObjEntries[i], BG_SA_ObjSpawnlocs[i][0],BG_SA_ObjSpawnlocs[i][1], @@ -84,7 +84,7 @@ bool BattleGroundSA::ResetObjs() //Cannons and demolishers - NPCs are spawned //By capturing GYs. - for(uint8 i = 0; i < BG_SA_NPC_SPARKLIGHT; i++) + for (uint8 i = 0; i < BG_SA_NPC_SPARKLIGHT; i++) { if(!AddCreature(BG_SA_NpcEntries[i], i, (attackers == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE), BG_SA_NpcSpawnlocs[i][0],BG_SA_NpcSpawnlocs[i][1], @@ -94,7 +94,7 @@ bool BattleGroundSA::ResetObjs() OverrideGunFaction(); - for(uint8 i = 0; i <= BG_SA_TITAN_RELIC; i++) + for (uint8 i = 0; i <= BG_SA_TITAN_RELIC; i++) { SpawnBGObject(i, RESPAWN_IMMEDIATELY); GetBGObject(i)->SetUInt32Value(GAMEOBJECT_FACTION, defF); @@ -103,7 +103,7 @@ bool BattleGroundSA::ResetObjs() GetBGObject(BG_SA_TITAN_RELIC)->SetUInt32Value(GAMEOBJECT_FACTION, atF); GetBGObject(BG_SA_TITAN_RELIC)->Refresh(); - for(uint8 i = 0; i <= 5; i++) + for (uint8 i = 0; i <= 5; i++) GateStatus[i] = BG_SA_GATE_OK; // MAD props for Kiper for discovering those values - 4 hours of his work. @@ -116,7 +116,7 @@ bool BattleGroundSA::ResetObjs() ShipsStarted = false; //Graveyards! - for(uint8 i = 0;i < BG_SA_MAX_GY; i++) + for (uint8 i = 0;i < BG_SA_MAX_GY; i++) { WorldSafeLocsEntry const *sg = NULL; sg = sWorldSafeLocsStore.LookupEntry(BG_SA_GYEntries[i]); @@ -141,7 +141,7 @@ bool BattleGroundSA::ResetObjs() } //GY capture points - for(uint8 i = BG_SA_CENTRAL_FLAG; i < BG_SA_MAXOBJ; i++) + for (uint8 i = BG_SA_CENTRAL_FLAG; i < BG_SA_MAXOBJ; i++) { AddObject(i, BG_SA_ObjEntries[i] - (attackers == TEAM_ALLIANCE ? 1:0), BG_SA_ObjSpawnlocs[i][0], BG_SA_ObjSpawnlocs[i][1], @@ -205,9 +205,9 @@ void BattleGroundSA::StartShips() DoorOpen(BG_SA_BOAT_ONE); DoorOpen(BG_SA_BOAT_TWO); - for(int i = BG_SA_BOAT_ONE; i <= BG_SA_BOAT_TWO; i++) + for (int i = BG_SA_BOAT_ONE; i <= BG_SA_BOAT_TWO; i++) { - for( BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end();itr++) + for ( BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end();itr++) { if(Player* p = objmgr.GetPlayer(itr->first)) { @@ -465,13 +465,13 @@ void BattleGroundSA::OverrideGunFaction() if(!m_BgCreatures[0]) return; - for(uint8 i = BG_SA_GUN_1; i <= BG_SA_GUN_10;i++) + for (uint8 i = BG_SA_GUN_1; i <= BG_SA_GUN_10;i++) { if(Creature* gun = GetBGCreature(i)) gun->setFaction(BG_SA_Factions[attackers? TEAM_ALLIANCE : TEAM_HORDE]); } - for(uint8 i = BG_SA_DEMOLISHER_1; i <= BG_SA_DEMOLISHER_4;i++) + for (uint8 i = BG_SA_DEMOLISHER_1; i <= BG_SA_DEMOLISHER_4;i++) { if(Creature* dem = GetBGCreature(i)) dem->setFaction(BG_SA_Factions[attackers]); @@ -539,7 +539,7 @@ WorldSafeLocsEntry const* BattleGroundSA::GetClosestGraveYard(Player* player) ret = sWorldSafeLocsStore.LookupEntry(safeloc); nearest = sqrt((ret->x - x)*(ret->x - x) + (ret->y - y)*(ret->y - y)+(ret->z - z)*(ret->z - z)); - for(uint8 i = BG_SA_RIGHT_CAPTURABLE_GY; i < BG_SA_MAX_GY; i++) + for (uint8 i = BG_SA_RIGHT_CAPTURABLE_GY; i < BG_SA_MAX_GY; i++) { if(GraveyardStatus[i] != player->GetTeamId()) continue; diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index d843643ad83..3b618a5e6d7 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -1314,7 +1314,7 @@ valid examples: int32 propertyId = 0; bool negativeNumber = false; char c; - for(uint8 i=0; i<randomPropertyPosition; ++i) + for (uint8 i=0; i<randomPropertyPosition; ++i) { propertyId = 0; negativeNumber = false; @@ -1629,7 +1629,7 @@ valid examples: ItemLocale const *il = objmgr.GetItemLocale(linkedItem->ItemId); bool foundName = false; - for(uint8 i=LOCALE_koKR; i<MAX_LOCALE; ++i) + for (uint8 i=LOCALE_koKR; i<MAX_LOCALE; ++i) { int8 dbIndex = objmgr.GetIndexForLocale(LocaleConstant(i)); if (dbIndex == -1 || il == NULL || dbIndex >= il->Name.size()) diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp index 38192d92ee8..a574efc3e1b 100644 --- a/src/game/DBCStores.cpp +++ b/src/game/DBCStores.cpp @@ -324,7 +324,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sMapDifficultyStore, dbcPath,"MapDifficulty.dbc"); // fill data - for(uint32 i = 1; i < sMapDifficultyStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sMapDifficultyStore.GetNumRows(); ++i) if(MapDifficultyEntry const* entry = sMapDifficultyStore.LookupEntry(i)) sMapDifficultyMap[MAKE_PAIR32(entry->MapId,entry->Difficulty)] = MapDifficulty(entry->resetTime,entry->maxPlayers); sMapDifficultyStore.Clear(); @@ -332,7 +332,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sMovieStore, dbcPath,"Movie.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sQuestSortStore, dbcPath,"QuestSort.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sPvPDifficultyStore, dbcPath,"PvpDifficulty.dbc"); - for(uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i) + for (uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i) if (PvPDifficultyEntry const* entry = sPvPDifficultyStore.LookupEntry(i)) if (entry->bracketId > MAX_BATTLEGROUND_BRACKETS) assert(false && "Need update MAX_BATTLEGROUND_BRACKETS by DBC data"); @@ -734,7 +734,7 @@ PvPDifficultyEntry const* GetBattlegroundBracketByLevel( uint32 mapid, uint32 le if (level > DEFAULT_MAX_LEVEL) level = DEFAULT_MAX_LEVEL; - for(uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i) + for (uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i) if (PvPDifficultyEntry const* entry = sPvPDifficultyStore.LookupEntry(i)) if (entry->mapId == mapid && entry->minLevel <= level && entry->maxLevel >= level) return entry; @@ -744,7 +744,7 @@ PvPDifficultyEntry const* GetBattlegroundBracketByLevel( uint32 mapid, uint32 le PvPDifficultyEntry const* GetBattlegroundBracketById(uint32 mapid, BattleGroundBracketId id) { - for(uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i) + for (uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i) if (PvPDifficultyEntry const* entry = sPvPDifficultyStore.LookupEntry(i)) if (entry->mapId == mapid && entry->GetBracketId() == id) return entry; diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index fb1ab876f6e..b8479e24ddc 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -1040,7 +1040,7 @@ uint32 GameEventMgr::GetNPCFlag(Creature * cr) for (ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) { - for(NPCFlagList::iterator itr = mGameEventNPCFlags[*e_itr].begin(); + for (NPCFlagList::iterator itr = mGameEventNPCFlags[*e_itr].begin(); itr != mGameEventNPCFlags[*e_itr].end(); ++ itr) if(itr->first == guid) @@ -1446,7 +1446,7 @@ bool GameEventMgr::hasCreatureQuestActiveEventExcept(uint32 quest_id, uint16 eve for (ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) { if((*e_itr) != event_id) - for(QuestRelList::iterator itr = mGameEventCreatureQuests[*e_itr].begin(); + for (QuestRelList::iterator itr = mGameEventCreatureQuests[*e_itr].begin(); itr != mGameEventCreatureQuests[*e_itr].end(); ++ itr) if(itr->second == quest_id) @@ -1460,7 +1460,7 @@ bool GameEventMgr::hasGameObjectQuestActiveEventExcept(uint32 quest_id, uint16 e for (ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) { if((*e_itr) != event_id) - for(QuestRelList::iterator itr = mGameEventGameObjectQuests[*e_itr].begin(); + for (QuestRelList::iterator itr = mGameEventGameObjectQuests[*e_itr].begin(); itr != mGameEventGameObjectQuests[*e_itr].end(); ++ itr) if(itr->second == quest_id) @@ -1475,7 +1475,7 @@ bool GameEventMgr::hasCreatureActiveEventExcept(uint32 creature_id, uint16 event if((*e_itr) != event_id) { int32 internal_event_id = mGameEvent.size() + (*e_itr) - 1; - for(GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin(); + for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin(); itr != mGameEventCreatureGuids[internal_event_id].end(); ++ itr) if(*itr == creature_id) @@ -1491,7 +1491,7 @@ bool GameEventMgr::hasGameObjectActiveEventExcept(uint32 go_id, uint16 event_id) if((*e_itr) != event_id) { int32 internal_event_id = mGameEvent.size() + (*e_itr) - 1; - for(GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin(); + for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin(); itr != mGameEventGameobjectGuids[internal_event_id].end(); ++ itr) if(*itr == go_id) diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index 377e7ae60e9..9bff0d4eb7e 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -519,13 +519,13 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID data << uint32(pQuest->GetRewArenaPoints()); // reward arena points data << uint32(0); // unk - for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) + for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) data << uint32(pQuest->RewRepFaction[i]); - for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) + for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) data << int32(pQuest->RewRepValueId[i]); - for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) + for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) data << int32(pQuest->RewRepValue[i]); data << uint32(QUEST_EMOTE_COUNT); @@ -637,13 +637,13 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest ) } } - for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // reward factions ids + for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // reward factions ids data << uint32(pQuest->RewRepFaction[i]); - for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // columnid+1 QuestFactionReward.dbc? + for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // columnid+1 QuestFactionReward.dbc? data << int32(pQuest->RewRepValueId[i]); - for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // unk (0) + for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // unk (0) data << int32(pQuest->RewRepValue[i]); data << pQuest->GetPointMapId(); @@ -772,13 +772,13 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, data << uint32(pQuest->GetRewArenaPoints()); // arena points data << uint32(0); - for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // reward factions ids + for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // reward factions ids data << uint32(pQuest->RewRepFaction[i]); - for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // columnid in QuestFactionReward.dbc (zero based)? + for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // columnid in QuestFactionReward.dbc (zero based)? data << int32(pQuest->RewRepValueId[i]); - for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // reward reputation override? + for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // reward reputation override? data << uint32(pQuest->RewRepValue[i]); pSession->SendPacket( &data ); diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp index 0e7b60fa607..4f26c173d8e 100644 --- a/src/game/GridNotifiers.cpp +++ b/src/game/GridNotifiers.cpp @@ -37,7 +37,7 @@ VisibleNotifier::SendToSelf() // at this moment i_clientGUIDs have guids that not iterate at grid level checks // but exist one case when this possible and object not out of range: transports if (Transport* transport = i_player.GetTransport()) - for(Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin();itr!=transport->GetPassengers().end();++itr) + for (Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin();itr!=transport->GetPassengers().end();++itr) { if(vis_guids.find((*itr)->GetGUID()) != vis_guids.end()) { @@ -50,7 +50,7 @@ VisibleNotifier::SendToSelf() } } - for(Player::ClientGUIDs::const_iterator it = vis_guids.begin();it != vis_guids.end(); ++it) + for (Player::ClientGUIDs::const_iterator it = vis_guids.begin();it != vis_guids.end(); ++it) { i_player.m_clientGUIDs.erase(*it); i_data.AddOutOfRangeGUID(*it); @@ -70,7 +70,7 @@ VisibleNotifier::SendToSelf() i_data.BuildPacket(&packet); i_player.GetSession()->SendPacket(&packet); - for(std::set<Unit*>::const_iterator it = i_visibleNow.begin(); it != i_visibleNow.end(); ++it) + for (std::set<Unit*>::const_iterator it = i_visibleNow.begin(); it != i_visibleNow.end(); ++it) i_player.SendInitialVisiblePackets(*it); } @@ -85,7 +85,7 @@ VisibleChangesNotifier::Visit(PlayerMapType &m) iter->getSource()->UpdateVisibilityOf(&i_object); if(!iter->getSource()->GetSharedVisionList().empty()) - for(SharedVisionList::const_iterator i = iter->getSource()->GetSharedVisionList().begin(); + for (SharedVisionList::const_iterator i = iter->getSource()->GetSharedVisionList().begin(); i != iter->getSource()->GetSharedVisionList().end(); ++i) if((*i)->m_seer == iter->getSource()) (*i)->UpdateVisibilityOf(&i_object); @@ -97,7 +97,7 @@ VisibleChangesNotifier::Visit(CreatureMapType &m) { for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) if(!iter->getSource()->GetSharedVisionList().empty()) - for(SharedVisionList::const_iterator i = iter->getSource()->GetSharedVisionList().begin(); + for (SharedVisionList::const_iterator i = iter->getSource()->GetSharedVisionList().begin(); i != iter->getSource()->GetSharedVisionList().end(); ++i) if((*i)->m_seer == iter->getSource()) (*i)->UpdateVisibilityOf(&i_object); @@ -125,7 +125,7 @@ inline void CreatureUnitRelocationWorker(Creature* c, Unit* u) void PlayerRelocationNotifier::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter) + for (PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { Player* plr = iter->getSource(); @@ -144,7 +144,7 @@ void PlayerRelocationNotifier::Visit(CreatureMapType &m) { bool relocated_for_ai = (&i_player == i_player.m_seer); - for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { Creature * c = iter->getSource(); @@ -159,7 +159,7 @@ void PlayerRelocationNotifier::Visit(CreatureMapType &m) void CreatureRelocationNotifier::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter) + for (PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { Player * pl = iter->getSource(); @@ -175,7 +175,7 @@ void CreatureRelocationNotifier::Visit(CreatureMapType &m) if(!i_creature.isAlive()) return; - for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { Creature* c = iter->getSource(); CreatureUnitRelocationWorker(&i_creature, c); @@ -187,7 +187,7 @@ void CreatureRelocationNotifier::Visit(CreatureMapType &m) void DelayedUnitRelocation::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { Creature * unit = iter->getSource(); if(!unit->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) @@ -205,7 +205,7 @@ void DelayedUnitRelocation::Visit(CreatureMapType &m) void DelayedUnitRelocation::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { Player * player = iter->getSource(); WorldObject const *viewPoint = player->m_seer; diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h index 09a4d64adfc..a9a7e9f031f 100644 --- a/src/game/GridNotifiersImpl.h +++ b/src/game/GridNotifiersImpl.h @@ -34,7 +34,7 @@ template<class T> inline void Trinity::VisibleNotifier::Visit(GridRefManager<T> &m) { - for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) + for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) { vis_guids.erase(iter->getSource()->GetGUID()); i_player.UpdateVisibilityOf(iter->getSource(),i_data,i_visibleNow); diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 62ace59bffa..d93b9e12b5a 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -1568,7 +1568,7 @@ void Group::SetRaidDifficulty(Difficulty difficulty) if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE groups SET raiddifficulty = %u WHERE leaderGuid ='%u'", m_raidDifficulty, GUID_LOPART(m_leaderGuid)); - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *player = itr->getSource(); if(!player->GetSession() || player->getLevel() < LEVELREQUIREMENT_HEROIC) diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index 188fbf9cebc..bb79814906e 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -1599,7 +1599,7 @@ void Guild::AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *t size_t enchCountPos = data.wpos(); data << uint8(enchCount); // number of enchantments - for(uint32 i = PERM_ENCHANTMENT_SLOT; i < MAX_ENCHANTMENT_SLOT; ++i) + for (uint32 i = PERM_ENCHANTMENT_SLOT; i < MAX_ENCHANTMENT_SLOT; ++i) { if(uint32 enchId = pItem->GetEnchantmentId(EnchantmentSlot(i))) { diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp index e5d846b6130..4428646fead 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/InstanceSaveMgr.cpp @@ -451,7 +451,7 @@ void InstanceSaveManager::LoadResetTimes() } // schedule the reset times - for(InstResetTimeMapDiffType::iterator itr = instResetTime.begin(); itr != instResetTime.end(); ++itr) + for (InstResetTimeMapDiffType::iterator itr = instResetTime.begin(); itr != instResetTime.end(); ++itr) if(itr->second.second > now) ScheduleReset(true, itr->second.second, InstResetEvent(0, PAIR32_LOPART(itr->second.first),Difficulty(PAIR32_HIPART(itr->second.first)),itr->first)); } @@ -491,7 +491,7 @@ void InstanceSaveManager::LoadResetTimes() // calculate new global reset times for expired instances and those that have never been reset yet // add the global reset times to the priority queue - for(MapDifficultyMap::const_iterator itr = sMapDifficultyMap.begin(); itr != sMapDifficultyMap.end(); ++itr) + for (MapDifficultyMap::const_iterator itr = sMapDifficultyMap.begin(); itr != sMapDifficultyMap.end(); ++itr) { uint32 map_diff_pair = itr->first; uint32 mapid = PAIR32_LOPART(map_diff_pair); @@ -527,13 +527,13 @@ void InstanceSaveManager::LoadResetTimes() // schedule the global reset/warning uint8 type = 1; static int tim[4] = {3600, 900, 300, 60}; - for(; type < 4; type++) + for (; type < 4; type++) if(t - tim[type-1] > now) break; ScheduleReset(true, t - tim[type-1], InstResetEvent(type, mapid, difficulty, -1)); - for(ResetTimeMapDiffInstances::const_iterator in_itr = mapDiffResetInstances.lower_bound(map_diff_pair); + for (ResetTimeMapDiffInstances::const_iterator in_itr = mapDiffResetInstances.lower_bound(map_diff_pair); in_itr != mapDiffResetInstances.upper_bound(map_diff_pair); ++in_itr) { ScheduleReset(true, t - tim[type-1], InstResetEvent(type, mapid, difficulty, in_itr->second)); diff --git a/src/game/LFGHandler.cpp b/src/game/LFGHandler.cpp index 6fa0199d6ff..72d1db5a5f9 100644 --- a/src/game/LFGHandler.cpp +++ b/src/game/LFGHandler.cpp @@ -270,7 +270,7 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type) if(uint8) { uint32 count1; - for(count1) + for (count1) { uint64; // player guid } @@ -278,7 +278,7 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type) data << uint32(0); // count2 data << uint32(0); - for(count2) + for (count2) { uint64 // not player guid uint32 flags; @@ -292,7 +292,7 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type) } if(flags & 0x20) { - for(3) + for (3) { uint8 } diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 5e43c29d1bd..773f931fd1a 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -4262,7 +4262,7 @@ bool ChatHandler::HandleLookupTitleCommand(const char* args) if (!Utf8FitTo(name, wnamepart)) { loc = 0; - for(; loc < MAX_LOCALE; ++loc) + for (; loc < MAX_LOCALE; ++loc) { if(loc==GetSessionDbcLocale()) continue; @@ -4427,7 +4427,7 @@ bool ChatHandler::HandleTitlesSetMaskCommand(const char* args) uint64 titles2 = titles; - for(uint32 i = 1; i < sCharTitlesStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sCharTitlesStore.GetNumRows(); ++i) if(CharTitlesEntry const* tEntry = sCharTitlesStore.LookupEntry(i)) titles2 &= ~(uint64(1) << tEntry->bit_index); diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index 755d3c06a6f..9c7fc68f51f 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -1454,7 +1454,7 @@ void LoadLootTemplates_Mail() LootTemplates_Mail.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sMailTemplateStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sMailTemplateStore.GetNumRows(); ++i) if(sMailTemplateStore.LookupEntry(i)) if (ids_set.find(i) != ids_set.end()) ids_set.erase(i); diff --git a/src/game/Map.cpp b/src/game/Map.cpp index dae351d5eff..194794b3a07 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -584,7 +584,7 @@ bool Map::loaded(const GridPair &p) const void Map::Update(const uint32 &t_diff) { /// update players at tick - for(m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) + for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) { Player* plr = m_mapRefIter->getSource(); if(plr && plr->IsInWorld()) @@ -710,7 +710,7 @@ struct ResetNotifier { template<class T>inline void resetNotify(GridRefManager<T> &m) { - for(typename GridRefManager<T>::iterator iter=m.begin(); iter != m.end(); ++iter) + for (typename GridRefManager<T>::iterator iter=m.begin(); iter != m.end(); ++iter) iter->getSource()->ResetAllNotifies(); } template<class T> void Visit(GridRefManager<T> &) {} @@ -720,7 +720,7 @@ struct ResetNotifier void Map::ProcessRelocationNotifies(const uint32 & diff) { - for(GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end(); ++i) + for (GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end(); ++i) { NGridType *grid = i->getSource(); @@ -736,9 +736,9 @@ void Map::ProcessRelocationNotifies(const uint32 & diff) CellPair cell_min(gx*MAX_NUMBER_OF_CELLS, gy*MAX_NUMBER_OF_CELLS); CellPair cell_max(cell_min.x_coord + MAX_NUMBER_OF_CELLS, cell_min.y_coord+MAX_NUMBER_OF_CELLS); - for(uint32 x = cell_min.x_coord; x < cell_max.x_coord; ++x) + for (uint32 x = cell_min.x_coord; x < cell_max.x_coord; ++x) { - for(uint32 y = cell_min.y_coord; y < cell_max.y_coord; ++y) + for (uint32 y = cell_min.y_coord; y < cell_max.y_coord; ++y) { uint32 cell_id = (y * TOTAL_NUMBER_OF_CELLS_PER_MAP) + x; if(!isCellMarked(cell_id)) @@ -760,7 +760,7 @@ void Map::ProcessRelocationNotifies(const uint32 & diff) ResetNotifier reset; TypeContainerVisitor<ResetNotifier, GridTypeMapContainer > grid_notifier(reset); TypeContainerVisitor<ResetNotifier, WorldTypeMapContainer > world_notifier(reset); - for(GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end(); ++i) + for (GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end(); ++i) { NGridType *grid = i->getSource(); @@ -777,9 +777,9 @@ void Map::ProcessRelocationNotifies(const uint32 & diff) CellPair cell_min(gx*MAX_NUMBER_OF_CELLS, gy*MAX_NUMBER_OF_CELLS); CellPair cell_max(cell_min.x_coord + MAX_NUMBER_OF_CELLS, cell_min.y_coord+MAX_NUMBER_OF_CELLS); - for(uint32 x = cell_min.x_coord; x < cell_max.x_coord; ++x) + for (uint32 x = cell_min.x_coord; x < cell_max.x_coord; ++x) { - for(uint32 y = cell_min.y_coord; y < cell_max.y_coord; ++y) + for (uint32 y = cell_min.y_coord; y < cell_max.y_coord; ++y) { uint32 cell_id = (y * TOTAL_NUMBER_OF_CELLS_PER_MAP) + x; if(!isCellMarked(cell_id)) diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 095c4389ae7..3644ea5e6c9 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -1503,7 +1503,7 @@ void WorldSession::HandleSetDungeonDifficultyOpcode( WorldPacket & recv_data ) { if(pGroup->IsLeader(_player->GetGUID())) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupGuy = itr->getSource(); if(!pGroupGuy) @@ -1564,7 +1564,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode( WorldPacket & recv_data ) { if(pGroup->IsLeader(_player->GetGUID())) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupGuy = itr->getSource(); if(!pGroupGuy) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index d237e044395..9927a8109e8 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -1216,9 +1216,9 @@ void ObjectMgr::LoadCreatures() // build single time for check spawnmask std::map<uint32,uint32> spawnMasks; - for(uint32 i = 0; i < sMapStore.GetNumRows(); ++i) + for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i) if(sMapStore.LookupEntry(i)) - for(int k = 0; k < MAX_DIFFICULTY; ++k) + for (int k = 0; k < MAX_DIFFICULTY; ++k) if (GetMapDifficultyData(i,Difficulty(k))) spawnMasks[i] |= (1 << k); @@ -1560,9 +1560,9 @@ void ObjectMgr::LoadGameobjects() // build single time for check spawnmask std::map<uint32,uint32> spawnMasks; - for(uint32 i = 0; i < sMapStore.GetNumRows(); ++i) + for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i) if(sMapStore.LookupEntry(i)) - for(int k = 0; k < MAX_DIFFICULTY; ++k) + for (int k = 0; k < MAX_DIFFICULTY; ++k) if (GetMapDifficultyData(i,Difficulty(k))) spawnMasks[i] |= (1 << k); @@ -2348,7 +2348,7 @@ void ObjectMgr::LoadItemPrototypes() if (!entry) continue; - for(int j = 0; j < MAX_OUTFIT_ITEMS; ++j) + for (int j = 0; j < MAX_OUTFIT_ITEMS; ++j) { if(entry->ItemId[j] <= 0) continue; @@ -2360,7 +2360,7 @@ void ObjectMgr::LoadItemPrototypes() } } - for(std::set<uint32>::const_iterator itr = notFoundOutfit.begin(); itr != notFoundOutfit.end(); ++itr) + for (std::set<uint32>::const_iterator itr = notFoundOutfit.begin(); itr != notFoundOutfit.end(); ++itr) sLog.outErrorDb("Item (Entry: %u) not exist in `item_template` but referenced in `CharStartOutfit.dnc`", *itr); } @@ -8561,7 +8561,7 @@ void ObjectMgr::LoadGossipMenuItems() std::set<uint32> gossipScriptSet; - for(ScriptMapMap::const_iterator itr = sGossipScripts.begin(); itr != sGossipScripts.end(); ++itr) + for (ScriptMapMap::const_iterator itr = sGossipScripts.begin(); itr != sGossipScripts.end(); ++itr) gossipScriptSet.insert(itr->first); do @@ -8656,7 +8656,7 @@ void ObjectMgr::LoadGossipMenuItems() if (!gossipScriptSet.empty()) { - for(std::set<uint32>::const_iterator itr = gossipScriptSet.begin(); itr != gossipScriptSet.end(); ++itr) + for (std::set<uint32>::const_iterator itr = gossipScriptSet.begin(); itr != gossipScriptSet.end(); ++itr) sLog.outErrorDb("Table `gossip_scripts` contain unused script, id %u.", *itr); } @@ -8960,7 +8960,7 @@ void ObjectMgr::LoadGMTickets() { if(!m_GMTicketList.empty()) { - for(GmTicketList::const_iterator itr = m_GMTicketList.begin(); itr != m_GMTicketList.end(); ++itr) + for (GmTicketList::const_iterator itr = m_GMTicketList.begin(); itr != m_GMTicketList.end(); ++itr) delete *itr; } m_GMTicketList.clear(); @@ -9157,7 +9157,7 @@ void ObjectMgr::LoadCreatureClassLevelStats() if (!info) continue; - for(uint16 lvl = info->minlevel; lvl <= info->maxlevel; ++lvl) + for (uint16 lvl = info->minlevel; lvl <= info->maxlevel; ++lvl) { if (m_creatureBaseStatsMap.find( MAKE_PAIR16(lvl, info->unit_class) ) == m_creatureBaseStatsMap.end()) sLog.outErrorDb("Missing base stats for creature class %u level %u", info->unit_class, lvl); diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index 2e7de177fdb..783a859418f 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -739,7 +739,7 @@ class ObjectMgr if (map_itr == m_mailLevelRewardMap.end()) return NULL; - for(MailLevelRewardList::const_iterator set_itr = map_itr->second.begin(); set_itr != map_itr->second.end(); ++set_itr) + for (MailLevelRewardList::const_iterator set_itr = map_itr->second.begin(); set_itr != map_itr->second.end(); ++set_itr) if (set_itr->raceMask & raceMask) return &*set_itr; diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index ea2c4ba82ce..38631a2c196 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -547,7 +547,7 @@ enum Opcodes SMSG_ENVIRONMENTALDAMAGELOG = 0x1FC, CMSG_PLAYER_DIFFICULTY_CHANGE = 0x1FD, SMSG_RWHOIS = 0x1FE, - SMSG_LFG_COMPLETION_REWARD = 0x1FF, // uint32, uint8, uint32, uint32, uint32, uint32, uint32, uint8, for(uint8) {uint32,uint32,uint32} + SMSG_LFG_COMPLETION_REWARD = 0x1FF, // uint32, uint8, uint32, uint32, uint32, uint32, uint32, uint8, for (uint8) {uint32,uint32,uint32} SMSG_LFG_ERROR = 0x200, // uint32 (1,2,4,6;0,5,7) CMSG_UNLEARN_SPELL = 0x201, CMSG_UNLEARN_SKILL = 0x202, @@ -900,25 +900,25 @@ enum Opcodes CMSG_LFG_LEAVE = 0x35D, // CMSG LeaveLFG CMSG_SEARCH_LFG_JOIN = 0x35E, // CMSG SearchLFGJoin CMSG_SEARCH_LFG_LEAVE = 0x35F, // CMSG SearchLFGLeave - SMSG_UPDATE_LFG_LIST = 0x360, // SMSG uint32, uint32, if(uint8) { uint32 count, for(count) { uint64} }, uint32 count2, uint32, for(count2) { uint64, uint32 flags, if(flags & 0x2) {string}, if(flags & 0x10) {for(3) uint8}, if(flags & 0x80) {uint64, uint32}}, uint32 count3, uint32, for(count3) {uint64, uint32 flags, if(flags & 0x1) {uint8, uint8, uint8, for(3) uint8, uint32, uint32, uint32, uint32, uint32, uint32, float, float, uint32, uint32, uint32, uint32, uint32, float, uint32, uint32, uint32, uint32, uint32, uint32}, if(flags&0x2) string, if(flags&0x4) uint8, if(flags&0x8) uint64, if(flags&0x10) uint8, if(flags&0x20) uint32, if(flags&0x40) uint8, if(flags& 0x80) {uint64, uint32}} - SMSG_LFG_PROPOSAL_DECLINED = 0x361, // SMSG uint32, uint8, uint32, uint32, uint8, for(uint8) {uint32,uint8,uint8,uint8,uint8} + SMSG_UPDATE_LFG_LIST = 0x360, // SMSG uint32, uint32, if(uint8) { uint32 count, for (count) { uint64} }, uint32 count2, uint32, for (count2) { uint64, uint32 flags, if(flags & 0x2) {string}, if(flags & 0x10) {for (3) uint8}, if(flags & 0x80) {uint64, uint32}}, uint32 count3, uint32, for (count3) {uint64, uint32 flags, if(flags & 0x1) {uint8, uint8, uint8, for (3) uint8, uint32, uint32, uint32, uint32, uint32, uint32, float, float, uint32, uint32, uint32, uint32, uint32, float, uint32, uint32, uint32, uint32, uint32, uint32}, if(flags&0x2) string, if(flags&0x4) uint8, if(flags&0x8) uint64, if(flags&0x10) uint8, if(flags&0x20) uint32, if(flags&0x40) uint8, if(flags& 0x80) {uint64, uint32}} + SMSG_LFG_PROPOSAL_DECLINED = 0x361, // SMSG uint32, uint8, uint32, uint32, uint8, for (uint8) {uint32,uint8,uint8,uint8,uint8} CMSG_LFG_PROPOSAL_RESULT = 0x362, // CMSG AcceptProposal, RejectProposal - SMSG_LFG_ROLE_CHECK = 0x363, // SMSG uint32, uint8, for(uint8) uint32, uint8, for(uint8) { uint64, uint8, uint32, uint8, } - SMSG_LFG_ROLE_CHECK_FAILED_RESULT = 0x364, // SMSG uint32 unk, uint32, if(unk==6) { uint8 count, for(count) uint64 } + SMSG_LFG_ROLE_CHECK = 0x363, // SMSG uint32, uint8, for (uint8) uint32, uint8, for (uint8) { uint64, uint8, uint32, uint8, } + SMSG_LFG_ROLE_CHECK_FAILED_RESULT = 0x364, // SMSG uint32 unk, uint32, if(unk==6) { uint8 count, for (count) uint64 } SMSG_LFG_QUEUE_STATUS_UPDATE = 0x365, // SMSG uint32 dungeon, uint32 lfgtype, uint32, uint32, uint32, uint32, uint8, uint8, uint8, uint8 CMSG_SET_LFG_COMMENT = 0x366, // CMSG SetLFGComment - SMSG_LFG_LFG_PROPOSAL_INFO = 0x367, // SMSG uint8, if(uint8) { uint8, uint8, uint8, uint8, if(uint8) for(uint8) uint32, string} - SMSG_LFG_LFG_PROPOSAL_INFO2 = 0x368, // SMSG uint8, if(uint8) { uint8, uint8, uint8, for(3) uint8, uint8, if(uint8) for(uint8) uint32, string} + SMSG_LFG_LFG_PROPOSAL_INFO = 0x367, // SMSG uint8, if(uint8) { uint8, uint8, uint8, uint8, if(uint8) for (uint8) uint32, string} + SMSG_LFG_LFG_PROPOSAL_INFO2 = 0x368, // SMSG uint8, if(uint8) { uint8, uint8, uint8, for (3) uint8, uint8, if(uint8) for (uint8) uint32, string} SMSG_LFG_UPDATE_LIST = 0x369, // SMSG uint8 CMSG_LFG_SET_ROLES = 0x36A, // CMSG SetLFGRoles CMSG_LFG_SET_NEEDS = 0x36B, // CMSG SetLFGNeeds CMSG_LFG_SET_BOOT_VOTE = 0x36C, // CMSG SetLFGBootVote SMSG_LFG_BOOT_PROPOSAL_UPDATE = 0x36D, // SMSG uint8, uint8, uint8, uint64, uint32, uint32, uint32, uint32 CMSG_LFD_PLAYER_LOCK_INFO_REQUEST = 0x36E, // CMSG RequestLFDPlayerLockInfo - SMSG_LFG_PLAYER_LOCK_INFO_RESPONSE = 0x36F, // SMSG uint8, for(uint8) { uint32, uint8, uint32, uint32, uint32, uint32, uint8, for(uint8) {uint32,uint32, uint32}}, uint32, for(uint32) {uint32,uint32} + SMSG_LFG_PLAYER_LOCK_INFO_RESPONSE = 0x36F, // SMSG uint8, for (uint8) { uint32, uint8, uint32, uint32, uint32, uint32, uint8, for (uint8) {uint32,uint32, uint32}}, uint32, for (uint32) {uint32,uint32} CMSG_LFG_TELEPORT = 0x370, // CMSG LFGTeleport CMSG_LFD_PARTY_LOCK_INFO_REQUEST = 0x371, // CMSG RequestLFDPartyLockInfo - SMSG_LFG_PLAYER_LOCK_INFO_UPDATE = 0x372, // SMSG uint8, for(uint8) uint64 + SMSG_LFG_PLAYER_LOCK_INFO_UPDATE = 0x372, // SMSG uint8, for (uint8) uint64 SMSG_TITLE_EARNED = 0x373, CMSG_SET_TITLE = 0x374, CMSG_CANCEL_MOUNT_AURA = 0x375, diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 72271a75d7b..a56a8b40406 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -425,7 +425,7 @@ void Pet::SavePetToDB(PetSaveMode mode) << curmana << ", " << GetPower(POWER_HAPPINESS) << ", '"; - for(uint32 i = ACTION_BAR_INDEX_START; i < ACTION_BAR_INDEX_END; ++i) + for (uint32 i = ACTION_BAR_INDEX_START; i < ACTION_BAR_INDEX_END; ++i) { ss << uint32(m_charmInfo->GetActionBarEntry(i)->GetType()) << " " << uint32(m_charmInfo->GetActionBarEntry(i)->GetAction()) << " "; diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 227c8ee2331..548349691e9 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -418,7 +418,7 @@ void WorldSession::HandlePetSetAction( WorldPacket & recv_data ) uint32 data[2]; bool move_command = false; - for(uint8 i = 0; i < count; ++i) + for (uint8 i = 0; i < count; ++i) { recv_data >> position[i]; recv_data >> data[i]; @@ -465,7 +465,7 @@ void WorldSession::HandlePetSetAction( WorldPacket & recv_data ) } } - for(uint8 i = 0; i < count; ++i) + for (uint8 i = 0; i < count; ++i) { uint32 spell_id = UNIT_ACTION_BUTTON_ACTION(data[i]); uint8 act_state = UNIT_ACTION_BUTTON_TYPE(data[i]); diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp index 74a6f56705f..76582672adb 100644 --- a/src/game/PetitionsHandler.cpp +++ b/src/game/PetitionsHandler.cpp @@ -353,7 +353,7 @@ void WorldSession::SendPetitionQueryOpcode(uint64 petitionguid) data << uint32(0); // 11 data << uint32(0); // 13 count of next strings? - for(int i = 0; i < 10; ++i) + for (int i = 0; i < 10; ++i) data << uint8(0); // some string data << uint32(0); // 14 diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 390d94e861f..da692573e03 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -5327,7 +5327,7 @@ void Player::UpdateRating(CombatRating cr) void Player::UpdateAllRatings() { - for(int cr = 0; cr < MAX_COMBAT_RATING; ++cr) + for (int cr = 0; cr < MAX_COMBAT_RATING; ++cr) UpdateRating(CombatRating(cr)); } @@ -5630,7 +5630,7 @@ void Player::UpdateSkillsForLevel() bool alwaysMaxSkill = sWorld.getConfig(CONFIG_ALWAYS_MAX_SKILL_FOR_LEVEL); - for(SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ++itr) + for (SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ++itr) { if(itr->second.uState == SKILL_DELETED) continue; @@ -5670,7 +5670,7 @@ void Player::UpdateSkillsForLevel() void Player::UpdateSkillsToMaxSkillsForLevel() { - for(SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ++itr) + for (SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ++itr) { if(itr->second.uState == SKILL_DELETED) continue; @@ -9541,7 +9541,7 @@ bool Player::HasItemOrGemWithLimitCategoryEquipped( uint32 limitCategory, uint32 uint8 Player::CountItemWithLimitCategory(uint32 limitCategory, Item* skipItem) const { uint8 tempcount = 0; - for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i) + for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if (!pItem) @@ -9555,7 +9555,7 @@ uint8 Player::CountItemWithLimitCategory(uint32 limitCategory, Item* skipItem) c tempcount += pItem->GetCount(); } - for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if (!pItem) @@ -9569,13 +9569,13 @@ uint8 Player::CountItemWithLimitCategory(uint32 limitCategory, Item* skipItem) c tempcount += pItem->GetCount(); } - for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) + for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) { Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if (!pBag) continue; - for(uint32 j = 0; j < pBag->GetBagSize(); ++j) + for (uint32 j = 0; j < pBag->GetBagSize(); ++j) { Item *pItem = GetItemByPos( i, j ); @@ -9590,7 +9590,7 @@ uint8 Player::CountItemWithLimitCategory(uint32 limitCategory, Item* skipItem) c } } - for(int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i) + for (int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if (!pItem) @@ -9604,13 +9604,13 @@ uint8 Player::CountItemWithLimitCategory(uint32 limitCategory, Item* skipItem) c tempcount += pItem->GetCount(); } - for(int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i) + for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i) { Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if (!pBag) continue; - for(uint32 j = 0; j < pBag->GetBagSize(); ++j) + for (uint32 j = 0; j < pBag->GetBagSize(); ++j) { Item *pItem = GetItemByPos( i, j ); @@ -11853,7 +11853,7 @@ void Player::DestroyConjuredItems( bool update ) Item* Player::GetItemByEntry(uint32 entry) const { // in inventory - for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i) + for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i) { if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) if (pItem->GetEntry() == entry) @@ -11861,11 +11861,11 @@ Item* Player::GetItemByEntry(uint32 entry) const } - for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) + for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) { if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { - for(uint32 j = 0; j < pBag->GetBagSize(); ++j) + for (uint32 j = 0; j < pBag->GetBagSize(); ++j) { if (Item* pItem = pBag->GetItemByPos(j)) if (pItem->GetEntry()==entry) @@ -11875,7 +11875,7 @@ Item* Player::GetItemByEntry(uint32 entry) const } - for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i) + for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i) { if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) if (pItem->GetEntry()==entry) @@ -12323,7 +12323,7 @@ void Player::SwapItem( uint16 src, uint16 dst ) if (IsBagPos(src)) { Bag* bag = (Bag*)pSrcItem; - for(int i=0; i < bag->GetBagSize(); ++i) + for (int i=0; i < bag->GetBagSize(); ++i) { if (Item *bagItem = bag->GetItemByPos(i)) { @@ -12340,7 +12340,7 @@ void Player::SwapItem( uint16 src, uint16 dst ) if (!released && IsBagPos(dst) && pDstItem) { Bag* bag = (Bag*)pDstItem; - for(int i=0; i < bag->GetBagSize(); ++i) + for (int i=0; i < bag->GetBagSize(); ++i) { if (Item *bagItem = bag->GetItemByPos(i)) { @@ -13092,7 +13092,7 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId) if (pMenuItemBounds.first == pMenuItemBounds.second && menuId == GetDefaultGossipMenuForSource(pSource)) pMenuItemBounds = objmgr.GetGossipMenuItemsMapBounds(0); - for(GossipMenuItemsMap::const_iterator itr = pMenuItemBounds.first; itr != pMenuItemBounds.second; ++itr) + for (GossipMenuItemsMap::const_iterator itr = pMenuItemBounds.first; itr != pMenuItemBounds.second; ++itr) { bool bCanTalk = true; @@ -13442,7 +13442,7 @@ uint32 Player::GetGossipTextId(uint32 menuId) GossipMenusMapBounds pMenuBounds = objmgr.GetGossipMenusMapBounds(menuId); - for(GossipMenusMap::const_iterator itr = pMenuBounds.first; itr != pMenuBounds.second; ++itr) + for (GossipMenusMap::const_iterator itr = pMenuBounds.first; itr != pMenuBounds.second; ++itr) { if (objmgr.IsPlayerMeetToCondition(this, itr->second.cond_1) && objmgr.IsPlayerMeetToCondition(this, itr->second.cond_2)) textId = itr->second.text_id; @@ -17705,7 +17705,7 @@ void Player::_SaveDailyQuestStatus() void Player::_SaveSkills() { // we don't need transactions here. - for( SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ) + for ( SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ) { if(itr->second.uState == SKILL_UNCHANGED) { @@ -20494,7 +20494,7 @@ void Player::SendInitialPacketsBeforeAddToMap() SendInitialSpells(); data.Initialize(SMSG_SEND_UNLEARN_SPELLS, 4); - data << uint32(0); // count, for(count) uint32; + data << uint32(0); // count, for (count) uint32; GetSession()->SendPacket(&data); SendInitialActionButtons(); @@ -22040,7 +22040,7 @@ uint32 Player::GetRuneBaseCooldown(uint8 index) uint32 cooldown = RUNE_COOLDOWN; AuraEffectList const& regenAura = GetAuraEffectsByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT); - for(AuraEffectList::const_iterator i = regenAura.begin();i != regenAura.end(); ++i) + for (AuraEffectList::const_iterator i = regenAura.begin();i != regenAura.end(); ++i) { if((*i)->GetMiscValue() == POWER_RUNE && (*i)->GetMiscValueB() == rune) cooldown = cooldown*(100-(*i)->GetAmount())/100; @@ -22051,7 +22051,7 @@ uint32 Player::GetRuneBaseCooldown(uint8 index) void Player::RemoveRunesByAuraEffect(AuraEffect const * aura) { - for(uint8 i = 0; i < MAX_RUNES; ++i) + for (uint8 i = 0; i < MAX_RUNES; ++i) { if (m_runes->runes[i].ConvertAura == aura) { @@ -22069,7 +22069,7 @@ void Player::RestoreBaseRune(uint8 index) // Don't drop passive talents providing rune convertion if (!aura || aura->GetAuraType() != SPELL_AURA_CONVERT_RUNE) return; - for(uint8 i = 0; i < MAX_RUNES; ++i) + for (uint8 i = 0; i < MAX_RUNES; ++i) { if (aura == m_runes->runes[i].ConvertAura) return; diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp index b23b77a8be2..f271c65dd24 100644 --- a/src/game/QueryHandler.cpp +++ b/src/game/QueryHandler.cpp @@ -483,7 +483,7 @@ void WorldSession::HandleQuestPOIQuery(WorldPacket& recv_data) WorldPacket data(SMSG_QUEST_POI_QUERY_RESPONSE, 4+(4+4)*count); data << uint32(count); // count - for(int i = 0; i < count; ++i) + for (int i = 0; i < count; ++i) { uint32 questId; recv_data >> questId; // quest id @@ -504,7 +504,7 @@ void WorldSession::HandleQuestPOIQuery(WorldPacket& recv_data) data << uint32(questId); // quest ID data << uint32(POI->size()); // POI count - for(QuestPOIVector::const_iterator itr = POI->begin(); itr != POI->end(); ++itr) + for (QuestPOIVector::const_iterator itr = POI->begin(); itr != POI->end(); ++itr) { data << uint32(itr->Id); // POI index data << int32(itr->ObjectiveIndex); // objective index @@ -515,7 +515,7 @@ void WorldSession::HandleQuestPOIQuery(WorldPacket& recv_data) data << uint32(itr->Unk4); // unknown data << uint32(itr->points.size()); // POI points count - for(std::vector<QuestPOIPoint>::const_iterator itr2 = itr->points.begin(); itr2 != itr->points.end(); ++itr2) + for (std::vector<QuestPOIPoint>::const_iterator itr2 = itr->points.begin(); itr2 != itr->points.end(); ++itr2) { data << int32(itr2->x); // POI point x data << int32(itr2->y); // POI point y diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index 89dac20a343..8bc46939b29 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -162,7 +162,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data ) { if (Group* pGroup = _player->GetGroup()) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pPlayer = itr->getSource(); @@ -697,7 +697,7 @@ void WorldSession::HandleQueryQuestsCompleted( WorldPacket & recv_data ) WorldPacket data(SMSG_QUERY_QUESTS_COMPLETED_RESPONSE, 4+4*count); data << uint32(count); - for(QuestStatusMap::const_iterator itr = _player->getQuestStatusMap().begin(); itr != _player->getQuestStatusMap().end(); ++itr) + for (QuestStatusMap::const_iterator itr = _player->getQuestStatusMap().begin(); itr != _player->getQuestStatusMap().end(); ++itr) { if(itr->second.m_rewarded) { diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index f0d3992fa73..ac82757f03c 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -3514,7 +3514,7 @@ void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 ca case SPELL_FAILED_TOO_MANY_OF_ITEM: { uint32 item; - for(int8 x=0;x < 3;x++) + for (int8 x=0;x < 3;x++) if (spellInfo->EffectItemType[x]) item = spellInfo->EffectItemType[x]; ItemPrototype const *pProto = objmgr.GetItemPrototype(item); @@ -6102,7 +6102,7 @@ SpellCastResult Spell::CheckItems() if (Item* pitem = p_caster->GetItemByEntry(item_id)) { - for(int x = 0; x < MAX_ITEM_PROTO_SPELLS; ++x) + for (int x = 0; x < MAX_ITEM_PROTO_SPELLS; ++x) if (pProto->Spells[x].SpellCharges != 0 && pitem->GetSpellCharges(x) == pProto->Spells[x].SpellCharges) return SPELL_FAILED_ITEM_AT_MAX_CHARGES; } diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index fe4732035f3..ea1b922dbc3 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -216,14 +216,14 @@ Aura * Aura::TryCreate(SpellEntry const* spellproto, uint8 tryEffMask, WorldObje { case TYPEID_UNIT: case TYPEID_PLAYER: - for(uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i) { if (IsUnitOwnedAuraEffect(spellproto->Effect[i])) effMask |= 1 << i; } break; case TYPEID_DYNAMICOBJECT: - for(uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i) { if (spellproto->Effect[i] == SPELL_EFFECT_PERSISTENT_AREA_AURA) effMask |= 1 << i; @@ -245,14 +245,14 @@ Aura * Aura::TryCreate(SpellEntry const* spellproto, WorldObject * owner, Unit * { case TYPEID_UNIT: case TYPEID_PLAYER: - for(uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i) { if (IsUnitOwnedAuraEffect(spellproto->Effect[i])) effMask |= 1 << i; } break; case TYPEID_DYNAMICOBJECT: - for(uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i) { if (spellproto->Effect[i] == SPELL_EFFECT_PERSISTENT_AREA_AURA) effMask |= 1 << i; diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index f6cd3804d53..a0eff82f278 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -151,7 +151,7 @@ class Aura bool HasEffect(uint8 effIndex) const { return bool(GetEffect(effIndex)); } bool HasEffectType(AuraType type) const; AuraEffect * GetEffect (uint8 effIndex) const { assert (effIndex < MAX_SPELL_EFFECTS); return m_effects[effIndex]; } - uint8 GetEffectMask() const { uint8 effMask = 0; for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (m_effects[i]) effMask |= 1<<i; return effMask; } + uint8 GetEffectMask() const { uint8 effMask = 0; for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (m_effects[i]) effMask |= 1<<i; return effMask; } void RecalculateAmountOfEffects(); void HandleAllEffects(AuraApplication const * aurApp, uint8 mode, bool apply); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 71067e8f5d9..6ff98b977a2 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -554,7 +554,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) else if (m_caster->m_form == FORM_SHADOW && (m_spellInfo->SpellFamilyFlags[0] & 0x00002000)) { Unit::AuraEffectList const& ImprMindBlast = m_caster->GetAuraEffectsByType(SPELL_AURA_ADD_FLAT_MODIFIER); - for(Unit::AuraEffectList::const_iterator i = ImprMindBlast.begin(); i != ImprMindBlast.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = ImprMindBlast.begin(); i != ImprMindBlast.end(); ++i) { if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST && ((*i)->GetSpellProto()->SpellIconID == 95)) @@ -1908,7 +1908,7 @@ void Spell::EffectDummy(uint32 i) Unit::AttackerSet attackers = unitTarget->getAttackers(); // selected from list 3 - for(int i = 0; i < std::min(size_t(3),attackers.size()); ++i) + for (int i = 0; i < std::min(size_t(3),attackers.size()); ++i) { Unit::AttackerSet::iterator aItr = attackers.begin(); std::advance(aItr, rand() % attackers.size()); @@ -4180,7 +4180,7 @@ void Spell::EffectEnchantItemTmp(uint32 i) } - for(int j = BASE_ATTACK; j <= OFF_ATTACK; ++j) + for (int j = BASE_ATTACK; j <= OFF_ATTACK; ++j) { if (Item* item = p_caster->GetWeaponForAttack(WeaponAttackType(j))) { @@ -7372,7 +7372,7 @@ void Spell::EffectActivateRune(uint32 eff_idx) uint32 count = damage; if (count == 0) count = 1; - for(uint32 j = 0; j < MAX_RUNES && count > 0; ++j) + for (uint32 j = 0; j < MAX_RUNES && count > 0; ++j) { if(plr->GetRuneCooldown(j) && plr->GetCurrentRune(j) == RuneType(m_spellInfo->EffectMiscValue[eff_idx])) { @@ -7387,7 +7387,7 @@ void Spell::EffectActivateRune(uint32 eff_idx) if (eff_idx != 0) return; - for(uint32 i = 0; i < MAX_RUNES; ++i) + for (uint32 i = 0; i < MAX_RUNES; ++i) { if(plr->GetRuneCooldown(i) && (plr->GetCurrentRune(i) == RUNE_FROST || plr->GetCurrentRune(i) == RUNE_DEATH)) plr->SetRuneCooldown(i, 0); @@ -7657,7 +7657,7 @@ void Spell::EffectRechargeManaGem(uint32 i) if (Item* pItem = player->GetItemByEntry(item_id)) { - for(int x = 0; x < MAX_ITEM_PROTO_SPELLS; ++x) + for (int x = 0; x < MAX_ITEM_PROTO_SPELLS; ++x) pItem->SetSpellCharges(x,pProto->Spells[x].SpellCharges); pItem->SetState(ITEM_CHANGED,player); } diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 114bd95837e..1b7e2369aeb 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -1242,7 +1242,7 @@ void Guardian::UpdateDamagePhysical(WeaponAttackType attType) } Unit::AuraEffectList const& mDummy = GetAuraEffectsByType(SPELL_AURA_MOD_ATTACKSPEED); - for(Unit::AuraEffectList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr) { switch ((*itr)->GetSpellProto()->Id) { diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 49dbaec1475..3e7d9b8983b 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -535,7 +535,7 @@ void Unit::GetRandomContactPoint(const Unit* obj, float &x, float &y, float &z, void Unit::UpdateInterruptMask() { m_interruptMask = 0; - for(AuraApplicationList::const_iterator i = m_interruptableAuras.begin(); i != m_interruptableAuras.end(); ++i) + for (AuraApplicationList::const_iterator i = m_interruptableAuras.begin(); i != m_interruptableAuras.end(); ++i) m_interruptMask |= (*i)->GetBase()->GetSpellProto()->AuraInterruptFlags; if (Spell* spell = m_currentSpells[CURRENT_CHANNELED_SPELL]) @@ -4240,7 +4240,7 @@ void Unit::RemoveAreaAurasDueToLeaveWorld() Aura * aura = iter->second; ++iter; Aura::ApplicationMap const & appMap = aura->GetApplicationMap(); - for(Aura::ApplicationMap::const_iterator itr = appMap.begin(); itr!= appMap.end();) + for (Aura::ApplicationMap::const_iterator itr = appMap.begin(); itr!= appMap.end();) { AuraApplication * aurApp = itr->second; ++itr; @@ -16189,7 +16189,7 @@ void Unit::StopAttackFaction(uint32 faction_id) } AttackerSet const& attackers = getAttackers(); - for(AttackerSet::const_iterator itr = attackers.begin(); itr != attackers.end();) + for (AttackerSet::const_iterator itr = attackers.begin(); itr != attackers.end();) { if ((*itr)->getFactionTemplateEntry()->faction==faction_id) { @@ -16202,7 +16202,7 @@ void Unit::StopAttackFaction(uint32 faction_id) getHostileRefManager().deleteReferencesForFaction(faction_id); - for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) (*itr)->StopAttackFaction(faction_id); } diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index 52ea4929ef1..ad5dd007685 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -634,7 +634,7 @@ void WorldSession::SendAccountDataTimes(uint32 mask) data << uint32(time(NULL)); // unix time of something data << uint8(1); data << uint32(mask); // type mask - for(uint32 i = 0; i < NUM_ACCOUNT_DATA_TYPES; ++i) + for (uint32 i = 0; i < NUM_ACCOUNT_DATA_TYPES; ++i) if(mask & (1 << i)) data << uint32(GetAccountData(AccountDataType(i))->Time);// also unix time SendPacket(&data); diff --git a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp index 08ab2c2830c..b4948c2132f 100644 --- a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp +++ b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp @@ -131,7 +131,7 @@ struct npc_blastmaster_emi_shortfuseAI : public npc_escortAI if (GoSummonList.empty()) return; - for(std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) { if (GameObject* pGo = GameObject::GetGameObject(*m_creature, *itr)) { @@ -186,14 +186,14 @@ struct npc_blastmaster_emi_shortfuseAI : public npc_escortAI pInstance->HandleGameObject(NULL,false,pGo); if (!GoSummonList.empty()) - for(std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) { if (GameObject* pGo = GameObject::GetGameObject(*m_creature, *itr)) pGo->RemoveFromWorld(); } if (!SummonList.empty()) - for(std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) { if (Creature* pSummon = Unit::GetCreature(*m_creature, *itr)) { diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp index dbadd70cb70..934450ea370 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp @@ -205,7 +205,7 @@ struct boss_volazjAI : public ScriptedAI Summons.Despawn(summon); // Check if all summons in this phase killed - for(SummonList::const_iterator iter = Summons.begin(); iter!=Summons.end(); ++iter) + for (SummonList::const_iterator iter = Summons.begin(); iter!=Summons.end(); ++iter) { if(Creature *visage = Unit::GetCreature(*m_creature, *iter)) { diff --git a/src/scripts/northrend/borean_tundra.cpp b/src/scripts/northrend/borean_tundra.cpp index 10481a6ecaa..f6075c7404d 100644 --- a/src/scripts/northrend/borean_tundra.cpp +++ b/src/scripts/northrend/borean_tundra.cpp @@ -2185,7 +2185,7 @@ struct npc_seaforium_depth_chargeAI : public ScriptedAI if (uiExplosionTimer < diff) { DoCast(SPELL_SEAFORIUM_DEPTH_CHARGE_EXPLOSION); - for(uint8 i = 0; i < 4; ++i) + for (uint8 i = 0; i < 4; ++i) { if(Creature* cCredit = m_creature->FindNearestCreature(25402 + i, 10.0f))//25402-25405 credit markers { diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp index 3ed4a81d6a3..ca882fc4607 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp @@ -131,7 +131,7 @@ struct boss_black_knightAI : public ScriptedAI if (SummonList.empty()) return; - for(std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) { if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) if (pTemp) diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp index edaad389bad..78893ee5eb8 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp @@ -81,7 +81,7 @@ struct instance_trial_of_the_champion : public ScriptedInstance bool IsEncounterInProgress() const { - for(uint8 i = 0; i < MAX_ENCOUNTER; ++i) + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) { if (m_auiEncounter[i] == IN_PROGRESS) return true; @@ -171,7 +171,7 @@ struct instance_trial_of_the_champion : public ScriptedInstance m_auiEncounter[0] = uiData; if (uiData == IN_PROGRESS) { - for(std::list<uint64>::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr) if (Creature* pSummon = instance->GetCreature(*itr)) pSummon->RemoveFromWorld(); }else if (uiData == DONE) diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp index 6f783bdf09e..c97ea6968c1 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp @@ -141,7 +141,7 @@ struct npc_announcer_toc5AI : public ScriptedAI break; } - for(std::list<uint64>::const_iterator itr = TempList.begin(); itr != TempList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = TempList.begin(); itr != TempList.end(); ++itr) if (Creature* pSummon = Unit::GetCreature(*m_creature, *itr)) AggroAllPlayers(pSummon); }else if (uiLesserChampions == 9) @@ -416,7 +416,7 @@ struct npc_announcer_toc5AI : public ScriptedAI case 3: if (!Champion1List.empty()) { - for(std::list<uint64>::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) + for (std::list<uint64>::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) if (Creature* pSummon = Unit::GetCreature(*m_creature, *itr)) AggroAllPlayers(pSummon); NextStep(0,false); diff --git a/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp b/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp index 674500584a7..48adc36cfd4 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp @@ -166,7 +166,7 @@ struct boss_algalonAI : public ScriptedAI if (m_lCollapsingStarGUIDList.empty()) return; - for(std::list<uint64>::const_iterator itr = m_lCollapsingStarGUIDList.begin(); itr != m_lCollapsingStarGUIDList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = m_lCollapsingStarGUIDList.begin(); itr != m_lCollapsingStarGUIDList.end(); ++itr) { if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index c792b03179b..889bc93050f 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -93,7 +93,7 @@ struct boss_palehoofAI : public ScriptedAI m_creature->GetMotionMaster()->MoveTargetedHome(); - for(uint32 i=0;i<4;i++) + for (uint32 i=0;i<4;i++) DoneAdds[i]=false; AddCount=0; @@ -206,7 +206,7 @@ struct boss_palehoofAI : public ScriptedAI { //select random not yet defeated add uint8 next = urand(0,3); - for(uint8 i=0; i < 16; i++) + for (uint8 i=0; i < 16; i++) { if(!DoneAdds[i%4] && next == 0) { diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/scripts/northrend/violet_hold/boss_ichoron.cpp index 7cc4f983020..dac6743213b 100644 --- a/src/scripts/northrend/violet_hold/boss_ichoron.cpp +++ b/src/scripts/northrend/violet_hold/boss_ichoron.cpp @@ -224,7 +224,7 @@ struct boss_ichoronAI : public ScriptedAI bIsExploded = true; m_creature->AttackStop(); m_creature->SetVisibility(VISIBILITY_OFF); - for(uint8 i = 0; i < 10; i++) + for (uint8 i = 0; i < 10; i++) { int tmp = urand(0, MAX_SPAWN_LOC-1); m_creature->SummonCreature(NPC_ICHOR_GLOBULE, SpawnLoc[tmp], TEMPSUMMON_CORPSE_DESPAWN); diff --git a/src/scripts/northrend/violet_hold/boss_xevozz.cpp b/src/scripts/northrend/violet_hold/boss_xevozz.cpp index 4d29ff592e2..200acba96bc 100644 --- a/src/scripts/northrend/violet_hold/boss_xevozz.cpp +++ b/src/scripts/northrend/violet_hold/boss_xevozz.cpp @@ -100,7 +100,7 @@ struct boss_xevozzAI : public ScriptedAI if (assistList.empty()) return; - for(std::list<Creature*>::const_iterator iter = assistList.begin(); iter != assistList.end(); ++iter) + for (std::list<Creature*>::const_iterator iter = assistList.begin(); iter != assistList.end(); ++iter) { if (Creature* pSphere = *iter) pSphere->Kill(pSphere, false); diff --git a/src/scripts/northrend/zuldrak.cpp b/src/scripts/northrend/zuldrak.cpp index db57b4674e0..a944330b955 100644 --- a/src/scripts/northrend/zuldrak.cpp +++ b/src/scripts/northrend/zuldrak.cpp @@ -279,7 +279,7 @@ struct npc_gurgthockAI : public ScriptedAI m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); - for(std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) { if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) if (pTemp) diff --git a/src/scripts/outland/netherstorm.cpp b/src/scripts/outland/netherstorm.cpp index 992a4f2dc85..6e339890707 100644 --- a/src/scripts/outland/netherstorm.cpp +++ b/src/scripts/outland/netherstorm.cpp @@ -746,7 +746,7 @@ struct mob_phase_hunterAI : public ScriptedAI std::list<HostileReference*> AggroList = m_creature->getThreatManager().getThreatList(); std::list<Unit*> UnitsWithMana; - for(std::list<HostileReference*>::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr) { if(Unit *pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { |