From de11b9e901d1d1caa0634fad541f08f11c5781af Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 29 Apr 2009 00:26:07 -0500 Subject: [7730] Some optimizantion and code style. Author: zhenya --HG-- branch : trunk --- src/game/AchievementMgr.cpp | 8 +++--- src/game/ArenaTeam.cpp | 8 +++--- src/game/ArenaTeamHandler.cpp | 2 +- src/game/AuctionHouseMgr.cpp | 4 +-- src/game/Bag.cpp | 6 ++--- src/game/BattleGround.cpp | 22 ++++++++-------- src/game/BattleGroundBE.cpp | 8 +++--- src/game/BattleGroundHandler.cpp | 6 ++--- src/game/BattleGroundNA.cpp | 6 ++--- src/game/BattleGroundRL.cpp | 6 ++--- src/game/BattleGroundWS.cpp | 10 ++++---- src/game/CalendarHandler.cpp | 2 +- src/game/Channel.cpp | 6 ++--- src/game/ChannelMgr.h | 2 +- src/game/CharacterHandler.cpp | 10 ++++---- src/game/Chat.cpp | 2 +- src/game/Corpse.cpp | 2 +- src/game/Creature.cpp | 8 +++--- src/game/Creature.h | 2 +- src/game/Debugcmds.cpp | 8 +++--- src/game/FleeingMovementGenerator.cpp | 2 +- src/game/GameObject.cpp | 6 ++--- src/game/GossipDef.cpp | 46 +++++++++++++++++----------------- src/game/Group.cpp | 14 +++++------ src/game/Guild.cpp | 10 ++++---- src/game/Item.cpp | 6 ++--- src/game/ItemEnchantmentMgr.cpp | 8 +++--- src/game/Level0.cpp | 2 +- src/game/Level2.cpp | 2 +- src/game/Level3.cpp | 24 +++++++++--------- src/game/LootHandler.cpp | 2 +- src/game/LootMgr.cpp | 22 ++++++++-------- src/game/LootMgr.h | 6 ++--- src/game/Mail.h | 4 +-- src/game/Map.cpp | 4 +-- src/game/MiscHandler.cpp | 10 ++++---- src/game/MovementHandler.cpp | 2 +- src/game/Pet.cpp | 24 +++++++++--------- src/game/PetAI.cpp | 4 +-- src/game/PetHandler.cpp | 4 +-- src/game/PetitionsHandler.cpp | 6 ++--- src/game/Player.h | 16 ++++++------ src/game/PlayerDump.cpp | 10 ++++---- src/game/QueryHandler.cpp | 6 ++--- src/game/QuestDef.cpp | 6 ++--- src/game/QuestHandler.cpp | 4 +-- src/game/SkillDiscovery.cpp | 12 ++++----- src/game/SocialMgr.cpp | 14 +++++------ src/game/SpellMgr.cpp | 14 +++++------ src/game/StatSystem.cpp | 16 ++++++------ src/game/ThreatManager.cpp | 8 +++--- src/game/TradeHandler.cpp | 12 ++++----- src/game/Transports.cpp | 24 +++++++++--------- src/game/Transports.h | 6 ++--- src/game/UpdateData.cpp | 2 +- src/game/UpdateMask.h | 4 +-- src/game/WaypointMovementGenerator.cpp | 4 +-- src/game/World.cpp | 24 +++++++++--------- src/game/WorldSession.cpp | 2 +- src/game/WorldSocketMgr.cpp | 8 +++--- 60 files changed, 264 insertions(+), 264 deletions(-) diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 507b3c17481..887e5865623 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -228,14 +228,14 @@ AchievementMgr::~AchievementMgr() void AchievementMgr::Reset() { - for(CompletedAchievementMap::iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter) + for(CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter) { WorldPacket data(SMSG_ACHIEVEMENT_DELETED,4); data << uint32(iter->first); m_player->SendDirectMessage(&data); } - for(CriteriaProgressMap::iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter) + for(CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter) { WorldPacket data(SMSG_CRITERIA_DELETED,4); data << uint32(iter->first); @@ -675,7 +675,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT: { uint32 counter =0; - for(QuestStatusMap::iterator itr = GetPlayer()->getQuestStatusMap().begin(); itr!=GetPlayer()->getQuestStatusMap().end(); itr++) + for(QuestStatusMap::const_iterator itr = GetPlayer()->getQuestStatusMap().begin(); itr!=GetPlayer()->getQuestStatusMap().end(); itr++) if(itr->second.m_rewarded) counter++; SetCriteriaProgress(achievementCriteria, counter); @@ -688,7 +688,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui continue; uint32 counter =0; - for(QuestStatusMap::iterator itr = GetPlayer()->getQuestStatusMap().begin(); itr!=GetPlayer()->getQuestStatusMap().end(); itr++) + for(QuestStatusMap::const_iterator itr = GetPlayer()->getQuestStatusMap().begin(); itr!=GetPlayer()->getQuestStatusMap().end(); itr++) { Quest const* quest = objmgr.GetQuestTemplate(itr->first); if(itr->second.m_rewarded && quest->GetZoneOrSort() >= 0 && uint32(quest->GetZoneOrSort()) == achievementCriteria->complete_quests_in_zone.zoneID) diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp index 96e279f7d83..c00a103b1ca 100644 --- a/src/game/ArenaTeam.cpp +++ b/src/game/ArenaTeam.cpp @@ -517,7 +517,7 @@ int32 ArenaTeam::WonAgainst(uint32 againstRating) stats.wins_season += 1; //update team's rank stats.rank = 1; - ObjectMgr::ArenaTeamMap::iterator i = objmgr.GetArenaTeamMapBegin(); + ObjectMgr::ArenaTeamMap::const_iterator i = objmgr.GetArenaTeamMapBegin(); for ( ; i != objmgr.GetArenaTeamMapEnd(); ++i) { if (i->second->GetType() == this->Type && i->second->GetStats().rating > stats.rating) @@ -542,7 +542,7 @@ int32 ArenaTeam::LostAgainst(uint32 againstRating) //update team's rank stats.rank = 1; - ObjectMgr::ArenaTeamMap::iterator i = objmgr.GetArenaTeamMapBegin(); + ObjectMgr::ArenaTeamMap::const_iterator i = objmgr.GetArenaTeamMapBegin(); for ( ; i != objmgr.GetArenaTeamMapEnd(); ++i) { if (i->second->GetType() == this->Type && i->second->GetStats().rating > stats.rating) @@ -630,7 +630,7 @@ void ArenaTeam::UpdateArenaPointsHelper(std::map& PlayerPoints) return; // to get points, a player has to participate in at least 30% of the matches uint32 min_plays = (uint32) ceil(stats.games_week * 0.3); - for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) + for(MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr) { // the player participated in enough games, update his points uint32 points_to_add = 0; @@ -656,7 +656,7 @@ void ArenaTeam::SaveToDB() // called after a match has ended, or when calculating arena_points CharacterDatabase.BeginTransaction(); CharacterDatabase.PExecute("UPDATE arena_team_stats SET rating = '%u',games = '%u',played = '%u',rank = '%u',wins = '%u',wins2 = '%u' WHERE arenateamid = '%u'", stats.rating, stats.games_week, stats.games_season, stats.rank, stats.wins_week, stats.wins_season, GetId()); - for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) + for(MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr) { CharacterDatabase.PExecute("UPDATE arena_team_member SET played_week = '%u', wons_week = '%u', played_season = '%u', wons_season = '%u', personal_rating = '%u' WHERE arenateamid = '%u' AND guid = '%u'", itr->games_week, itr->wins_week, itr->games_season, itr->wins_season, itr->personal_rating, Id, GUID_LOPART(itr->guid)); } diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp index cebdb71411f..f195ccc93c3 100644 --- a/src/game/ArenaTeamHandler.cpp +++ b/src/game/ArenaTeamHandler.cpp @@ -40,7 +40,7 @@ void WorldSession::HandleInspectArenaStatsOpcode(WorldPacket & recv_data) if(Player *plr = objmgr.GetPlayer(guid)) { - for (uint8 i = 0; i < MAX_ARENA_SLOT; i++) + for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i) { if(uint32 a_id = plr->GetArenaTeamId(i)) { diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp index 11b75a0be4e..e34795c9ecd 100644 --- a/src/game/AuctionHouseMgr.cpp +++ b/src/game/AuctionHouseMgr.cpp @@ -43,7 +43,7 @@ AuctionHouseMgr::AuctionHouseMgr() AuctionHouseMgr::~AuctionHouseMgr() { - for(ItemMap::iterator itr = mAitems.begin(); itr != mAitems.end(); ++itr) + for(ItemMap::const_iterator itr = mAitems.begin(); itr != mAitems.end(); ++itr) delete itr->second; } @@ -635,7 +635,7 @@ bool AuctionEntry::BuildAuctionInfo(WorldPacket & data) const data << uint32(Id); data << uint32(pItem->GetEntry()); - for (uint8 i = 0; i < MAX_INSPECTED_ENCHANTMENT_SLOT; i++) + for (uint8 i = 0; i < MAX_INSPECTED_ENCHANTMENT_SLOT; ++i) { data << uint32(pItem->GetEnchantmentId(EnchantmentSlot(i))); data << uint32(pItem->GetEnchantmentDuration(EnchantmentSlot(i))); diff --git a/src/game/Bag.cpp b/src/game/Bag.cpp index 06c2f6ade6b..1edbc06474d 100644 --- a/src/game/Bag.cpp +++ b/src/game/Bag.cpp @@ -84,7 +84,7 @@ bool Bag::Create(uint32 guidlow, uint32 itemid, Player const* owner) SetUInt32Value(CONTAINER_FIELD_NUM_SLOTS, itemProto->ContainerSlots); // Cleaning 20 slots - for (uint8 i = 0; i < MAX_BAG_SIZE; i++) + for (uint8 i = 0; i < MAX_BAG_SIZE; ++i) { SetUInt64Value(CONTAINER_FIELD_SLOT_1 + (i*2), 0); m_bagslot[i] = NULL; @@ -119,7 +119,7 @@ bool Bag::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result) void Bag::DeleteFromDB() { - for (int i = 0; i < MAX_BAG_SIZE; i++) + for (int i = 0; i < MAX_BAG_SIZE; ++i) if (m_bagslot[i]) m_bagslot[i]->DeleteFromDB(); @@ -129,7 +129,7 @@ void Bag::DeleteFromDB() uint32 Bag::GetFreeSlots() const { uint32 slots = 0; - for (uint32 i=0; i < GetBagSize(); i++) + for (uint32 i=0; i < GetBagSize(); ++i) if (!m_bagslot[i]) ++slots; diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 620e5383ba5..d179ec33691 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -120,7 +120,7 @@ namespace MaNGOS template void BattleGround::BroadcastWorker(Do& _do) { - for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) if (Player *plr = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER))) _do(plr); } @@ -264,7 +264,7 @@ void BattleGround::Update(uint32 diff) for(std::map >::iterator itr = m_ReviveQueue.begin(); itr != m_ReviveQueue.end(); ++itr) { Creature *sh = NULL; - for(std::vector::iterator itr2 = (itr->second).begin(); itr2 != (itr->second).end(); ++itr2) + for(std::vector::const_iterator itr2 = (itr->second).begin(); itr2 != (itr->second).end(); ++itr2) { Player *plr = objmgr.GetPlayer(*itr2); if (!plr) @@ -293,7 +293,7 @@ void BattleGround::Update(uint32 diff) } else if (m_LastResurrectTime > 500) // Resurrect players only half a second later, to see spirit heal effect on NPC { - for(std::vector::iterator itr = m_ResurrectQueue.begin(); itr != m_ResurrectQueue.end(); ++itr) + for(std::vector::const_iterator itr = m_ResurrectQueue.begin(); itr != m_ResurrectQueue.end(); ++itr) { Player *plr = objmgr.GetPlayer(*itr); if (!plr) @@ -463,7 +463,7 @@ void BattleGround::SetTeamStartLoc(uint32 TeamID, float X, float Y, float Z, flo void BattleGround::SendPacketToAll(WorldPacket *packet) { - for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { Player *plr = objmgr.GetPlayer(itr->first); if (plr) @@ -475,7 +475,7 @@ void BattleGround::SendPacketToAll(WorldPacket *packet) void BattleGround::SendPacketToTeam(uint32 TeamID, WorldPacket *packet, Player *sender, bool self) { - for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { Player *plr = objmgr.GetPlayer(itr->first); @@ -507,7 +507,7 @@ void BattleGround::PlaySoundToTeam(uint32 SoundID, uint32 TeamID) { WorldPacket data; - for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { Player *plr = objmgr.GetPlayer(itr->first); @@ -530,7 +530,7 @@ void BattleGround::PlaySoundToTeam(uint32 SoundID, uint32 TeamID) void BattleGround::CastSpellOnTeam(uint32 SpellID, uint32 TeamID) { - for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { Player *plr = objmgr.GetPlayer(itr->first); @@ -567,7 +567,7 @@ void BattleGround::YellToAll(Creature* creature, const char* text, uint32 langua void BattleGround::RewardHonorToTeam(uint32 Honor, uint32 TeamID) { - for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { Player *plr = objmgr.GetPlayer(itr->first); @@ -592,7 +592,7 @@ void BattleGround::RewardReputationToTeam(uint32 faction_id, uint32 Reputation, if (!factionEntry) return; - for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { Player *plr = objmgr.GetPlayer(itr->first); @@ -1244,7 +1244,7 @@ bool BattleGround::HasFreeSlots() const void BattleGround::UpdatePlayerScore(Player *Source, uint32 type, uint32 value) { //this procedure is called from virtual function implemented in bg subclass - std::map::iterator itr = m_PlayerScores.find(Source->GetGUID()); + std::map::const_iterator itr = m_PlayerScores.find(Source->GetGUID()); if(itr == m_PlayerScores.end()) // player not found... return; @@ -1674,7 +1674,7 @@ void BattleGround::HandleKillPlayer( Player *player, Player *killer ) UpdatePlayerScore(killer, SCORE_HONORABLE_KILLS, 1); UpdatePlayerScore(killer, SCORE_KILLING_BLOWS, 1); - for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { Player *plr = objmgr.GetPlayer(itr->first); diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp index dd45b78d924..f61ff697faa 100644 --- a/src/game/BattleGroundBE.cpp +++ b/src/game/BattleGroundBE.cpp @@ -58,19 +58,19 @@ void BattleGroundBE::Update(uint32 diff) void BattleGroundBE::StartingEventCloseDoors() { - for(uint32 i = BG_BE_OBJECT_DOOR_1; i <= BG_BE_OBJECT_DOOR_4; i++) + for(uint32 i = BG_BE_OBJECT_DOOR_1; i <= BG_BE_OBJECT_DOOR_4; ++i) SpawnBGObject(i, RESPAWN_IMMEDIATELY); - for(uint32 i = BG_BE_OBJECT_BUFF_1; i <= BG_BE_OBJECT_BUFF_2; i++) + for(uint32 i = BG_BE_OBJECT_BUFF_1; i <= BG_BE_OBJECT_BUFF_2; ++i) SpawnBGObject(i, RESPAWN_ONE_DAY); } void BattleGroundBE::StartingEventOpenDoors() { - for(uint32 i = BG_BE_OBJECT_DOOR_1; i <= BG_BE_OBJECT_DOOR_2; i++) + for(uint32 i = BG_BE_OBJECT_DOOR_1; i <= BG_BE_OBJECT_DOOR_2; ++i) DoorOpen(i); - for(uint32 i = BG_BE_OBJECT_BUFF_1; i <= BG_BE_OBJECT_BUFF_2; i++) + for(uint32 i = BG_BE_OBJECT_BUFF_1; i <= BG_BE_OBJECT_BUFF_2; ++i) SpawnBGObject(i, 60); } diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index 5540aa025d4..883ad974277 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -230,7 +230,7 @@ void WorldSession::HandleBattleGroundPlayerPositionsOpcode( WorldPacket & /*recv WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, (4+4+16*count1+16*count2)); data << count1; // alliance flag holders count - obsolete, now always 0 - /*for(uint8 i = 0; i < count1; i++) + /*for(uint8 i = 0; i < count1; ++i) { data << uint64(0); // guid data << (float)0; // x @@ -332,7 +332,7 @@ void WorldSession::HandleBattleGroundPlayerPortOpcode( WorldPacket &recv_data ) if (_player->InBattleGroundQueue()) { // update all queues, send invitation info if player is invited, queue info if queued - for (uint32 i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (uint32 i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) { BattleGroundQueueTypeId bgQueueTypeId = _player->GetBattleGroundQueueTypeId(i); if (!bgQueueTypeId) @@ -534,7 +534,7 @@ void WorldSession::HandleBattlefieldStatusOpcode( WorldPacket & /*recv_data*/ ) WorldPacket data; // we must update all queues here BattleGround *bg = NULL; - for (uint8 i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (uint8 i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) { BattleGroundQueueTypeId bgQueueTypeId = _player->GetBattleGroundQueueTypeId(i); if (!bgQueueTypeId) diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGroundNA.cpp index 364ba972bec..f46746829e7 100644 --- a/src/game/BattleGroundNA.cpp +++ b/src/game/BattleGroundNA.cpp @@ -58,16 +58,16 @@ void BattleGroundNA::Update(uint32 diff) void BattleGroundNA::StartingEventCloseDoors() { - for(uint32 i = BG_NA_OBJECT_DOOR_1; i <= BG_NA_OBJECT_DOOR_4; i++) + for(uint32 i = BG_NA_OBJECT_DOOR_1; i <= BG_NA_OBJECT_DOOR_4; ++i) SpawnBGObject(i, RESPAWN_IMMEDIATELY); } void BattleGroundNA::StartingEventOpenDoors() { - for(uint32 i = BG_NA_OBJECT_DOOR_1; i <= BG_NA_OBJECT_DOOR_2; i++) + for(uint32 i = BG_NA_OBJECT_DOOR_1; i <= BG_NA_OBJECT_DOOR_2; ++i) DoorOpen(i); - for(uint32 i = BG_NA_OBJECT_BUFF_1; i <= BG_NA_OBJECT_BUFF_2; i++) + for(uint32 i = BG_NA_OBJECT_BUFF_1; i <= BG_NA_OBJECT_BUFF_2; ++i) SpawnBGObject(i, 60); } diff --git a/src/game/BattleGroundRL.cpp b/src/game/BattleGroundRL.cpp index 033733aa61a..f8f8bd9fef5 100644 --- a/src/game/BattleGroundRL.cpp +++ b/src/game/BattleGroundRL.cpp @@ -58,16 +58,16 @@ void BattleGroundRL::Update(uint32 diff) void BattleGroundRL::StartingEventCloseDoors() { - for(uint32 i = BG_RL_OBJECT_DOOR_1; i <= BG_RL_OBJECT_DOOR_2; i++) + for(uint32 i = BG_RL_OBJECT_DOOR_1; i <= BG_RL_OBJECT_DOOR_2; ++i) SpawnBGObject(i, RESPAWN_IMMEDIATELY); } void BattleGroundRL::StartingEventOpenDoors() { - for(uint32 i = BG_RL_OBJECT_DOOR_1; i <= BG_RL_OBJECT_DOOR_2; i++) + for(uint32 i = BG_RL_OBJECT_DOOR_1; i <= BG_RL_OBJECT_DOOR_2; ++i) DoorOpen(i); - for(uint32 i = BG_RL_OBJECT_BUFF_1; i <= BG_RL_OBJECT_BUFF_2; i++) + for(uint32 i = BG_RL_OBJECT_BUFF_1; i <= BG_RL_OBJECT_BUFF_2; ++i) SpawnBGObject(i, 60); } diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp index fac59229e63..76ecde6527b 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -114,20 +114,20 @@ void BattleGroundWS::Update(uint32 diff) void BattleGroundWS::StartingEventCloseDoors() { - for(uint32 i = BG_WS_OBJECT_DOOR_A_1; i <= BG_WS_OBJECT_DOOR_H_4; i++) + for(uint32 i = BG_WS_OBJECT_DOOR_A_1; i <= BG_WS_OBJECT_DOOR_H_4; ++i) { DoorClose(i); SpawnBGObject(i, RESPAWN_IMMEDIATELY); } - for(uint32 i = BG_WS_OBJECT_A_FLAG; i <= BG_WS_OBJECT_BERSERKBUFF_2; i++) + for(uint32 i = BG_WS_OBJECT_A_FLAG; i <= BG_WS_OBJECT_BERSERKBUFF_2; ++i) SpawnBGObject(i, RESPAWN_ONE_DAY); } void BattleGroundWS::StartingEventOpenDoors() { - for(uint32 i = BG_WS_OBJECT_DOOR_A_1; i <= BG_WS_OBJECT_DOOR_A_4; i++) + for(uint32 i = BG_WS_OBJECT_DOOR_A_1; i <= BG_WS_OBJECT_DOOR_A_4; ++i) DoorOpen(i); - for(uint32 i = BG_WS_OBJECT_DOOR_H_1; i <= BG_WS_OBJECT_DOOR_H_2; i++) + for(uint32 i = BG_WS_OBJECT_DOOR_H_1; i <= BG_WS_OBJECT_DOOR_H_2; ++i) DoorOpen(i); SpawnBGObject(BG_WS_OBJECT_DOOR_A_5, RESPAWN_ONE_DAY); @@ -135,7 +135,7 @@ void BattleGroundWS::StartingEventOpenDoors() SpawnBGObject(BG_WS_OBJECT_DOOR_H_3, RESPAWN_ONE_DAY); SpawnBGObject(BG_WS_OBJECT_DOOR_H_4, RESPAWN_ONE_DAY); - for(uint32 i = BG_WS_OBJECT_A_FLAG; i <= BG_WS_OBJECT_BERSERKBUFF_2; i++) + for(uint32 i = BG_WS_OBJECT_A_FLAG; i <= BG_WS_OBJECT_BERSERKBUFF_2; ++i) SpawnBGObject(i, RESPAWN_IMMEDIATELY); } diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp index e9946e1a05e..3cd186c15d3 100644 --- a/src/game/CalendarHandler.cpp +++ b/src/game/CalendarHandler.cpp @@ -47,7 +47,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket &recv_data) for(int i = 0; i < TOTAL_DIFFICULTIES; ++i) { - for (Player::BoundInstancesMap::iterator itr = _player->m_boundInstances[i].begin(); itr != _player->m_boundInstances[i].end(); ++itr) + for (Player::BoundInstancesMap::const_iterator itr = _player->m_boundInstances[i].begin(); itr != _player->m_boundInstances[i].end(); ++itr) { if(itr->second.perm) { diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index 4799539ac62..5524f30b143 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -451,7 +451,7 @@ void Channel::List(Player* player) bool gmInWhoList = sWorld.getConfig(CONFIG_GM_IN_WHO_LIST) || player->GetSession()->GetSecurity() > SEC_PLAYER; uint32 count = 0; - for(PlayerList::iterator i = players.begin(); i != players.end(); ++i) + for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { Player *plr = objmgr.GetPlayer(i->first); @@ -664,7 +664,7 @@ void Channel::SetOwner(uint64 guid, bool exclaim) void Channel::SendToAll(WorldPacket *data, uint64 p) { - for(PlayerList::iterator i = players.begin(); i != players.end(); ++i) + for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { Player *plr = objmgr.GetPlayer(i->first); if(plr) @@ -677,7 +677,7 @@ void Channel::SendToAll(WorldPacket *data, uint64 p) void Channel::SendToAllButOne(WorldPacket *data, uint64 who) { - for(PlayerList::iterator i = players.begin(); i != players.end(); ++i) + for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { if(i->first != who) { diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h index 66f692ef69c..73e69c371ab 100644 --- a/src/game/ChannelMgr.h +++ b/src/game/ChannelMgr.h @@ -34,7 +34,7 @@ class ChannelMgr ChannelMgr() {} ~ChannelMgr() { - for(ChannelMap::iterator itr = channels.begin();itr!=channels.end(); ++itr) + for(ChannelMap::const_iterator itr = channels.begin();itr!=channels.end(); ++itr) delete itr->second; channels.clear(); } diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp index a2e189603f9..ca6a96c3b08 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -600,7 +600,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) data.Initialize( SMSG_ACCOUNT_DATA_TIMES, 4+1+8*4 ); // changed in WotLK data << uint32(time(NULL)); // unix time of something data << uint8(1); - for(int i = 0; i < NUM_ACCOUNT_DATA_TYPES; i++) + for(int i = 0; i < NUM_ACCOUNT_DATA_TYPES; ++i) data << uint32(GetAccountData(i)->Time); // also unix time SendPacket(&data); @@ -931,14 +931,14 @@ void WorldSession::HandleTutorialFlag( WorldPacket & recv_data ) void WorldSession::HandleTutorialClear( WorldPacket & /*recv_data*/ ) { - for ( uint32 iI = 0; iI < 8; iI++) - GetPlayer()->SetTutorialInt( iI, 0xFFFFFFFF ); + for (int i = 0; i < 8; ++i) + GetPlayer()->SetTutorialInt( i, 0xFFFFFFFF ); } void WorldSession::HandleTutorialReset( WorldPacket & /*recv_data*/ ) { - for ( uint32 iI = 0; iI < 8; iI++) - GetPlayer()->SetTutorialInt( iI, 0x00000000 ); + for (int i = 0; i < 8; ++i) + GetPlayer()->SetTutorialInt( i, 0x00000000 ); } void WorldSession::HandleSetWatchedFactionIndexOpcode(WorldPacket & recv_data) diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index f029ba7d74a..789936302fc 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -910,7 +910,7 @@ bool ChatHandler::ExecuteCommandInTable(ChatCommand *table, const char* text, co while (*text == ' ') ++text; - for(uint32 i = 0; table[i].Name != NULL; i++) + for(uint32 i = 0; table[i].Name != NULL; ++i) { if( !hasStringAbbr(table[i].Name, cmd.c_str()) ) continue; diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp index d427d1e5943..3df7838cf60 100644 --- a/src/game/Corpse.cpp +++ b/src/game/Corpse.cpp @@ -111,7 +111,7 @@ void Corpse::SaveToDB() << GetOrientation() << ", " << GetZoneId() << ", " << GetMapId() << ", '"; - for(uint16 i = 0; i < m_valuesCount; i++ ) + for(uint16 i = 0; i < m_valuesCount; ++i ) ss << GetUInt32Value(i) << " "; ss << "'," << uint64(m_time) <<", " diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 95d652e04ef..fc3e7ad7bac 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1463,7 +1463,7 @@ void Creature::LoadEquipment(uint32 equip_entry, bool force) { if (force) { - for (uint8 i = 0; i < 3; i++) + for (uint8 i = 0; i < 3; ++i) SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i, 0); m_equipmentId = 0; } @@ -1475,7 +1475,7 @@ void Creature::LoadEquipment(uint32 equip_entry, bool force) return; m_equipmentId = equip_entry; - for (uint8 i = 0; i < 3; i++) + for (uint8 i = 0; i < 3; ++i) SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i, einfo->equipentry[i]); } @@ -1767,7 +1767,7 @@ SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim) if(!pVictim) return NULL; - for(uint32 i=0; i < CREATURE_MAX_SPELLS; i++) + for(uint32 i=0; i < CREATURE_MAX_SPELLS; ++i) { if(!m_spells[i]) continue; @@ -1817,7 +1817,7 @@ SpellEntry const *Creature::reachWithSpellCure(Unit *pVictim) if(!pVictim) return NULL; - for(uint32 i=0; i < CREATURE_MAX_SPELLS; i++) + for(uint32 i=0; i < CREATURE_MAX_SPELLS; ++i) { if(!m_spells[i]) continue; diff --git a/src/game/Creature.h b/src/game/Creature.h index 4ac2ba3d3cd..4381a317b0d 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -390,7 +390,7 @@ struct VendorItemData void Clear() { - for (VendorItemList::iterator itr = m_items.begin(); itr != m_items.end(); ++itr) + for (VendorItemList::const_iterator itr = m_items.begin(); itr != m_items.end(); ++itr) delete (*itr); m_items.clear(); } diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp index 5b0f1cbebe3..2e3a256a214 100644 --- a/src/game/Debugcmds.cpp +++ b/src/game/Debugcmds.cpp @@ -412,7 +412,7 @@ bool ChatHandler::HandleDebugGetItemState(const char* args) { state_str = "The player has the following " + state_str + " items: "; SendSysMessage(state_str.c_str()); - for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; i++) + for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i) { if(i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) continue; @@ -440,7 +440,7 @@ bool ChatHandler::HandleDebugGetItemState(const char* args) if (list_queue) { std::vector &updateQueue = player->GetItemUpdateQueue(); - for(size_t i = 0; i < updateQueue.size(); i++) + for(size_t i = 0; i < updateQueue.size(); ++i) { Item *item = updateQueue[i]; if(!item) continue; @@ -467,7 +467,7 @@ bool ChatHandler::HandleDebugGetItemState(const char* args) { bool error = false; std::vector &updateQueue = player->GetItemUpdateQueue(); - for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; i++) + for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i) { if(i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) continue; @@ -583,7 +583,7 @@ bool ChatHandler::HandleDebugGetItemState(const char* args) } } - for(size_t i = 0; i < updateQueue.size(); i++) + for(size_t i = 0; i < updateQueue.size(); ++i) { Item *item = updateQueue[i]; if(!item) continue; diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp index 8f9eb6073d5..0b499168538 100644 --- a/src/game/FleeingMovementGenerator.cpp +++ b/src/game/FleeingMovementGenerator.cpp @@ -79,7 +79,7 @@ FleeingMovementGenerator::_getPoint(T &owner, float &x, float &y, float &z) float temp_x, temp_y, angle; const Map * _map = MapManager::Instance().GetBaseMap(owner.GetMapId()); //primitive path-finding - for(uint8 i = 0; i < 18; i++) + for(uint8 i = 0; i < 18; ++i) { if(i_only_forward && i > 2) break; diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 3fcf8a02722..b7043de99f1 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -386,8 +386,8 @@ void GameObject::Update(uint32 /*p_time*/) if(spellId) { - std::set::iterator it = m_unique_users.begin(); - std::set::iterator end = m_unique_users.end(); + std::set::const_iterator it = m_unique_users.begin(); + std::set::const_iterator end = m_unique_users.end(); for (; it != end; it++) { Unit* owner = Unit::GetUnit(*this, uint64(*it)); @@ -962,7 +962,7 @@ void GameObject::Use(Unit* user) // every slot will be on that straight line float orthogonalOrientation = GetOrientation()+M_PI*0.5f; // find nearest slot - for(uint32 i=0; ichair.slots; i++) + for(uint32 i=0; ichair.slots; ++i) { // the distance between this slot and the center of the go - imagine a 1D space float relativeDistance = (info->size*i)-(info->size*(info->chair.slots-1)/2.0f); diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index c362b23ff71..754783aca06 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -132,7 +132,7 @@ void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID ) data << uint32( TitleTextId ); data << uint32( mGossipMenu.MenuItemCount() ); // max count 0x0F - for ( unsigned int iI = 0; iI < mGossipMenu.MenuItemCount(); iI++ ) + for (int iI = 0; iI < mGossipMenu.MenuItemCount(); ++iI ) { GossipMenuItem const& gItem = mGossipMenu.GetItem(iI); data << uint32( iI ); @@ -145,7 +145,7 @@ void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID ) data << uint32( mQuestMenu.MenuItemCount() ); // max count 0x20 - for ( uint16 iI = 0; iI < mQuestMenu.MenuItemCount(); iI++ ) + for ( int iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI ) { QuestMenuItem const& qItem = mQuestMenu.GetItem(iI); uint32 questID = qItem.m_qId; @@ -255,7 +255,7 @@ void PlayerMenu::SendTalking( uint32 textID ) else { std::string Text_0[8],Text_1[8]; - for (int i=0;i<8;i++) + for (int i=0;i<8;++i) { Text_0[i]=pGossip->Options[i].Text_0; Text_1[i]=pGossip->Options[i].Text_1; @@ -266,7 +266,7 @@ void PlayerMenu::SendTalking( uint32 textID ) NpcTextLocale const *nl = objmgr.GetNpcTextLocale(textID); if (nl) { - for (int i=0;i<8;i++) + for (int i=0;i<8;++i) { if (nl->Text_0[i].size() > loc_idx && !nl->Text_0[i][loc_idx].empty()) Text_0[i]=nl->Text_0[i][loc_idx]; @@ -275,7 +275,7 @@ void PlayerMenu::SendTalking( uint32 textID ) } } } - for (int i=0; i<8; i++) + for (int i=0; i<8; ++i) { data << pGossip->Options[i].Probability; @@ -357,7 +357,7 @@ void QuestMenu::AddMenuItem( uint32 QuestId, uint8 Icon) bool QuestMenu::HasItem( uint32 questid ) { - for (QuestMenuItemList::iterator i = m_qItems.begin(); i != m_qItems.end(); ++i) + for (QuestMenuItemList::const_iterator i = m_qItems.begin(); i != m_qItems.end(); ++i) { if(i->m_qId==questid) { @@ -381,7 +381,7 @@ void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Titl data << uint32(eEmote._Emote ); // NPC emote data << uint8 ( mQuestMenu.MenuItemCount() ); - for ( uint16 iI = 0; iI < mQuestMenu.MenuItemCount(); iI++ ) + for ( int iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI ) { QuestMenuItem const& qmi = mQuestMenu.GetItem(iI); @@ -466,7 +466,7 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID ItemPrototype const* IProto; data << uint32(pQuest->GetRewChoiceItemsCount()); - for (uint32 i=0; i < QUEST_REWARD_CHOICES_COUNT; i++) + for (uint32 i=0; i < QUEST_REWARD_CHOICES_COUNT; ++i) { if ( !pQuest->RewChoiceItemId[i] ) continue; data << uint32(pQuest->RewChoiceItemId[i]); @@ -479,7 +479,7 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID } data << uint32(pQuest->GetRewItemsCount()); - for (uint32 i=0; i < QUEST_REWARDS_COUNT; i++) + for (uint32 i=0; i < QUEST_REWARDS_COUNT; ++i) { if ( !pQuest->RewItemId[i] ) continue; data << uint32(pQuest->RewItemId[i]); @@ -502,7 +502,7 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID data << uint32(pQuest->GetBonusTalents()); // bonus talents data << uint32(QUEST_EMOTE_COUNT); - for (uint32 i=0; i < QUEST_EMOTE_COUNT; i++) + for (uint32 i=0; i < QUEST_EMOTE_COUNT; ++i) { data << uint32(pQuest->DetailsEmote[i]); data << uint32(0); // DetailsEmoteDelay @@ -520,7 +520,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest ) Details = pQuest->GetDetails(); Objectives = pQuest->GetObjectives(); EndText = pQuest->GetEndText(); - for (int i=0;iObjectiveText[i]; int loc_idx = pSession->GetSessionDbLocaleIndex(); @@ -538,7 +538,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest ) if (ql->EndText.size() > loc_idx && !ql->EndText[loc_idx].empty()) EndText=ql->EndText[loc_idx]; - for (int i=0;iObjectiveText[i].size() > loc_idx && !ql->ObjectiveText[i][loc_idx].empty()) ObjectiveText[i]=ql->ObjectiveText[i][loc_idx]; } @@ -583,19 +583,19 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest ) if (pQuest->HasFlag(QUEST_FLAGS_HIDDEN_REWARDS)) { - for (iI = 0; iI < QUEST_REWARDS_COUNT; iI++) + for (iI = 0; iI < QUEST_REWARDS_COUNT; ++iI) data << uint32(0) << uint32(0); - for (iI = 0; iI < QUEST_REWARD_CHOICES_COUNT; iI++) + for (iI = 0; iI < QUEST_REWARD_CHOICES_COUNT; ++iI) data << uint32(0) << uint32(0); } else { - for (iI = 0; iI < QUEST_REWARDS_COUNT; iI++) + for (iI = 0; iI < QUEST_REWARDS_COUNT; ++iI) { data << uint32(pQuest->RewItemId[iI]); data << uint32(pQuest->RewItemCount[iI]); } - for (iI = 0; iI < QUEST_REWARD_CHOICES_COUNT; iI++) + for (iI = 0; iI < QUEST_REWARD_CHOICES_COUNT; ++iI) { data << uint32(pQuest->RewChoiceItemId[iI]); data << uint32(pQuest->RewChoiceItemCount[iI]); @@ -612,7 +612,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest ) data << Details; data << EndText; - for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; iI++) + for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI) { if (pQuest->ReqCreatureOrGOId[iI] < 0) { @@ -636,7 +636,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest ) data << uint32(0); // TODO: 5 item objective data << uint32(0); - for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; iI++) + for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI) data << ObjectiveText[iI]; pSession->SendPacket( &data ); @@ -672,7 +672,7 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, data << uint32(0); // unk uint32 EmoteCount = 0; - for (uint32 i = 0; i < QUEST_EMOTE_COUNT; i++) + for (uint32 i = 0; i < QUEST_EMOTE_COUNT; ++i) { if(pQuest->OfferRewardEmote[i] <= 0) break; @@ -680,7 +680,7 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, } data << EmoteCount; // Emote Count - for (uint32 i = 0; i < EmoteCount; i++) + for (uint32 i = 0; i < EmoteCount; ++i) { data << uint32(0); // Delay Emote data << pQuest->OfferRewardEmote[i]; @@ -689,7 +689,7 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, ItemPrototype const *pItem; data << uint32(pQuest->GetRewChoiceItemsCount()); - for (uint32 i=0; i < pQuest->GetRewChoiceItemsCount(); i++) + for (uint32 i=0; i < pQuest->GetRewChoiceItemsCount(); ++i) { pItem = objmgr.GetItemPrototype( pQuest->RewChoiceItemId[i] ); @@ -703,7 +703,7 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, } data << uint32(pQuest->GetRewItemsCount()); - for (uint16 i=0; i < pQuest->GetRewItemsCount(); i++) + for (uint16 i=0; i < pQuest->GetRewItemsCount(); ++i) { pItem = objmgr.GetItemPrototype(pQuest->RewItemId[i]); data << uint32(pQuest->RewItemId[i]); @@ -782,7 +782,7 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID data << uint32( pQuest->GetReqItemsCount() ); ItemPrototype const *pItem; - for (int i = 0; i < QUEST_OBJECTIVES_COUNT; i++) + for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) { if ( !pQuest->ReqItemId[i] ) continue; pItem = objmgr.GetItemPrototype(pQuest->ReqItemId[i]); diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 34829b7794c..601440c0466 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -46,7 +46,7 @@ Group::Group() m_lootThreshold = ITEM_QUALITY_UNCOMMON; m_subGroupsCounts = NULL; - for(int i=0; isecond.save->RemoveGroup(this); @@ -156,7 +156,7 @@ bool Group::LoadGroupFromDB(const uint64 &leaderGuid, QueryResult *result, bool m_looterGuid = MAKE_NEW_GUID((*result)[3].GetUInt32(), 0, HIGHGUID_PLAYER); m_lootThreshold = (ItemQualities)(*result)[4].GetUInt16(); - for(int i=0; iguid); if(player) { - for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++) + for(uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i) { for(BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end();) { diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index b35bdf300bf..fdc39d5d851 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -562,7 +562,7 @@ void Guild::BroadcastToOfficers(WorldSession *session, const std::string& msg, u { if (session && session->GetPlayer() && HasRankRight(session->GetPlayer()->GetRank(),GR_RIGHT_OFFCHATSPEAK)) { - for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) + for(MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr) { WorldPacket data; ChatHandler::FillMessageData(&data, session, CHAT_MSG_OFFICER, language, NULL, 0, msg.c_str(),NULL); @@ -577,7 +577,7 @@ void Guild::BroadcastToOfficers(WorldSession *session, const std::string& msg, u void Guild::BroadcastPacket(WorldPacket *packet) { - for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) + for(MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr) { Player *player = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER)); if(player) @@ -587,7 +587,7 @@ void Guild::BroadcastPacket(WorldPacket *packet) void Guild::BroadcastPacketToRank(WorldPacket *packet, uint32 rankId) { - for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) + for(MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr) { if (itr->second.RankId == rankId) { @@ -674,7 +674,7 @@ void Guild::SetRankRights(uint32 rankId, uint32 rights) int32 Guild::GetRank(uint32 LowGuid) { - MemberList::iterator itr = members.find(LowGuid); + MemberList::const_iterator itr = members.find(LowGuid); if (itr==members.end()) return -1; @@ -689,7 +689,7 @@ void Guild::Disband() while (!members.empty()) { - MemberList::iterator itr = members.begin(); + MemberList::const_iterator itr = members.begin(); DelMember(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER), true); } diff --git a/src/game/Item.cpp b/src/game/Item.cpp index 26f49097b65..c44bca06246 100644 --- a/src/game/Item.cpp +++ b/src/game/Item.cpp @@ -301,7 +301,7 @@ void Item::SaveToDB() CharacterDatabase.PExecute( "DELETE FROM item_instance WHERE guid = '%u'", guid ); std::ostringstream ss; ss << "INSERT INTO item_instance (guid,owner_guid,data) VALUES (" << guid << "," << GUID_LOPART(GetOwnerGUID()) << ",'"; - for(uint16 i = 0; i < m_valuesCount; i++ ) + for(uint16 i = 0; i < m_valuesCount; ++i ) ss << GetUInt32Value(i) << " "; ss << "' )"; CharacterDatabase.Execute( ss.str().c_str() ); @@ -310,7 +310,7 @@ void Item::SaveToDB() { std::ostringstream ss; ss << "UPDATE item_instance SET data = '"; - for(uint16 i = 0; i < m_valuesCount; i++ ) + for(uint16 i = 0; i < m_valuesCount; ++i ) ss << GetUInt32Value(i) << " "; ss << "', owner_guid = '" << GUID_LOPART(GetOwnerGUID()) << "' WHERE guid = '" << guid << "'"; @@ -411,7 +411,7 @@ bool Item::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result) { std::ostringstream ss; ss << "UPDATE item_instance SET data = '"; - for(uint16 i = 0; i < m_valuesCount; i++ ) + for(uint16 i = 0; i < m_valuesCount; ++i ) ss << GetUInt32Value(i) << " "; ss << "', owner_guid = '" << GUID_LOPART(GetOwnerGUID()) << "' WHERE guid = '" << guid << "'"; diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/game/ItemEnchantmentMgr.cpp index e4b2d809582..b40a398a782 100644 --- a/src/game/ItemEnchantmentMgr.cpp +++ b/src/game/ItemEnchantmentMgr.cpp @@ -50,7 +50,7 @@ void LoadRandomEnchantmentsTable() { RandomItemEnch.clear(); // for reload case - EnchantmentStore::iterator tab; + EnchantmentStore::const_iterator tab; uint32 entry, ench; float chance; uint32 count = 0; @@ -92,7 +92,7 @@ uint32 GetItemEnchantMod(uint32 entry) { if (!entry) return 0; - EnchantmentStore::iterator tab = RandomItemEnch.find(entry); + EnchantmentStore::const_iterator tab = RandomItemEnch.find(entry); if (tab == RandomItemEnch.end()) { @@ -103,7 +103,7 @@ uint32 GetItemEnchantMod(uint32 entry) double dRoll = rand_chance(); float fCount = 0; - for(EnchStoreList::iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter) + for(EnchStoreList::const_iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter) { fCount += ench_iter->chance; @@ -114,7 +114,7 @@ uint32 GetItemEnchantMod(uint32 entry) dRoll = (irand(0, (int)floor(fCount * 100) + 1)) / 100; fCount = 0; - for(EnchStoreList::iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter) + for(EnchStoreList::const_iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter) { fCount += ench_iter->chance; diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index 86ac187326d..51fd0c523d2 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -157,7 +157,7 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/) bool first = true; HashMapHolder::MapType &m = HashMapHolder::GetContainer(); - HashMapHolder::MapType::iterator itr = m.begin(); + HashMapHolder::MapType::const_iterator itr = m.begin(); for(; itr != m.end(); ++itr) { if (itr->second->GetSession()->GetSecurity() && diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index e94f752c41f..136156d44dd 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -1965,7 +1965,7 @@ bool ChatHandler::HandleNpcNameCommand(const char* /*args*/) return true; } - for (uint8 i = 0; i < strlen(args); i++) + for (uint8 i = 0; i < strlen(args); ++i) { if(!isalpha(args[i]) && args[i]!=' ') { diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index ca1ef59ec6c..11a148c6966 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -2295,7 +2295,7 @@ bool ChatHandler::HandleLearnAllMySpellsCommand(const char* /*args*/) return true; uint32 family = clsEntry->spellfamily; - for (uint32 i = 0; i < sSpellStore.GetNumRows(); i++) + for (uint32 i = 0; i < sSpellStore.GetNumRows(); ++i) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(i); if(!spellInfo) @@ -2334,7 +2334,7 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/) Player* player = m_session->GetPlayer(); uint32 classMask = player->getClassMask(); - for (uint32 i = 0; i < sTalentStore.GetNumRows(); i++) + for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i) { TalentEntry const *talentInfo = sTalentStore.LookupEntry(i); if(!talentInfo) @@ -2409,7 +2409,7 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) return false; } - for (uint32 i = 0; i < sTalentStore.GetNumRows(); i++) + for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i) { TalentEntry const *talentInfo = sTalentStore.LookupEntry(i); if(!talentInfo) @@ -4082,7 +4082,7 @@ bool ChatHandler::HandleAuraCommand(const char* args) uint8 eff_mask=0; if(spellInfo) { - for(uint32 i = 0;i<3;i++) + for(uint32 i = 0;i<3;++i) { uint8 eff = spellInfo->Effect[i]; if (eff>=TOTAL_SPELL_EFFECTS) @@ -4452,7 +4452,7 @@ bool ChatHandler::HandleExploreCheatCommand(const char* args) ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_NOTHING,GetNameLink().c_str()); } - for (uint8 i=0; i<128; i++) + for (uint8 i=0; i<128; ++i) { if (flag != 0) { @@ -5117,7 +5117,7 @@ bool ChatHandler::HandleListAurasCommand (const char * /*args*/) IS_PLAYER_GUID(itr->second->GetCasterGUID()) ? "player" : "creature",GUID_LOPART(itr->second->GetCasterGUID())); } } - for (int i = 0; i < TOTAL_AURAS; i++) + for (int i = 0; i < TOTAL_AURAS; ++i) { Unit::AuraEffectList const& uAuraList = unit->GetAurasByType(AuraType(i)); if (uAuraList.empty()) continue; @@ -5809,7 +5809,7 @@ bool ChatHandler::HandleQuestComplete(const char* args) } // All creature/GO slain/casted (not required, but otherwise it will display "Creature slain 0/10") - for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) + for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) { uint32 creature = pQuest->ReqCreatureOrGOId[i]; uint32 creaturecount = pQuest->ReqCreatureOrGOCount[i]; @@ -6926,10 +6926,10 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/) Player* player = getSelectedPlayer(); if (!player) player = m_session->GetPlayer(); uint32 counter = 0; - for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++) + for(uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i) { Player::BoundInstancesMap &binds = player->GetBoundInstances(i); - for(Player::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end(); ++itr) + for(Player::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr) { InstanceSave *save = itr->second.save; std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL)); @@ -6942,10 +6942,10 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/) Group *group = player->GetGroup(); if(group) { - for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++) + for(uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i) { Group::BoundInstancesMap &binds = group->GetBoundInstances(i); - for(Group::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end(); ++itr) + for(Group::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr) { InstanceSave *save = itr->second.save; std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL)); @@ -6970,7 +6970,7 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char* args) Player* player = getSelectedPlayer(); if (!player) player = m_session->GetPlayer(); uint32 counter = 0; - for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++) + for(uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i) { Player::BoundInstancesMap &binds = player->GetBoundInstances(i); for(Player::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end();) diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp index 803fbdec5bd..0254da76cec 100644 --- a/src/game/LootHandler.cpp +++ b/src/game/LootHandler.cpp @@ -229,7 +229,7 @@ void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ ) uint32 money_per_player = uint32((pLoot->gold)/(playersNear.size())); - for (std::vector::iterator i = playersNear.begin(); i != playersNear.end(); ++i) + for (std::vector::const_iterator i = playersNear.begin(); i != playersNear.end(); ++i) { (*i)->ModifyMoney( money_per_player ); (*i)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_MONEY, money_per_player); diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index a3dd4167be2..ab086756616 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -92,7 +92,7 @@ void LootStore::Verify() const // All checks of the loaded template are called from here, no error reports at loot generation required void LootStore::LoadLootTable() { - LootTemplateMap::iterator tab; + LootTemplateMap::const_iterator tab; uint32 count = 0; // Clearing store (for reloading case) @@ -151,7 +151,7 @@ void LootStore::LoadLootTable() tab = m_LootTemplates.find(entry); if ( tab == m_LootTemplates.end() ) { - std::pair< LootTemplateMap::iterator, bool > pr = m_LootTemplates.insert(LootTemplateMap::value_type(entry, new LootTemplate)); + std::pair< LootTemplateMap::const_iterator, bool > pr = m_LootTemplates.insert(LootTemplateMap::value_type(entry, new LootTemplate)); tab = pr.first; } } @@ -425,7 +425,7 @@ void Loot::FillNotNormalLootFor(Player* pl) { uint32 plguid = pl->GetGUIDLow(); - QuestItemMap::iterator qmapitr = PlayerQuestItems.find(plguid); + QuestItemMap::const_iterator qmapitr = PlayerQuestItems.find(plguid); if (qmapitr == PlayerQuestItems.end()) FillQuestLoot(pl); @@ -442,7 +442,7 @@ QuestItemList* Loot::FillFFALoot(Player* player) { QuestItemList *ql = new QuestItemList(); - for(uint8 i = 0; i < items.size(); i++) + for(uint8 i = 0; i < items.size(); ++i) { LootItem &item = items[i]; if(!item.is_looted && item.freeforall && item.AllowedForPlayer(player) ) @@ -466,7 +466,7 @@ QuestItemList* Loot::FillQuestLoot(Player* player) if (items.size() == MAX_NR_LOOT_ITEMS) return NULL; QuestItemList *ql = new QuestItemList(); - for(uint8 i = 0; i < quest_items.size(); i++) + for(uint8 i = 0; i < quest_items.size(); ++i) { LootItem &item = quest_items[i]; if(!item.is_looted && item.AllowedForPlayer(player) ) @@ -570,7 +570,7 @@ void Loot::NotifyQuestItemRemoved(uint8 questIndex) ++i_next; if(Player* pl = ObjectAccessor::FindPlayer(*i)) { - QuestItemMap::iterator pq = PlayerQuestItems.find(pl->GetGUIDLow()); + QuestItemMap::const_iterator pq = PlayerQuestItems.find(pl->GetGUIDLow()); if (pq != PlayerQuestItems.end() && pq->second) { // find where/if the player has the given item in it's vector @@ -629,7 +629,7 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite QuestItemMap::const_iterator itr = PlayerFFAItems.find(player->GetGUIDLow()); if (itr != PlayerFFAItems.end()) { - for(QuestItemList::iterator iter=itr->second->begin(); iter!= itr->second->end(); ++iter) + for(QuestItemList::const_iterator iter=itr->second->begin(); iter!= itr->second->end(); ++iter) if(iter->index==lootSlot) { QuestItem *ffaitem2 = (QuestItem*)&(*iter); @@ -645,7 +645,7 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite QuestItemMap::const_iterator itr = PlayerNonQuestNonFFAConditionalItems.find(player->GetGUIDLow()); if (itr != PlayerNonQuestNonFFAConditionalItems.end()) { - for(QuestItemList::iterator iter=itr->second->begin(); iter!= itr->second->end(); ++iter) + for(QuestItemList::const_iterator iter=itr->second->begin(); iter!= itr->second->end(); ++iter) { if(iter->index==lootSlot) { @@ -745,7 +745,7 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv) if (q_itr != lootPlayerQuestItems.end()) { QuestItemList *q_list = q_itr->second; - for (QuestItemList::iterator qi = q_list->begin() ; qi != q_list->end(); ++qi) + for (QuestItemList::const_iterator qi = q_list->begin() ; qi != q_list->end(); ++qi) { LootItem &item = l.quest_items[qi->index]; if (!qi->is_looted && !item.is_looted) @@ -763,7 +763,7 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv) if (ffa_itr != lootPlayerFFAItems.end()) { QuestItemList *ffa_list = ffa_itr->second; - for (QuestItemList::iterator fi = ffa_list->begin() ; fi != ffa_list->end(); ++fi) + for (QuestItemList::const_iterator fi = ffa_list->begin() ; fi != ffa_list->end(); ++fi) { LootItem &item = l.items[fi->index]; if (!fi->is_looted && !item.is_looted) @@ -780,7 +780,7 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv) if (nn_itr != lootPlayerNonQuestNonFFAConditionalItems.end()) { QuestItemList *conditional_list = nn_itr->second; - for (QuestItemList::iterator ci = conditional_list->begin() ; ci != conditional_list->end(); ++ci) + for (QuestItemList::const_iterator ci = conditional_list->begin() ; ci != conditional_list->end(); ++ci) { LootItem &item = l.items[ci->index]; if (!ci->is_looted && !item.is_looted) diff --git a/src/game/LootMgr.h b/src/game/LootMgr.h index 79d292cf8d4..c5845e8131c 100644 --- a/src/game/LootMgr.h +++ b/src/game/LootMgr.h @@ -239,15 +239,15 @@ struct Loot // void clear(); void clear() { - for (QuestItemMap::iterator itr = PlayerQuestItems.begin(); itr != PlayerQuestItems.end(); ++itr) + for (QuestItemMap::const_iterator itr = PlayerQuestItems.begin(); itr != PlayerQuestItems.end(); ++itr) delete itr->second; PlayerQuestItems.clear(); - for (QuestItemMap::iterator itr = PlayerFFAItems.begin(); itr != PlayerFFAItems.end(); ++itr) + for (QuestItemMap::const_iterator itr = PlayerFFAItems.begin(); itr != PlayerFFAItems.end(); ++itr) delete itr->second; PlayerFFAItems.clear(); - for (QuestItemMap::iterator itr = PlayerNonQuestNonFFAConditionalItems.begin(); itr != PlayerNonQuestNonFFAConditionalItems.end(); ++itr) + for (QuestItemMap::const_iterator itr = PlayerNonQuestNonFFAConditionalItems.begin(); itr != PlayerNonQuestNonFFAConditionalItems.end(); ++itr) delete itr->second; PlayerNonQuestNonFFAConditionalItems.clear(); diff --git a/src/game/Mail.h b/src/game/Mail.h index acf0d9346fe..6bac6d60735 100644 --- a/src/game/Mail.h +++ b/src/game/Mail.h @@ -196,11 +196,11 @@ struct Mail } } - bool RemoveItem(uint32 itemId) + bool RemoveItem(uint32 item_guid) { for(std::vector::iterator itr = items.begin(); itr != items.end(); ++itr) { - if(itr->item_guid == itemId) + if(itr->item_guid == item_guid) { items.erase(itr); return true; diff --git a/src/game/Map.cpp b/src/game/Map.cpp index adefb0770ae..20590eb071b 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -2002,7 +2002,7 @@ void Map::SendInitTransports( Player * player ) bool hasTransport = false; - for (MapManager::TransportSet::iterator i = tset.begin(); i != tset.end(); ++i) + for (MapManager::TransportSet::const_iterator i = tset.begin(); i != tset.end(); ++i) { // send data for current transport in other place if((*i) != player->GetTransport() && (*i)->GetMapId()==i_id) @@ -2031,7 +2031,7 @@ void Map::SendRemoveTransports( Player * player ) MapManager::TransportSet& tset = tmap[player->GetMapId()]; // except used transport - for (MapManager::TransportSet::iterator i = tset.begin(); i != tset.end(); ++i) + for (MapManager::TransportSet::const_iterator i = tset.begin(); i != tset.end(); ++i) if((*i) != player->GetTransport() && (*i)->GetMapId()!=i_id) (*i)->BuildOutOfRangeUpdateBlock(&transData); diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index aca89640d6d..21342753909 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -179,7 +179,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data ) // recheck CHECK_PACKET_SIZE(recv_data,4+4+(player_name.size()+1)+(guild_name.size()+1)+4+4+4+(4*zones_count)+4); - for(uint32 i = 0; i < zones_count; i++) + for(uint32 i = 0; i < zones_count; ++i) { uint32 temp; recv_data >> temp; // zone id, 0 if zone is unknown... @@ -198,7 +198,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data ) sLog.outDebug("Minlvl %u, maxlvl %u, name %s, guild %s, racemask %u, classmask %u, zones %u, strings %u", level_min, level_max, player_name.c_str(), guild_name.c_str(), racemask, classmask, zones_count, str_count); std::wstring str[4]; // 4 is client limit - for(uint32 i = 0; i < str_count; i++) + for(uint32 i = 0; i < str_count; ++i) { // recheck (have one more byte) CHECK_PACKET_SIZE(recv_data,recv_data.rpos()); @@ -237,7 +237,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data ) //TODO: Guard Player map HashMapHolder::MapType& m = ObjectAccessor::Instance().GetPlayers(); - for(HashMapHolder::MapType::iterator itr = m.begin(); itr != m.end(); ++itr) + for(HashMapHolder::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { if (security == SEC_PLAYER) { @@ -272,7 +272,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data ) uint32 pzoneid = itr->second->GetZoneId(); bool z_show = true; - for(uint32 i = 0; i < zones_count; i++) + for(uint32 i = 0; i < zones_count; ++i) { if(zoneids[i] == pzoneid) { @@ -308,7 +308,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data ) aname = areaEntry->area_name[GetSessionDbcLocale()]; bool s_show = true; - for(uint32 i = 0; i < str_count; i++) + for(uint32 i = 0; i < str_count; ++i) { if (!str[i].empty()) { diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index cbf345aead2..2ef75c24be7 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -251,7 +251,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data ) if (plMover && !plMover->m_transport) { // elevators also cause the client to send MOVEMENTFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list - for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter) + for (MapManager::TransportSet::const_iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter) { if ((*iter)->GetGUID() == movementInfo.t_guid) { diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 0c254bc9eb7..070de6e5899 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -63,7 +63,7 @@ Pet::~Pet() if(GetOwnerGUID()) sLog.outCrash("Pet %u is deconstructed but it still has owner guid", GetEntry()); - for (PetSpellMap::iterator i = m_spells.begin(); i != m_spells.end(); ++i) + for (PetSpellMap::const_iterator i = m_spells.begin(); i != m_spells.end(); ++i) delete i->second; } @@ -449,14 +449,14 @@ void Pet::SavePetToDB(PetSaveMode mode) << curmana << ", " << GetPower(POWER_HAPPINESS) << ", '"; - for(uint32 i = 0; i < 10; i++) + for(uint32 i = 0; i < 10; ++i) ss << uint32(m_charmInfo->GetActionBarEntry(i)->Type) << " " << uint32(m_charmInfo->GetActionBarEntry(i)->SpellOrAction) << " "; ss << "', '"; //save spells the pet can teach to it's Master { int i = 0; - for(TeachSpellMap::iterator itr = m_teachspells.begin(); i < 4 && itr != m_teachspells.end(); ++i, ++itr) + for(TeachSpellMap::const_iterator itr = m_teachspells.begin(); i < 4 && itr != m_teachspells.end(); ++i, ++itr) ss << itr->first << " " << itr->second << " "; for(; i < 4; ++i) ss << uint32(0) << " " << uint32(0) << " "; @@ -642,7 +642,7 @@ bool Pet::CanTakeMoreActiveSpells(uint32 spellid) chainstartstore[0] = spellmgr.GetFirstSpellInChain(spellid); - for (PetSpellMap::iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr) + for (PetSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr) { if(IsPassiveSpell(itr->first)) continue; @@ -1275,7 +1275,7 @@ bool Pet::addSpell(uint32 spell_id, uint16 active, PetSpellState state, PetSpell } else if(uint32 chainstart = spellmgr.GetFirstSpellInChain(spell_id)) { - for (PetSpellMap::iterator itr2 = m_spells.begin(); itr2 != m_spells.end(); ++itr2) + for (PetSpellMap::const_iterator itr2 = m_spells.begin(); itr2 != m_spells.end(); ++itr2) { if(itr2->second->state == PETSPELL_REMOVED) continue; @@ -1409,7 +1409,7 @@ void Pet::InitPetCreateSpells() { m_charmInfo->InitPetActionBar(); - for (PetSpellMap::iterator i = m_spells.begin(); i != m_spells.end(); ++i) + for (PetSpellMap::const_iterator i = m_spells.begin(); i != m_spells.end(); ++i) delete i->second; m_spells.clear(); @@ -1417,7 +1417,7 @@ void Pet::InitPetCreateSpells() PetCreateSpellEntry const* CreateSpells = objmgr.GetPetCreateSpellEntry(GetEntry()); if(CreateSpells) { - for(uint8 i = 0; i < 4; i++) + for(uint8 i = 0; i < 4; ++i) { if(!CreateSpells->spellid[i]) break; @@ -1510,7 +1510,7 @@ bool Pet::resetTalents(bool no_cost) } } - for (unsigned int i = 0; i < sTalentStore.GetNumRows(); i++) + for (unsigned int i = 0; i < sTalentStore.GetNumRows(); ++i) { TalentEntry const *talentInfo = sTalentStore.LookupEntry(i); @@ -1527,7 +1527,7 @@ bool Pet::resetTalents(bool no_cost) for (int j = 0; j < MAX_TALENT_RANK; j++) { - for(PetSpellMap::iterator itr = m_spells.begin(); itr != m_spells.end();) + for(PetSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end();) { if(itr->second->state == PETSPELL_REMOVED) { @@ -1617,7 +1617,7 @@ void Pet::ToggleAutocast(uint32 spellid, bool apply) if(apply) { - for (i = 0; i < m_autospells.size() && m_autospells[i] != spellid; i++) + for (i = 0; i < m_autospells.size() && m_autospells[i] != spellid; ++i) ; // just search if (i == m_autospells.size()) @@ -1630,7 +1630,7 @@ void Pet::ToggleAutocast(uint32 spellid, bool apply) else { AutoSpellList::iterator itr2 = m_autospells.begin(); - for (i = 0; i < m_autospells.size() && m_autospells[i] != spellid; i++, itr2++) + for (i = 0; i < m_autospells.size() && m_autospells[i] != spellid; ++i, itr2++) ; // just search if (i < m_autospells.size()) @@ -1698,7 +1698,7 @@ void Pet::CastPetAuras(bool current) if(getPetType() != HUNTER_PET && (getPetType() != SUMMON_PET || owner->getClass() != CLASS_WARLOCK)) return; - for(PetAuraSet::iterator itr = owner->m_petAuras.begin(); itr != owner->m_petAuras.end();) + for(PetAuraSet::const_iterator itr = owner->m_petAuras.begin(); itr != owner->m_petAuras.end();) { PetAura const* pa = *itr; ++itr; diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp index 88327978de9..ae4441d7c6d 100644 --- a/src/game/PetAI.cpp +++ b/src/game/PetAI.cpp @@ -131,7 +131,7 @@ void PetAI::UpdateAI(const uint32 diff) bool inCombat = me->getVictim(); //Autocast - for (uint8 i = 0; i < m_creature->GetPetAutoSpellSize(); i++) + for (uint8 i = 0; i < m_creature->GetPetAutoSpellSize(); ++i) { uint32 spellID = m_creature->GetPetAutoSpellOnPos(i); if (!spellID) @@ -163,7 +163,7 @@ void PetAI::UpdateAI(const uint32 diff) else { bool spellUsed = false; - for(std::set::iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar) + for(std::set::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar) { Unit* Target = ObjectAccessor::GetUnit(*m_creature,*tar); diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 37f0255f6b3..52af6b5a15e 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -207,7 +207,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid return; } - for(uint32 i = 0; i < 3;i++) + for(uint32 i = 0; i < 3;++i) { if(spellInfo->EffectImplicitTargetA[i] == TARGET_ALL_ENEMY_IN_AREA || spellInfo->EffectImplicitTargetA[i] == TARGET_ALL_ENEMY_IN_AREA_INSTANT || spellInfo->EffectImplicitTargetA[i] == TARGET_ALL_ENEMY_IN_AREA_CHANNELED) return; @@ -376,7 +376,7 @@ void WorldSession::HandlePetSetAction( WorldPacket & recv_data ) } count = (recv_data.size() == 24) ? 2 : 1; - for(uint8 i = 0; i < count; i++) + for(uint8 i = 0; i < count; ++i) { recv_data >> position; recv_data >> spell_id; diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp index 316de998a80..19457caa048 100644 --- a/src/game/PetitionsHandler.cpp +++ b/src/game/PetitionsHandler.cpp @@ -279,7 +279,7 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket & recv_data) data << petitionguid_low; // guild guid (in Trinity always same as GUID_LOPART(petitionguid) data << signs; // sign's count - for(uint8 i = 1; i <= signs; i++) + for(uint8 i = 1; i <= signs; ++i) { Field *fields2 = result->Fetch(); uint64 plguid = fields2[0].GetUInt64(); @@ -690,7 +690,7 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recv_data) data << GUID_LOPART(petitionguid); // guild guid (in Trinity always same as GUID_LOPART(petition guid) data << signs; // sign's count - for(uint8 i = 1; i <= signs; i++) + for(uint8 i = 1; i <= signs; ++i) { Field *fields2 = result->Fetch(); plguid = fields2[0].GetUInt64(); @@ -959,7 +959,7 @@ void WorldSession::SendPetitionShowList(uint64 guid) data << uint32(5); // unknown data << uint32(5); // required signs? } - //for(uint8 i = 0; i < count; i++) + //for(uint8 i = 0; i < count; ++i) //{ // data << uint32(i); // index // data << uint32(GUILD_CHARTER); // charter entry diff --git a/src/game/Player.h b/src/game/Player.h index 01241e6f9e8..895656541d4 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1754,7 +1754,7 @@ class TRINITY_DLL_SPEC Player : public Unit bool InBattleGroundQueue() const { - for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) if (m_bgBattleGroundQueueID[i].bgQueueTypeId != BATTLEGROUND_QUEUE_NONE) return true; return false; @@ -1763,14 +1763,14 @@ class TRINITY_DLL_SPEC Player : public Unit BattleGroundQueueTypeId GetBattleGroundQueueTypeId(uint32 index) const { return m_bgBattleGroundQueueID[index].bgQueueTypeId; } uint32 GetBattleGroundQueueIndex(BattleGroundQueueTypeId bgQueueTypeId) const { - for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) if (m_bgBattleGroundQueueID[i].bgQueueTypeId == bgQueueTypeId) return i; return PLAYER_MAX_BATTLEGROUND_QUEUES; } bool IsInvitedForBattleGroundQueueType(BattleGroundQueueTypeId bgQueueTypeId) const { - for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) if (m_bgBattleGroundQueueID[i].bgQueueTypeId == bgQueueTypeId) return m_bgBattleGroundQueueID[i].invitedToInstance != 0; return false; @@ -1787,7 +1787,7 @@ class TRINITY_DLL_SPEC Player : public Unit } uint32 AddBattleGroundQueueId(BattleGroundQueueTypeId val) { - for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) { if (m_bgBattleGroundQueueID[i].bgQueueTypeId == BATTLEGROUND_QUEUE_NONE || m_bgBattleGroundQueueID[i].bgQueueTypeId == val) { @@ -1800,14 +1800,14 @@ class TRINITY_DLL_SPEC Player : public Unit } bool HasFreeBattleGroundQueueId() { - for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) if (m_bgBattleGroundQueueID[i].bgQueueTypeId == BATTLEGROUND_QUEUE_NONE) return true; return false; } void RemoveBattleGroundQueueId(BattleGroundQueueTypeId val) { - for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) { if (m_bgBattleGroundQueueID[i].bgQueueTypeId == val) { @@ -1819,13 +1819,13 @@ class TRINITY_DLL_SPEC Player : public Unit } void SetInviteForBattleGroundQueueType(BattleGroundQueueTypeId bgQueueTypeId, uint32 instanceId) { - for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) if (m_bgBattleGroundQueueID[i].bgQueueTypeId == bgQueueTypeId) m_bgBattleGroundQueueID[i].invitedToInstance = instanceId; } bool IsInvitedForBattleGroundInstance(uint32 instanceId) const { - for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) if (m_bgBattleGroundQueueID[i].invitedToInstance == instanceId) return true; return false; diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp index 5879741b61d..5218d9c4a54 100644 --- a/src/game/PlayerDump.cpp +++ b/src/game/PlayerDump.cpp @@ -93,7 +93,7 @@ bool findnth(std::string &str, int n, std::string::size_type &s, std::string::si if (e == std::string::npos) return false; } while(str[e-1] == '\\'); - for(int i = 1; i < n; i++) + for(int i = 1; i < n; ++i) { do { @@ -157,7 +157,7 @@ bool changetoknth(std::string &str, int n, const char *with, bool insert = false uint32 registerNewGuid(uint32 oldGuid, std::map &guidMap, uint32 hiGuid) { - std::map::iterator itr = guidMap.find(oldGuid); + std::map::const_iterator itr = guidMap.find(oldGuid); if(itr != guidMap.end()) return itr->second; @@ -198,7 +198,7 @@ std::string CreateDumpString(char const* tableName, QueryResult *result) std::ostringstream ss; ss << "INSERT INTO "<< _TABLE_SIM_ << tableName << _TABLE_SIM_ << " VALUES ("; Field *fields = result->Fetch(); - for(uint32 i = 0; i < result->GetFieldCount(); i++) + for(uint32 i = 0; i < result->GetFieldCount(); ++i) { if (i == 0) ss << "'"; else ss << ", '"; @@ -364,7 +364,7 @@ std::string PlayerDumpWriter::GetDump(uint32 guid) else sLog.outError("Character DB not have 'character_db_version' table, revision guard query not added to pdump."); - for(int i = 0; i < DUMP_TABLE_COUNT; i++) + for(int i = 0; i < DUMP_TABLE_COUNT; ++i) DumpTable(dump, guid, dumpTables[i].name, dumpTables[i].name, dumpTables[i].type); // TODO: Add instance/group.. @@ -498,7 +498,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s DumpTableType type; uint8 i; - for(i = 0; i < DUMP_TABLE_COUNT; i++) + for(i = 0; i < DUMP_TABLE_COUNT; ++i) { if (tn == dumpTables[i].name) { diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp index 2a4e08cf0d9..bdb02913f59 100644 --- a/src/game/QueryHandler.cpp +++ b/src/game/QueryHandler.cpp @@ -354,7 +354,7 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data ) else { std::string Text_0[8], Text_1[8]; - for (int i=0;i<8;i++) + for (int i=0;i<8;++i) { Text_0[i]=pGossip->Options[i].Text_0; Text_1[i]=pGossip->Options[i].Text_1; @@ -366,7 +366,7 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data ) NpcTextLocale const *nl = objmgr.GetNpcTextLocale(textID); if (nl) { - for (int i=0;i<8;i++) + for (int i=0;i<8;++i) { if (nl->Text_0[i].size() > loc_idx && !nl->Text_0[i][loc_idx].empty()) Text_0[i]=nl->Text_0[i][loc_idx]; @@ -376,7 +376,7 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data ) } } - for (int i=0; i<8; i++) + for (int i=0; i<8; ++i) { data << pGossip->Options[i].Probability; diff --git a/src/game/QuestDef.cpp b/src/game/QuestDef.cpp index 799896c8280..8099bf40e88 100644 --- a/src/game/QuestDef.cpp +++ b/src/game/QuestDef.cpp @@ -133,7 +133,7 @@ Quest::Quest(Field * questRecord) m_rewitemscount = 0; m_rewchoiceitemscount = 0; - for (int i=0; i < QUEST_OBJECTIVES_COUNT; i++) + for (int i=0; i < QUEST_OBJECTIVES_COUNT; ++i) { if ( ReqItemId[i] ) ++m_reqitemscount; @@ -141,13 +141,13 @@ Quest::Quest(Field * questRecord) ++m_reqCreatureOrGOcount; } - for (int i=0; i < QUEST_REWARDS_COUNT; i++) + for (int i=0; i < QUEST_REWARDS_COUNT; ++i) { if ( RewItemId[i] ) ++m_rewitemscount; } - for (int i=0; i < QUEST_REWARD_CHOICES_COUNT; i++) + for (int i=0; i < QUEST_REWARD_CHOICES_COUNT; ++i) { if (RewChoiceItemId[i]) ++m_rewchoiceitemscount; diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index b47af0ccd12..7decc561779 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -178,7 +178,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data ) // destroy not required for quest finish quest starting item bool destroyItem = true; - for(int i = 0; i < QUEST_OBJECTIVES_COUNT; i++) + for(int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) { if ((qInfo->ReqItemId[i] == ((Item*)pObject)->GetEntry()) && (((Item*)pObject)->GetProto()->MaxCount > 0)) { @@ -614,7 +614,7 @@ void WorldSession::HandleQuestgiverStatusQueryMultipleOpcode(WorldPacket& /*recv WorldPacket data(SMSG_QUESTGIVER_STATUS_MULTIPLE, 4); data << uint32(count); // placeholder - for(Player::ClientGUIDs::iterator itr = _player->m_clientGUIDs.begin(); itr != _player->m_clientGUIDs.end(); ++itr) + for(Player::ClientGUIDs::const_iterator itr = _player->m_clientGUIDs.begin(); itr != _player->m_clientGUIDs.end(); ++itr) { uint8 questStatus = DIALOG_STATUS_NONE; uint8 defstatus = DIALOG_STATUS_NONE; diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp index 0fbaeb0fbaf..7bd7b2347b1 100644 --- a/src/game/SkillDiscovery.cpp +++ b/src/game/SkillDiscovery.cpp @@ -142,7 +142,7 @@ uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player) { // explicit discovery spell chances (always success if case exist) // in this case we have both skill and spell - SkillDiscoveryMap::iterator tab = SkillDiscoveryStore.find(spellId); + SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId); if(tab == SkillDiscoveryStore.end()) return 0; @@ -151,7 +151,7 @@ uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player) uint32 skillvalue = lower != upper ? player->GetSkillValue(lower->second->skillId) : 0; float full_chance = 0; - for(SkillDiscoveryList::iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) + for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) if(item_iter->reqSkillValue <= skillvalue) if(!player->HasSpell(item_iter->spellId)) full_chance += item_iter->chance; @@ -159,7 +159,7 @@ uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player) float rate = full_chance / 100.0f; float roll = rand_chance() * rate; // roll now in range 0..full_chance - for(SkillDiscoveryList::iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) + for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) { if(item_iter->reqSkillValue > skillvalue) continue; @@ -181,11 +181,11 @@ uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player) uint32 skillvalue = skillId ? player->GetSkillValue(skillId) : 0; // check spell case - SkillDiscoveryMap::iterator tab = SkillDiscoveryStore.find(spellId); + SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId); if(tab != SkillDiscoveryStore.end()) { - for(SkillDiscoveryList::iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) + for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) { if( roll_chance_f(item_iter->chance * sWorld.getRate(RATE_SKILL_DISCOVERY)) && item_iter->reqSkillValue <= skillvalue @@ -203,7 +203,7 @@ uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player) tab = SkillDiscoveryStore.find(-(int32)skillId); if(tab != SkillDiscoveryStore.end()) { - for(SkillDiscoveryList::iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) + for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) { if( roll_chance_f(item_iter->chance * sWorld.getRate(RATE_SKILL_DISCOVERY)) && item_iter->reqSkillValue <= skillvalue diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index 2786618fbf8..119b968a45a 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -43,10 +43,10 @@ PlayerSocial::~PlayerSocial() uint32 PlayerSocial::GetNumberOfSocialsWithFlag(SocialFlag flag) { uint32 counter = 0; - for(PlayerSocialMap::iterator itr = m_playerSocialMap.begin(); itr != m_playerSocialMap.end(); ++itr) + for(PlayerSocialMap::const_iterator itr = m_playerSocialMap.begin(); itr != m_playerSocialMap.end(); ++itr) { if(itr->second.Flags & flag) - counter++; + ++counter; } return counter; } @@ -69,7 +69,7 @@ bool PlayerSocial::AddToSocialList(uint32 friend_guid, bool ignore) if(ignore) flag = SOCIAL_FLAG_IGNORED; - PlayerSocialMap::iterator itr = m_playerSocialMap.find(friend_guid); + PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid); if(itr != m_playerSocialMap.end()) { CharacterDatabase.PExecute("UPDATE character_social SET flags = (flags | %u) WHERE guid = '%u' AND friend = '%u'", flag, GetPlayerGUID(), friend_guid); @@ -109,7 +109,7 @@ void PlayerSocial::RemoveFromSocialList(uint32 friend_guid, bool ignore) void PlayerSocial::SetFriendNote(uint32 friend_guid, std::string note) { - PlayerSocialMap::iterator itr = m_playerSocialMap.find(friend_guid); + PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid); if(itr == m_playerSocialMap.end()) // not exist return; @@ -157,7 +157,7 @@ void PlayerSocial::SendSocialList() bool PlayerSocial::HasFriend(uint32 friend_guid) { - PlayerSocialMap::iterator itr = m_playerSocialMap.find(friend_guid); + PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid); if(itr != m_playerSocialMap.end()) return itr->second.Flags & SOCIAL_FLAG_FRIEND; return false; @@ -165,7 +165,7 @@ bool PlayerSocial::HasFriend(uint32 friend_guid) bool PlayerSocial::HasIgnore(uint32 ignore_guid) { - PlayerSocialMap::iterator itr = m_playerSocialMap.find(ignore_guid); + PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(ignore_guid); if(itr != m_playerSocialMap.end()) return itr->second.Flags & SOCIAL_FLAG_IGNORED; return false; @@ -272,7 +272,7 @@ void SocialMgr::BroadcastToFriendListers(Player *player, WorldPacket *packet) bool gmInWhoList = sWorld.getConfig(CONFIG_GM_IN_WHO_LIST); bool allowTwoSideWhoList = sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_WHO_LIST); - for(SocialMap::iterator itr = m_socialMap.begin(); itr != m_socialMap.end(); ++itr) + for(SocialMap::const_iterator itr = m_socialMap.begin(); itr != m_socialMap.end(); ++itr) { PlayerSocialMap::const_iterator itr2 = itr->second.m_playerSocialMap.find(guid); if(itr2 != itr->second.m_playerSocialMap.end() && (itr2->second.Flags & SOCIAL_FLAG_FRIEND)) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index dfb2184094d..da1ddc9c3e7 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -393,7 +393,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId) if ((spellInfo->SpellFamilyFlags[1] & 0x000008 || spellInfo->SpellFamilyFlags[0] & 0x20180400) && (spellInfo->AttributesEx3 & 0x200)) return SPELL_JUDGEMENT; - for (int i = 0; i < 3; i++) + for (int i = 0; i < 3; ++i) { // only paladin auras have this (for palaldin class family) if (spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AREA_AURA_RAID) @@ -745,7 +745,7 @@ bool IsPositiveSpell(uint32 spellId, bool deep) // spells with at least one negative effect are considered negative // some self-applied spells have negative effects but in self casting case negative check ignored. - for (int i = 0; i < 3; i++) + for (int i = 0; i < 3; ++i) if (!IsPositiveEffect(spellId, i, deep)) return false; return true; @@ -819,7 +819,7 @@ bool IsAuraAddedBySpell(uint32 auraType, uint32 spellId) SpellEntry const *spellproto = sSpellStore.LookupEntry(spellId); if (!spellproto) return false; - for (int i = 0; i < 3; i++) + for (int i = 0; i < 3; ++i) if (spellproto->EffectApplyAuraName[i] == auraType) return true; return false; @@ -1350,7 +1350,7 @@ bool SpellMgr::canStackSpellRanks(SpellEntry const *spellInfo) return false; // All stance spells. if any better way, change it. - for (int i = 0; i < 3; i++) + for (int i = 0; i < 3; ++i) { switch(spellInfo->SpellFamilyName) { @@ -1530,7 +1530,7 @@ SpellEntry const* SpellMgr::SelectAuraRankForPlayerLevel(SpellEntry const* spell return spellInfo; bool needRankSelection = false; - for(int i=0;i<3;i++) + for(int i=0;i<3;++i) { if( IsPositiveEffect(spellInfo->Id, i) && ( spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA || @@ -2864,7 +2864,7 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell AreaGroupEntry const* groupEntry = sAreaGroupStore.LookupEntry(spellInfo->AreaGroupId); while (groupEntry) { - for (uint32 i=0; i<6; i++) + for (uint32 i=0; i<6; ++i) if( groupEntry->AreaId[i] == zone_id || groupEntry->AreaId[i] == area_id ) found = true; if (found || !groupEntry->nextGroup) @@ -2964,7 +2964,7 @@ void SpellMgr::LoadSkillLineAbilityMap() barGoLink bar( sSkillLineAbilityStore.GetNumRows() ); uint32 count = 0; - for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); i++) + for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); ++i) { bar.step(); SkillLineAbilityEntry const *SkillInfo = sSkillLineAbilityStore.LookupEntry(i); diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index c24999e8fe5..4cf93760957 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -132,13 +132,13 @@ void Player::UpdateSpellDamageAndHealingBonus() // Get healing bonus for all schools SetStatInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS, SpellBaseHealingBonus(SPELL_SCHOOL_MASK_ALL)); // Get damage bonus for all schools - for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; i++) + for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i) SetStatInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i, SpellBaseDamageBonus(SpellSchoolMask(1 << i))); } bool Player::UpdateAllStats() { - for (int i = STAT_STRENGTH; i < MAX_STATS; i++) + for (int i = STAT_STRENGTH; i < MAX_STATS; ++i) { float value = GetTotalStatValue(Stats(i)); SetStat(Stats(i), (int32)value); @@ -149,7 +149,7 @@ bool Player::UpdateAllStats() UpdateArmor(); UpdateMaxHealth(); - for(int i = POWER_MANA; i < MAX_POWERS; i++) + for(int i = POWER_MANA; i < MAX_POWERS; ++i) UpdateMaxPower(Powers(i)); UpdateAllCritPercentages(); @@ -160,7 +160,7 @@ bool Player::UpdateAllStats() UpdateManaRegen(); UpdateExpertise(BASE_ATTACK); UpdateExpertise(OFF_ATTACK); - for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++) + for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i) UpdateResistances(i); return true; @@ -638,7 +638,7 @@ void Player::UpdateSpellHitChances() void Player::UpdateAllSpellCritChances() { - for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++) + for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i) UpdateSpellCritChance(i); } @@ -925,13 +925,13 @@ bool Pet::UpdateStats(Stats stat) bool Pet::UpdateAllStats() { - for (int i = STAT_STRENGTH; i < MAX_STATS; i++) + for (int i = STAT_STRENGTH; i < MAX_STATS; ++i) UpdateStats(Stats(i)); - for(int i = POWER_MANA; i < MAX_POWERS; i++) + for(int i = POWER_MANA; i < MAX_POWERS; ++i) UpdateMaxPower(Powers(i)); - for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++) + for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i) UpdateResistances(i); return true; diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp index 336f02c4470..ab989ad9598 100644 --- a/src/game/ThreatManager.cpp +++ b/src/game/ThreatManager.cpp @@ -203,7 +203,7 @@ Unit* HostilReference::getSourceUnit() void ThreatContainer::clearReferences() { - for(std::list::iterator i = iThreatList.begin(); i != iThreatList.end(); ++i) + for(std::list::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i) { (*i)->unlink(); delete (*i); @@ -217,7 +217,7 @@ HostilReference* ThreatContainer::getReferenceByTarget(Unit* pVictim) { HostilReference* result = NULL; uint64 guid = pVictim->GetGUID(); - for(std::list::iterator i = iThreatList.begin(); i != iThreatList.end(); ++i) + for(std::list::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i) { if((*i)->getUnitGuid() == guid) { @@ -278,10 +278,10 @@ HostilReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostilRe bool found = false; bool noPriorityTargetFound = false; - std::list::iterator lastRef = iThreatList.end(); + std::list::const_iterator lastRef = iThreatList.end(); lastRef--; - for(std::list::iterator iter = iThreatList.begin(); iter != iThreatList.end() && !found;) + for(std::list::const_iterator iter = iThreatList.begin(); iter != iThreatList.end() && !found;) { currentRef = (*iter); diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp index cc3bcab62d2..439626861fd 100644 --- a/src/game/TradeHandler.cpp +++ b/src/game/TradeHandler.cpp @@ -134,7 +134,7 @@ void WorldSession::SendUpdateTrade() data << (uint32) _player->pTrader->tradeGold; // trader gold data << (uint32) 0; // spell casted on lowest slot item - for(uint8 i = 0; i < TRADE_SLOT_COUNT; i++) + for(uint8 i = 0; i < TRADE_SLOT_COUNT; ++i) { item = (_player->pTrader->tradeItems[i] != NULL_SLOT ? _player->pTrader->GetItemByPos( _player->pTrader->tradeItems[i] ) : NULL); @@ -179,7 +179,7 @@ void WorldSession::SendUpdateTrade() void WorldSession::moveItems(Item* myItems[], Item* hisItems[]) { - for(int i=0; itradeItems[i] != NULL_SLOT ) { @@ -311,7 +311,7 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_ACCEPT); // store items in local list and set 'in-trade' flag - for(int i=0; itradeItems[i] != NULL_SLOT ) { @@ -336,7 +336,7 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) myCanCompleteTrade = (_player->CanStoreItems( hisItems,TRADE_SLOT_TRADED_COUNT ) == EQUIP_ERR_OK); // clear 'in-trade' flag - for(int i=0; iSetInTrade(false); if(hisItems[i]) hisItems[i]->SetInTrade(false); @@ -361,7 +361,7 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) } // execute trade: 1. remove - for(int i=0; i::iterator i = mapsUsed.begin(); i != mapsUsed.end(); ++i) + for (std::set::const_iterator i = mapsUsed.begin(); i != mapsUsed.end(); ++i) m_TransportsByMap[*i].insert(t); //If we someday decide to use the grid to track transports, here: @@ -219,7 +219,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) std::vector keyFrames; int mapChange = 0; mapids.clear(); - for (size_t i = 1; i < path.Size() - 1; i++) + for (size_t i = 1; i < path.Size() - 1; ++i) { if (mapChange == 0) { @@ -251,7 +251,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) } // find the rest of the distances between key points - for (size_t i = 1; i < keyFrames.size(); i++) + for (size_t i = 1; i < keyFrames.size(); ++i) { if ((keyFrames[i].actionflag == 1) || (keyFrames[i].mapid != keyFrames[i-1].mapid)) { @@ -274,7 +274,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) } float tmpDist = 0; - for (size_t i = 0; i < keyFrames.size(); i++) + for (size_t i = 0; i < keyFrames.size(); ++i) { int j = (i + lastStop) % keyFrames.size(); if (keyFrames[j].actionflag == 2) @@ -293,7 +293,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) tmpDist = 0; } - for (size_t i = 0; i < keyFrames.size(); i++) + for (size_t i = 0; i < keyFrames.size(); ++i) { if (keyFrames[i].distSinceStop < (30 * 30 * 0.5f)) keyFrames[i].tFrom = sqrt(2 * keyFrames[i].distSinceStop); @@ -309,7 +309,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) keyFrames[i].tTo *= 1000; } - // for (int i = 0; i < keyFrames.size(); i++) { + // for (int i = 0; i < keyFrames.size(); ++i) { // sLog.outString("%f, %f, %f, %f, %f, %f, %f", keyFrames[i].x, keyFrames[i].y, keyFrames[i].distUntilStop, keyFrames[i].distSinceStop, keyFrames[i].distFromPrev, keyFrames[i].tFrom, keyFrames[i].tTo); // } @@ -325,7 +325,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) t += keyFrames[0].delay * 1000; uint32 cM = keyFrames[0].mapid; - for (size_t i = 0; i < keyFrames.size() - 1; i++) + for (size_t i = 0; i < keyFrames.size() - 1; ++i) { float d = 0; float tFrom = keyFrames[i].tFrom; @@ -428,9 +428,9 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) return true; } -Transport::WayPointMap::iterator Transport::GetNextWayPoint() +Transport::WayPointMap::const_iterator Transport::GetNextWayPoint() { - WayPointMap::iterator iter = m_curr; + WayPointMap::const_iterator iter = m_curr; ++iter; if (iter == m_WayPoints.end()) iter = m_WayPoints.begin(); @@ -443,7 +443,7 @@ void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z) SetMapId(newMapid); Relocate(x, y, z); - for(PlayerSet::iterator itr = m_passengers.begin(); itr != m_passengers.end();) + for(PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end();) { Player *plr = *itr; ++itr; @@ -531,9 +531,9 @@ void Transport::Update(uint32 /*p_time*/) } */ /* - for(PlayerSet::iterator itr = m_passengers.begin(); itr != m_passengers.end();) + for(PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end();) { - PlayerSet::iterator it2 = itr; + PlayerSet::const_iterator it2 = itr; ++itr; //(*it2)->SetPosition( m_curr->second.x + (*it2)->GetTransOffsetX(), m_curr->second.y + (*it2)->GetTransOffsetY(), m_curr->second.z + (*it2)->GetTransOffsetZ(), (*it2)->GetTransOffsetO() ); } diff --git a/src/game/Transports.h b/src/game/Transports.h index 5e0f954c3b7..2df39f401e7 100644 --- a/src/game/Transports.h +++ b/src/game/Transports.h @@ -99,8 +99,8 @@ class Transport : protected GameObject typedef std::map WayPointMap; - WayPointMap::iterator m_curr; - WayPointMap::iterator m_next; + WayPointMap::const_iterator m_curr; + WayPointMap::const_iterator m_next; uint32 m_pathTime; uint32 m_timer; @@ -114,7 +114,7 @@ class Transport : protected GameObject private: void TeleportTransport(uint32 newMapid, float x, float y, float z); void UpdateForMap(Map const* map); - WayPointMap::iterator GetNextWayPoint(); + WayPointMap::const_iterator GetNextWayPoint(); }; #endif diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp index de615c9cc8e..8eb8278d071 100644 --- a/src/game/UpdateData.cpp +++ b/src/game/UpdateData.cpp @@ -116,7 +116,7 @@ bool UpdateData::BuildPacket(WorldPacket *packet, bool hasTransport) buf << (uint32) m_outOfRangeGUIDs.size(); for(std::set::const_iterator i = m_outOfRangeGUIDs.begin(); - i != m_outOfRangeGUIDs.end(); i++) + i != m_outOfRangeGUIDs.end(); ++i) { //buf.appendPackGUID(*i); buf << (uint8)0xFF; diff --git a/src/game/UpdateMask.h b/src/game/UpdateMask.h index 3d510c00d60..66a6947fc37 100644 --- a/src/game/UpdateMask.h +++ b/src/game/UpdateMask.h @@ -85,14 +85,14 @@ class UpdateMask void operator &= ( const UpdateMask& mask ) { ASSERT(mask.mCount <= mCount); - for (uint32 i = 0; i < mBlocks; i++) + for (uint32 i = 0; i < mBlocks; ++i) mUpdateMask[i] &= mask.mUpdateMask[i]; } void operator |= ( const UpdateMask& mask ) { ASSERT(mask.mCount <= mCount); - for (uint32 i = 0; i < mBlocks; i++) + for (uint32 i = 0; i < mBlocks; ++i) mUpdateMask[i] |= mask.mUpdateMask[i]; } diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index 4ca838ebc33..397b4adadab 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -491,7 +491,7 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist) break; } - for (i = 0; i < nodes[atNode].enodenum; i++) //loop through all the links for this node + for (i = 0; i < nodes[atNode].enodenum; ++i) //loop through all the links for this node { newnode = nodes[atNode].links[i].targetNode; @@ -549,7 +549,7 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist) parent[newnode] = atNode; //set the new parent for this node gcost[newnode] = gc; //and the new g cost - for (i = 1; i < numOpen; i++) //loop through all the items on the open list + for (i = 1; i < numOpen; ++i) //loop through all the items on the open list { if (openlist[i] == newnode) //find this node in the list { diff --git a/src/game/World.cpp b/src/game/World.cpp index 71635e83559..9615a378faa 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -127,7 +127,7 @@ World::~World() } ///- Empty the WeatherMap - for (WeatherMap::iterator itr = m_weathers.begin(); itr != m_weathers.end(); ++itr) + for (WeatherMap::const_iterator itr = m_weathers.begin(); itr != m_weathers.end(); ++itr) delete itr->second; m_weathers.clear(); @@ -146,7 +146,7 @@ World::~World() Player* World::FindPlayerInZone(uint32 zone) { ///- circle through active sessions and return the first player found in the zone - SessionMap::iterator itr; + SessionMap::const_iterator itr; for (itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) { if(!itr->second) @@ -178,7 +178,7 @@ WorldSession* World::FindSession(uint32 id) const bool World::RemoveSession(uint32 id) { ///- Find the session, kick the user, but we can't delete session at this moment to prevent iterator invalidation - SessionMap::iterator itr = m_sessions.find(id); + SessionMap::const_iterator itr = m_sessions.find(id); if(itr != m_sessions.end() && itr->second) { @@ -295,7 +295,7 @@ int32 World::GetQueuePos(WorldSession* sess) { uint32 position = 1; - for(Queue::iterator iter = m_QueuedPlayer.begin(); iter != m_QueuedPlayer.end(); ++iter, ++position) + for(Queue::const_iterator iter = m_QueuedPlayer.begin(); iter != m_QueuedPlayer.end(); ++iter, ++position) if((*iter) == sess) return position; @@ -1646,7 +1646,7 @@ void World::Update(uint32 diff) } ///- Update the different timers - for(int i = 0; i < WUPDATE_COUNT; i++) + for(int i = 0; i < WUPDATE_COUNT; ++i) if(m_timers[i].GetCurrent()>=0) m_timers[i].Update(diff); else m_timers[i].SetCurrent(0); @@ -2629,7 +2629,7 @@ void World::ScriptsProcess() /// Send a packet to all players (except self if mentioned) void World::SendGlobalMessage(WorldPacket *packet, WorldSession *self, uint32 team) { - SessionMap::iterator itr; + SessionMap::const_iterator itr; for (itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) { if (itr->second && @@ -2726,7 +2726,7 @@ void World::SendWorldText(int32 string_id, ...) MaNGOS::WorldWorldTextBuilder wt_builder(string_id, &ap); MaNGOS::LocalizedPacketListDo wt_do(wt_builder); - for(SessionMap::iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) + for(SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) { if(!itr->second || !itr->second->GetPlayer() || !itr->second->GetPlayer()->IsInWorld() ) continue; @@ -2780,7 +2780,7 @@ void World::SendGlobalText(const char* text, WorldSession *self) /// Send a packet to all players (or players selected team) in the zone (except self if mentioned) void World::SendZoneMessage(uint32 zone, WorldPacket *packet, WorldSession *self, uint32 team) { - SessionMap::iterator itr; + SessionMap::const_iterator itr; for (itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) { if (itr->second && @@ -2809,7 +2809,7 @@ void World::KickAll() m_QueuedPlayer.clear(); // prevent send queue update packet and login queued sessions // session not removed at kick and will removed in next update tick - for (SessionMap::iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) + for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) itr->second->KickPlayer(); } @@ -2817,7 +2817,7 @@ void World::KickAll() void World::KickAllLess(AccountTypes sec) { // session not removed at kick and will removed in next update tick - for (SessionMap::iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) + for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) if(itr->second->GetSecurity() < sec) itr->second->KickPlayer(); } @@ -2825,7 +2825,7 @@ void World::KickAllLess(AccountTypes sec) /// Kick (and save) the designated player bool World::KickPlayer(const std::string& playerName) { - SessionMap::iterator itr; + SessionMap::const_iterator itr; // session not removed at kick and will removed in next update tick for (itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) @@ -3175,7 +3175,7 @@ void World::ResetDailyQuests() { sLog.outDetail("Daily quests reset for all characters."); CharacterDatabase.Execute("DELETE FROM character_queststatus_daily"); - for(SessionMap::iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) + for(SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) if(itr->second->GetPlayer()) itr->second->GetPlayer()->ResetDailyQuestStatus(); } diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index 563f5f4a168..a5cc9f1e2fc 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -313,7 +313,7 @@ void WorldSession::LogoutPlayer(bool Save) sOutdoorPvPMgr.HandlePlayerLeaveZone(_player,_player->GetZoneId()); - for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) { if(BattleGroundQueueTypeId bgQueueTypeId = _player->GetBattleGroundQueueTypeId(i)) { diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp index e8f8bad5894..561fa37eee3 100644 --- a/src/game/WorldSocketMgr.cpp +++ b/src/game/WorldSocketMgr.cpp @@ -134,7 +134,7 @@ class ReactorRunnable : protected ACE_Task_Base if (m_NewSockets.empty ()) return; - for (SocketSet::iterator i = m_NewSockets.begin (); i != m_NewSockets.end (); ++i) + for (SocketSet::const_iterator i = m_NewSockets.begin (); i != m_NewSockets.end (); ++i) { WorldSocket* sock = (*i); @@ -158,7 +158,7 @@ class ReactorRunnable : protected ACE_Task_Base ACE_ASSERT (m_Reactor); - SocketSet::iterator i, t; + SocketSet::const_iterator i, t; while (!m_Reactor->reactor_event_loop_done ()) { @@ -176,14 +176,14 @@ class ReactorRunnable : protected ACE_Task_Base if ((*i)->Update () == -1) { t = i; - i++; + ++i; (*t)->CloseSocket (); (*t)->RemoveReference (); --m_Connections; m_Sockets.erase (t); } else - i++; + ++i; } } -- cgit v1.2.3