diff options
Diffstat (limited to 'src/game')
148 files changed, 2032 insertions, 2144 deletions
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index c9b98c3ddef..a2c76ffb4c6 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -39,7 +39,6 @@ #include "BattleGround.h" #include "BattleGroundAB.h" - INSTANTIATE_SINGLETON_1(AchievementGlobalMgr); namespace MaNGOS @@ -72,7 +71,6 @@ namespace MaNGOS }; } // namespace MaNGOS - bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) { if(dataType >= MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE) @@ -320,7 +318,7 @@ bool AchievementCriteriaData::Meets(Player const* source, Unit const* target, ui bool AchievementCriteriaDataSet::Meets(Player const* source, Unit const* target, uint32 miscvalue /*= 0*/) const { - for(Storage::const_iterator itr = storage.begin(); itr != storage.end(); ++itr) + for (Storage::const_iterator itr = storage.begin(); itr != storage.end(); ++itr) if(!itr->Meets(source,target,miscvalue)) return false; @@ -338,14 +336,14 @@ AchievementMgr::~AchievementMgr() void AchievementMgr::Reset() { - for(CompletedAchievementMap::const_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::const_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); @@ -369,7 +367,7 @@ void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uin return; AchievementCriteriaEntryList const& achievementCriteriaList = achievementmgr.GetAchievementCriteriaByType(type); - for(AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i!=achievementCriteriaList.end(); ++i) + for (AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i!=achievementCriteriaList.end(); ++i) { AchievementCriteriaEntry const *achievementCriteria = (*i); @@ -415,7 +413,7 @@ void AchievementMgr::SaveToDB() bool need_execute = false; std::ostringstream ssdel; std::ostringstream ssins; - for(CompletedAchievementMap::iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter) + for (CompletedAchievementMap::iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter) { if(!iter->second.changed) continue; @@ -459,7 +457,7 @@ void AchievementMgr::SaveToDB() bool need_execute_ins = false; std::ostringstream ssdel; std::ostringstream ssins; - for(CriteriaProgressMap::iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter) + for (CriteriaProgressMap::iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter) { if(!iter->second.changed) continue; @@ -640,7 +638,7 @@ void AchievementMgr::SendCriteriaUpdate(uint32 id, CriteriaProgress const* progr void AchievementMgr::CheckAllAchievementCriteria() { // suppress sending packets - for(uint32 i=0; i<ACHIEVEMENT_CRITERIA_TYPE_TOTAL; ++i) + for (uint32 i=0; i<ACHIEVEMENT_CRITERIA_TYPE_TOTAL; ++i) UpdateAchievementCriteria(AchievementCriteriaTypes(i)); } @@ -668,7 +666,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui return; AchievementCriteriaEntryList const& achievementCriteriaList = achievementmgr.GetAchievementCriteriaByType(type); - for(AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i!=achievementCriteriaList.end(); ++i) + for (AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i!=achievementCriteriaList.end(); ++i) { AchievementCriteriaEntry const *achievementCriteria = (*i); @@ -820,7 +818,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT: { uint32 counter =0; - for(QuestStatusMap::const_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); @@ -833,7 +831,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui continue; uint32 counter =0; - for(QuestStatusMap::const_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) @@ -865,7 +863,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui continue; // skip wrong arena achievements, if not achievIdByArenaSlot then normal total death counter bool notfit = false; - for(int j = 0; j < MAX_ARENA_SLOT; ++j) + for (int j = 0; j < MAX_ARENA_SLOT; ++j) { if(achievIdByArenaSlot[j] == achievement->ID) { @@ -894,7 +892,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui // search case bool found = false; - for(int j = 0; achievIdForDangeon[j][0]; ++j) + for (int j = 0; achievIdForDangeon[j][0]; ++j) { if(achievIdForDangeon[j][0] == achievement->ID) { @@ -1008,7 +1006,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui break; } - SetCriteriaProgress(achievementCriteria, 1); break; } @@ -1257,7 +1254,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui ++spellIter) { SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spellIter->first); - for(SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter) + for (SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter) { if(skillIter->second->skillId == achievementCriteria->learn_skillline_spell.skillLine) spellCount++; @@ -1304,7 +1301,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui ++spellIter) { SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spellIter->first); - for(SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter) + for (SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter) if (skillIter->second->skillId == achievementCriteria->learn_skill_line.skillLine) spellCount++; } @@ -1375,7 +1372,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui if(AchievementEntryList const* achRefList = achievementmgr.GetAchievementByReferencedId(achievement->ID)) { - for(AchievementEntryList::const_iterator itr = achRefList->begin(); itr != achRefList->end(); ++itr) + for (AchievementEntryList::const_iterator itr = achRefList->begin(); itr != achRefList->end(); ++itr) if(IsCompletedAchievement(*itr)) CompletedAchievement(*itr); } @@ -1413,12 +1410,12 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve case ACHIEVEMENT_CRITERIA_TYPE_REACH_LEVEL: { // skip wrong class achievements - for(int i = 1; i < MAX_CLASSES; ++i) + for (int i = 1; i < MAX_CLASSES; ++i) if(achievIdByClass[i] == achievement->ID && i != GetPlayer()->getClass()) return false; // skip wrong race achievements - for(int i = 1; i < MAX_RACES; ++i) + for (int i = 1; i < MAX_RACES; ++i) if(achievIdByRace[i] == achievement->ID && i != GetPlayer()->getRace()) return false; @@ -1564,7 +1561,7 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry) // Oddly, the target count is NOT countained in the achievement, but in each individual criteria if (entry->flags & ACHIEVEMENT_FLAG_SUMM) { - for(AchievementCriteriaEntryList::const_iterator itr = cList->begin(); itr != cList->end(); ++itr) + for (AchievementCriteriaEntryList::const_iterator itr = cList->begin(); itr != cList->end(); ++itr) { AchievementCriteriaEntry const* criteria = *itr; @@ -1584,7 +1581,7 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry) // Default case - need complete all or bool completed_all = true; - for(AchievementCriteriaEntryList::const_iterator itr = cList->begin(); itr != cList->end(); ++itr) + for (AchievementCriteriaEntryList::const_iterator itr = cList->begin(); itr != cList->end(); ++itr) { AchievementCriteriaEntry const* criteria = *itr; @@ -1676,7 +1673,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) if(!sWorld.getConfig(CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS) && m_player->GetSession()->GetSecurity() > SEC_PLAYER) return; - + if(achievement->flags & ACHIEVEMENT_FLAG_COUNTER || m_completedAchievements.find(achievement->ID)!=m_completedAchievements.end()) return; @@ -1755,7 +1752,7 @@ void AchievementMgr::SendAllAchievementData() else data.resize( 0x7fff ); // More than this causes client trouble - + CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); CriteriaProgressMap::const_iterator iter2 = m_criteriaProgress.begin(); @@ -1765,10 +1762,10 @@ void AchievementMgr::SendAllAchievementData() { data.clear(); send = false; - + if( !cAchievements ) { - for(; iter != m_completedAchievements.end() && !send; ++iter) + for (; iter != m_completedAchievements.end() && !send; ++iter) { data << uint32(iter->first); data << uint32(secsToTimeBitFields(iter->second.date)); @@ -1780,7 +1777,7 @@ void AchievementMgr::SendAllAchievementData() } data << int32(-1); - for(; iter2 != m_criteriaProgress.end() && !send; ++iter2) + for (; iter2 != m_criteriaProgress.end() && !send; ++iter2) { data << uint32(iter2->first); data.appendPackGUID(iter2->second.counter); @@ -1791,7 +1788,7 @@ void AchievementMgr::SendAllAchievementData() data << uint32(0); send = data.size() > 0x7f00; } - + if( iter2 == m_criteriaProgress.end() ) cProgress = true; @@ -1814,14 +1811,14 @@ void AchievementMgr::SendRespondInspectAchievements(Player* player) */ void AchievementMgr::BuildAllDataPacket(WorldPacket *data) { - for(CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter) + for (CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter) { *data << uint32(iter->first); *data << uint32(secsToTimeBitFields(iter->second.date)); } *data << int32(-1); - for(CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter) + for (CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter) { *data << uint32(iter->first); data->appendPackGUID(iter->second.counter); @@ -2209,7 +2206,7 @@ void AchievementGlobalMgr::LoadRewardLocales() AchievementRewardLocale& data = m_achievementRewardLocales[entry]; - for(int i = 1; i < MAX_LOCALE; ++i) + for (int i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[1+2*(i-1)].GetCppString(); if(!str.empty()) @@ -2240,7 +2237,6 @@ void AchievementGlobalMgr::LoadRewardLocales() delete result; - sLog.outString(); sLog.outString( ">> Loaded %lu achievement reward locale strings", (unsigned long)m_achievementRewardLocales.size() ); } diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h index 5020539bb5c..d031672f2a5 100644 --- a/src/game/AchievementMgr.h +++ b/src/game/AchievementMgr.h @@ -186,7 +186,6 @@ struct AchievementCriteriaDataSet Storage storage; }; - typedef std::map<uint32,AchievementCriteriaDataSet> AchievementCriteriaDataMap; struct AchievementReward @@ -208,7 +207,6 @@ struct AchievementRewardLocale typedef std::map<uint32,AchievementRewardLocale> AchievementRewardLocales; - struct CompletedAchievementData { time_t date; diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp index 22d121c38c1..96468f20c42 100644 --- a/src/game/ArenaTeam.cpp +++ b/src/game/ArenaTeam.cpp @@ -298,7 +298,7 @@ void ArenaTeam::DelMember(uint64 guid) player->SetInArenaTeam(0, GetSlot()); player->GetSession()->SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, GetName(), "", 0); // delete all info regarding this team - for(uint8 i = 0; i < 6; ++i) + for (uint8 i = 0; i < 6; ++i) { player->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot() * 6) + i, 0); } @@ -401,7 +401,7 @@ void ArenaTeam::NotifyStatsChanged() { // this is called after a rated match ended // updates arena team stats for every member of the team (not only the ones who participated!) - for(MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { Player * plr = objmgr.GetPlayer(itr->guid); if(plr) @@ -550,7 +550,7 @@ void ArenaTeam::FinishGame(int32 mod) // update team's rank m_stats.rank = 1; ObjectMgr::ArenaTeamMap::const_iterator i = objmgr.GetArenaTeamMapBegin(); - for ( ; i != objmgr.GetArenaTeamMapEnd(); ++i) + for (; i != objmgr.GetArenaTeamMapEnd(); ++i) { if (i->second->GetType() == m_Type && i->second->GetStats().rating > m_stats.rating) ++m_stats.rank; @@ -590,7 +590,7 @@ int32 ArenaTeam::LostAgainst(uint32 againstRating) void ArenaTeam::MemberLost(Player * plr, uint32 againstRating) { // called for each participant of a match after losing - for(MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { if(itr->guid == plr->GetGUID()) { @@ -612,7 +612,7 @@ void ArenaTeam::MemberLost(Player * plr, uint32 againstRating) void ArenaTeam::OfflineMemberLost(uint64 guid, uint32 againstRating) { // called for offline player after ending rated arena match! - for(MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { if(itr->guid == guid) { @@ -634,7 +634,7 @@ void ArenaTeam::OfflineMemberLost(uint64 guid, uint32 againstRating) void ArenaTeam::MemberWon(Player * plr, uint32 againstRating) { // called for each participant after winning a match - for(MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { if(itr->guid == plr->GetGUID()) { @@ -664,7 +664,7 @@ void ArenaTeam::UpdateArenaPointsHelper(std::map<uint32, uint32>& PlayerPoints) return; // to get points, a player has to participate in at least 30% of the matches uint32 min_plays = (uint32) ceil(m_stats.games_week * 0.3); - for(MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { // the player participated in enough games, update his points uint32 points_to_add = 0; @@ -690,7 +690,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'", m_stats.rating, m_stats.games_week, m_stats.games_season, m_stats.rank, m_stats.wins_week, m_stats.wins_season, GetId()); - for(MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (MemberList::const_iterator itr = m_members.begin(); itr != m_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, m_TeamId, GUID_LOPART(itr->guid)); } @@ -701,7 +701,7 @@ void ArenaTeam::FinishWeek() { m_stats.games_week = 0; // played this week m_stats.wins_week = 0; // wins this week - for(MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { itr->games_week = 0; itr->wins_week = 0; diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp index cef09af8252..2a77aaea7a6 100644 --- a/src/game/AuctionHouseBot.cpp +++ b/src/game/AuctionHouseBot.cpp @@ -210,7 +210,7 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config) if (debug_Out) sLog.outString("AHSeller: %u items", items); // only insert a few at a time, so as not to peg the processor - for (uint32 cnt = 1;cnt <= items;cnt++) + for (uint32 cnt = 1; cnt <= items; cnt++) { if (debug_Out) sLog.outString("AHSeller: %u count", cnt); uint32 itemID = 0; @@ -484,7 +484,7 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con if (debug_Out) sLog.outError("AHBuyer: Disabled"); return; } - + QueryResult* result = CharacterDatabase.PQuery("SELECT id FROM auctionhouse WHERE itemowner<>%u AND buyguid<>%u", AHBplayerGUID, AHBplayerGUID); if (!result) @@ -510,7 +510,7 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con }while (result->NextRow()); delete result; - for (uint32 count = 1;count <= config->GetBidsPerInterval();++count) + for (uint32 count = 1; count <= config->GetBidsPerInterval(); ++count) { // Do we have anything to bid? If not, stop here. if (possibleBids.empty()) @@ -767,7 +767,6 @@ void AuctionHouseBot::Initialize() AHBplayerGUID = sConfig.GetIntDefault("AuctionHouseBot.GUID", 0); ItemsPerCycle = sConfig.GetIntDefault("AuctionHouseBot.ItemsPerCycle", 200); - //Begin Filters Vendor_Items = sConfig.GetBoolDefault("AuctionHouseBot.VendorItems", false); @@ -1774,10 +1773,10 @@ void AuctionHouseBot::LoadValues(AHBConfig *config) config->ResetItemCounts(); uint32 auctions = auctionHouse->Getcount(); - + if (auctions) { - for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = auctionHouse->GetAuctionsBegin();itr != auctionHouse->GetAuctionsEnd();++itr) + for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = auctionHouse->GetAuctionsBegin(); itr != auctionHouse->GetAuctionsEnd(); ++itr) { AuctionEntry *Aentry = itr->second; Item *item = auctionmgr.GetAItem(Aentry->item_guidlow); diff --git a/src/game/AuctionHouseBot.h b/src/game/AuctionHouseBot.h index d135af5c479..8299a53ca0f 100644 --- a/src/game/AuctionHouseBot.h +++ b/src/game/AuctionHouseBot.h @@ -956,7 +956,7 @@ public: break; } } - + void IncItemCounts(uint32 Class, uint32 Quality) { switch(Class) diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp index 52790526dd7..f0284a6458b 100644 --- a/src/game/AuctionHouseHandler.cpp +++ b/src/game/AuctionHouseHandler.cpp @@ -31,7 +31,6 @@ #include "UpdateMask.h" #include "Util.h" - //please DO NOT use iterator++, because it is slower than ++iterator!!! //post-incrementation is always slower than pre-incrementation ! diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp index ffc0c55d9d3..905e9c4fa17 100644 --- a/src/game/AuctionHouseMgr.cpp +++ b/src/game/AuctionHouseMgr.cpp @@ -35,7 +35,6 @@ #include "ProgressBar.h" #include <vector> - INSTANTIATE_SINGLETON_1(AuctionHouseMgr); using namespace std; @@ -564,7 +563,7 @@ void AuctionHouseObject::Update() void AuctionHouseObject::BuildListBidderItems(WorldPacket& data, Player* player, uint32& count, uint32& totalcount) { - for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin();itr != AuctionsMap.end();++itr) + for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr) { AuctionEntry *Aentry = itr->second; if (Aentry && Aentry->bidder == player->GetGUIDLow()) @@ -579,7 +578,7 @@ void AuctionHouseObject::BuildListBidderItems(WorldPacket& data, Player* player, void AuctionHouseObject::BuildListOwnerItems(WorldPacket& data, Player* player, uint32& count, uint32& totalcount) { - for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin();itr != AuctionsMap.end();++itr) + for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr) { AuctionEntry *Aentry = itr->second; if (Aentry && Aentry->owner == player->GetGUIDLow()) @@ -599,7 +598,7 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player { int loc_idx = player->GetSession()->GetSessionDbLocaleIndex(); - for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin();itr != AuctionsMap.end();++itr) + for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr) { AuctionEntry *Aentry = itr->second; Item *item = auctionmgr.GetAItem(Aentry->item_guidlow); diff --git a/src/game/Bag.cpp b/src/game/Bag.cpp index 2d58b63c0a9..72d71c5e8bc 100644 --- a/src/game/Bag.cpp +++ b/src/game/Bag.cpp @@ -38,7 +38,7 @@ Bag::Bag( ): Item() Bag::~Bag() { - for(uint8 i = 0; i < MAX_BAG_SIZE; ++i) + for (uint8 i = 0; i < MAX_BAG_SIZE; ++i) if (Item *item = m_bagslot[i]) { if(item->IsInWorld()) @@ -56,14 +56,14 @@ void Bag::AddToWorld() { Item::AddToWorld(); - for(uint32 i = 0; i < GetBagSize(); ++i) + for (uint32 i = 0; i < GetBagSize(); ++i) if(m_bagslot[i]) m_bagslot[i]->AddToWorld(); } void Bag::RemoveFromWorld() { - for(uint32 i = 0; i < GetBagSize(); ++i) + for (uint32 i = 0; i < GetBagSize(); ++i) if(m_bagslot[i]) m_bagslot[i]->RemoveFromWorld(); @@ -184,7 +184,7 @@ void Bag::BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) co // If the bag is empty returns true bool Bag::IsEmpty() const { - for(uint32 i = 0; i < GetBagSize(); ++i) + for (uint32 i = 0; i < GetBagSize(); ++i) if (m_bagslot[i]) return false; @@ -195,7 +195,7 @@ uint32 Bag::GetItemCount( uint32 item, Item* eItem ) const { Item *pItem; uint32 count = 0; - for(uint32 i=0; i < GetBagSize(); ++i) + for (uint32 i=0; i < GetBagSize(); ++i) { pItem = m_bagslot[i]; if( pItem && pItem != eItem && pItem->GetEntry() == item ) @@ -204,7 +204,7 @@ uint32 Bag::GetItemCount( uint32 item, Item* eItem ) const if(eItem && eItem->GetProto()->GemProperties) { - for(uint32 i=0; i < GetBagSize(); ++i) + for (uint32 i=0; i < GetBagSize(); ++i) { pItem = m_bagslot[i]; if( pItem && pItem != eItem && pItem->GetProto()->Socket[0].Color ) @@ -217,7 +217,7 @@ uint32 Bag::GetItemCount( uint32 item, Item* eItem ) const uint8 Bag::GetSlotByItemGUID(uint64 guid) const { - for(uint32 i = 0; i < GetBagSize(); ++i) + for (uint32 i = 0; i < GetBagSize(); ++i) if(m_bagslot[i] != 0) if(m_bagslot[i]->GetGUID() == guid) return i; diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 3eb699472d8..97b8aa0c928 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -36,7 +36,6 @@ #include "SpellAuras.h" #include "Util.h" - namespace MaNGOS { class BattleGroundChatBuilder @@ -122,7 +121,7 @@ namespace MaNGOS template<class Do> void BattleGround::BroadcastWorker(Do& _do) { - for(BattleGroundPlayerMap::const_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); } @@ -206,11 +205,11 @@ BattleGround::~BattleGround() // remove objects and creatures // (this is done automatically in mapmanager update, when the instance is reset after the reset time) int size = m_BgCreatures.size(); - for(int i = 0; i < size; ++i) + for (int i = 0; i < size; ++i) DelCreature(i); size = m_BgObjects.size(); - for(int i = 0; i < size; ++i) + for (int i = 0; i < size; ++i) DelObject(i); if (GetInstanceID()) // not spam by useless queries in case BG templates @@ -231,7 +230,7 @@ BattleGround::~BattleGround() // remove from bg free slot queue this->RemoveFromBGFreeSlotQueue(); - for(BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr) + for (BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr) delete itr->second; } @@ -279,10 +278,10 @@ void BattleGround::Update(uint32 diff) { if (GetReviveQueueSize()) { - for(std::map<uint64, std::vector<uint64> >::iterator itr = m_ReviveQueue.begin(); itr != m_ReviveQueue.end(); ++itr) + for (std::map<uint64, std::vector<uint64> >::iterator itr = m_ReviveQueue.begin(); itr != m_ReviveQueue.end(); ++itr) { Creature *sh = NULL; - for(std::vector<uint64>::const_iterator itr2 = (itr->second).begin(); itr2 != (itr->second).end(); ++itr2) + for (std::vector<uint64>::const_iterator itr2 = (itr->second).begin(); itr2 != (itr->second).end(); ++itr2) { Player *plr = objmgr.GetPlayer(*itr2); if (!plr) @@ -313,7 +312,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<uint64>::const_iterator itr = m_ResurrectQueue.begin(); itr != m_ResurrectQueue.end(); ++itr) + for (std::vector<uint64>::const_iterator itr = m_ResurrectQueue.begin(); itr != m_ResurrectQueue.end(); ++itr) { Player *plr = objmgr.GetPlayer(*itr); if (!plr) @@ -423,13 +422,13 @@ void BattleGround::Update(uint32 diff) { //TODO : add arena sound PlaySoundToAll(SOUND_ARENA_START); - for(BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr) + for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr) if (Player *plr = objmgr.GetPlayer(itr->first)) { plr->RemoveAurasDueToSpell(SPELL_ARENA_PREPARATION); // remove auras with duration lower than 30s Unit::AuraMap & aurMap = plr->GetAuras(); - for(Unit::AuraMap::iterator iter = aurMap.begin(); iter != aurMap.end();) + for (Unit::AuraMap::iterator iter = aurMap.begin(); iter != aurMap.end(); ) { if (!iter->second->IsPermanent() && iter->second->GetAuraDuration()<=30*IN_MILISECONDS @@ -451,7 +450,7 @@ void BattleGround::Update(uint32 diff) PlaySoundToAll(SOUND_BG_START); - for(BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr) + for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr) if (Player* plr = objmgr.GetPlayer(itr->first)) plr->RemoveAurasDueToSpell(SPELL_PREPARATION); //Announce BG starting @@ -475,7 +474,7 @@ void BattleGround::Update(uint32 diff) { m_EndTime = 0; BattleGroundPlayerMap::iterator itr, next; - for(itr = m_Players.begin(); itr != m_Players.end(); itr = next) + for (itr = m_Players.begin(); itr != m_Players.end(); itr = next) { next = itr; ++next; @@ -501,7 +500,7 @@ void BattleGround::SetTeamStartLoc(uint32 TeamID, float X, float Y, float Z, flo void BattleGround::SendPacketToAll(WorldPacket *packet) { - for(BattleGroundPlayerMap::const_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) @@ -513,7 +512,7 @@ void BattleGround::SendPacketToAll(WorldPacket *packet) void BattleGround::SendPacketToTeam(uint32 TeamID, WorldPacket *packet, Player *sender, bool self) { - for(BattleGroundPlayerMap::const_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); @@ -545,7 +544,7 @@ void BattleGround::PlaySoundToTeam(uint32 SoundID, uint32 TeamID) { WorldPacket data; - for(BattleGroundPlayerMap::const_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); @@ -568,7 +567,7 @@ void BattleGround::PlaySoundToTeam(uint32 SoundID, uint32 TeamID) void BattleGround::CastSpellOnTeam(uint32 SpellID, uint32 TeamID) { - for(BattleGroundPlayerMap::const_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); @@ -588,7 +587,7 @@ void BattleGround::CastSpellOnTeam(uint32 SpellID, uint32 TeamID) void BattleGround::YellToAll(Creature* creature, const char* text, uint32 language) { - for(std::map<uint64, BattleGroundPlayer>::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for (std::map<uint64, BattleGroundPlayer>::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { WorldPacket data(SMSG_MESSAGECHAT, 200); Player *plr = objmgr.GetPlayer(itr->first); @@ -602,10 +601,9 @@ void BattleGround::YellToAll(Creature* creature, const char* text, uint32 langua } } - void BattleGround::RewardHonorToTeam(uint32 Honor, uint32 TeamID) { - for(BattleGroundPlayerMap::const_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); @@ -630,7 +628,7 @@ void BattleGround::RewardReputationToTeam(uint32 faction_id, uint32 Reputation, if (!factionEntry) return; - for(BattleGroundPlayerMap::const_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); @@ -721,7 +719,7 @@ void BattleGround::EndBattleGround(uint32 winner) } } - for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for (BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { Player *plr = objmgr.GetPlayer(itr->first); uint32 team = itr->second.Team; @@ -1125,7 +1123,7 @@ void BattleGround::Reset() m_Players.clear(); - for(BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr) + for (BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr) delete itr->second; m_PlayerScores.clear(); @@ -1251,7 +1249,7 @@ void BattleGround::AddOrSetPlayerToCorrectBgGroup(Player *plr, uint64 plr_guid, void BattleGround::EventPlayerLoggedIn(Player* player, uint64 plr_guid) { // player is correct pointer - for(std::deque<uint64>::iterator itr = m_OfflineQueue.begin(); itr != m_OfflineQueue.end(); ++itr) + for (std::deque<uint64>::iterator itr = m_OfflineQueue.begin(); itr != m_OfflineQueue.end(); ++itr) { if (*itr == plr_guid) { @@ -1427,9 +1425,9 @@ void BattleGround::AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid void BattleGround::RemovePlayerFromResurrectQueue(uint64 player_guid) { - for(std::map<uint64, std::vector<uint64> >::iterator itr = m_ReviveQueue.begin(); itr != m_ReviveQueue.end(); ++itr) + for (std::map<uint64, std::vector<uint64> >::iterator itr = m_ReviveQueue.begin(); itr != m_ReviveQueue.end(); ++itr) { - for(std::vector<uint64>::iterator itr2 =(itr->second).begin(); itr2 != (itr->second).end(); ++itr2) + for (std::vector<uint64>::iterator itr2 =(itr->second).begin(); itr2 != (itr->second).end(); ++itr2) { if (*itr2 == player_guid) { @@ -1790,7 +1788,7 @@ void BattleGround::HandleKillPlayer( Player *player, Player *killer ) UpdatePlayerScore(killer, SCORE_HONORABLE_KILLS, 1); UpdatePlayerScore(killer, SCORE_KILLING_BLOWS, 1); - for(BattleGroundPlayerMap::const_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); @@ -1850,7 +1848,7 @@ void BattleGround::PlayerAddedToBGCheckIfBGIsRunning(Player* plr) uint32 BattleGround::GetAlivePlayersCountByTeam(uint32 Team) const { int count = 0; - for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) + for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { if (itr->second.Team == Team) { @@ -1872,7 +1870,7 @@ void BattleGround::SetHoliday(bool is_holiday) int32 BattleGround::GetObjectType(uint64 guid) { - for(uint32 i = 0; i < m_BgObjects.size(); ++i) + for (uint32 i = 0; i < m_BgObjects.size(); ++i) if(m_BgObjects[i] == guid) return i; sLog.outError("BattleGround: cheating? a player used a gameobject which isnt supposed to be a usable object!"); diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index 007f7a642dd..38772f9fd33 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -543,7 +543,7 @@ class BattleGround void PlayerAddedToBGCheckIfBGIsRunning(Player* plr); /* Scorekeeping */ - + BattleGroundScoreMap m_PlayerScores; // Player scores // must be implemented in BG subclass virtual void RemovePlayer(Player * /*player*/, uint64 /*guid*/) {} diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp index 6609c3400be..b684f4523e1 100644 --- a/src/game/BattleGroundAB.cpp +++ b/src/game/BattleGroundAB.cpp @@ -688,7 +688,7 @@ void BattleGroundAB::UpdatePlayerScore(Player *Source, uint32 type, uint32 value bool BattleGroundAB::IsAllNodesConrolledByTeam(uint32 team) const { uint32 count = 0; - for(int i = 0; i < BG_AB_DYNAMIC_NODES_COUNT; ++i) + for (int i = 0; i < BG_AB_DYNAMIC_NODES_COUNT; ++i) if ((team == ALLIANCE && m_Nodes[i] == BG_AB_NODE_STATUS_ALLY_OCCUPIED) || (team == HORDE && m_Nodes[i] == BG_AB_NODE_STATUS_HORDE_OCCUPIED)) ++count; diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp index 42d15a6ce84..abcc2e72d14 100644 --- a/src/game/BattleGroundAV.cpp +++ b/src/game/BattleGroundAV.cpp @@ -90,7 +90,7 @@ void BattleGroundAV::HandleKillUnit(Creature *unit, Player *killer) RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_CAPTAIN),HORDE); UpdateScore(ALLIANCE,(-1)*BG_AV_RES_CAPTAIN); //spawn destroyed aura - for(uint8 i=0; i<=9; i++) + for (uint8 i=0; i<=9; i++) SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE+i,RESPAWN_IMMEDIATELY); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if(creature) @@ -109,7 +109,7 @@ void BattleGroundAV::HandleKillUnit(Creature *unit, Player *killer) RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_CAPTAIN),ALLIANCE); UpdateScore(HORDE,(-1)*BG_AV_RES_CAPTAIN); //spawn destroyed aura - for(uint8 i=0; i<=9; i++) + for (uint8 i=0; i<=9; i++) SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_HORDE+i,RESPAWN_IMMEDIATELY); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if(creature) @@ -224,7 +224,6 @@ void BattleGroundAV::HandleQuestComplete(uint32 questid, Player *player) } } - void BattleGroundAV::UpdateScore(uint16 team, int16 points ) { //note: to remove reinforcementpoints points must be negative, for adding reinforcements points must be positive assert( team == ALLIANCE || team == HORDE); @@ -302,7 +301,7 @@ void BattleGroundAV::Update(uint32 diff) if(GetStatus() == STATUS_IN_PROGRESS) { - for(uint8 i=0; i<=1;i++)//0=alliance, 1=horde + for (uint8 i=0; i<=1; i++)//0=alliance, 1=horde { if(!m_CaptainAlive[i]) continue; @@ -329,7 +328,7 @@ void BattleGroundAV::Update(uint32 diff) } //add points from mine owning, and look if he neutral team wanrts to reclaim the mine m_Mine_Timer -=diff; - for(uint8 mine=0; mine <2; mine++) + for (uint8 mine=0; mine <2; mine++) { if(m_Mine_Owner[mine] == ALLIANCE || m_Mine_Owner[mine] == HORDE) { @@ -347,7 +346,7 @@ void BattleGroundAV::Update(uint32 diff) m_Mine_Timer=AV_MINE_TICK_TIMER; //this is at the end, cause we need to update both mines //looks for all timers of the nodes and destroy the building (for graveyards the building wont get destroyed, it goes just to the other team - for(BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i) + for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i) if(m_Nodes[i].State == POINT_ASSAULTED) //maybe remove this { if(m_Nodes[i].Timer > diff) @@ -367,11 +366,11 @@ void BattleGroundAV::StartingEventCloseDoors() void BattleGroundAV::StartingEventOpenDoors() { sLog.outDebug("BG_AV: start spawning mine stuff"); - for(uint16 i= BG_AV_OBJECT_MINE_SUPPLY_N_MIN; i<=BG_AV_OBJECT_MINE_SUPPLY_N_MAX;i++) + for (uint16 i= BG_AV_OBJECT_MINE_SUPPLY_N_MIN; i<=BG_AV_OBJECT_MINE_SUPPLY_N_MAX; i++) SpawnBGObject(i,RESPAWN_IMMEDIATELY); - for(uint16 i= BG_AV_OBJECT_MINE_SUPPLY_S_MIN; i<=BG_AV_OBJECT_MINE_SUPPLY_S_MAX;i++) + for (uint16 i= BG_AV_OBJECT_MINE_SUPPLY_S_MIN; i<=BG_AV_OBJECT_MINE_SUPPLY_S_MAX; i++) SpawnBGObject(i,RESPAWN_IMMEDIATELY); - for(uint8 mine = AV_NORTH_MINE; mine <= AV_SOUTH_MINE; mine++) //mine population + for (uint8 mine = AV_NORTH_MINE; mine <= AV_SOUTH_MINE; mine++) //mine population ChangeMineOwner(mine, AV_NEUTRAL_TEAM,true); UpdateWorldState(AV_SHOW_H_SCORE, 1); @@ -398,7 +397,7 @@ void BattleGroundAV::EndBattleGround(uint32 winner) //first towers: uint8 kills[2]={0,0}; //0=ally 1=horde uint8 rep[2]={0,0}; //0=ally 1=horde - for(BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i) + for (BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i) { if(m_Nodes[i].State == POINT_CONTROLED) { @@ -415,7 +414,7 @@ void BattleGroundAV::EndBattleGround(uint32 winner) } } - for(int i=0; i<=1; i++) //0=ally 1=horde + for (int i=0; i<=1; i++) //0=ally 1=horde { if(m_CaptainAlive[i]) { @@ -445,7 +444,6 @@ void BattleGroundAV::RemovePlayer(Player* plr,uint64 /*guid*/) plr->RemoveAurasDueToSpell(AV_BUFF_H_CAPTAIN); } - void BattleGroundAV::HandleAreaTrigger(Player *Source, uint32 Trigger) { // this is wrong way to implement these things. On official it done by gameobject spell cast. @@ -522,8 +520,6 @@ void BattleGroundAV::UpdatePlayerScore(Player* Source, uint32 type, uint32 value } } - - void BattleGroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) { @@ -545,7 +541,7 @@ void BattleGroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) else sLog.outError("BG_AV: playerdestroyedpoint: marshal %i doesn't exist",AV_CPLACE_A_MARSHAL_SOUTH + tmp); //spawn destroyed aura - for(uint8 i=0; i<=9; i++) + for (uint8 i=0; i<=9; i++) SpawnBGObject(BG_AV_OBJECT_BURN_DUNBALDAR_SOUTH + i + (tmp * 10),RESPAWN_IMMEDIATELY); UpdateScore((owner == ALLIANCE) ? HORDE : ALLIANCE, (-1)*BG_AV_RES_TOWER); @@ -566,7 +562,7 @@ void BattleGroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) PopulateNode(node); if(node == BG_AV_NODES_SNOWFALL_GRAVE) //snowfall eyecandy { - for(uint8 i = 0; i < 4; i++) + for (uint8 i = 0; i < 4; i++) { SpawnBGObject(((owner==ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_PA : BG_AV_OBJECT_SNOW_EYECANDY_PH)+i,RESPAWN_ONE_DAY); SpawnBGObject(((owner==ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_A : BG_AV_OBJECT_SNOW_EYECANDY_H )+i,RESPAWN_IMMEDIATELY); @@ -603,10 +599,10 @@ void BattleGroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) { sLog.outDebug("bg_av depopulating mine %i (0=north,1=south)",mine); if(mine==AV_SOUTH_MINE) - for(uint16 i=AV_CPLACE_MINE_S_S_MIN; i <= AV_CPLACE_MINE_S_S_MAX; i++) + for (uint16 i=AV_CPLACE_MINE_S_S_MIN; i <= AV_CPLACE_MINE_S_S_MAX; i++) if( m_BgCreatures[i] ) DelCreature(i); //TODO just set the respawntime to 999999 - for(uint16 i=((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_1_MIN:AV_CPLACE_MINE_S_1_MIN); i <= ((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_3:AV_CPLACE_MINE_S_3); i++) + for (uint16 i=((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_1_MIN:AV_CPLACE_MINE_S_1_MIN); i <= ((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_3:AV_CPLACE_MINE_S_3); i++) if( m_BgCreatures[i] ) DelCreature(i); //TODO here also } @@ -641,17 +637,17 @@ void BattleGroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) cinfo = AV_NPC_S_MINE_H_3; else cinfo = AV_NPC_S_MINE_N_S; - for(uint16 i=AV_CPLACE_MINE_S_S_MIN; i <= AV_CPLACE_MINE_S_S_MAX; i++) + for (uint16 i=AV_CPLACE_MINE_S_S_MIN; i <= AV_CPLACE_MINE_S_S_MAX; i++) AddAVCreature(cinfo,i); } - for(uint16 i=( (mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_1_MIN:AV_CPLACE_MINE_S_1_MIN ); i <= ((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_1_MAX:AV_CPLACE_MINE_S_1_MAX); i++) + for (uint16 i=( (mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_1_MIN:AV_CPLACE_MINE_S_1_MIN ); i <= ((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_1_MAX:AV_CPLACE_MINE_S_1_MAX); i++) AddAVCreature(miner,i); //the next chooses randomly between 2 cretures - for(uint16 i=((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_2_MIN:AV_CPLACE_MINE_S_2_MIN); i <= ((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_2_MAX:AV_CPLACE_MINE_S_2_MAX); i++) + for (uint16 i=((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_2_MIN:AV_CPLACE_MINE_S_2_MIN); i <= ((mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_2_MAX:AV_CPLACE_MINE_S_2_MAX); i++) AddAVCreature(miner+(urand(1,2)),i); AddAVCreature(miner+3,(mine==AV_NORTH_MINE)?AV_CPLACE_MINE_N_3:AV_CPLACE_MINE_S_3); //because the gameobjects in this mine have changed, update all surrounding players: -// for(uint16 i = ((mine==AV_NORTH_MINE)?BG_AV_OBJECT_MINE_SUPPLY_N_MIN:BG_AV_OBJECT_MINE_SUPPLY_N_MIN); i <= ((mine==AV_NORTH_MINE)?BG_AV_OBJECT_MINE_SUPPLY_N_MAX:BG_AV_OBJECT_MINE_SUPPLY_N_MAX); i++) +// for (uint16 i = ((mine==AV_NORTH_MINE)?BG_AV_OBJECT_MINE_SUPPLY_N_MIN:BG_AV_OBJECT_MINE_SUPPLY_N_MIN); i <= ((mine==AV_NORTH_MINE)?BG_AV_OBJECT_MINE_SUPPLY_N_MAX:BG_AV_OBJECT_MINE_SUPPLY_N_MAX); i++) // { //TODO: add gameobject-update code // } @@ -711,7 +707,7 @@ void BattleGroundAV::PopulateNode(BG_AV_Nodes node) sLog.outError("AV: couldn't spawn spiritguide at node %i",node); } - for(uint8 i=0; i<4; i++) + for (uint8 i=0; i<4; i++) { Creature* cr = AddAVCreature(creatureid,c_place+i); } @@ -719,7 +715,7 @@ void BattleGroundAV::PopulateNode(BG_AV_Nodes node) void BattleGroundAV::DePopulateNode(BG_AV_Nodes node) { uint32 c_place = AV_CPLACE_DEFENSE_STORM_AID + ( 4 * node ); - for(uint8 i=0; i<4; i++) + for (uint8 i=0; i<4; i++) if( m_BgCreatures[c_place+i] ) DelCreature(c_place+i); //spiritguide @@ -727,7 +723,6 @@ void BattleGroundAV::DePopulateNode(BG_AV_Nodes node) DelCreature(node); } - const BG_AV_Nodes BattleGroundAV::GetNodeThroughObject(uint32 object) { sLog.outDebug("bg_AV getnodethroughobject %i",object); @@ -786,7 +781,6 @@ const uint32 BattleGroundAV::GetObjectThroughNode(BG_AV_Nodes node) return 0; } - //called when using banner void BattleGroundAV::EventPlayerClickedOnFlag(Player *source, GameObject* target_obj) @@ -840,7 +834,6 @@ void BattleGroundAV::EventPlayerDefendsPoint(Player* player, uint32 object) return; } - //spawn new go :) if(m_Nodes[node].Owner == ALLIANCE) SpawnBGObject(object+22, RESPAWN_IMMEDIATELY); //spawn horde banner @@ -869,7 +862,7 @@ void BattleGroundAV::EventPlayerDefendsPoint(Player* player, uint32 object) } else if(node == BG_AV_NODES_SNOWFALL_GRAVE) //snowfall eyecandy { - for(uint8 i = 0; i < 4; i++) + for (uint8 i = 0; i < 4; i++) { SpawnBGObject(((owner==ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_PA : BG_AV_OBJECT_SNOW_EYECANDY_PH)+i,RESPAWN_ONE_DAY); SpawnBGObject(((team==ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_A : BG_AV_OBJECT_SNOW_EYECANDY_H)+i,RESPAWN_IMMEDIATELY); @@ -900,7 +893,6 @@ void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) if(owner == team || team == m_Nodes[node].TotalOwner) return; //surely a gm used this object - if(node == BG_AV_NODES_SNOWFALL_GRAVE) //snowfall is a bit special in capping + it gets eyecandy stuff { if(object == BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE) //initial capping @@ -932,7 +924,7 @@ void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) despawn = ( m_Nodes[node].State == POINT_ASSAULTED )?BG_AV_OBJECT_SNOW_EYECANDY_PA : BG_AV_OBJECT_SNOW_EYECANDY_A; spawn = BG_AV_OBJECT_SNOW_EYECANDY_PH; } - for(uint8 i = 0; i < 4; i++) + for (uint8 i = 0; i < 4; i++) { SpawnBGObject(despawn+i,RESPAWN_ONE_DAY); SpawnBGObject(spawn+i,RESPAWN_IMMEDIATELY); @@ -1094,7 +1086,6 @@ void BattleGroundAV::SendMineWorldStates(uint32 mine) UpdateWorldState(BG_AV_MineWorldStates[mine2][prevowner],0); } - WorldSafeLocsEntry const* BattleGroundAV::GetClosestGraveYard(Player* player) { WorldSafeLocsEntry const* good_entry = NULL; @@ -1124,7 +1115,6 @@ WorldSafeLocsEntry const* BattleGroundAV::GetClosestGraveYard(Player* player) return good_entry; } - bool BattleGroundAV::SetupBattleGround() { // Create starting objects @@ -1184,7 +1174,7 @@ bool BattleGroundAV::SetupBattleGround() return false; } } - for(uint8 j=0; j<=9; j++) //burning aura + for (uint8 j=0; j<=9; j++) //burning aura { if(!AddObject(BG_AV_OBJECT_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j,BG_AV_OBJECTID_FIRE,BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][0],BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][1],BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][2],BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][3]/2),RESPAWN_ONE_DAY)) { @@ -1194,9 +1184,9 @@ bool BattleGroundAV::SetupBattleGround() } } } - for(uint8 i=0;i<2;i++) //burning aura for buildings + for (uint8 i=0; i<2; i++) //burning aura for buildings { - for(uint8 j=0; j<=9; j++) + for (uint8 j=0; j<=9; j++) { if(j<5) { @@ -1216,7 +1206,7 @@ bool BattleGroundAV::SetupBattleGround() } } } - for(uint16 i= 0; i<=(BG_AV_OBJECT_MINE_SUPPLY_N_MAX-BG_AV_OBJECT_MINE_SUPPLY_N_MIN);i++) + for (uint16 i= 0; i<=(BG_AV_OBJECT_MINE_SUPPLY_N_MAX-BG_AV_OBJECT_MINE_SUPPLY_N_MIN); i++) { if(!AddObject(BG_AV_OBJECT_MINE_SUPPLY_N_MIN+i,BG_AV_OBJECTID_MINE_N,BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][0],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][1],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][2],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][3]/2),RESPAWN_ONE_DAY)) { @@ -1224,7 +1214,7 @@ bool BattleGroundAV::SetupBattleGround() return false; } } - for(uint16 i= 0 ; i<=(BG_AV_OBJECT_MINE_SUPPLY_S_MAX-BG_AV_OBJECT_MINE_SUPPLY_S_MIN);i++) + for (uint16 i= 0 ; i<=(BG_AV_OBJECT_MINE_SUPPLY_S_MAX-BG_AV_OBJECT_MINE_SUPPLY_S_MIN); i++) { if(!AddObject(BG_AV_OBJECT_MINE_SUPPLY_S_MIN+i,BG_AV_OBJECTID_MINE_S,BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][0],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][1],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][2],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][3]/2),RESPAWN_ONE_DAY)) { @@ -1238,7 +1228,7 @@ bool BattleGroundAV::SetupBattleGround() sLog.outError("BatteGroundAV: Failed to spawn some object BattleGround not created!8"); return false; } - for(uint8 i = 0; i < 4; i++) + for (uint8 i = 0; i < 4; i++) { if(!AddObject(BG_AV_OBJECT_SNOW_EYECANDY_A+i, BG_AV_OBJECTID_SNOWFALL_CANDY_A ,BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3],0,0,sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PA+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PA ,BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3],0,0,sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) @@ -1253,44 +1243,44 @@ bool BattleGroundAV::SetupBattleGround() uint16 i; sLog.outDebug("Alterac Valley: entering state STATUS_WAIT_JOIN ..."); // Initial Nodes - for(i = 0; i < BG_AV_OBJECT_MAX; i++) + for (i = 0; i < BG_AV_OBJECT_MAX; i++) SpawnBGObject(i, RESPAWN_ONE_DAY); - for(i = BG_AV_OBJECT_FLAG_A_FIRSTAID_STATION; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_GRAVE ; i++){ + for (i = BG_AV_OBJECT_FLAG_A_FIRSTAID_STATION; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_GRAVE ; i++){ SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+3*i,RESPAWN_IMMEDIATELY); SpawnBGObject(i, RESPAWN_IMMEDIATELY); } - for(i = BG_AV_OBJECT_FLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_BUNKER ; i++) + for (i = BG_AV_OBJECT_FLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_BUNKER ; i++) SpawnBGObject(i, RESPAWN_IMMEDIATELY); - for(i = BG_AV_OBJECT_FLAG_H_ICEBLOOD_GRAVE; i <= BG_AV_OBJECT_FLAG_H_FROSTWOLF_WTOWER ; i++){ + for (i = BG_AV_OBJECT_FLAG_H_ICEBLOOD_GRAVE; i <= BG_AV_OBJECT_FLAG_H_FROSTWOLF_WTOWER ; i++){ SpawnBGObject(i, RESPAWN_IMMEDIATELY); if(i<=BG_AV_OBJECT_FLAG_H_FROSTWOLF_HUT) SpawnBGObject(BG_AV_OBJECT_AURA_H_FIRSTAID_STATION+3*GetNodeThroughObject(i),RESPAWN_IMMEDIATELY); } - for(i = BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_TFLAG_A_STONEHEART_BUNKER; i+=2) + for (i = BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_TFLAG_A_STONEHEART_BUNKER; i+=2) { SpawnBGObject(i, RESPAWN_IMMEDIATELY); //flag SpawnBGObject(i+16, RESPAWN_IMMEDIATELY); //aura } - for(i = BG_AV_OBJECT_TFLAG_H_ICEBLOOD_TOWER; i <= BG_AV_OBJECT_TFLAG_H_FROSTWOLF_WTOWER; i+=2) + for (i = BG_AV_OBJECT_TFLAG_H_ICEBLOOD_TOWER; i <= BG_AV_OBJECT_TFLAG_H_FROSTWOLF_WTOWER; i+=2) { SpawnBGObject(i, RESPAWN_IMMEDIATELY); //flag SpawnBGObject(i+16, RESPAWN_IMMEDIATELY); //aura } //snowfall and the doors - for(i = BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE; i <= BG_AV_OBJECT_DOOR_A; i++) + for (i = BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE; i <= BG_AV_OBJECT_DOOR_A; i++) SpawnBGObject(i, RESPAWN_IMMEDIATELY); SpawnBGObject(BG_AV_OBJECT_AURA_N_SNOWFALL_GRAVE,RESPAWN_IMMEDIATELY); //creatures sLog.outDebug("BG_AV start poputlating nodes"); - for(BG_AV_Nodes i= BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i ) + for (BG_AV_Nodes i= BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i ) { if(m_Nodes[i].Owner) PopulateNode(i); } //all creatures which don't get despawned through the script are static sLog.outDebug("BG_AV: start spawning static creatures"); - for(i=0; i < AV_STATICCPLACE_MAX; i++ ) + for (i=0; i < AV_STATICCPLACE_MAX; i++ ) AddAVCreature(0,i+AV_CPLACE_MAX); //mainspiritguides: sLog.outDebug("BG_AV: start spawning spiritguides creatures"); @@ -1298,7 +1288,7 @@ bool BattleGroundAV::SetupBattleGround() AddSpiritGuide(8, BG_AV_CreaturePos[8][0], BG_AV_CreaturePos[8][1], BG_AV_CreaturePos[8][2], BG_AV_CreaturePos[8][3], HORDE); //spawn the marshals (those who get deleted, if a tower gets destroyed) sLog.outDebug("BG_AV: start spawning marshal creatures"); - for(i=AV_NPC_A_MARSHAL_SOUTH; i<= AV_NPC_H_MARSHAL_WTOWER; i++) + for (i=AV_NPC_A_MARSHAL_SOUTH; i<= AV_NPC_H_MARSHAL_WTOWER; i++) AddAVCreature(i,AV_CPLACE_A_MARSHAL_SOUTH+(i-AV_NPC_A_MARSHAL_SOUTH)); AddAVCreature(AV_NPC_HERALD,AV_CPLACE_HERALD); return true; @@ -1400,9 +1390,9 @@ void BattleGroundAV::DefendNode(BG_AV_Nodes node, uint16 team) void BattleGroundAV::ResetBGSubclass() { m_MaxLevel=0; - for(uint8 i=0; i<2; i++) //forloop for both teams (it just make 0==alliance and 1==horde also for both mines 0=north 1=south + for (uint8 i=0; i<2; i++) //forloop for both teams (it just make 0==alliance and 1==horde also for both mines 0=north 1=south { - for(uint8 j=0; j<9; j++) + for (uint8 j=0; j<9; j++) m_Team_QuestStatus[i][j]=0; m_Team_Scores[i]=BG_AV_SCORE_INITIAL_POINTS; m_IsInformedNearVictory[i]=false; @@ -1411,18 +1401,18 @@ void BattleGroundAV::ResetBGSubclass() m_Mine_Owner[i] = AV_NEUTRAL_TEAM; m_Mine_PrevOwner[i] = m_Mine_Owner[i]; } - for(BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_STONEHEART_GRAVE; ++i) //alliance graves + for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_STONEHEART_GRAVE; ++i) //alliance graves InitNode(i,ALLIANCE,false); - for(BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_STONEHEART_BUNKER; ++i) //alliance towers + for (BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_STONEHEART_BUNKER; ++i) //alliance towers InitNode(i,ALLIANCE,true); - for(BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_GRAVE; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i) //horde graves + for (BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_GRAVE; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i) //horde graves InitNode(i,HORDE,false); - for(BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_TOWER; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i) //horde towers + for (BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_TOWER; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i) //horde towers InitNode(i,HORDE,true); InitNode(BG_AV_NODES_SNOWFALL_GRAVE,AV_NEUTRAL_TEAM,false); //give snowfall neutral owner m_Mine_Timer=AV_MINE_TICK_TIMER; - for(uint16 i = 0; i < AV_CPLACE_MAX+AV_STATICCPLACE_MAX; i++) + for (uint16 i = 0; i < AV_CPLACE_MAX+AV_STATICCPLACE_MAX; i++) if(m_BgCreatures[i]) DelCreature(i); diff --git a/src/game/BattleGroundAV.h b/src/game/BattleGroundAV.h index 306c513ae95..17d8c97e7e8 100644 --- a/src/game/BattleGroundAV.h +++ b/src/game/BattleGroundAV.h @@ -97,7 +97,6 @@ horde: AV_SOUND_ALLIANCE_CAPTAIN = 8232, //gets called when someone attacks them and at the beginning after 3min+rand(x)*10sec (maybe buff) AV_SOUND_HORDE_CAPTAIN = 8333, - }; enum BG_AV_OTHER_VALUES @@ -310,8 +309,6 @@ enum BG_AV_ObjectTypes BG_AV_OBJECT_MAX = 237 }; - - enum BG_AV_OBJECTS { AV_OPLACE_FIRSTAID_STATION = 0, @@ -535,7 +532,6 @@ const float BG_AV_DoorPositons[2][4] = { {-1375.193f, -538.981f, 55.2824f, 0.72178f} //horde }; - //creaturestuff starts here //is related to BG_AV_CreaturePos enum BG_AV_CreaturePlace @@ -942,7 +938,6 @@ const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = { }; - enum BG_AV_CreatureIds { @@ -1256,8 +1251,6 @@ enum BG_AV_Graveyards AV_GRAVE_MAIN_HORDE = 610 }; - - const uint32 BG_AV_GraveyardIds[9]= { AV_GRAVE_STORM_AID, AV_GRAVE_STORM_GRAVE, @@ -1338,7 +1331,6 @@ enum BG_AV_WorldStates AV_FROSTWOLFHUT_H_C = 1330, AV_FROSTWOLFHUT_H_A = 1332, //over ac - //Towers //Alliance //Dunbaldar South Bunker @@ -1405,7 +1397,6 @@ const uint32 BG_AV_MineWorldStates[2][3] = { {1355, 1357,1356} }; - //alliance_control alliance_assault h_control h_assault const uint32 BG_AV_NodeWorldStates[16][4] = { //Stormpike first aid station @@ -1523,7 +1514,6 @@ class BattleGroundAV : public BattleGround void HandleQuestComplete(uint32 questid, Player *player); bool PlayerCanDoMineQuest(int32 GOId,uint32 team); - void EndBattleGround(uint32 winner); virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player); @@ -1547,7 +1537,6 @@ class BattleGroundAV : public BattleGround const char* GetNodeName(BG_AV_Nodes node); const bool IsTower(BG_AV_Nodes node) { return m_Nodes[node].Tower; } - /*mine*/ void ChangeMineOwner(uint8 mine, uint32 team, bool initial=false); @@ -1577,7 +1566,6 @@ class BattleGroundAV : public BattleGround uint8 m_MaxLevel; //TODO remove this when battleground-getmaxlevel() returns something usefull bool m_IsInformedNearVictory[2]; - }; #endif diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp index 05475328b01..c81042ec2e8 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/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp index 0c7ea66388b..55c745525dc 100644 --- a/src/game/BattleGroundEY.cpp +++ b/src/game/BattleGroundEY.cpp @@ -107,7 +107,7 @@ void BattleGroundEY::StartingEventCloseDoors() SpawnBGObject(BG_EY_OBJECT_DOOR_A, RESPAWN_IMMEDIATELY); SpawnBGObject(BG_EY_OBJECT_DOOR_H, RESPAWN_IMMEDIATELY); - for(uint32 i = BG_EY_OBJECT_A_BANNER_FEL_REALVER_CENTER; i < BG_EY_OBJECT_MAX; ++i) + for (uint32 i = BG_EY_OBJECT_A_BANNER_FEL_REALVER_CENTER; i < BG_EY_OBJECT_MAX; ++i) SpawnBGObject(i, RESPAWN_ONE_DAY); } @@ -116,9 +116,9 @@ void BattleGroundEY::StartingEventOpenDoors() SpawnBGObject(BG_EY_OBJECT_DOOR_A, RESPAWN_ONE_DAY); SpawnBGObject(BG_EY_OBJECT_DOOR_H, RESPAWN_ONE_DAY); - for(uint32 i = BG_EY_OBJECT_N_BANNER_FEL_REALVER_CENTER; i <= BG_EY_OBJECT_FLAG_NETHERSTORM; ++i) + for (uint32 i = BG_EY_OBJECT_N_BANNER_FEL_REALVER_CENTER; i <= BG_EY_OBJECT_FLAG_NETHERSTORM; ++i) SpawnBGObject(i, RESPAWN_IMMEDIATELY); - for(uint32 i = 0; i < EY_POINTS_MAX; ++i) + for (uint32 i = 0; i < EY_POINTS_MAX; ++i) { //randomly spawn buff uint8 buff = urand(0, 2); @@ -182,7 +182,7 @@ void BattleGroundEY::CheckSomeoneLeftPoint() for (uint8 i = 0; i < 2*EY_POINTS_MAX; ++i) m_CurrentPointPlayersCount[i] = 0; GameObject *obj = NULL; - for(uint8 i = 0; i < EY_POINTS_MAX; ++i) + for (uint8 i = 0; i < EY_POINTS_MAX; ++i) { obj = HashMapHolder<GameObject>::Find(m_BgObjects[BG_EY_OBJECT_TOWER_CAP_FEL_REALVER + i]); if (obj) @@ -220,7 +220,7 @@ void BattleGroundEY::CheckSomeoneLeftPoint() void BattleGroundEY::UpdatePointStatuses() { - for(uint8 point = 0; point < EY_POINTS_MAX; ++point) + for (uint8 point = 0; point < EY_POINTS_MAX; ++point) { if (m_PlayersNearPoint[point].empty()) continue; @@ -350,7 +350,7 @@ void BattleGroundEY::RemovePlayer(Player *plr, uint64 guid) // sometimes flag aura not removed :( for (int j = EY_POINTS_MAX; j >= 0; --j) { - for(size_t i = 0; i < m_PlayersNearPoint[j].size(); ++i) + for (size_t i = 0; i < m_PlayersNearPoint[j].size(); ++i) if (m_PlayersNearPoint[j][i] == guid) m_PlayersNearPoint[j].erase(m_PlayersNearPoint[j].begin() + i); } @@ -532,7 +532,7 @@ void BattleGroundEY::Reset() bool isBGWeekend = sBattleGroundMgr.IsBGWeekend(GetTypeID()); m_HonorTics = (isBGWeekend) ? BG_EY_EYWeekendHonorTicks : BG_EY_NotEYWeekendHonorTicks; - for(uint8 i = 0; i < EY_POINTS_MAX; ++i) + for (uint8 i = 0; i < EY_POINTS_MAX; ++i) { m_PointOwnedByTeam[i] = EY_POINT_NO_OWNER; m_PointState[i] = EY_POINT_STATE_UNCONTROLLED; @@ -881,11 +881,10 @@ WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(Player* player) float plr_y = player->GetPositionY(); float plr_z = player->GetPositionZ(); - distance = (entry->x - plr_x)*(entry->x - plr_x) + (entry->y - plr_y)*(entry->y - plr_y) + (entry->z - plr_z)*(entry->z - plr_z); nearestDistance = distance; - for(uint8 i = 0; i < EY_POINTS_MAX; ++i) + for (uint8 i = 0; i < EY_POINTS_MAX; ++i) { if (m_PointOwnedByTeam[i]==player->GetTeam() && m_PointState[i]==EY_POINT_UNDER_CONTROL) { @@ -910,7 +909,7 @@ WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(Player* player) bool BattleGroundEY::IsAllNodesConrolledByTeam(uint32 team) const { uint32 count = 0; - for(int i = 0; i < EY_POINTS_MAX; ++i) + for (int i = 0; i < EY_POINTS_MAX; ++i) if (m_PointOwnedByTeam[i] == team && m_PointState[i] == EY_POINT_UNDER_CONTROL) ++count; diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index 3e7c453e300..caf400f7364 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -153,7 +153,7 @@ void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data ) if (joinAsGroup /* && _player->GetGroup()*/) { sLog.outDebug("Battleground: the following players are joining as group:"); - for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { Player *member = itr->getSource(); if(!member) continue; // this should never happen @@ -215,7 +215,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 @@ -710,7 +710,7 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data ) // the arenateam id must match for everyone in the group // get the personal ratings for queueing uint32 avg_pers_rating = 0; - for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { Player *member = itr->getSource(); @@ -738,8 +738,8 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data ) } else bg->SetRated(false); - - for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) + + for (GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { Player *member = itr->getSource(); if(!member) continue; diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index f2143de5bdc..49d24fd2809 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -54,13 +54,13 @@ INSTANTIATE_SINGLETON_1( BattleGroundMgr ); BattleGroundQueue::BattleGroundQueue() { - for(uint32 i = 0; i < BG_TEAMS_COUNT; i++) + for (uint32 i = 0; i < BG_TEAMS_COUNT; i++) { - for(uint32 j = 0; j < MAX_BATTLEGROUND_QUEUES; j++) + for (uint32 j = 0; j < MAX_BATTLEGROUND_QUEUES; j++) { m_SumOfWaitTimes[i][j] = 0; m_WaitTimeLastPlayer[i][j] = 0; - for(uint32 k = 0; k < COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME; k++) + for (uint32 k = 0; k < COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME; k++) m_WaitTimes[i][j][k] = 0; } } @@ -71,9 +71,9 @@ BattleGroundQueue::~BattleGroundQueue() m_QueuedPlayers.clear(); for (int i = 0; i < MAX_BATTLEGROUND_QUEUES; i++) { - for(uint32 j = 0; j < BG_QUEUE_GROUP_TYPES_COUNT; j++) + for (uint32 j = 0; j < BG_QUEUE_GROUP_TYPES_COUNT; j++) { - for(GroupsQueueType::iterator itr = m_QueuedGroups[i][j].begin(); itr!= m_QueuedGroups[i][j].end(); ++itr) + for (GroupsQueueType::iterator itr = m_QueuedGroups[i][j].begin(); itr!= m_QueuedGroups[i][j].end(); ++itr) delete (*itr); m_QueuedGroups[i][j].clear(); } @@ -273,7 +273,7 @@ void BattleGroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCou //they leave groupinfo so we can't use its players size to find out index for (uint32 j = index; j < BG_QUEUE_GROUP_TYPES_COUNT; j += BG_QUEUE_NORMAL_ALLIANCE) { - for(group_itr_tmp = m_QueuedGroups[queue_id_tmp][j].begin(); group_itr_tmp != m_QueuedGroups[queue_id_tmp][j].end(); ++group_itr_tmp) + for (group_itr_tmp = m_QueuedGroups[queue_id_tmp][j].begin(); group_itr_tmp != m_QueuedGroups[queue_id_tmp][j].end(); ++group_itr_tmp) { if ((*group_itr_tmp) == group) { @@ -415,10 +415,10 @@ void BattleGroundQueue::AnnounceWorld(GroupQueueInfo *ginfo, const uint64& playe uint32 q_min_level = (queue_id + 1) * 10; uint32 q_max_level = std::min(q_min_level + 9, sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)); GroupsQueueType::const_iterator itr; - for(itr = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE].begin(); itr != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE].end(); ++itr) + for (itr = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE].begin(); itr != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE].end(); ++itr) if (!(*itr)->IsInvitedToBGInstanceGUID) qAlliance += (*itr)->Players.size(); - for(itr = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_HORDE].begin(); itr != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_HORDE].end(); ++itr) + for (itr = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_HORDE].begin(); itr != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_HORDE].end(); ++itr) if (!(*itr)->IsInvitedToBGInstanceGUID) qHorde += (*itr)->Players.size(); @@ -460,7 +460,7 @@ bool BattleGroundQueue::InviteGroupToBG(GroupQueueInfo * ginfo, BattleGround * b ginfo->RemoveInviteTime = getMSTime() + INVITE_ACCEPT_WAIT_TIME; // loop through the players - for(std::map<uint64,PlayerQueueInfo*>::iterator itr = ginfo->Players.begin(); itr != ginfo->Players.end(); ++itr) + for (std::map<uint64,PlayerQueueInfo*>::iterator itr = ginfo->Players.begin(); itr != ginfo->Players.end(); ++itr) { // get the player Player* plr = objmgr.GetPlayer(itr->first); @@ -591,10 +591,10 @@ bool BattleGroundQueue::CheckPremadeMatch(BGQueueIdBasedOnLevel queue_id, uint32 //start premade match //if groups aren't invited GroupsQueueType::const_iterator ali_group, horde_group; - for( ali_group = m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_ALLIANCE].begin(); ali_group != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++ali_group) + for (ali_group = m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_ALLIANCE].begin(); ali_group != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++ali_group) if (!(*ali_group)->IsInvitedToBGInstanceGUID) break; - for( horde_group = m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].begin(); horde_group != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].end(); ++horde_group) + for (horde_group = m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].begin(); horde_group != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].end(); ++horde_group) if (!(*horde_group)->IsInvitedToBGInstanceGUID) break; @@ -605,9 +605,9 @@ bool BattleGroundQueue::CheckPremadeMatch(BGQueueIdBasedOnLevel queue_id, uint32 //add groups/players from normal queue to size of bigger group uint32 maxPlayers = std::min(m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount(), m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount()); GroupsQueueType::const_iterator itr; - for(uint32 i = 0; i < BG_TEAMS_COUNT; i++) + for (uint32 i = 0; i < BG_TEAMS_COUNT; i++) { - for(itr = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin(); itr != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++itr) + for (itr = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin(); itr != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++itr) { //if itr can join BG and player count is less that maxPlayers, then add group to selectionpool if (!(*itr)->IsInvitedToBGInstanceGUID && !m_SelectionPools[i].AddGroup((*itr), maxPlayers)) @@ -623,7 +623,7 @@ bool BattleGroundQueue::CheckPremadeMatch(BGQueueIdBasedOnLevel queue_id, uint32 // if first is invited to BG and seconds timer expired, but we can ignore it, because players have only 80 seconds to click to enter bg // and when they click or after 80 seconds the queue info is removed from queue uint32 time_before = getMSTime() - sWorld.getConfig(CONFIG_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH); - for(uint32 i = 0; i < BG_TEAMS_COUNT; i++) + for (uint32 i = 0; i < BG_TEAMS_COUNT; i++) { if (!m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_ALLIANCE + i].empty()) { @@ -644,10 +644,10 @@ bool BattleGroundQueue::CheckPremadeMatch(BGQueueIdBasedOnLevel queue_id, uint32 bool BattleGroundQueue::CheckNormalMatch(BattleGround* bg_template, BGQueueIdBasedOnLevel queue_id, uint32 minPlayers, uint32 maxPlayers) { GroupsQueueType::const_iterator itr_team[BG_TEAMS_COUNT]; - for(uint32 i = 0; i < BG_TEAMS_COUNT; i++) + for (uint32 i = 0; i < BG_TEAMS_COUNT; i++) { itr_team[i] = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin(); - for(; itr_team[i] != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++(itr_team[i])) + for (; itr_team[i] != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++(itr_team[i])) { if (!(*(itr_team[i]))->IsInvitedToBGInstanceGUID) { @@ -666,7 +666,7 @@ bool BattleGroundQueue::CheckNormalMatch(BattleGround* bg_template, BGQueueIdBas { //we will try to invite more groups to team with less players indexed by j ++(itr_team[j]); //this will not cause a crash, because for cycle above reached break; - for(; itr_team[j] != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + j].end(); ++(itr_team[j])) + for (; itr_team[j] != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + j].end(); ++(itr_team[j])) { if (!(*(itr_team[j]))->IsInvitedToBGInstanceGUID) if (!m_SelectionPools[j].AddGroup(*(itr_team[j]), m_SelectionPools[(j + 1) % BG_TEAMS_COUNT].GetPlayerCount())) @@ -703,7 +703,7 @@ bool BattleGroundQueue::CheckSkirmishForSameFaction(BGQueueIdBasedOnLevel queue_ GroupQueueInfo* ginfo = m_SelectionPools[teamIndex].SelectedGroups.back(); //set itr_team to group that was added to selection pool latest GroupsQueueType::iterator itr_team = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].begin(); - for(; itr_team != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr_team) + for (; itr_team != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr_team) if (ginfo == *itr_team) break; if (itr_team == m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end()) @@ -711,7 +711,7 @@ bool BattleGroundQueue::CheckSkirmishForSameFaction(BGQueueIdBasedOnLevel queue_ GroupsQueueType::iterator itr_team2 = itr_team; ++itr_team2; //invite players to other selection pool - for(; itr_team2 != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr_team2) + for (; itr_team2 != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr_team2) { //if selection pool is full then break; if (!(*itr_team2)->IsInvitedToBGInstanceGUID && !m_SelectionPools[otherTeam].AddGroup(*itr_team2, minPlayersPerTeam)) @@ -721,7 +721,7 @@ bool BattleGroundQueue::CheckSkirmishForSameFaction(BGQueueIdBasedOnLevel queue_ return false; //here we have correct 2 selections and we need to change one teams team and move selection pool teams to other team's queue - for(GroupsQueueType::iterator itr = m_SelectionPools[otherTeam].SelectedGroups.begin(); itr != m_SelectionPools[otherTeam].SelectedGroups.end(); ++itr) + for (GroupsQueueType::iterator itr = m_SelectionPools[otherTeam].SelectedGroups.begin(); itr != m_SelectionPools[otherTeam].SelectedGroups.end(); ++itr) { //set correct team (*itr)->Team = otherTeamId; @@ -730,7 +730,7 @@ bool BattleGroundQueue::CheckSkirmishForSameFaction(BGQueueIdBasedOnLevel queue_ //remove team from old queue GroupsQueueType::iterator itr2 = itr_team; ++itr2; - for(; itr2 != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr2) + for (; itr2 != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE + teamIndex].end(); ++itr2) { if (*itr2 == *itr) { @@ -778,9 +778,9 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve FillPlayersToBG(bg, queue_id); // now everything is set, invite players - for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.end(); ++citr) + for (GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.end(); ++citr) InviteGroupToBG((*citr), bg, (*citr)->Team); - for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.end(); ++citr) + for (GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.end(); ++citr) InviteGroupToBG((*citr), bg, (*citr)->Team); if (!bg->HasFreeSlots()) @@ -850,8 +850,8 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve return; } //invite those selection pools - for(uint32 i = 0; i < BG_TEAMS_COUNT; i++) - for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.end(); ++citr) + for (uint32 i = 0; i < BG_TEAMS_COUNT; i++) + for (GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.end(); ++citr) InviteGroupToBG((*citr), bg2, (*citr)->Team); //start bg bg2->StartBattleGround(); @@ -877,8 +877,8 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve } // invite those selection pools - for(uint32 i = 0; i < BG_TEAMS_COUNT; i++) - for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.end(); ++citr) + for (uint32 i = 0; i < BG_TEAMS_COUNT; i++) + for (GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.end(); ++citr) InviteGroupToBG((*citr), bg2, (*citr)->Team); // start bg bg2->StartBattleGround(); @@ -927,11 +927,11 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve //optimalization : --- we dont need to use selection_pools - each update we select max 2 groups - for(uint32 i = BG_QUEUE_PREMADE_ALLIANCE; i < BG_QUEUE_NORMAL_ALLIANCE; i++) + for (uint32 i = BG_QUEUE_PREMADE_ALLIANCE; i < BG_QUEUE_NORMAL_ALLIANCE; i++) { // take the group that joined first itr_team[i] = m_QueuedGroups[queue_id][i].begin(); - for(; itr_team[i] != m_QueuedGroups[queue_id][i].end(); ++(itr_team[i])) + for (; itr_team[i] != m_QueuedGroups[queue_id][i].end(); ++(itr_team[i])) { // if group match conditions, then add it to pool if( !(*itr_team[i])->IsInvitedToBGInstanceGUID @@ -952,7 +952,7 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve { itr_team[BG_TEAM_ALLIANCE] = itr_team[BG_TEAM_HORDE]; ++itr_team[BG_TEAM_ALLIANCE]; - for(; itr_team[BG_TEAM_ALLIANCE] != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].end(); ++(itr_team[BG_TEAM_ALLIANCE])) + for (; itr_team[BG_TEAM_ALLIANCE] != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].end(); ++(itr_team[BG_TEAM_ALLIANCE])) { if( !(*itr_team[BG_TEAM_ALLIANCE])->IsInvitedToBGInstanceGUID && (((*itr_team[BG_TEAM_ALLIANCE])->ArenaTeamRating >= arenaMinRating && (*itr_team[BG_TEAM_ALLIANCE])->ArenaTeamRating <= arenaMaxRating) @@ -968,7 +968,7 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve { itr_team[BG_TEAM_HORDE] = itr_team[BG_TEAM_ALLIANCE]; ++itr_team[BG_TEAM_HORDE]; - for(; itr_team[BG_TEAM_HORDE] != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++(itr_team[BG_TEAM_HORDE])) + for (; itr_team[BG_TEAM_HORDE] != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++(itr_team[BG_TEAM_HORDE])) { if( !(*itr_team[BG_TEAM_HORDE])->IsInvitedToBGInstanceGUID && (((*itr_team[BG_TEAM_HORDE])->ArenaTeamRating >= arenaMinRating && (*itr_team[BG_TEAM_HORDE])->ArenaTeamRating <= arenaMaxRating) @@ -1119,7 +1119,7 @@ void BGQueueRemoveEvent::Abort(uint64 /*e_time*/) BattleGroundMgr::BattleGroundMgr() : m_AutoDistributionTimeChecker(0), m_ArenaTesting(false) { - for(uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++) + for (uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++) m_BattleGrounds[i].clear(); m_NextRatingDiscardUpdate = sWorld.getConfig(CONFIG_ARENA_RATING_DISCARD_TIMER); m_Testing=false; @@ -1132,9 +1132,9 @@ BattleGroundMgr::~BattleGroundMgr() void BattleGroundMgr::DeleteAllBattleGrounds() { - for(uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++) + for (uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++) { - for(BattleGroundSet::iterator itr = m_BattleGrounds[i].begin(); itr != m_BattleGrounds[i].end();) + for (BattleGroundSet::iterator itr = m_BattleGrounds[i].begin(); itr != m_BattleGrounds[i].end(); ) { BattleGround * bg = itr->second; m_BattleGrounds[i].erase(itr++); @@ -1145,7 +1145,7 @@ void BattleGroundMgr::DeleteAllBattleGrounds() } // destroy template battlegrounds that listed only in queues (other already terminated) - for(uint32 bgTypeId = 0; bgTypeId < MAX_BATTLEGROUND_TYPE_ID; ++bgTypeId) + for (uint32 bgTypeId = 0; bgTypeId < MAX_BATTLEGROUND_TYPE_ID; ++bgTypeId) { // ~BattleGround call unregistring BG from queue while(!BGFreeSlotQueue[bgTypeId].empty()) @@ -1157,13 +1157,13 @@ void BattleGroundMgr::DeleteAllBattleGrounds() void BattleGroundMgr::Update(uint32 diff) { BattleGroundSet::iterator itr, next; - for(uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++) + for (uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++) { itr = m_BattleGrounds[i].begin(); // skip updating battleground template if (itr != m_BattleGrounds[i].end()) ++itr; - for(; itr != m_BattleGrounds[i].end(); itr = next) + for (; itr != m_BattleGrounds[i].end(); itr = next) { next = itr; ++next; @@ -1339,14 +1339,14 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg) if(type) // arena { // it seems this must be according to BG_WINNER_A/H and _NOT_ BG_TEAM_A/H - for(int i = 1; i >= 0; --i) + for (int i = 1; i >= 0; --i) { *data << uint32(bg->m_ArenaTeamRatingChanges[i]); *data << uint32(3999); // huge thanks for TOM_RUS for this! *data << uint32(0); // added again in 3.1 sLog.outDebug("rating change: %d", bg->m_ArenaTeamRatingChanges[i]); } - for(int i = 1; i >= 0; --i) + for (int i = 1; i >= 0; --i) { uint32 at_id = bg->m_ArenaTeamIds[i]; ArenaTeam * at = objmgr.GetArenaTeamById(at_id); @@ -1369,7 +1369,7 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg) *data << (int32)(bg->GetPlayerScoresSize()); - for(BattleGround::BattleGroundScoreMap::const_iterator itr = bg->GetPlayerScoresBegin(); itr != bg->GetPlayerScoresEnd(); ++itr) + for (BattleGround::BattleGroundScoreMap::const_iterator itr = bg->GetPlayerScoresBegin(); itr != bg->GetPlayerScoresEnd(); ++itr) { *data << (uint64)itr->first; *data << (int32)itr->second->KillingBlows; @@ -1484,7 +1484,7 @@ BattleGround * BattleGroundMgr::GetBattleGroundThroughClientInstance(uint32 inst if (bg->isArena()) return GetBattleGround(instanceId, bgTypeId); - for(BattleGroundSet::iterator itr = m_BattleGrounds[bgTypeId].begin(); itr != m_BattleGrounds[bgTypeId].end(); ++itr) + for (BattleGroundSet::iterator itr = m_BattleGrounds[bgTypeId].begin(); itr != m_BattleGrounds[bgTypeId].end(); ++itr) { if (itr->second->GetClientInstanceID() == instanceId) return itr->second; @@ -1500,7 +1500,7 @@ BattleGround * BattleGroundMgr::GetBattleGround(uint32 InstanceID, BattleGroundT BattleGroundSet::iterator itr; if (bgTypeId == BATTLEGROUND_TYPE_NONE) { - for(uint32 i = BATTLEGROUND_AV; i < MAX_BATTLEGROUND_TYPE_ID; i++) + for (uint32 i = BATTLEGROUND_AV; i < MAX_BATTLEGROUND_TYPE_ID; i++) { itr = m_BattleGrounds[i].find(InstanceID); if (itr != m_BattleGrounds[i].end()) @@ -1530,7 +1530,7 @@ uint32 BattleGroundMgr::CreateClientVisibleInstanceId(BattleGroundTypeId bgTypeI // the following works, because std::set is default ordered with "<" // the optimalization would be to use as bitmask std::vector<uint32> - but that would only make code unreadable uint32 lastId = 0; - for(std::set<uint32>::iterator itr = m_ClientBattleGroundIds[bgTypeId][queue_id].begin(); itr != m_ClientBattleGroundIds[bgTypeId][queue_id].end();) + for (std::set<uint32>::iterator itr = m_ClientBattleGroundIds[bgTypeId][queue_id].begin(); itr != m_ClientBattleGroundIds[bgTypeId][queue_id].end(); ) { if( (++lastId) != *itr) //if there is a gap between the ids, we will break.. break; @@ -1816,7 +1816,7 @@ void BattleGroundMgr::DistributeArenaPoints() std::map<uint32, uint32> PlayerPoints; //at first update all points for all team members - for(ObjectMgr::ArenaTeamMap::iterator team_itr = objmgr.GetArenaTeamMapBegin(); team_itr != objmgr.GetArenaTeamMapEnd(); ++team_itr) + for (ObjectMgr::ArenaTeamMap::iterator team_itr = objmgr.GetArenaTeamMapBegin(); team_itr != objmgr.GetArenaTeamMapEnd(); ++team_itr) if (ArenaTeam * at = team_itr->second) at->UpdateArenaPointsHelper(PlayerPoints); @@ -1843,7 +1843,7 @@ void BattleGroundMgr::DistributeArenaPoints() sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_ONLINE_END); sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_TEAM_START); - for(ObjectMgr::ArenaTeamMap::iterator titr = objmgr.GetArenaTeamMapBegin(); titr != objmgr.GetArenaTeamMapEnd(); ++titr) + for (ObjectMgr::ArenaTeamMap::iterator titr = objmgr.GetArenaTeamMapBegin(); titr != objmgr.GetArenaTeamMapEnd(); ++titr) { if (ArenaTeam * at = titr->second) { @@ -1884,7 +1884,7 @@ void BattleGroundMgr::BuildBattleGroundListPacket(WorldPacket *data, const uint6 *data << uint32(0x00); // number of bg instances uint32 queue_id = plr->GetBattleGroundQueueIdFromLevel(bgTypeId); - for(std::set<uint32>::iterator itr = m_ClientBattleGroundIds[bgTypeId][queue_id].begin(); itr != m_ClientBattleGroundIds[bgTypeId][queue_id].end();++itr) + for (std::set<uint32>::iterator itr = m_ClientBattleGroundIds[bgTypeId][queue_id].begin(); itr != m_ClientBattleGroundIds[bgTypeId][queue_id].end(); ++itr) { *data << uint32(*itr); ++count; @@ -2026,7 +2026,7 @@ void BattleGroundMgr::ToggleArenaTesting() void BattleGroundMgr::SetHolidayWeekends(uint32 mask) { - for(uint32 bgtype = 1; bgtype < MAX_BATTLEGROUND_TYPE_ID; ++bgtype) + for (uint32 bgtype = 1; bgtype < MAX_BATTLEGROUND_TYPE_ID; ++bgtype) { if(BattleGround * bg = GetBattleGroundTemplate(BattleGroundTypeId(bgtype))) { diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGroundNA.cpp index 92e71c1c283..cbf43117d0a 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 b9f9943bbf2..2890f3698d6 100644 --- a/src/game/BattleGroundRL.cpp +++ b/src/game/BattleGroundRL.cpp @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include "BattleGround.h" #include "BattleGroundRL.h" #include "Language.h" @@ -59,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 ec19308e71f..63dd2f48a0b 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -148,20 +148,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); @@ -169,7 +169,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 93d3b7eae26..8d7bd63a9a9 100644 --- a/src/game/CalendarHandler.cpp +++ b/src/game/CalendarHandler.cpp @@ -45,7 +45,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket &recv_data) size_t p_counter = data.wpos(); data << uint32(counter); // instance save count - for(int i = 0; i < TOTAL_DIFFICULTIES; ++i) + for (int i = 0; i < TOTAL_DIFFICULTIES; ++i) { for (Player::BoundInstancesMap::const_iterator itr = _player->m_boundInstances[i].begin(); itr != _player->m_boundInstances[i].end(); ++itr) { @@ -119,7 +119,7 @@ void WorldSession::HandleCalendarAddEvent(WorldPacket &recv_data) // { // uint8 unk12,unk13; // uint64 guid; - // for (int i=0;i<count;i++) + // for (int i=0; i<count; i++) // { // recv_data.readPackGUID(guid); // recv_data >> (uint8)unk12; diff --git a/src/game/Cell.h b/src/game/Cell.h index 9baf4104080..5b9f62bdc64 100644 --- a/src/game/Cell.h +++ b/src/game/Cell.h @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL CellArea CellArea() : right_offset(0), left_offset(0), upper_offset(0), lower_offset(0) {} CellArea(int right, int left, int upper, int lower) : right_offset(right), left_offset(left), upper_offset(upper), lower_offset(lower) {} bool operator!() const { return !right_offset && !left_offset && !upper_offset && !lower_offset; } - + void ResizeBorders(CellPair& begin_cell, CellPair& end_cell) const { begin_cell << left_offset; @@ -60,13 +60,12 @@ struct TRINITY_DLL_DECL CellArea end_cell >> right_offset; end_cell += upper_offset; } - + int right_offset; int left_offset; int upper_offset; int lower_offset; }; - struct TRINITY_DLL_DECL Cell { @@ -168,9 +167,9 @@ struct TRINITY_DLL_DECL Cell template<class LOCK_TYPE, class T, class CONTAINER> void Visit(const CellLock<LOCK_TYPE> &, TypeContainerVisitor<T, CONTAINER> &visitor, Map &) const; template<class LOCK_TYPE, class T, class CONTAINER> void Visit(const CellLock<LOCK_TYPE> &, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const WorldObject &obj, float radius) const; template<class LOCK_TYPE, class T, class CONTAINER> void Visit(const CellLock<LOCK_TYPE> &, TypeContainerVisitor<T, CONTAINER> &visitor, Map &, float radius, float x_off, float y_off) const; - + static CellArea CalculateCellArea(const WorldObject &obj, float radius); - + private: template<class LOCK_TYPE, class T, class CONTAINER> void VisitCircle(const CellLock<LOCK_TYPE> &, TypeContainerVisitor<T, CONTAINER> &, Map &, const CellPair& , const CellPair& ) const; }; diff --git a/src/game/CellImpl.h b/src/game/CellImpl.h index ff2b0343c69..617d567ce32 100644 --- a/src/game/CellImpl.h +++ b/src/game/CellImpl.h @@ -119,9 +119,9 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi } // loop the cell range - for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++) + for (uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++) { - for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; y++) + for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; y++) { CellPair cell_pair(x,y); Cell r_zone(cell_pair); @@ -167,9 +167,9 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi end_cell += upper; // loop the cell range - for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++) + for (uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++) { - for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; y++) + for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; y++) { CellPair cell_pair(x,y); Cell r_zone(cell_pair); @@ -184,15 +184,15 @@ inline int CellHelper(const float radius) { if(radius < 1.0f) return 0; - + return (int)ceilf(radius/SIZE_OF_GRID_CELL); } - + inline CellArea Cell::CalculateCellArea(const WorldObject &obj, float radius) { if(radius <= 0.0f) return CellArea(); - + //we should increase search radius by object's radius, otherwise //we could have problems with huge creatures, which won't attack nearest players etc radius += obj.GetObjectSize(); @@ -200,23 +200,23 @@ inline CellArea Cell::CalculateCellArea(const WorldObject &obj, float radius) //TODO: add more correct/generic method for this task const float x_offset = (obj.GetPositionX() - CENTER_GRID_CELL_OFFSET)/SIZE_OF_GRID_CELL; const float y_offset = (obj.GetPositionY() - CENTER_GRID_CELL_OFFSET)/SIZE_OF_GRID_CELL; - + const float x_val = floor(x_offset + CENTER_GRID_CELL_ID + 0.5f); const float y_val = floor(y_offset + CENTER_GRID_CELL_ID + 0.5f); - + const float x_off = (x_offset - x_val + CENTER_GRID_CELL_ID) * SIZE_OF_GRID_CELL; const float y_off = (y_offset - y_val + CENTER_GRID_CELL_ID) * SIZE_OF_GRID_CELL; - + const float tmp_diff = radius - CENTER_GRID_CELL_OFFSET; //lets calculate upper/lower/right/left corners for cell search int right = CellHelper(tmp_diff + x_off); int left = CellHelper(tmp_diff - x_off); int upper = CellHelper(tmp_diff + y_off); int lower = CellHelper(tmp_diff - y_off); - + return CellArea(right, left, upper, lower); } - + template<class LOCK_TYPE, class T, class CONTAINER> inline void Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const WorldObject &obj, float radius) const @@ -224,7 +224,7 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi const CellPair &standing_cell = l.i_cellPair; if (standing_cell.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || standing_cell.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP) return; - + //no jokes here... Actually placing ASSERT() here was good idea, but //we had some problems with DynamicObjects, which pass radius = 0.0f (DB issue?) //maybe it is better to just return when radius <= 0.0f? @@ -236,7 +236,7 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi //lets limit the upper value for search radius if(radius > 333.0f) radius = 333.0f; - + //lets calculate object coord offsets from cell borders. CellArea area = Cell::CalculateCellArea(obj, radius); //if radius fits inside standing cell @@ -245,10 +245,10 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi m.Visit(l, visitor); return; } - + CellPair begin_cell = standing_cell; CellPair end_cell = standing_cell; - + area.ResizeBorders(begin_cell, end_cell); //visit all cells, found in CalculateCellArea() //if radius is known to reach cell area more than 4x4 then we should call optimized VisitCircle @@ -259,15 +259,15 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi VisitCircle(l, visitor, m, begin_cell, end_cell); return; } - + //ALWAYS visit standing cell first!!! Since we deal with small radiuses //it is very essential to call visitor for standing cell firstly... m.Visit(l, visitor); - + // loop the cell range - for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++) + for (uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++) { - for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; y++) + for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; y++) { CellPair cell_pair(x,y); //lets skip standing cell since we already visited it @@ -281,7 +281,7 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi } } } - + template<class LOCK_TYPE, class T, class CONTAINER> inline void Cell::VisitCircle(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const CellPair& begin_cell, const CellPair& end_cell) const @@ -291,11 +291,11 @@ Cell::VisitCircle(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINE //lets calculate x_start/x_end coords for central strip... const uint32 x_start = begin_cell.x_coord + x_shift; const uint32 x_end = end_cell.x_coord - x_shift; - + //visit central strip with constant width... - for(uint32 x = x_start; x <= x_end; ++x) + for (uint32 x = x_start; x <= x_end; ++x) { - for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) + for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) { CellPair cell_pair(x,y); Cell r_zone(cell_pair); @@ -304,12 +304,12 @@ Cell::VisitCircle(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINE m.Visit(lock, visitor); } } - + //if x_shift == 0 then we have too small cell area, which were already //visited at previous step, so just return from procedure... if(x_shift == 0) return; - + uint32 y_start = end_cell.y_coord; uint32 y_end = begin_cell.y_coord; //now we are visiting borders of an octagon... @@ -327,7 +327,7 @@ Cell::VisitCircle(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINE r_zone_left.data.Part.nocreate = l->data.Part.nocreate; CellLock<LOCK_TYPE> lock_left(r_zone_left, cell_pair_left); m.Visit(lock_left, visitor); - + //right trapezoid cell visit CellPair cell_pair_right(x_end + step, y); Cell r_zone_right(cell_pair_right); diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index 72e35a6e777..c7155d7d2b1 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -46,7 +46,7 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team) m_flags |= CHANNEL_FLAG_LFG; else // for all other channels m_flags |= CHANNEL_FLAG_NOT_LFG; - m_IsSaved = false; + m_IsSaved = false; } else // it's custom channel { @@ -62,14 +62,14 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team) m_moderate = fields[3].GetBool(); m_password = fields[4].GetString(); const char* db_BannedList = fields[5].GetString(); - + m_IsSaved = true; if(db_BannedList) { Tokens tokens = StrSplit(db_BannedList, " "); Tokens::iterator iter; - for (iter = tokens.begin();iter != tokens.end(); ++iter) + for (iter = tokens.begin(); iter != tokens.end(); ++iter) { uint64 banned_guid = atol((*iter).c_str()); if(banned_guid) @@ -87,7 +87,7 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team) { sLog.outDebug("New Channel(%s) saved", name.c_str()); m_IsSaved = true; - } + } } } } @@ -160,7 +160,7 @@ void Channel::Join(uint64 p, const char *pass) if(!IsConstant() && !m_ownerGUID) { SetOwner(p, (players.size() > 1 ? true : false)); - players[p].SetModerator(true); + players[p].SetModerator(true); } /* else if(!IsConstant() && m_ownerGUID && plr && m_ownerGUID == plr->GetGUID() )) @@ -265,7 +265,7 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban) { std::ostringstream banlist; BannedList::iterator iter; - for (iter = banned.begin();iter != banned.end(); ++iter) + for (iter = banned.begin(); iter != banned.end(); ++iter) { banlist << (*iter) << " "; } @@ -274,7 +274,7 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban) if(CharacterDatabase.PExecute( ss.str( ).c_str( ) )) { sLog.outDebug("Channel(%s) BannedList saved", m_name.c_str()); - } + } } } @@ -335,7 +335,7 @@ void Channel::UnBan(uint64 good, const char *badname) { std::ostringstream banlist; BannedList::iterator iter; - for (iter = banned.begin();iter != banned.end(); ++iter) + for (iter = banned.begin(); iter != banned.end(); ++iter) { banlist << (*iter) << " "; } @@ -344,7 +344,7 @@ void Channel::UnBan(uint64 good, const char *badname) if(CharacterDatabase.PExecute( ss.str( ).c_str( ) )) { sLog.outDebug("Channel(%s) BannedList saved", m_name.c_str()); - } + } } } } @@ -383,7 +383,7 @@ void Channel::Password(uint64 p, const char *pass) if(CharacterDatabase.PExecute( ss.str( ).c_str( ) )) { sLog.outDebug("Channel(%s) password saved", m_name.c_str()); - } + } } } } @@ -541,7 +541,7 @@ void Channel::List(Player* player) uint32 gmLevelInWhoList = sWorld.getConfig(CONFIG_GM_LEVEL_IN_WHO_LIST); uint32 count = 0; - for(PlayerList::const_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); @@ -598,7 +598,7 @@ void Channel::Announce(uint64 p) if(CharacterDatabase.PExecute( ss.str( ).c_str( ) )) { sLog.outDebug("Channel(%s) announce saved", m_name.c_str()); - } + } } } @@ -640,7 +640,7 @@ void Channel::Moderate(uint64 p) if(CharacterDatabase.PExecute( ss.str( ).c_str( ) )) { sLog.outDebug("Channel(%s) moderate saved", m_name.c_str()); - } + } } } } @@ -777,7 +777,7 @@ void Channel::SetOwner(uint64 guid, bool exclaim) if(CharacterDatabase.PExecute( ss.str( ).c_str( ) )) { sLog.outDebug("Channel(%s) owner saved", m_name.c_str()); - } + } }*/ } @@ -785,7 +785,7 @@ void Channel::SetOwner(uint64 guid, bool exclaim) void Channel::SendToAll(WorldPacket *data, uint64 p) { - for(PlayerList::const_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) @@ -798,7 +798,7 @@ void Channel::SendToAll(WorldPacket *data, uint64 p) void Channel::SendToAllButOne(WorldPacket *data, uint64 who) { - for(PlayerList::const_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/ChannelHandler.cpp b/src/game/ChannelHandler.cpp index abf73e0e274..31d0c609da1 100644 --- a/src/game/ChannelHandler.cpp +++ b/src/game/ChannelHandler.cpp @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include "Policies/SingletonImp.h" #include "ObjectMgr.h" // for normalizePlayerName diff --git a/src/game/ChannelMgr.cpp b/src/game/ChannelMgr.cpp index 09d172155cc..09483c7fbe0 100644 --- a/src/game/ChannelMgr.cpp +++ b/src/game/ChannelMgr.cpp @@ -38,7 +38,7 @@ ChannelMgr* channelMgr(uint32 team) ChannelMgr::~ChannelMgr() { - for(ChannelMap::iterator itr = channels.begin();itr!=channels.end(); ++itr) + for (ChannelMap::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 e1e6eae86a3..14a69e2b732 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -443,7 +443,7 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data ) recv_data >> hairColor; recv_data >> facialHair; recv_data >> outfitId; - + if(recv_data.rpos() < recv_data.wpos()) { uint8 unk; @@ -846,7 +846,7 @@ void WorldSession::HandleSetFactionCheat( WorldPacket & /*recv_data*/ ) std::list<struct Factions>::iterator itr; - for(itr = GetPlayer()->factions.begin(); itr != GetPlayer()->factions.end(); ++itr) + for (itr = GetPlayer()->factions.begin(); itr != GetPlayer()->factions.end(); ++itr) { if(itr->ReputationListID == FactionID) { @@ -1060,7 +1060,7 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data) return; } - for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i) { recv_data >> declinedname.name[i]; if(!normalizePlayerName(declinedname.name[i])) @@ -1082,7 +1082,7 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data) return; } - for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i) CharacterDatabase.escape_string(declinedname.name[i]); CharacterDatabase.BeginTransaction(); @@ -1288,7 +1288,7 @@ void WorldSession::HandleEquipmentSetSave(WorldPacket &recv_data) eqSet.IconName = iconName; eqSet.state = EQUIPMENT_SET_NEW; - for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) + for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) { uint64 itemGuid; if(!recv_data.readPackGUID(itemGuid)) @@ -1324,7 +1324,7 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket &recv_data) sLog.outDebug("CMSG_EQUIPMENT_SET_USE"); recv_data.hexlike(); - for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) + for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) { uint64 itemGuid; if(!recv_data.readPackGUID(itemGuid)) diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 32233aae5a9..48ffb073327 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -825,7 +825,7 @@ bool ChatHandler::hasStringAbbr(const char* name, const char* part) if (!*part) return false; - for (;;) + for (; ; ) { if (!*part) return true; @@ -2373,4 +2373,4 @@ LocaleConstant CliHandler::GetSessionDbcLocale() const int CliHandler::GetSessionDbLocaleIndex() const { return objmgr.GetDBCLocaleIndex(); -}
\ No newline at end of file +} diff --git a/src/game/Chat.h b/src/game/Chat.h index 1518cb6d45e..70a3c4149f9 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -92,7 +92,6 @@ class TRINITY_DLL_SPEC ChatHandler bool HasLowerSecurity(Player* target, uint64 guid, bool strong = false); bool HasLowerSecurityAccount(WorldSession* target, uint32 account, bool strong = false); - void SendGlobalGMSysMessage(const char *str); static bool SetDataForCommandInTable(ChatCommand *table, const char* text, uint32 security, std::string const& help, std::string const& fullcommand ); diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index e5aaab05c9d..77661def698 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -90,7 +90,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data ) // also check SPELL_AURA_COMPREHEND_LANGUAGE (client offers option to speak in that language) Unit::AuraEffectList const& langAuras = _player->GetAurasByType(SPELL_AURA_COMPREHEND_LANGUAGE); bool foundAura = false; - for(Unit::AuraEffectList::const_iterator i = langAuras.begin();i != langAuras.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = langAuras.begin(); i != langAuras.end(); ++i) { if((*i)->GetMiscValue() == int32(lang)) { diff --git a/src/game/CombatAI.cpp b/src/game/CombatAI.cpp index b18e6dd7532..b4b7e662188 100644 --- a/src/game/CombatAI.cpp +++ b/src/game/CombatAI.cpp @@ -56,7 +56,7 @@ int TurretAI::Permissible(const Creature *creature) void CombatAI::InitializeAI() { - for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i) + for (uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i) if(me->m_spells[i] && GetSpellStore()->LookupEntry(me->m_spells[i])) spells.push_back(me->m_spells[i]); @@ -70,14 +70,14 @@ void CombatAI::Reset() void CombatAI::JustDied(Unit *killer) { - for(SpellVct::iterator i = spells.begin(); i != spells.end(); ++i) + for (SpellVct::iterator i = spells.begin(); i != spells.end(); ++i) if(AISpellInfo[*i].condition == AICOND_DIE) me->CastSpell(killer, *i, true); } void CombatAI::EnterCombat(Unit *who) { - for(SpellVct::iterator i = spells.begin(); i != spells.end(); ++i) + for (SpellVct::iterator i = spells.begin(); i != spells.end(); ++i) { if(AISpellInfo[*i].condition == AICOND_AGGRO) me->CastSpell(who, *i, false); @@ -105,7 +105,6 @@ void CombatAI::UpdateAI(const uint32 diff) DoMeleeAttackIfReady(); } - ///////////////// //CasterAI ///////////////// @@ -115,7 +114,7 @@ void CasterAI::InitializeAI() CombatAI::InitializeAI(); float m_attackDist = 30.0f; - for(SpellVct::iterator itr = spells.begin(); itr != spells.end(); ++itr) + for (SpellVct::iterator itr = spells.begin(); itr != spells.end(); ++itr) if (AISpellInfo[*itr].condition == AICOND_COMBAT && m_attackDist > GetAISpellInfo(*itr)->maxRange) m_attackDist = GetAISpellInfo(*itr)->maxRange; if (m_attackDist == 30.0f) @@ -129,7 +128,7 @@ void CasterAI::EnterCombat(Unit *who) uint32 spell = rand()%spells.size(); uint32 count = 0; - for(SpellVct::iterator itr = spells.begin(); itr != spells.end(); ++itr, ++count) + for (SpellVct::iterator itr = spells.begin(); itr != spells.end(); ++itr, ++count) { if(AISpellInfo[*itr].condition == AICOND_AGGRO) me->CastSpell(who, *itr, false); @@ -164,7 +163,6 @@ void CasterAI::UpdateAI(const uint32 diff) } } - ////////////// //ArchorAI ////////////// @@ -210,7 +208,6 @@ void ArchorAI::UpdateAI(const uint32 diff) DoMeleeAttackIfReady(); } - ////////////// //TurretAI ////////////// diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/game/ConfusedMovementGenerator.cpp index 23477c6e62f..24308dd6c36 100644 --- a/src/game/ConfusedMovementGenerator.cpp +++ b/src/game/ConfusedMovementGenerator.cpp @@ -49,15 +49,15 @@ ConfusedMovementGenerator<T>::Initialize(T &unit) VMAP::IVMapManager *vMaps = VMAP::VMapFactory::createOrGetVMapManager(); - for(unsigned int idx=0; idx < MAX_CONF_WAYPOINTS+1; ++idx) + for (unsigned int idx=0; idx < MAX_CONF_WAYPOINTS+1; ++idx) { const float wanderX=wander_distance*rand_norm() - wander_distance/2; const float wanderY=wander_distance*rand_norm() - wander_distance/2; - const bool isInLoS = vMaps->isInLineOfSight(unit.GetMapId(), x, y, z + 2.0f, i_waypoints[idx][0], i_waypoints[idx][1], z + 2.0f); + const bool isInLoS = vMaps->isInLineOfSight(unit.GetMapId(), x, y, z + 2.0f, i_waypoints[idx][0], i_waypoints[idx][1], z + 2.0f); if (!isInLoS) { - i_waypoints[idx][0] = x; + i_waypoints[idx][0] = x; i_waypoints[idx][1] = y; } diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp index 16e52ef46aa..7c669a568ba 100644 --- a/src/game/Corpse.cpp +++ b/src/game/Corpse.cpp @@ -118,7 +118,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 a3a2e5c1690..5ba7427bcbe 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -61,7 +61,7 @@ TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const bool VendorItemData::RemoveItem( uint32 item_id ) { - for(VendorItemList::iterator i = m_items.begin(); i != m_items.end(); ++i ) + for (VendorItemList::iterator i = m_items.begin(); i != m_items.end(); ++i ) { if((*i)->item==item_id) { @@ -74,7 +74,7 @@ bool VendorItemData::RemoveItem( uint32 item_id ) size_t VendorItemData::FindItemSlot(uint32 item_id) const { - for(size_t i = 0; i < m_items.size(); ++i ) + for (size_t i = 0; i < m_items.size(); ++i ) if(m_items[i]->item==item_id) return i; return m_items.size(); @@ -82,7 +82,7 @@ size_t VendorItemData::FindItemSlot(uint32 item_id) const VendorItem const* VendorItemData::FindItem(uint32 item_id) const { - for(VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i ) + for (VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i ) if((*i)->item==item_id) return *i; return NULL; @@ -146,7 +146,7 @@ m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formation(NULL) m_regenTimer = 200; m_valuesCount = UNIT_END; - for(uint8 i =0; i<CREATURE_MAX_SPELLS; ++i) + for (uint8 i =0; i<CREATURE_MAX_SPELLS; ++i) m_spells[i] = 0; m_CreatureSpellCooldowns.clear(); @@ -334,7 +334,7 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data ) if(!m_respawnradius && m_defaultMovementType==RANDOM_MOTION_TYPE) m_defaultMovementType = IDLE_MOTION_TYPE; - for(uint8 i=0; i < CREATURE_MAX_SPELLS; ++i) + for (uint8 i=0; i < CREATURE_MAX_SPELLS; ++i) m_spells[i] = GetCreatureInfo()->spells[i]; return true; @@ -549,7 +549,7 @@ void Creature::Update(uint32 diff) !getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() || // or the victim/owner/charmer is not a player !getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster()); // or the victim/owner/charmer is not a GameMaster - /*if(m_regenTimer <= diff) + /*if(m_regenTimer <= diff) {*/ if(!bInCombat || bIsPolymorphed) // regenerate health if not in combat or if polymorphed RegenerateHealth(); @@ -564,7 +564,7 @@ void Creature::Update(uint32 diff) /*if(!bIsPolymorphed) // only increase the timer if not polymorphed m_regenTimer += 2000 - diff; - } + } else if(!bIsPolymorphed) // if polymorphed, skip the timer m_regenTimer -= diff;*/ @@ -682,7 +682,7 @@ bool Creature::AIM_Initialize(CreatureAI* ai) UnitAI *oldAI = i_AI; Motion_Initialize(); - + i_AI = ai ? ai : FactorySelector::selectAI(this); if(oldAI) delete oldAI; IsAIEnabled = true; @@ -695,7 +695,7 @@ void Creature::Motion_Initialize() if(!m_formation) i_motionMaster.Initialize(); else if(m_formation->getLeader() == this) - { + { m_formation->FormationReset(false); i_motionMaster.Initialize(); } @@ -894,7 +894,7 @@ void Creature::prepareGossipMenu( Player *pPlayer,uint32 gossipid ) // lazy loading single time at use LoadGossipOptions(); - for( GossipOptionList::iterator i = m_goptions.begin( ); i != m_goptions.end( ); ++i ) + for (GossipOptionList::iterator i = m_goptions.begin( ); i != m_goptions.end( ); ++i ) { GossipOption* gso=&*i; if(gso->GossipId == gossipid) @@ -1218,7 +1218,7 @@ uint32 Creature::GetNpcTextId() GossipOption const* Creature::GetGossipOption( uint32 id ) const { - for( GossipOptionList::const_iterator i = m_goptions.begin( ); i != m_goptions.end( ); ++i ) + for (GossipOptionList::const_iterator i = m_goptions.begin( ); i != m_goptions.end( ); ++i ) { if(i->Action==id ) return &*i; @@ -1421,7 +1421,6 @@ void Creature::SelectLevel(const CreatureInfo *cinfo) SetModifierValue(UNIT_MOD_HEALTH, BASE_VALUE, health); SetModifierValue(UNIT_MOD_MANA, BASE_VALUE, mana); - //damage float damagemod = 1.0f;//_GetDamageMod(rank); @@ -1607,7 +1606,7 @@ void Creature::LoadEquipment(uint32 equip_entry, bool force) bool Creature::hasQuest(uint32 quest_id) const { QuestRelations const& qr = objmgr.mCreatureQuestRelations; - for(QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) + for (QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) { if(itr->second==quest_id) return true; @@ -1618,7 +1617,7 @@ bool Creature::hasQuest(uint32 quest_id) const bool Creature::hasInvolvedQuest(uint32 quest_id) const { QuestRelations const& qr = objmgr.mCreatureQuestInvolvedRelations; - for(QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) + for (QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) { if(itr->second==quest_id) return true; @@ -1695,7 +1694,7 @@ bool Creature::canStartAttack(Unit const* who, bool force) const { if(isCivilian()) return false; - + if(!canFly() && (GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE + m_CombatDistance)) //|| who->IsControlledByPlayer() && who->IsFlying())) // we cannot check flying for other creatures, too much map/vmap calculation @@ -1784,7 +1783,7 @@ void Creature::setDeathState(DeathState s) SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); SetNoSearchAssistance(false); - + //Dismiss group if is leader if(m_formation && m_formation->getLeader() == this) m_formation->FormationReset(true); @@ -1927,7 +1926,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; @@ -1939,7 +1938,7 @@ SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim) } bool bcontinue = true; - for(uint32 j=0;j<3;j++) + for (uint32 j=0; j<3; j++) { if( (spellInfo->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE ) || (spellInfo->Effect[j] == SPELL_EFFECT_INSTAKILL) || @@ -1977,7 +1976,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; @@ -1989,7 +1988,7 @@ SpellEntry const *Creature::reachWithSpellCure(Unit *pVictim) } bool bcontinue = true; - for(uint32 j=0;j<3;j++) + for (uint32 j=0; j<3; j++) { if( (spellInfo->Effect[j] == SPELL_EFFECT_HEAL ) ) { @@ -2221,7 +2220,7 @@ void Creature::SaveRespawnTime() objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),time(NULL)+m_respawnDelay+m_deathTimer/IN_MILISECONDS); } -// this should not be called by petAI or +// this should not be called by petAI or bool Creature::canCreatureAttack(Unit const *pVictim, bool force) const { if(!pVictim->IsInMap(this)) @@ -2370,7 +2369,7 @@ void Creature::SetInCombatWithZone() if (PlList.isEmpty()) return; - for(Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) + for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { if (Player* pPlayer = i->getSource()) { @@ -2405,7 +2404,7 @@ void Creature::AddCreatureSpellCooldown(uint32 spellid) uint32 cooldown = GetSpellRecoveryTime(spellInfo); if(Player *modOwner = GetSpellModOwner()) modOwner->ApplySpellMod(spellid, SPELLMOD_COOLDOWN, cooldown); - + if(cooldown) _AddCreatureSpellCooldown(spellid, time(NULL) + cooldown/IN_MILISECONDS); @@ -2438,7 +2437,7 @@ bool Creature::HasSpellCooldown(uint32 spell_id) const bool Creature::HasSpell(uint32 spellID) const { uint8 i; - for(i = 0; i < CREATURE_MAX_SPELLS; ++i) + for (i = 0; i < CREATURE_MAX_SPELLS; ++i) if(spellID == m_spells[i]) break; return i < CREATURE_MAX_SPELLS; //broke before end of iteration of known spells @@ -2542,7 +2541,7 @@ uint32 Creature::GetVendorItemCurrentCount(VendorItem const* vItem) return vItem->maxcount; VendorItemCounts::iterator itr = m_vendorItemCounts.begin(); - for(; itr != m_vendorItemCounts.end(); ++itr) + for (; itr != m_vendorItemCounts.end(); ++itr) if(itr->itemId==vItem->item) break; @@ -2577,7 +2576,7 @@ uint32 Creature::UpdateVendorItemCurrentCount(VendorItem const* vItem, uint32 us return 0; VendorItemCounts::iterator itr = m_vendorItemCounts.begin(); - for(; itr != m_vendorItemCounts.end(); ++itr) + for (; itr != m_vendorItemCounts.end(); ++itr) if(itr->itemId==vItem->item) break; diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index 27fe428efd1..f065a0b40c6 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -79,7 +79,7 @@ void CreatureAI::DoZoneInCombat(Creature* creature) if(PlList.isEmpty()) return; - for(Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) + for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { if(Player* pPlayer = i->getSource()) { @@ -94,7 +94,7 @@ void CreatureAI::DoZoneInCombat(Creature* creature) } /* Causes certain things to never leave the threat list (Priest Lightwell, etc): - for(Unit::ControlList::const_iterator itr = pPlayer->m_Controlled.begin(); itr != pPlayer->m_Controlled.end(); ++itr) + for (Unit::ControlList::const_iterator itr = pPlayer->m_Controlled.begin(); itr != pPlayer->m_Controlled.end(); ++itr) { creature->SetInCombatWith(*itr); (*itr)->SetInCombatWith(creature); @@ -108,7 +108,7 @@ void CreatureAI::MoveInLineOfSight(Unit *who) { if(me->getVictim()) return; - + if (me->GetTypeId() == CREATURE_TYPE_NON_COMBAT_PET) // non-combat pets should just stand there and look good;) return; diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h index 556e9be14e0..6b20c059828 100644 --- a/src/game/CreatureAI.h +++ b/src/game/CreatureAI.h @@ -140,7 +140,7 @@ class TRINITY_DLL_SPEC CreatureAI : public UnitAI void DoZoneInCombat(Creature* pUnit = NULL); - // Called at text emote receive from player + // Called at text emote receive from player virtual void ReceiveEmote(Player* pPlayer, uint32 text_emote) {} ///== Triggered Actions Requested ================== diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h index 89d5bbc2a9e..38d91624c75 100644 --- a/src/game/CreatureAIImpl.h +++ b/src/game/CreatureAIImpl.h @@ -413,7 +413,7 @@ class EventMap : private std::map<uint32, uint32> { time += m_time; gcd = (1 << (gcd + 16)); - for(iterator itr = begin(); itr != end();) + for (iterator itr = begin(); itr != end(); ) { if(itr->first >= time) break; @@ -429,7 +429,7 @@ class EventMap : private std::map<uint32, uint32> void CancelEvent(uint32 eventId) { - for(iterator itr = begin(); itr != end();) + for (iterator itr = begin(); itr != end(); ) { if(eventId == (itr->second & 0x0000FFFF)) erase(itr++); @@ -440,7 +440,7 @@ class EventMap : private std::map<uint32, uint32> void CancelEventsByGCD(uint32 gcd) { - for(iterator itr = begin(); itr != end();) + for (iterator itr = begin(); itr != end(); ) { if(itr->second & gcd) erase(itr++); @@ -482,7 +482,6 @@ struct AISpellInfoType TRINITY_DLL_SPEC AISpellInfoType * GetAISpellInfo(uint32 i); - inline void CreatureAI::SetGazeOn(Unit *target) { if(me->canAttack(target)) @@ -573,7 +572,7 @@ inline bool CreatureAI::_EnterEvadeMode() me->LoadCreaturesAddon(); me->SetLootRecipient(NULL); me->ResetPlayerDamageReq(); - + if(me->IsInEvadeMode()) return false; diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp index 9f2828bf776..83975c0fc7d 100644 --- a/src/game/CreatureAISelector.cpp +++ b/src/game/CreatureAISelector.cpp @@ -77,7 +77,7 @@ namespace FactorySelector if(!ai_factory) { - for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i) + for (uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i) { if(creature->m_spells[i]) { @@ -93,7 +93,7 @@ namespace FactorySelector int best_val = -1; typedef CreatureAIRegistry::RegistryMapType RMT; RMT const &l = ai_registry.GetRegisteredItems(); - for( RMT::const_iterator iter = l.begin(); iter != l.end(); ++iter) + for (RMT::const_iterator iter = l.begin(); iter != l.end(); ++iter) { const CreatureAICreator *factory = iter->second; const SelectableAI *p = dynamic_cast<const SelectableAI *>(factory); @@ -125,7 +125,7 @@ namespace FactorySelector int best_val = -1; std::vector<std::string> l; mv_registry.GetRegisteredItems(l); - for( std::vector<std::string>::iterator iter = l.begin(); iter != l.end(); ++iter) + for (std::vector<std::string>::iterator iter = l.begin(); iter != l.end(); ++iter) { const MovementGeneratorCreator *factory = mv_registry.GetRegistryItem((*iter).c_str()); const SelectableMovement *p = dynamic_cast<const SelectableMovement *>(factory); diff --git a/src/game/CreatureEventAIMgr.cpp b/src/game/CreatureEventAIMgr.cpp index 5325edff4a9..79a17ed9c8d 100644 --- a/src/game/CreatureEventAIMgr.cpp +++ b/src/game/CreatureEventAIMgr.cpp @@ -722,7 +722,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() { //sLog.outErrorDb("CreatureEventAI: Creature Entry %u has EventAI script but it also has C++ script. EventAI script will be overriden.", cInfo->Entry); } - } + } } while (result->NextRow()); delete result; diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp index 97610754e69..850af004789 100644 --- a/src/game/CreatureGroups.cpp +++ b/src/game/CreatureGroups.cpp @@ -142,7 +142,7 @@ void CreatureGroupManager::LoadCreatureFormations() } CreatureGroupMap[memberGUID] = group_member; - } + } while(result->NextRow()) ; sLog.outString(); @@ -185,7 +185,7 @@ void CreatureGroup::MemberAttackStart(Creature *member, Unit *target) if(groupAI == 1 && member != m_leader) return; - for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { sLog.outDebug("GROUP ATTACK: group instance id %u calls member instid %u", m_leader->GetInstanceId(), member->GetInstanceId()); //sLog.outDebug("AI:%u:Group member found: %u, attacked by %s.", groupAI, itr->second->GetGUIDLow(), member->getVictim()->GetName()); @@ -207,7 +207,7 @@ void CreatureGroup::MemberAttackStart(Creature *member, Unit *target) void CreatureGroup::FormationReset(bool dismiss) { - for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { if(itr->first != m_leader && itr->first->isAlive()) { @@ -228,14 +228,14 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z) float pathangle = atan2(m_leader->GetPositionY() - y, m_leader->GetPositionX() - x); - for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) + for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { Creature *member = itr->first; if(member == m_leader || !member->isAlive() || member->getVictim()) continue; float angle = itr->second->follow_angle; - float dist = itr->second->follow_dist; + float dist = itr->second->follow_dist; float dx = x + cos(angle + pathangle) * dist; float dy = y + sin(angle + pathangle) * dist; diff --git a/src/game/CreatureGroups.h b/src/game/CreatureGroups.h index cc3eacfe185..0f5ca4a90e2 100644 --- a/src/game/CreatureGroups.h +++ b/src/game/CreatureGroups.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -28,8 +28,8 @@ class CreatureGroup; struct FormationInfo { uint32 leaderGUID; - float follow_dist; - float follow_angle; + float follow_dist; + float follow_angle; uint8 groupAI; }; @@ -59,7 +59,7 @@ class CreatureGroup //Group cannot be created empty explicit CreatureGroup(uint32 id) : m_groupID(id), m_leader(NULL), m_Formed(false) {} ~CreatureGroup() { sLog.outDebug("Destroying group"); } - + Creature* getLeader() const { return m_leader; } uint32 GetId() const { return m_groupID; } bool isEmpty() const { return m_members.empty(); } diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp index 5dae4cb6e17..159c448f415 100644 --- a/src/game/DBCStores.cpp +++ b/src/game/DBCStores.cpp @@ -178,7 +178,7 @@ inline void LoadDBC(uint32& availableDbcLocales,barGoLink& bar, StoreProblemList if(storage.Load(dbc_filename.c_str(), sql)) { bar.step(); - for(uint8 i = 0; i < MAX_LOCALE; ++i) + for (uint8 i = 0; i < MAX_LOCALE; ++i) { if(!(availableDbcLocales & (1 << i))) continue; @@ -220,7 +220,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAreaStore, dbcPath,"AreaTable.dbc"); // must be after sAreaStore loading - for(uint32 i = 0; i < sAreaStore.GetNumRows(); ++i) // areaflag numbered from 0 + for (uint32 i = 0; i < sAreaStore.GetNumRows(); ++i) // areaflag numbered from 0 { if(AreaTableEntry const* area = sAreaStore.LookupEntry(i)) { @@ -259,7 +259,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sEmotesStore, dbcPath,"Emotes.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sEmotesTextStore, dbcPath,"EmotesText.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sFactionStore, dbcPath,"Faction.dbc"); - for (uint32 i=0;i<sFactionStore.GetNumRows(); ++i) + for (uint32 i=0; i<sFactionStore.GetNumRows(); ++i) { FactionEntry const * faction = sFactionStore.LookupEntry(i); if (faction && faction->team) @@ -271,7 +271,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sFactionTemplateStore, dbcPath,"FactionTemplate.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGameObjectDisplayInfoStore, dbcPath,"GameObjectDisplayInfo.dbc"); - for(uint32 i = 0; i < sGameObjectDisplayInfoStore.GetNumRows(); ++i) + for (uint32 i = 0; i < sGameObjectDisplayInfoStore.GetNumRows(); ++i) { if(GameObjectDisplayInfoEntry const * info = sGameObjectDisplayInfoStore.LookupEntry(i)) { @@ -323,7 +323,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSkillLineAbilityStore, dbcPath,"SkillLineAbility.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSoundEntriesStore, dbcPath,"SoundEntries.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellStore, dbcPath,"Spell.dbc", &CustomSpellEntryfmt, &CustomSpellEntryIndex); - for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) { SpellEntry const * spell = sSpellStore.LookupEntry(i); if(spell && spell->Category) @@ -388,7 +388,7 @@ void LoadDBCStores(const std::string& dataPath) // prepare fast data access to bit pos of talent ranks for use at inspecting { // now have all max ranks (and then bit amount used for store talent ranks in inspect) - for(uint32 talentTabId = 1; talentTabId < sTalentTabStore.GetNumRows(); ++talentTabId) + for (uint32 talentTabId = 1; talentTabId < sTalentTabStore.GetNumRows(); ++talentTabId) { TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentTabId ); if(!talentTabInfo) @@ -400,7 +400,7 @@ void LoadDBCStores(const std::string& dataPath) // store class talent tab pages uint32 cls = 1; - for(uint32 m=1;!(m & talentTabInfo->ClassMask) && cls < MAX_CLASSES;m <<=1, ++cls) {} + for (uint32 m=1; !(m & talentTabInfo->ClassMask) && cls < MAX_CLASSES; m <<=1, ++cls) {} sTalentTabPages[cls][talentTabInfo->tabpage]=talentTabId; } @@ -409,7 +409,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTaxiNodesStore, dbcPath,"TaxiNodes.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTaxiPathStore, dbcPath,"TaxiPath.dbc"); - for(uint32 i = 1; i < sTaxiPathStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sTaxiPathStore.GetNumRows(); ++i) if(TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(i)) sTaxiPathSetBySource[entry->from][entry->to] = TaxiPathBySourceAndDestination(entry->ID,entry->price); uint32 pathCount = sTaxiPathStore.GetNumRows(); @@ -419,7 +419,7 @@ void LoadDBCStores(const std::string& dataPath) // Calculate path nodes count std::vector<uint32> pathLength; pathLength.resize(pathCount); // 0 and some other indexes not used - for(uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i) if(TaxiPathNodeEntry const* entry = sTaxiPathNodeStore.LookupEntry(i)) { if (pathLength[entry->path] < entry->index + 1) @@ -427,10 +427,10 @@ void LoadDBCStores(const std::string& dataPath) } // Set path length sTaxiPathNodesByPath.resize(pathCount); // 0 and some other indexes not used - for(uint32 i = 1; i < sTaxiPathNodesByPath.size(); ++i) + for (uint32 i = 1; i < sTaxiPathNodesByPath.size(); ++i) sTaxiPathNodesByPath[i].resize(pathLength[i]); // fill data - for(uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i) if(TaxiPathNodeEntry const* entry = sTaxiPathNodeStore.LookupEntry(i)) sTaxiPathNodesByPath[entry->path][entry->index] = TaxiPathNode(entry->mapid,entry->x,entry->y,entry->z,entry->actionFlag,entry->delay); sTaxiPathNodeStore.Clear(); @@ -439,15 +439,15 @@ void LoadDBCStores(const std::string& dataPath) // include existed nodes that have at least single not spell base (scripted) path { std::set<uint32> spellPaths; - for(uint32 i = 1; i < sSpellStore.GetNumRows (); ++i) + for (uint32 i = 1; i < sSpellStore.GetNumRows (); ++i) if(SpellEntry const* sInfo = sSpellStore.LookupEntry (i)) - for(int j=0; j < 3; ++j) + for (int j=0; j < 3; ++j) if(sInfo->Effect[j]==123 /*SPELL_EFFECT_SEND_TAXI*/) spellPaths.insert(sInfo->EffectMiscValue[j]); memset(sTaxiNodesMask,0,sizeof(sTaxiNodesMask)); memset(sOldContinentsNodesMask,0,sizeof(sTaxiNodesMask)); - for(uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i) { TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i); if(!node) @@ -457,7 +457,7 @@ void LoadDBCStores(const std::string& dataPath) if(src_i!=sTaxiPathSetBySource.end() && !src_i->second.empty()) { bool ok = false; - for(TaxiPathSetForSource::const_iterator dest_i = src_i->second.begin();dest_i != src_i->second.end(); ++dest_i) + for (TaxiPathSetForSource::const_iterator dest_i = src_i->second.begin(); dest_i != src_i->second.end(); ++dest_i) { // not spell path if(spellPaths.find(dest_i->second.ID)==spellPaths.end()) @@ -498,7 +498,7 @@ void LoadDBCStores(const std::string& dataPath) else if(!bad_dbc_files.empty() ) { std::string str; - for(std::list<std::string>::iterator i = bad_dbc_files.begin(); i != bad_dbc_files.end(); ++i) + for (std::list<std::string>::iterator i = bad_dbc_files.begin(); i != bad_dbc_files.end(); ++i) str += *i + "\n"; sLog.outError("\nSome required *.dbc files (%u from %d) not found or not compatible:\n%s",(uint32)bad_dbc_files.size(),DBCFilesCount,str.c_str()); @@ -524,14 +524,14 @@ void LoadDBCStores(const std::string& dataPath) SimpleFactionsList const* GetFactionTeamList(uint32 faction, bool &isTeamMember) { - for(FactionTeamMap::const_iterator itr = sFactionTeamMap.begin(); itr != sFactionTeamMap.end(); ++itr) + for (FactionTeamMap::const_iterator itr = sFactionTeamMap.begin(); itr != sFactionTeamMap.end(); ++itr) { if(itr->first == faction) { isTeamMember = false; return &itr->second; } - for(SimpleFactionsList::const_iterator itr2 = itr->second.begin(); itr2 != itr->second.end(); ++itr2) + for (SimpleFactionsList::const_iterator itr2 = itr->second.begin(); itr2 != itr->second.end(); ++itr2) { if((*itr2) == faction) { @@ -640,7 +640,7 @@ ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId) ChatChannelsEntry const* GetChannelEntryFor(uint32 channel_id) { // not sorted, numbering index from 0 - for(uint32 i = 0; i < sChatChannelsStore.GetNumRows(); ++i) + for (uint32 i = 0; i < sChatChannelsStore.GetNumRows(); ++i) { ChatChannelsEntry const* ch = sChatChannelsStore.LookupEntry(i); if(ch && ch->ChannelID == channel_id) diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index 7e459c61e8b..9e44687e867 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -390,7 +390,6 @@ struct AchievementCriteriaEntry uint32 goldInCopper; // 4 } quest_reward_money; - // ACHIEVEMENT_CRITERIA_TYPE_LOOT_MONEY = 67 struct { @@ -837,10 +836,10 @@ struct FactionTemplateEntry return true; if(entry.faction) { - for(int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) if (enemyFaction[i] == entry.faction) return false; - for(int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) if (friendFaction[i] == entry.faction) return true; } @@ -852,10 +851,10 @@ struct FactionTemplateEntry return false; if(entry.faction) { - for(int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) if (enemyFaction[i] == entry.faction) return true; - for(int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) if (friendFaction[i] == entry.faction) return false; } @@ -864,7 +863,7 @@ struct FactionTemplateEntry bool IsHostileToPlayers() const { return (hostileMask & FACTION_MASK_PLAYER) !=0; } bool IsNeutralToAll() const { - for(int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) if (enemyFaction[i] != 0) return false; return hostileMask == 0 && friendlyMask == 0; diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp index 97f90e33af4..e016d8c98b0 100644 --- a/src/game/Debugcmds.cpp +++ b/src/game/Debugcmds.cpp @@ -465,7 +465,7 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args) if (list_queue) { std::vector<Item *> &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; @@ -608,7 +608,7 @@ bool ChatHandler::HandleDebugGetItemStateCommand(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; @@ -669,7 +669,7 @@ bool ChatHandler::HandleDebugThreatList(const char * /*args*/) std::list<HostilReference*>::iterator itr; uint32 cnt = 0; PSendSysMessage("Threat list of %s (guid %u)",target->GetName(), target->GetGUIDLow()); - for(itr = tlist.begin(); itr != tlist.end(); ++itr) + for (itr = tlist.begin(); itr != tlist.end(); ++itr) { Unit* unit = (*itr)->getTarget(); if(!unit) @@ -901,7 +901,7 @@ bool ChatHandler::HandleDebugSetAuraStateCommand(const char* args) if (!state) { // reset all states - for(int i = 1; i <= 32; ++i) + for (int i = 1; i <= 32; ++i) unit->ModifyAuraState(AuraState(i),false); return true; } diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp index 30147732b08..db0a4a7f2ef 100644 --- a/src/game/DynamicObject.cpp +++ b/src/game/DynamicObject.cpp @@ -135,12 +135,12 @@ void DynamicObject::Update(uint32 p_time) Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - + MaNGOS::DynamicObjectUpdater notifier(*this, caster); - + TypeContainerVisitor<MaNGOS::DynamicObjectUpdater, WorldTypeMapContainer > world_object_notifier(notifier); TypeContainerVisitor<MaNGOS::DynamicObjectUpdater, GridTypeMapContainer > grid_object_notifier(notifier); - + CellLock<GridReadGuard> cell_lock(cell, p); cell_lock->Visit(cell_lock, world_object_notifier, *GetMap(), *this, m_radius); cell_lock->Visit(cell_lock, grid_object_notifier, *GetMap(), *this, m_radius); diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp index eef98b705cc..5c844ff4db5 100644 --- a/src/game/FleeingMovementGenerator.cpp +++ b/src/game/FleeingMovementGenerator.cpp @@ -80,7 +80,7 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z) float temp_x, temp_y, angle; const Map * _map = owner.GetBaseMap(); //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/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index 5b7aa737bc0..22a4d7a7f13 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -58,7 +58,7 @@ bool GameEventMgr::CheckOneGameEvent(uint16 entry) const case GAMEEVENT_WORLD_INACTIVE: { time_t currenttime = time(NULL); - for(std::set<uint16>::const_iterator itr = mGameEvent[entry].prerequisite_events.begin(); itr != mGameEvent[entry].prerequisite_events.end(); ++itr) + for (std::set<uint16>::const_iterator itr = mGameEvent[entry].prerequisite_events.begin(); itr != mGameEvent[entry].prerequisite_events.end(); ++itr) { if( (mGameEvent[*itr].state != GAMEEVENT_WORLD_NEXTPHASE && mGameEvent[*itr].state != GAMEEVENT_WORLD_FINISHED) || // if prereq not in nextphase or finished state, then can't start this one mGameEvent[*itr].nextstart > currenttime) // if not in nextphase state for long enough, can't start this one @@ -181,7 +181,7 @@ void GameEventMgr::StopEvent( uint16 event_id, bool overwrite ) mGameEvent[event_id].nextstart = 0; mGameEvent[event_id].state = GAMEEVENT_WORLD_INACTIVE; std::map<uint32 /*condition id*/, GameEventFinishCondition>::iterator itr; - for(itr = mGameEvent[event_id].conditions.begin(); itr != mGameEvent[event_id].conditions.end(); ++itr) + for (itr = mGameEvent[event_id].conditions.begin(); itr != mGameEvent[event_id].conditions.end(); ++itr) itr->second.done = 0; CharacterDatabase.BeginTransaction(); CharacterDatabase.PExecute("DELETE FROM game_event_save WHERE event_id = '%u'",event_id); @@ -351,7 +351,6 @@ void GameEventMgr::LoadFromDB() continue; } - if(mGameEvent[event_id].state != GAMEEVENT_NORMAL && mGameEvent[event_id].state != GAMEEVENT_INTERNAL) { uint16 prerequisite_event = fields[1].GetUInt16(); @@ -839,7 +838,7 @@ void GameEventMgr::LoadFromDB() // get the event npc flag for checking if the npc will be vendor during the event or not uint32 event_npc_flag = 0; NPCFlagList& flist = mGameEventNPCFlags[event_id]; - for(NPCFlagList::const_iterator itr = flist.begin(); itr != flist.end(); ++itr) + for (NPCFlagList::const_iterator itr = flist.begin(); itr != flist.end(); ++itr) { if(itr->first == guid) { @@ -1014,7 +1013,7 @@ uint32 GameEventMgr::GetNPCFlag(Creature * cr) uint32 mask = 0; uint32 guid = cr->GetDBTableGUIDLow(); - for(ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) + for (ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) { for(NPCFlagList::iterator itr = mGameEventNPCFlags[*e_itr].begin(); itr != mGameEventNPCFlags[*e_itr].end(); @@ -1102,13 +1101,13 @@ uint32 GameEventMgr::Update() // return the next e // now activate the queue // a now activated event can contain a spawn of a to-be-deactivated one // following the activate - deactivate order, deactivating the first event later will leave the spawn in (wont disappear then reappear clientside) - for(std::set<uint16>::iterator itr = activate.begin(); itr != activate.end(); ++itr) + for (std::set<uint16>::iterator itr = activate.begin(); itr != activate.end(); ++itr) // start the event // returns true the started event completed // in that case, initiate next update in 1 second if(StartEvent(*itr)) nextEventDelay = 0; - for(std::set<uint16>::iterator itr = deactivate.begin(); itr != deactivate.end(); ++itr) + for (std::set<uint16>::iterator itr = deactivate.begin(); itr != deactivate.end(); ++itr) StopEvent(*itr); sLog.outDetail("Next game event check in %u seconds.", nextEventDelay + 1); return (nextEventDelay + 1) * IN_MILISECONDS; // Add 1 second to be sure event has started/stopped at next call @@ -1167,7 +1166,7 @@ void GameEventMgr::ApplyNewEvent(uint16 event_id) void GameEventMgr::UpdateEventNPCFlags(uint16 event_id) { // go through the creatures whose npcflags are changed in the event - for(NPCFlagList::iterator itr = mGameEventNPCFlags[event_id].begin(); itr != mGameEventNPCFlags[event_id].end(); ++itr) + for (NPCFlagList::iterator itr = mGameEventNPCFlags[event_id].begin(); itr != mGameEventNPCFlags[event_id].end(); ++itr) { // get the creature data from the low guid to get the entry, to be able to find out the whole guid if( CreatureData const* data = objmgr.GetCreatureData(itr->first) ) @@ -1193,14 +1192,14 @@ void GameEventMgr::UpdateEventNPCFlags(uint16 event_id) void GameEventMgr::UpdateBattleGroundSettings() { uint32 mask = 0; - for(ActiveEvents::const_iterator itr = m_ActiveEvents.begin(); itr != m_ActiveEvents.end(); ++itr ) + for (ActiveEvents::const_iterator itr = m_ActiveEvents.begin(); itr != m_ActiveEvents.end(); ++itr ) mask |= mGameEventBattleGroundHolidays[*itr]; sBattleGroundMgr.SetHolidayWeekends(mask); } void GameEventMgr::UpdateEventNPCVendor(uint16 event_id, bool activate) { - for(NPCVendorList::iterator itr = mGameEventVendors[event_id].begin(); itr != mGameEventVendors[event_id].end(); ++itr) + for (NPCVendorList::iterator itr = mGameEventVendors[event_id].begin(); itr != mGameEventVendors[event_id].end(); ++itr) { if(activate) objmgr.AddVendorItem(itr->entry, itr->item, itr->maxcount, itr->incrtime, itr->ExtendedCost, false); @@ -1219,7 +1218,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) return; } - for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin();itr != mGameEventCreatureGuids[internal_event_id].end();++itr) + for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin(); itr != mGameEventCreatureGuids[internal_event_id].end(); ++itr) { // Add to correct cell CreatureData const* data = objmgr.GetCreatureData(*itr); @@ -1252,7 +1251,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) return; } - for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin();itr != mGameEventGameobjectGuids[internal_event_id].end();++itr) + for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin(); itr != mGameEventGameobjectGuids[internal_event_id].end(); ++itr) { // Add to correct cell GameObjectData const* data = objmgr.GetGOData(*itr); @@ -1286,7 +1285,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) return; } - for (IdList::iterator itr = mGameEventPoolIds[internal_event_id].begin();itr != mGameEventPoolIds[internal_event_id].end();++itr) + for (IdList::iterator itr = mGameEventPoolIds[internal_event_id].begin(); itr != mGameEventPoolIds[internal_event_id].end(); ++itr) { poolhandler.SpawnPool(*itr); } @@ -1302,7 +1301,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) return; } - for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin();itr != mGameEventCreatureGuids[internal_event_id].end();++itr) + for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin(); itr != mGameEventCreatureGuids[internal_event_id].end(); ++itr) { // check if it's needed by another event, if so, don't remove if( event_id > 0 && hasCreatureActiveEventExcept(*itr,event_id) ) @@ -1323,7 +1322,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) return; } - for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin();itr != mGameEventGameobjectGuids[internal_event_id].end();++itr) + for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin(); itr != mGameEventGameobjectGuids[internal_event_id].end(); ++itr) { // check if it's needed by another event, if so, don't remove if( event_id >0 && hasGameObjectActiveEventExcept(*itr,event_id) ) @@ -1343,7 +1342,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) return; } - for (IdList::iterator itr = mGameEventPoolIds[internal_event_id].begin();itr != mGameEventPoolIds[internal_event_id].end();++itr) + for (IdList::iterator itr = mGameEventPoolIds[internal_event_id].begin(); itr != mGameEventPoolIds[internal_event_id].end(); ++itr) { poolhandler.DespawnPool(*itr); } @@ -1351,7 +1350,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) { - for(ModelEquipList::iterator itr = mGameEventModelEquip[event_id].begin();itr != mGameEventModelEquip[event_id].end();++itr) + for (ModelEquipList::iterator itr = mGameEventModelEquip[event_id].begin(); itr != mGameEventModelEquip[event_id].end(); ++itr) { // Remove the creature from grid CreatureData const* data = objmgr.GetCreatureData(itr->first); @@ -1431,7 +1430,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) bool GameEventMgr::hasCreatureQuestActiveEventExcept(uint32 quest_id, uint16 event_id) { - for(ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) + for (ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) { if((*e_itr) != event_id) for(QuestRelList::iterator itr = mGameEventCreatureQuests[*e_itr].begin(); @@ -1445,7 +1444,7 @@ bool GameEventMgr::hasCreatureQuestActiveEventExcept(uint32 quest_id, uint16 eve bool GameEventMgr::hasGameObjectQuestActiveEventExcept(uint32 quest_id, uint16 event_id) { - for(ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) + for (ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) { if((*e_itr) != event_id) for(QuestRelList::iterator itr = mGameEventGameObjectQuests[*e_itr].begin(); @@ -1458,7 +1457,7 @@ bool GameEventMgr::hasGameObjectQuestActiveEventExcept(uint32 quest_id, uint16 e } bool GameEventMgr::hasCreatureActiveEventExcept(uint32 creature_id, uint16 event_id) { - for(ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) + for (ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) { if((*e_itr) != event_id) { @@ -1474,7 +1473,7 @@ bool GameEventMgr::hasCreatureActiveEventExcept(uint32 creature_id, uint16 event } bool GameEventMgr::hasGameObjectActiveEventExcept(uint32 go_id, uint16 event_id) { - for(ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) + for (ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr) { if((*e_itr) != event_id) { @@ -1492,7 +1491,7 @@ bool GameEventMgr::hasGameObjectActiveEventExcept(uint32 go_id, uint16 event_id) void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate) { QuestRelList::iterator itr; - for (itr = mGameEventCreatureQuests[event_id].begin();itr != mGameEventCreatureQuests[event_id].end();++itr) + for (itr = mGameEventCreatureQuests[event_id].begin(); itr != mGameEventCreatureQuests[event_id].end(); ++itr) { QuestRelations &CreatureQuestMap = objmgr.mCreatureQuestRelations; if (Activate) // Add the pair(id,quest) to the multimap @@ -1506,7 +1505,7 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate) if (qitr == CreatureQuestMap.end()) continue; QuestRelations::iterator lastElement = CreatureQuestMap.upper_bound(itr->first); - for ( ;qitr != lastElement;++qitr) + for (; qitr != lastElement; ++qitr) { if (qitr->second == itr->second) { @@ -1517,7 +1516,7 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate) } } } - for (itr = mGameEventGameObjectQuests[event_id].begin();itr != mGameEventGameObjectQuests[event_id].end();++itr) + for (itr = mGameEventGameObjectQuests[event_id].begin(); itr != mGameEventGameObjectQuests[event_id].end(); ++itr) { QuestRelations &GameObjectQuestMap = objmgr.mGOQuestRelations; if (Activate) // Add the pair(id,quest) to the multimap @@ -1531,7 +1530,7 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate) if (qitr == GameObjectQuestMap.end()) continue; QuestRelations::iterator lastElement = GameObjectQuestMap.upper_bound(itr->first); - for ( ;qitr != lastElement;++qitr) + for (; qitr != lastElement; ++qitr) { if (qitr->second == itr->second) { @@ -1596,7 +1595,7 @@ void GameEventMgr::HandleQuestComplete(uint32 quest_id) bool GameEventMgr::CheckOneGameEventConditions(uint16 event_id) { - for(std::map<uint32,GameEventFinishCondition>::iterator itr = mGameEvent[event_id].conditions.begin(); itr != mGameEvent[event_id].conditions.end(); ++itr) + for (std::map<uint32,GameEventFinishCondition>::iterator itr = mGameEvent[event_id].conditions.begin(); itr != mGameEvent[event_id].conditions.end(); ++itr) if(itr->second.done < itr->second.reqNum) // return false if a condition doesn't match return false; @@ -1637,7 +1636,7 @@ void GameEventMgr::HandleWorldEventGossip(Player *plr, Creature *c) void GameEventMgr::SendWorldStateUpdate(Player * plr, uint16 event_id) { std::map<uint32,GameEventFinishCondition>::iterator itr; - for(itr = mGameEvent[event_id].conditions.begin(); itr !=mGameEvent[event_id].conditions.end(); ++itr) + for (itr = mGameEvent[event_id].conditions.begin(); itr !=mGameEvent[event_id].conditions.end(); ++itr) { if(itr->second.done_world_state) plr->SendUpdateWorldState(itr->second.done_world_state, (uint32)(itr->second.done)); @@ -1651,7 +1650,7 @@ TRINITY_DLL_SPEC bool IsHolidayActive( HolidayIds id ) GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap(); GameEventMgr::ActiveEvents const& ae = gameeventmgr.GetActiveEventList(); - for(GameEventMgr::ActiveEvents::const_iterator itr = ae.begin(); itr != ae.end(); ++itr) + for (GameEventMgr::ActiveEvents::const_iterator itr = ae.begin(); itr != ae.end(); ++itr) if(events[*itr].holiday_id==id) return true; diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index d7315f9626b..ae12b1cb379 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -633,7 +633,7 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map) if(data->spawntimesecs >= 0) { m_spawnedByDefault = true; - + if(!GetGOInfo()->GetDespawnPossibility() && !GetGOInfo()->IsDespawnAtAction()) { SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NODESPAWN); @@ -684,7 +684,7 @@ GameObject* GameObject::GetGameObject(WorldObject& object, uint64 guid) bool GameObject::hasQuest(uint32 quest_id) const { QuestRelations const& qr = objmgr.mGOQuestRelations; - for(QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) + for (QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) { if(itr->second==quest_id) return true; @@ -695,7 +695,7 @@ bool GameObject::hasQuest(uint32 quest_id) const bool GameObject::hasInvolvedQuest(uint32 quest_id) const { QuestRelations const& qr = objmgr.mGOQuestInvolvedRelations; - for(QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) + for (QuestRelations::const_iterator itr = qr.lower_bound(GetEntry()); itr != qr.upper_bound(GetEntry()); ++itr) { if(itr->second==quest_id) return true; @@ -1000,7 +1000,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; i<info->chair.slots; ++i) + for (uint32 i=0; i<info->chair.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); @@ -1387,7 +1387,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId) return; bool self = false; - for(uint8 i = 0; i < 3; ++i) + for (uint8 i = 0; i < 3; ++i) { if(spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_CASTER) { @@ -1416,7 +1416,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId) else { trigger->setFaction(14); - // Set owner guid for target if no owner avalible - needed by trigger auras + // Set owner guid for target if no owner avalible - needed by trigger auras // - trigger gets despawned and there's no caster avalible (see AuraEffect::TriggerSpell()) trigger->CastSpell(target, spellInfo, true, 0, 0, target ? target->GetGUID() : 0); } diff --git a/src/game/GameObject.h b/src/game/GameObject.h index 358eb0cbfb7..c0362702176 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -698,7 +698,6 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject // 0 = use `gameobject`.`spawntimesecs` void ResetDoorOrButton(); - void TriggeringLinkedGameObject( uint32 trapEntry, Unit* target); bool isVisibleForInState(Player const* u, bool inVisibleList) const; diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index cd633f6ab8b..e6458b8fee7 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -238,7 +238,7 @@ void PlayerMenu::SendTalking( uint32 textID ) if (!pGossip) { - for(uint32 i = 0; i < 8; ++i) + for (uint32 i = 0; i < 8; ++i) { data << float(0); data << "Greetings $N"; @@ -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]; @@ -291,7 +291,7 @@ void PlayerMenu::SendTalking( uint32 textID ) data << pGossip->Options[i].Language; - for(int j = 0; j < 3; ++j) + for (int j = 0; j < 3; ++j) { data << pGossip->Options[i].Emotes[j]._Delay; data << pGossip->Options[i].Emotes[j]._Emote; @@ -307,7 +307,7 @@ void PlayerMenu::SendTalking( char const * title, char const * text ) { WorldPacket data( SMSG_NPC_TEXT_UPDATE, 50 ); // guess size data << uint32(0); - for(uint32 i = 0; i < 8; ++i) + for (uint32 i = 0; i < 8; ++i) { data << float(0); data << title; @@ -521,7 +521,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest ) Details = pQuest->GetDetails(); Objectives = pQuest->GetObjectives(); EndText = pQuest->GetEndText(); - for (int i=0;i<QUEST_OBJECTIVES_COUNT;++i) + for (int i=0; i<QUEST_OBJECTIVES_COUNT; ++i) ObjectiveText[i]=pQuest->ObjectiveText[i]; int loc_idx = pSession->GetSessionDbLocaleIndex(); @@ -539,7 +539,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;i<QUEST_OBJECTIVES_COUNT;++i) + for (int i=0; i<QUEST_OBJECTIVES_COUNT; ++i) if (ql->ObjectiveText[i].size() > loc_idx && !ql->ObjectiveText[i][loc_idx].empty()) ObjectiveText[i]=ql->ObjectiveText[i][loc_idx]; } diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp index 11cbb741e45..cf403208389 100644 --- a/src/game/GridNotifiers.cpp +++ b/src/game/GridNotifiers.cpp @@ -32,7 +32,7 @@ using namespace Trinity; void VisibleChangesNotifier::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter) + for (PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { if(iter->getSource() == &i_object) continue; @@ -50,7 +50,7 @@ VisibleChangesNotifier::Visit(PlayerMapType &m) void VisibleChangesNotifier::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) if(!iter->getSource()->GetSharedVisionList().empty()) for(SharedVisionList::const_iterator i = iter->getSource()->GetSharedVisionList().begin(); i != iter->getSource()->GetSharedVisionList().end(); ++i) @@ -61,7 +61,7 @@ VisibleChangesNotifier::Visit(CreatureMapType &m) void VisibleChangesNotifier::Visit(DynamicObjectMapType &m) { - for(DynamicObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (DynamicObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter) if(IS_PLAYER_GUID(iter->getSource()->GetCasterGUID())) if(Player* caster = (Player*)iter->getSource()->GetCaster()) if(caster->m_seer == iter->getSource()) @@ -75,7 +75,7 @@ PlayerVisibilityNotifier::Notify() // but exist one case when this possible and object not out of range: transports if(Transport* transport = i_player.GetTransport()) { - for(Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin();itr!=transport->GetPassengers().end();++itr) + for (Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin(); itr!=transport->GetPassengers().end(); ++itr) { if(i_clientGUIDs.find((*itr)->GetGUID())!=i_clientGUIDs.end()) { @@ -88,7 +88,7 @@ PlayerVisibilityNotifier::Notify() // generate outOfRange for not iterate objects i_data.AddOutOfRangeGUID(i_clientGUIDs); - for(Player::ClientGUIDs::iterator itr = i_clientGUIDs.begin();itr!=i_clientGUIDs.end();++itr) + for (Player::ClientGUIDs::iterator itr = i_clientGUIDs.begin(); itr!=i_clientGUIDs.end(); ++itr) { i_player.m_clientGUIDs.erase(*itr); @@ -118,7 +118,7 @@ PlayerVisibilityNotifier::Notify() // send out of range to other players if need std::set<uint64> const& oor = i_data.GetOutOfRangeGUIDs(); - for(std::set<uint64>::const_iterator iter = oor.begin(); iter != oor.end(); ++iter) + for (std::set<uint64>::const_iterator iter = oor.begin(); iter != oor.end(); ++iter) { if(!IS_PLAYER_GUID(*iter)) continue; @@ -132,7 +132,7 @@ PlayerVisibilityNotifier::Notify() // Now do operations that required done at object visibility change to visible // send data at target visibility change (adding to client) - for(std::set<WorldObject*>::const_iterator vItr = i_visibleNow.begin(); vItr != i_visibleNow.end(); ++vItr) + for (std::set<WorldObject*>::const_iterator vItr = i_visibleNow.begin(); vItr != i_visibleNow.end(); ++vItr) // target aura duration for caster show only if target exist at caster client if((*vItr)!=&i_player && (*vItr)->isType(TYPEMASK_UNIT)) i_player.SendInitialVisiblePackets((Unit*)(*vItr)); @@ -157,7 +157,7 @@ MessageDistDeliverer::Visit(PlayerMapType &m) if (!target->GetSharedVisionList().empty()) { SharedVisionList::const_iterator i = target->GetSharedVisionList().begin(); - for ( ; i != target->GetSharedVisionList().end(); ++i) + for (; i != target->GetSharedVisionList().end(); ++i) if((*i)->m_seer == target) SendPacket(*i); } @@ -182,7 +182,7 @@ MessageDistDeliverer::Visit(CreatureMapType &m) if (!iter->getSource()->GetSharedVisionList().empty()) { SharedVisionList::const_iterator i = iter->getSource()->GetSharedVisionList().begin(); - for ( ; i != iter->getSource()->GetSharedVisionList().end(); ++i) + for (; i != iter->getSource()->GetSharedVisionList().end(); ++i) if((*i)->m_seer == iter->getSource()) SendPacket(*i); } @@ -224,7 +224,7 @@ MessageDistDeliverer::VisitObject(Player* plr) template<class T> void ObjectUpdater::Visit(GridRefManager<T> &m) { - for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) + for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) { if(iter->getSource()->IsInWorld()) iter->getSource()->Update(i_timeDiff); diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h index b76bbb27256..38cef3bd61a 100644 --- a/src/game/GridNotifiers.h +++ b/src/game/GridNotifiers.h @@ -92,7 +92,7 @@ namespace Trinity template<class T> void updateObjects(GridRefManager<T> &m) { - for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) + for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) iter->getSource()->Update(i_timeDiff); } @@ -241,34 +241,34 @@ namespace Trinity void Visit(GameObjectMapType &m) { - for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) i_do(itr->getSource()); } void Visit(PlayerMapType &m) { - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) i_do(itr->getSource()); } void Visit(CreatureMapType &m) { - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) i_do(itr->getSource()); } void Visit(CorpseMapType &m) { - for(CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) i_do(itr->getSource()); } void Visit(DynamicObjectMapType &m) { - for(DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) i_do(itr->getSource()); } @@ -436,7 +436,7 @@ namespace Trinity void Visit(CreatureMapType &m) { - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) i_do(itr->getSource()); } @@ -487,7 +487,7 @@ namespace Trinity void Visit(PlayerMapType &m) { - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) i_do(itr->getSource()); } @@ -507,7 +507,7 @@ namespace Trinity void Visit(PlayerMapType &m) { - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if (itr->getSource()->InSamePhase(i_searcher) && itr->getSource()->IsWithinDist(i_searcher,i_dist)) i_do(itr->getSource()); } @@ -1202,7 +1202,7 @@ namespace Trinity ~LocalizedPacketDo() { - for(size_t i = 0; i < i_data_cache.size(); ++i) + for (size_t i = 0; i < i_data_cache.size(); ++i) delete i_data_cache[i]; } void operator()( Player* p ); @@ -1222,8 +1222,8 @@ namespace Trinity ~LocalizedPacketListDo() { - for(size_t i = 0; i < i_data_cache.size(); ++i) - for(size_t j = 0; j < i_data_cache[i].size(); ++j) + for (size_t i = 0; i < i_data_cache.size(); ++i) + for (size_t j = 0; j < i_data_cache[i].size(); ++j) delete i_data_cache[i][j]; } void operator()( Player* p ); diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h index d9e27cc8bcc..5a439b9c164 100644 --- a/src/game/GridNotifiersImpl.h +++ b/src/game/GridNotifiersImpl.h @@ -32,7 +32,7 @@ inline void Trinity::ObjectUpdater::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) if(iter->getSource()->IsInWorld() && !iter->getSource()->isSpiritService()) iter->getSource()->Update(i_timeDiff); } @@ -63,7 +63,7 @@ template<class T> inline void Trinity::PlayerVisibilityNotifier::Visit(GridRefManager<T> &m) { - for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) + for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) { i_player.UpdateVisibilityOf(iter->getSource(),i_data,i_visibleNow); i_clientGUIDs.erase(iter->getSource()->GetGUID()); @@ -74,7 +74,7 @@ template<> inline void Trinity::PlayerRelocationNotifier::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { i_clientGUIDs.erase(iter->getSource()->GetGUID()); @@ -99,7 +99,7 @@ template<> inline void Trinity::PlayerRelocationNotifier::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { i_clientGUIDs.erase(iter->getSource()->GetGUID()); @@ -116,7 +116,7 @@ template<> inline void Trinity::CreatureRelocationNotifier::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { if(iter->getSource()->m_Notified) continue; @@ -134,7 +134,7 @@ Trinity::CreatureRelocationNotifier::Visit(CreatureMapType &m) if(!i_creature.isAlive()) return; - for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { if(iter->getSource()->m_Notified) continue; @@ -175,9 +175,8 @@ inline void Trinity::DynamicObjectUpdater::VisitHelper(Unit* target) if(target->HasAura(i_dynobject.GetSpellId(), i_check->GetGUID())) return; - uint32 eff_index = 0; - for(; eff_index < MAX_SPELL_EFFECTS; ++eff_index) + for (; eff_index < MAX_SPELL_EFFECTS; ++eff_index) if(i_dynobject.HasEffect(eff_index)) break; @@ -221,7 +220,7 @@ template<> inline void Trinity::DynamicObjectUpdater::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) VisitHelper(itr->getSource()); } @@ -229,7 +228,7 @@ template<> inline void Trinity::DynamicObjectUpdater::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) VisitHelper(itr->getSource()); } @@ -244,7 +243,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m) if(i_object) return; - for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -264,7 +263,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(PlayerMapType &m) if(i_object) return; - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -284,7 +283,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(CreatureMapType &m) if(i_object) return; - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -304,7 +303,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(CorpseMapType &m) if(i_object) return; - for(CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -324,7 +323,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m) if(i_object) return; - for(DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -340,7 +339,7 @@ void Trinity::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m) template<class Check> void Trinity::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if(i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -349,7 +348,7 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m) template<class Check> void Trinity::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if(i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -358,7 +357,7 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m) template<class Check> void Trinity::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m) { - for(CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if(i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -367,7 +366,7 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m) template<class Check> void Trinity::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m) { - for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if(i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -376,7 +375,7 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m) template<class Check> void Trinity::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m) { - for(DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if(i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -391,7 +390,7 @@ void Trinity::GameObjectSearcher<Check>::Visit(GameObjectMapType &m) if(i_object) return; - for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -407,7 +406,7 @@ void Trinity::GameObjectSearcher<Check>::Visit(GameObjectMapType &m) template<class Check> void Trinity::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m) { - for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -420,7 +419,7 @@ void Trinity::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m) template<class Check> void Trinity::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m) { - for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if(i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -435,7 +434,7 @@ void Trinity::UnitSearcher<Check>::Visit(CreatureMapType &m) if(i_object) return; - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -455,7 +454,7 @@ void Trinity::UnitSearcher<Check>::Visit(PlayerMapType &m) if(i_object) return; - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -471,7 +470,7 @@ void Trinity::UnitSearcher<Check>::Visit(PlayerMapType &m) template<class Check> void Trinity::UnitLastSearcher<Check>::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -484,7 +483,7 @@ void Trinity::UnitLastSearcher<Check>::Visit(CreatureMapType &m) template<class Check> void Trinity::UnitLastSearcher<Check>::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -497,7 +496,7 @@ void Trinity::UnitLastSearcher<Check>::Visit(PlayerMapType &m) template<class Check> void Trinity::UnitListSearcher<Check>::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if(i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -506,7 +505,7 @@ void Trinity::UnitListSearcher<Check>::Visit(PlayerMapType &m) template<class Check> void Trinity::UnitListSearcher<Check>::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if(i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -521,7 +520,7 @@ void Trinity::CreatureSearcher<Check>::Visit(CreatureMapType &m) if(i_object) return; - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -537,7 +536,7 @@ void Trinity::CreatureSearcher<Check>::Visit(CreatureMapType &m) template<class Check> void Trinity::CreatureLastSearcher<Check>::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -550,7 +549,7 @@ void Trinity::CreatureLastSearcher<Check>::Visit(CreatureMapType &m) template<class Check> void Trinity::CreatureListSearcher<Check>::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if( i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -559,7 +558,7 @@ void Trinity::CreatureListSearcher<Check>::Visit(CreatureMapType &m) template<class Check> void Trinity::PlayerListSearcher<Check>::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(itr->getSource()->InSamePhase(i_phaseMask)) if( i_check(itr->getSource())) i_objects.push_back(itr->getSource()); @@ -572,7 +571,7 @@ void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m) if(i_object) return; - for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) + for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { if(!itr->getSource()->InSamePhase(i_phaseMask)) continue; @@ -630,7 +629,7 @@ void MaNGOS::LocalizedPacketListDo<Builder>::operator()( Player* p ) else data_list = &i_data_cache[cache_idx]; - for(size_t i = 0; i < data_list->size(); ++i) + for (size_t i = 0; i < data_list->size(); ++i) p->SendDirectMessage((*data_list)[i]); } diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 8a02afa25d2..c7a18d638f0 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -71,8 +71,8 @@ Group::~Group() // it is undefined whether objectmgr (which stores the groups) or instancesavemgr // will be unloaded first so we must be prepared for both cases // this may unload some instance saves - for(uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i) - for(BoundInstancesMap::iterator itr2 = m_boundInstances[i].begin(); itr2 != m_boundInstances[i].end(); ++itr2) + for (uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i) + for (BoundInstancesMap::iterator itr2 = m_boundInstances[i].begin(); itr2 != m_boundInstances[i].end(); ++itr2) itr2->second.save->RemoveGroup(this); // Sub group counters clean up @@ -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; i<TARGETICONCOUNT; ++i) + for (int i=0; i<TARGETICONCOUNT; ++i) m_targetIcons[i] = (*result)[5+i].GetUInt64(); if(!external) delete result; @@ -208,7 +208,7 @@ void Group::ConvertToRaid() SendUpdate(); // update quest related GO states (quest activity dependent from raid membership) - for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) + for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) if(Player* player = objmgr.GetPlayer(citr->guid)) player->UpdateForQuestWorldObjects(); } @@ -252,7 +252,7 @@ uint32 Group::RemoveInvite(Player *player) void Group::RemoveAllInvites() { - for(InvitesList::iterator itr=m_invitees.begin(); itr!=m_invitees.end(); ++itr) + for (InvitesList::iterator itr=m_invitees.begin(); itr!=m_invitees.end(); ++itr) (*itr)->SetGroupInvite(NULL); m_invitees.clear(); @@ -260,7 +260,7 @@ void Group::RemoveAllInvites() Player* Group::GetInvited(const uint64& guid) const { - for(InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr) + for (InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr) { if((*itr)->GetGUID() == guid) return (*itr); @@ -270,7 +270,7 @@ Player* Group::GetInvited(const uint64& guid) const Player* Group::GetInvited(const std::string& name) const { - for(InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr) + for (InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr) { if((*itr)->GetName() == name) return (*itr); @@ -383,7 +383,7 @@ void Group::Disband(bool hideDestroy) { Player *player; - for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) + for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) { player = objmgr.GetPlayer(citr->guid); if(!player) @@ -486,7 +486,7 @@ void Group::SendLootRoll(const uint64& SourceGuid, const uint64& TargetGuid, uin data << uint8(RollType); // 0: "Need for: [item name]" 0: "You have selected need for [item name] 1: need roll 2: greed roll data << uint8(0); // 2.4.0 - for( Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr) + for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr) { Player *p = objmgr.GetPlayer(itr->first); if(!p || !p->GetSession()) @@ -509,7 +509,7 @@ void Group::SendLootRollWon(const uint64& SourceGuid, const uint64& TargetGuid, data << uint8(RollNumber); // rollnumber realted to SMSG_LOOT_ROLL data << uint8(RollType); // Rolltype related to SMSG_LOOT_ROLL - for( Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr) + for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr) { Player *p = objmgr.GetPlayer(itr->first); if(!p || !p->GetSession()) @@ -529,7 +529,7 @@ void Group::SendLootAllPassed(uint32 NumberOfPlayers, const Roll &r) data << uint32(r.itemRandomPropId); // Item random property ID data << uint32(r.itemRandomSuffix); // Item random suffix ID - for( Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr) + for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr) { Player *p = objmgr.GetPlayer(itr->first); if(!p || !p->GetSession()) @@ -564,7 +564,7 @@ void Group::GroupLoot(const uint64& playerGUID, Loot *loot, Creature *creature) Roll* r=new Roll(newitemGUID,*i); //a vector is filled with only near party members - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *member = itr->getSource(); if(!member || !member->GetSession()) @@ -603,7 +603,7 @@ void Group::NeedBeforeGreed(const uint64& playerGUID, Loot *loot, Creature *crea Group *group = player->GetGroup(); uint8 itemSlot = 0; - for(std::vector<LootItem>::iterator i=loot->items.begin(); i != loot->items.end(); ++i, ++itemSlot) + for (std::vector<LootItem>::iterator i=loot->items.begin(); i != loot->items.end(); ++i, ++itemSlot) { item = objmgr.GetItemPrototype(i->itemid); @@ -613,7 +613,7 @@ void Group::NeedBeforeGreed(const uint64& playerGUID, Loot *loot, Creature *crea uint64 newitemGUID = MAKE_NEW_GUID(objmgr.GenerateLowGuid(HIGHGUID_ITEM),0,HIGHGUID_ITEM); Roll* r=new Roll(newitemGUID,*i); - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *playerToRoll = itr->getSource(); if(!playerToRoll || !playerToRoll->GetSession()) @@ -663,7 +663,7 @@ void Group::MasterLoot(const uint64& playerGUID, Loot* /*loot*/, Creature *creat WorldPacket data(SMSG_LOOT_MASTER_LIST, 330); data << (uint8)GetMembersCount(); - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *looter = itr->getSource(); if (!looter->IsInWorld()) @@ -678,7 +678,7 @@ void Group::MasterLoot(const uint64& playerGUID, Loot* /*loot*/, Creature *creat data.put<uint8>(0,real_count); - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *looter = itr->getSource(); if (looter->IsWithinDist(creature,sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE),false)) @@ -762,7 +762,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers) uint64 maxguid = (*roll->playerVote.begin()).first; Player *player; - for( Roll::PlayerVote::const_iterator itr=roll->playerVote.begin(); itr!=roll->playerVote.end(); ++itr) + for (Roll::PlayerVote::const_iterator itr=roll->playerVote.begin(); itr!=roll->playerVote.end(); ++itr) { if (itr->second != NEED) continue; @@ -864,7 +864,7 @@ void Group::SetTargetIcon(uint8 id, uint64 guid) // clean other icons if( guid != 0 ) - for(int i=0; i<TARGETICONCOUNT; ++i) + for (int i=0; i<TARGETICONCOUNT; ++i) if( m_targetIcons[i] == guid ) SetTargetIcon(i, 0); @@ -879,7 +879,7 @@ void Group::SetTargetIcon(uint8 id, uint64 guid) void Group::GetDataForXPAtKill(Unit const* victim, uint32& count,uint32& sum_level, Player* & member_with_max_level, Player* & not_gray_member_with_max_level) { - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player* member = itr->getSource(); if(!member || !member->isAlive()) // only for alive @@ -908,7 +908,7 @@ void Group::SendTargetIconList(WorldSession *session) WorldPacket data(MSG_RAID_TARGET_UPDATE, (1+TARGETICONCOUNT*9)); data << (uint8)1; - for(int i=0; i<TARGETICONCOUNT; ++i) + for (int i=0; i<TARGETICONCOUNT; ++i) { if(m_targetIcons[i] == 0) continue; @@ -924,7 +924,7 @@ void Group::SendUpdate() { Player *player; - for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) + for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) { player = objmgr.GetPlayer(citr->guid); if(!player || !player->GetSession() || player->GetGroup() != this ) @@ -937,7 +937,7 @@ void Group::SendUpdate() data << (uint8)(citr->assistant?0x01:0); // 0x2 main assist, 0x4 main tank data << uint64(0x50000000FFFFFFFELL); // related to voice chat? data << uint32(GetMembersCount()-1); - for(member_citerator citr2 = m_memberSlots.begin(); citr2 != m_memberSlots.end(); ++citr2) + for (member_citerator citr2 = m_memberSlots.begin(); citr2 != m_memberSlots.end(); ++citr2) { if(citr->guid == citr2->guid) continue; @@ -974,7 +974,7 @@ void Group::UpdatePlayerOutOfRange(Player* pPlayer) WorldPacket data; pPlayer->GetSession()->BuildPartyMemberStatsChangedPacket(pPlayer, &data); - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { player = itr->getSource(); if (player && player != pPlayer && !pPlayer->isVisibleFor(player)) @@ -984,7 +984,7 @@ void Group::UpdatePlayerOutOfRange(Player* pPlayer) void Group::BroadcastPacket(WorldPacket *packet, bool ignorePlayersInBGRaid, int group, uint64 ignore) { - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *pl = itr->getSource(); if(!pl || (ignore != 0 && pl->GetGUID() == ignore) || (ignorePlayersInBGRaid && pl->GetGroup() != this) ) @@ -997,7 +997,7 @@ void Group::BroadcastPacket(WorldPacket *packet, bool ignorePlayersInBGRaid, int void Group::BroadcastReadyCheck(WorldPacket *packet) { - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *pl = itr->getSource(); if(pl && pl->GetSession()) @@ -1008,7 +1008,7 @@ void Group::BroadcastReadyCheck(WorldPacket *packet) void Group::OfflineReadyCheck() { - for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) + for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) { Player *pl = objmgr.GetPlayer(citr->guid); if (!pl || !pl->GetSession()) @@ -1083,7 +1083,7 @@ bool Group::_addMember(const uint64 &guid, const char* name, bool isAssistant, u if(!isRaidGroup()) // reset targetIcons for non-raid-groups { - for(int i=0; i<TARGETICONCOUNT; ++i) + for (int i=0; i<TARGETICONCOUNT; ++i) m_targetIcons[i] = 0; } @@ -1162,9 +1162,9 @@ void Group::_setLeader(const uint64 &guid) Player *player = objmgr.GetPlayer(slot->guid); 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();) + for (BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ) { if(itr->second.perm) { @@ -1347,7 +1347,7 @@ void Group::UpdateLooterGuid( Creature* creature, bool ifneed ) // search next after current if(guid_itr != m_memberSlots.end()) { - for(member_citerator itr = guid_itr; itr != m_memberSlots.end(); ++itr) + for (member_citerator itr = guid_itr; itr != m_memberSlots.end(); ++itr) { if(Player* pl = ObjectAccessor::FindPlayer(itr->guid)) { @@ -1368,7 +1368,7 @@ void Group::UpdateLooterGuid( Creature* creature, bool ifneed ) } // search from start - for(member_citerator itr = m_memberSlots.begin(); itr != guid_itr; ++itr) + for (member_citerator itr = m_memberSlots.begin(); itr != guid_itr; ++itr) { if(Player* pl = ObjectAccessor::FindPlayer(itr->guid)) { @@ -1411,7 +1411,7 @@ uint32 Group::CanJoinBattleGroundQueue(BattleGroundTypeId bgTypeId, BattleGround uint32 team = reference->GetTeam(); // check every member of the group to be able to join - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *member = itr->getSource(); // offline member? don't let join @@ -1454,7 +1454,7 @@ void Group::SetDifficulty(uint8 difficulty) m_difficulty = difficulty; if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE groups SET difficulty = %u WHERE leaderGuid ='%u'", m_difficulty, GUID_LOPART(m_leaderGuid)); - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *player = itr->getSource(); if(!player->GetSession() || player->getLevel() < LEVELREQUIREMENT_HEROIC) @@ -1466,11 +1466,11 @@ void Group::SetDifficulty(uint8 difficulty) bool Group::InCombatToInstance(uint32 instanceId) { - for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *pPlayer = itr->getSource(); if(pPlayer && pPlayer->getAttackers().size() && pPlayer->GetInstanceId() == instanceId && (pPlayer->GetMap()->IsRaid() || pPlayer->GetMap()->IsHeroic())) - for(std::set<Unit*>::const_iterator i = pPlayer->getAttackers().begin(); i!=pPlayer->getAttackers().end(); ++i) + for (std::set<Unit*>::const_iterator i = pPlayer->getAttackers().begin(); i!=pPlayer->getAttackers().end(); ++i) if((*i) && (*i)->GetTypeId() == TYPEID_UNIT && ((Creature*)(*i))->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND) return true; } @@ -1487,7 +1487,7 @@ void Group::ResetInstances(uint8 method, Player* SendMsgTo) // we assume that when the difficulty changes, all instances that can be reset will be uint8 dif = GetDifficulty(); - for(BoundInstancesMap::iterator itr = m_boundInstances[dif].begin(); itr != m_boundInstances[dif].end();) + for (BoundInstancesMap::iterator itr = m_boundInstances[dif].begin(); itr != m_boundInstances[dif].end(); ) { InstanceSave *p = itr->second.save; const MapEntry *entry = sMapStore.LookupEntry(itr->first); @@ -1611,7 +1611,7 @@ void Group::BroadcastGroupUpdate(void) { // FG: HACK: force flags update on group leave - for values update hack // -- not very efficient but safe - for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) + for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) { Player *pp = objmgr.GetPlayer(citr->guid); diff --git a/src/game/Group.h b/src/game/Group.h index d09ef616897..e38d39ecd7b 100644 --- a/src/game/Group.h +++ b/src/game/Group.h @@ -189,7 +189,7 @@ class TRINITY_DLL_SPEC Group bool IsLeader(const uint64& guid) const { return (GetLeaderGUID() == guid); } uint64 GetMemberGUID(const std::string& name) { - for(member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) + for (member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) { if(itr->name == name) { @@ -364,7 +364,7 @@ class TRINITY_DLL_SPEC Group member_citerator _getMemberCSlot(uint64 Guid) const { - for(member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) + for (member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) { if (itr->guid == Guid) return itr; @@ -374,7 +374,7 @@ class TRINITY_DLL_SPEC Group member_witerator _getMemberWSlot(uint64 Guid) { - for(member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) + for (member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) { if (itr->guid == Guid) return itr; diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index 2746c6c7772..fab192bbedc 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -702,7 +702,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke { const uint64& auramask = player->GetAuraUpdateMaskForRaid(); *data << uint64(auramask); - for(uint32 i = 0; i < MAX_AURAS; ++i) + for (uint32 i = 0; i < MAX_AURAS; ++i) { if(auramask & (uint64(1) << i)) { @@ -784,7 +784,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke { const uint64& auramask = pet->GetAuraUpdateMaskForRaid(); *data << uint64(auramask); - for(uint32 i = 0; i < MAX_AURAS; ++i) + for (uint32 i = 0; i < MAX_AURAS; ++i) { if(auramask & (uint64(1) << i)) { @@ -844,7 +844,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data ) uint64 auramask = 0; size_t maskPos = data.wpos(); data << (uint64) auramask; // placeholder - for(uint8 i = 0; i < MAX_AURAS; ++i) + for (uint8 i = 0; i < MAX_AURAS; ++i) { if(Aura * pAura = player->GetVisibleAura(i)) { @@ -870,7 +870,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data ) uint64 petauramask = 0; size_t petMaskPos = data.wpos(); data << (uint64) petauramask; // placeholder - for(uint8 i = 0; i < MAX_AURAS; ++i) + for (uint8 i = 0; i < MAX_AURAS; ++i) { if(Aura * pAura = pet->GetVisibleAura(i)) { diff --git a/src/game/GuardAI.cpp b/src/game/GuardAI.cpp index a821939910a..4a3a6c991b0 100644 --- a/src/game/GuardAI.cpp +++ b/src/game/GuardAI.cpp @@ -136,4 +136,3 @@ void GuardAI::JustDied(Unit *killer) m_creature->SendZoneUnderAttackMessage(pkiller); } - diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index 92faebccad5..99f79b1738d 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -344,7 +344,7 @@ bool Guild::LoadRanksFromDB(uint32 GuildId) sLog.outError("Guild %u has broken `guild_rank` data, repairing...",GuildId); CharacterDatabase.BeginTransaction(); CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid='%u'", GuildId); - for(size_t i = 0; i < m_Ranks.size(); ++i) + for (size_t i = 0; i < m_Ranks.size(); ++i) { std::string name = m_Ranks[i].Name; uint32 rights = m_Ranks[i].Rights; @@ -1698,7 +1698,7 @@ void Guild::AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *t data << (uint32) pItem->GetItemRandomPropertyId(); // random item property id +8 if (pItem->GetItemRandomPropertyId()) data << (uint32) pItem->GetItemSuffixFactor(); // SuffixFactor +4 - + data << uint32(pItem->GetCount()); // +12 // ITEM_FIELD_STACK_COUNT data << uint32(0); // +16 // Unknown value data << uint8(abs(pItem->GetSpellCharges())); // spell charges @@ -1720,7 +1720,7 @@ Item* Guild::StoreItem(uint8 tabId, GuildItemPosCountVec const& dest, Item* pIte Item* lastItem = pItem; - for(GuildItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ) + for (GuildItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ) { uint8 slot = itr->Slot; uint32 count = itr->Count; @@ -1838,7 +1838,7 @@ uint8 Guild::_CanStoreItem_InSpecificSlot( uint8 tab, uint8 slot, GuildItemPosCo uint8 Guild::_CanStoreItem_InTab( uint8 tab, GuildItemPosCountVec &dest, uint32& count, bool merge, Item* pSrcItem, uint8 skip_slot ) const { - for(uint32 j = 0; j < GUILD_BANK_MAX_SLOTS; j++) + for (uint32 j = 0; j < GUILD_BANK_MAX_SLOTS; j++) { // skip specific slot already processed in first called _CanStoreItem_InSpecificSlot if (j == skip_slot) @@ -2095,7 +2095,6 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT DisplayGuildBankContentUpdate(BankTabDst,BankTabSlotDst); } - void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 PlayerBag, uint8 PlayerSlot, uint32 SplitedAmount) { Item *pItemBank = GetItem(BankTab, BankTabSlot); @@ -2243,7 +2242,6 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u DisplayGuildBankContentUpdate(BankTab,BankTabSlot); } - void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot, uint8 BankTab, uint8 BankTabSlot, uint32 SplitedAmount ) { Item *pItemBank = GetItem(BankTab, BankTabSlot); diff --git a/src/game/Guild.h b/src/game/Guild.h index 8df8d01d264..f3626942bfc 100644 --- a/src/game/Guild.h +++ b/src/game/Guild.h @@ -268,7 +268,7 @@ struct RankInfo { RankInfo(const std::string& _name, uint32 _rights, uint32 _money) : Name(_name), Rights(_rights), BankMoneyPerDay(_money) { - for(uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i) + for (uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i) { TabRight[i] = 0; TabSlotPerDay[i] = 0; @@ -301,12 +301,10 @@ class Guild std::string const& GetMOTD() const { return MOTD; } std::string const& GetGINFO() const { return GINFO; } - uint32 GetCreatedYear() const { return m_CreatedYear; } uint32 GetCreatedMonth() const { return m_CreatedMonth; } uint32 GetCreatedDay() const { return m_CreatedDay; } - uint32 GetEmblemStyle() const { return m_EmblemStyle; } uint32 GetEmblemColor() const { return m_EmblemColor; } uint32 GetBorderStyle() const { return m_BorderStyle; } @@ -342,7 +340,7 @@ class Guild template<class Do> void BroadcastWorker(Do& _do, Player* except = NULL) { - for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) + for (MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) if(Player *player = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER))) if(player != except) _do(player); @@ -367,7 +365,7 @@ class Guild } MemberSlot* GetMemberSlot(const std::string& name, uint64& guid) { - for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) + for (MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) { if(itr->second.Name == name) { diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index c11ad11766b..3f5e7fb7cb7 100644 --- a/src/game/GuildHandler.cpp +++ b/src/game/GuildHandler.cpp @@ -324,7 +324,7 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket) data << plName; data << guild->GetRankName(newRankId); guild->BroadcastPacket(&data); - + guild->ChangeRank(plGuid, newRankId); // Put record into guildlog guild->LogGuildEvent(GUILD_EVENT_LOG_PROMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), newRankId); @@ -893,7 +893,7 @@ void WorldSession::HandleGuildPermissions( WorldPacket& /* recv_data */ ) data << uint32(pGuild->GetMemberMoneyWithdrawRem(GetPlayer()->GetGUIDLow())); data << uint8(pGuild->GetPurchasedTabs()); // tabs count // why sending all info when not all tabs are purchased??? - for(int i = 0; i < GUILD_BANK_MAX_TABS; ++i) + for (int i = 0; i < GUILD_BANK_MAX_TABS; ++i) { data << uint32(pGuild->GetBankRights(rankId, uint8(i))); data << uint32(pGuild->GetMemberSlotWithdrawRem(GetPlayer()->GetGUIDLow(), uint8(i))); diff --git a/src/game/HomeMovementGenerator.h b/src/game/HomeMovementGenerator.h index 964b5c3e801..00e92ac9e76 100644 --- a/src/game/HomeMovementGenerator.h +++ b/src/game/HomeMovementGenerator.h @@ -47,7 +47,7 @@ class TRINITY_DLL_SPEC HomeMovementGenerator<Creature> MovementGeneratorType GetMovementGeneratorType() { return HOME_MOTION_TYPE; } bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; } - + private: void _setTargetLocation(Creature &); DestinationHolder< Traveller<Creature> > i_destinationHolder; diff --git a/src/game/IdleMovementGenerator.cpp b/src/game/IdleMovementGenerator.cpp index 7c68e3c09f5..9d6d4252352 100644 --- a/src/game/IdleMovementGenerator.cpp +++ b/src/game/IdleMovementGenerator.cpp @@ -49,7 +49,7 @@ void RotateMovementGenerator::Initialize(Unit& owner) owner.addUnitState(UNIT_STAT_ROTATING); - owner.AttackStop(); + owner.AttackStop(); } bool RotateMovementGenerator::Update(Unit& owner, const uint32& diff) diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp index 1398038d724..b798c884312 100644 --- a/src/game/InstanceData.cpp +++ b/src/game/InstanceData.cpp @@ -47,7 +47,7 @@ void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go) bool InstanceData::IsEncounterInProgress() const { - for(std::vector<BossInfo>::const_iterator itr = bosses.begin(); itr != bosses.end(); ++itr) + for (std::vector<BossInfo>::const_iterator itr = bosses.begin(); itr != bosses.end(); ++itr) if(itr->state == IN_PROGRESS) return true; @@ -105,7 +105,7 @@ void InstanceData::UpdateDoorState(GameObject *door) return; bool open = true; - for(DoorInfoMap::iterator itr = lower; itr != upper; ++itr) + for (DoorInfoMap::iterator itr = lower; itr != upper; ++itr) { if(itr->second.type == DOOR_TYPE_ROOM) { @@ -136,7 +136,7 @@ void InstanceData::AddDoor(GameObject *door, bool add) if(lower == upper) return; - for(DoorInfoMap::iterator itr = lower; itr != upper; ++itr) + for (DoorInfoMap::iterator itr = lower; itr != upper; ++itr) { if(add) { @@ -201,19 +201,19 @@ bool InstanceData::SetBossState(uint32 id, EncounterState state) return false; if(state == DONE) - for(MinionSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i) + for (MinionSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i) if((*i)->isWorldBoss() && (*i)->isAlive()) return false; bossInfo->state = state; SaveToDB(); } - - for(uint32 type = 0; type < MAX_DOOR_TYPES; ++type) - for(DoorSet::iterator i = bossInfo->door[type].begin(); i != bossInfo->door[type].end(); ++i) + + for (uint32 type = 0; type < MAX_DOOR_TYPES; ++type) + for (DoorSet::iterator i = bossInfo->door[type].begin(); i != bossInfo->door[type].end(); ++i) UpdateDoorState(*i); - for(MinionSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i) + for (MinionSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i) UpdateMinionState(*i, state); return true; @@ -227,7 +227,7 @@ std::string InstanceData::LoadBossState(const char * data) std::istringstream loadStream(data); uint32 buff; uint32 bossId = 0; - for(std::vector<BossInfo>::iterator i = bosses.begin(); i != bosses.end(); ++i, ++bossId) + for (std::vector<BossInfo>::iterator i = bosses.begin(); i != bosses.end(); ++i, ++bossId) { loadStream >> buff; if(buff < TO_BE_DECIDED) @@ -239,10 +239,10 @@ std::string InstanceData::LoadBossState(const char * data) std::string InstanceData::GetBossSaveData() { std::ostringstream saveStream; - for(std::vector<BossInfo>::iterator i = bosses.begin(); i != bosses.end(); ++i) + for (std::vector<BossInfo>::iterator i = bosses.begin(); i != bosses.end(); ++i) saveStream << (uint32)i->state << " "; return saveStream.str(); -} +} void InstanceData::DoUseDoorOrButton(uint64 uiGuid, uint32 uiWithRestoreTime, bool bUseAlternativeState) { @@ -287,7 +287,7 @@ void InstanceData::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData) if (!lPlayers.isEmpty()) { - for(Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) + for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) { if (Player* pPlayer = itr->getSource()) pPlayer->SendUpdateWorldState(uiStateId, uiStateData); diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp index 90714356fc1..667cd289c77 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/InstanceSaveMgr.cpp @@ -57,13 +57,13 @@ InstanceSaveManager::~InstanceSaveManager() for (InstanceSaveHashMap::iterator itr = m_instanceSaveById.begin(); itr != m_instanceSaveById.end(); ++itr) { InstanceSave *save = itr->second; - for(InstanceSave::PlayerListType::iterator itr2 = save->m_playerList.begin(), next = itr2; itr2 != save->m_playerList.end(); itr2 = next) + for (InstanceSave::PlayerListType::iterator itr2 = save->m_playerList.begin(), next = itr2; itr2 != save->m_playerList.end(); itr2 = next) { ++next; (*itr2)->UnbindInstance(save->GetMapId(), save->GetDifficulty(), true); } save->m_playerList.clear(); - for(InstanceSave::GroupListType::iterator itr2 = save->m_groupList.begin(), next = itr2; itr2 != save->m_groupList.end(); itr2 = next) + for (InstanceSave::GroupListType::iterator itr2 = save->m_groupList.begin(), next = itr2; itr2 != save->m_groupList.end(); itr2 = next) { ++next; (*itr2)->UnbindInstance(save->GetMapId(), save->GetDifficulty(), true); @@ -233,7 +233,7 @@ void InstanceSaveManager::_DelHelper(DatabaseType &db, const char *fields, const { Field *fields = result->Fetch(); std::ostringstream ss; - for(size_t i = 0; i < fieldTokens.size(); i++) + for (size_t i = 0; i < fieldTokens.size(); i++) { std::string fieldValue = fields[i].GetCppString(); db.escape_string(fieldValue); @@ -440,7 +440,7 @@ void InstanceSaveManager::LoadResetTimes() } // schedule the reset times - for(ResetTimeMapType::iterator itr = InstResetTime.begin(); itr != InstResetTime.end(); ++itr) + for (ResetTimeMapType::iterator itr = InstResetTime.begin(); itr != InstResetTime.end(); ++itr) if(itr->second.second > now) ScheduleReset(true, itr->second.second, InstResetEvent(0, itr->second.first, itr->first)); } @@ -479,7 +479,7 @@ void InstanceSaveManager::LoadResetTimes() // calculate new global reset times for expired instances and those that have never been reset yet // add the global reset times to the priority queue - for(uint32 i = 0; i < sInstanceTemplate.MaxEntry; i++) + for (uint32 i = 0; i < sInstanceTemplate.MaxEntry; i++) { InstanceTemplate const* temp = objmgr.GetInstanceTemplate(i); if(!temp) continue; @@ -512,7 +512,7 @@ void InstanceSaveManager::LoadResetTimes() // schedule the global reset/warning uint8 type = 1; static int tim[4] = {3600, 900, 300, 60}; - for(; type < 4; type++) + for (; type < 4; type++) if(t - tim[type-1] > now) break; ScheduleReset(true, t - tim[type-1], InstResetEvent(type, i)); } @@ -527,12 +527,12 @@ void InstanceSaveManager::ScheduleReset(bool add, time_t time, InstResetEvent ev ResetTimeQueue::iterator itr; std::pair<ResetTimeQueue::iterator, ResetTimeQueue::iterator> range; range = m_resetTimeQueue.equal_range(time); - for(itr = range.first; itr != range.second; ++itr) + for (itr = range.first; itr != range.second; ++itr) if(itr->second == event) { m_resetTimeQueue.erase(itr); return; } // in case the reset time changed (should happen very rarely), we search the whole queue if(itr == range.second) { - for(itr = m_resetTimeQueue.begin(); itr != m_resetTimeQueue.end(); ++itr) + for (itr = m_resetTimeQueue.begin(); itr != m_resetTimeQueue.end(); ++itr) if(itr->second == event) { m_resetTimeQueue.erase(itr); return; } if(itr == m_resetTimeQueue.end()) sLog.outError("InstanceSaveManager::ScheduleReset: cannot cancel the reset, the event(%d,%d,%d) was not found!", event.type, event.mapid, event.instanceId); @@ -627,7 +627,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeLe } // remove all binds to instances of the given map - for(InstanceSaveHashMap::iterator itr = m_instanceSaveById.begin(); itr != m_instanceSaveById.end();) + for (InstanceSaveHashMap::iterator itr = m_instanceSaveById.begin(); itr != m_instanceSaveById.end(); ) { if(itr->second->GetMapId() == mapid) _ResetSave(itr); @@ -656,7 +656,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeLe MapInstanced::InstancedMaps &instMaps = ((MapInstanced*)map)->GetInstancedMaps(); MapInstanced::InstancedMaps::iterator mitr; - for(mitr = instMaps.begin(); mitr != instMaps.end(); ++mitr) + for (mitr = instMaps.begin(); mitr != instMaps.end(); ++mitr) { Map *map2 = mitr->second; if(!map2->IsDungeon()) continue; @@ -670,7 +670,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeLe uint32 InstanceSaveManager::GetNumBoundPlayersTotal() { uint32 ret = 0; - for(InstanceSaveHashMap::iterator itr = m_instanceSaveById.begin(); itr != m_instanceSaveById.end(); ++itr) + for (InstanceSaveHashMap::iterator itr = m_instanceSaveById.begin(); itr != m_instanceSaveById.end(); ++itr) ret += itr->second->GetPlayerCount(); return ret; } @@ -678,7 +678,7 @@ uint32 InstanceSaveManager::GetNumBoundPlayersTotal() uint32 InstanceSaveManager::GetNumBoundGroupsTotal() { uint32 ret = 0; - for(InstanceSaveHashMap::iterator itr = m_instanceSaveById.begin(); itr != m_instanceSaveById.end(); ++itr) + for (InstanceSaveHashMap::iterator itr = m_instanceSaveById.begin(); itr != m_instanceSaveById.end(); ++itr) ret += itr->second->GetGroupCount(); return ret; } diff --git a/src/game/Item.cpp b/src/game/Item.cpp index 2d39b016623..137d90acafd 100644 --- a/src/game/Item.cpp +++ b/src/game/Item.cpp @@ -45,7 +45,7 @@ void AddItemsSetItem(Player*player,Item *item) ItemSetEffect *eff = NULL; - for(size_t x = 0; x < player->ItemSetEff.size(); ++x) + for (size_t x = 0; x < player->ItemSetEff.size(); ++x) { if(player->ItemSetEff[x] && player->ItemSetEff[x]->setid == setid) { @@ -61,7 +61,7 @@ void AddItemsSetItem(Player*player,Item *item) eff->setid = setid; size_t x = 0; - for(; x < player->ItemSetEff.size(); x++) + for (; x < player->ItemSetEff.size(); x++) if(!player->ItemSetEff[x]) break; @@ -73,7 +73,7 @@ void AddItemsSetItem(Player*player,Item *item) ++eff->item_count; - for(uint32 x=0;x<8;x++) + for (uint32 x=0; x<8; x++) { if(!set->spells [x]) continue; @@ -82,7 +82,7 @@ void AddItemsSetItem(Player*player,Item *item) continue; uint32 z=0; - for(;z<8;z++) + for (; z<8; z++) if(eff->spells[z] && eff->spells[z]->Id==set->spells[x]) break; @@ -90,7 +90,7 @@ void AddItemsSetItem(Player*player,Item *item) continue; //new spell - for(uint32 y=0;y<8;y++) + for (uint32 y=0; y<8; y++) { if(!eff->spells[y]) // free slot { @@ -124,7 +124,7 @@ void RemoveItemsSetItem(Player*player,ItemPrototype const *proto) ItemSetEffect *eff = NULL; size_t setindex = 0; - for(;setindex < player->ItemSetEff.size(); setindex++) + for (; setindex < player->ItemSetEff.size(); setindex++) { if(player->ItemSetEff[setindex] && player->ItemSetEff[setindex]->setid == setid) { @@ -139,7 +139,7 @@ void RemoveItemsSetItem(Player*player,ItemPrototype const *proto) --eff->item_count; - for(uint32 x=0;x<8;x++) + for (uint32 x=0; x<8; x++) { if(!set->spells[x]) continue; @@ -148,7 +148,7 @@ void RemoveItemsSetItem(Player*player,ItemPrototype const *proto) if(set->items_to_triggerspell[x] <= eff->item_count) continue; - for(uint32 z=0;z<8;z++) + for (uint32 z=0; z<8; z++) { if(eff->spells[z] && eff->spells[z]->Id==set->spells[x]) { @@ -267,7 +267,7 @@ bool Item::Create( uint32 guidlow, uint32 itemid, Player const* owner) SetUInt32Value(ITEM_FIELD_MAXDURABILITY, itemProto->MaxDurability); SetUInt32Value(ITEM_FIELD_DURABILITY, itemProto->MaxDurability); - for(uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) + for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) SetSpellCharges(i,itemProto->Spells[i].SpellCharges); SetUInt32Value(ITEM_FIELD_FLAGS, itemProto->Flags); @@ -286,7 +286,7 @@ void Item::UpdateDuration(Player* owner, uint32 diff) if (GetUInt32Value(ITEM_FIELD_DURATION)<=diff) { Script->ItemExpire(owner, GetProto()); - owner->DestroyItem(GetBagSlot(), GetSlot(), true); + owner->DestroyItem(GetBagSlot(), GetSlot(), true); return; } @@ -304,7 +304,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() ); @@ -313,7 +313,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 << "'"; @@ -424,7 +424,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 << "'"; @@ -592,7 +592,7 @@ void Item::SetItemRandomProperties(int32 randomPropId) SetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID,item_rand->ID); SetState(ITEM_CHANGED); } - for(uint32 i = PROP_ENCHANTMENT_SLOT_2; i < PROP_ENCHANTMENT_SLOT_2 + 3; ++i) + for (uint32 i = PROP_ENCHANTMENT_SLOT_2; i < PROP_ENCHANTMENT_SLOT_2 + 3; ++i) SetEnchantment(EnchantmentSlot(i),item_rand->enchant_id[i - PROP_ENCHANTMENT_SLOT_2],0,0); } } @@ -609,7 +609,7 @@ void Item::SetItemRandomProperties(int32 randomPropId) SetState(ITEM_CHANGED); } - for(uint32 i = PROP_ENCHANTMENT_SLOT_0; i < PROP_ENCHANTMENT_SLOT_0 + 3; ++i) + for (uint32 i = PROP_ENCHANTMENT_SLOT_0; i < PROP_ENCHANTMENT_SLOT_0 + 3; ++i) SetEnchantment(EnchantmentSlot(i),item_rand->enchant_id[i - PROP_ENCHANTMENT_SLOT_0],0,0); } } @@ -736,7 +736,7 @@ bool Item::CanBeTraded(bool mail) const bool Item::IsBoundByEnchant() const { // Check all enchants for soulbound - for(uint32 enchant_slot = PERM_ENCHANTMENT_SLOT; enchant_slot < MAX_ENCHANTMENT_SLOT; ++enchant_slot) + for (uint32 enchant_slot = PERM_ENCHANTMENT_SLOT; enchant_slot < MAX_ENCHANTMENT_SLOT; ++enchant_slot) { uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot)); if(!enchant_id) @@ -798,7 +798,7 @@ bool Item::IsTargetValidForItemUse(Unit* pUnitTarget) if (!pUnitTarget) return false; - for(ItemRequiredTargetMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr) + for (ItemRequiredTargetMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr) if(itr->second.IsFitToRequirements(pUnitTarget)) return true; @@ -840,7 +840,7 @@ void Item::ClearEnchantment(EnchantmentSlot slot) if(!GetEnchantmentId(slot)) return; - for(uint8 x = 0; x < 3; ++x) + for (uint8 x = 0; x < 3; ++x) SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + x, 0); SetState(ITEM_CHANGED); } @@ -848,7 +848,7 @@ void Item::ClearEnchantment(EnchantmentSlot slot) bool Item::GemsFitSockets() const { bool fits = true; - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) + for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) { uint8 SocketColor = GetProto()->Socket[enchant_slot-SOCK_ENCHANTMENT_SLOT].Color; @@ -888,7 +888,7 @@ bool Item::GemsFitSockets() const uint8 Item::GetGemCountWithID(uint32 GemID) const { uint8 count = 0; - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) + for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) { uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot)); if(!enchant_id) @@ -907,7 +907,7 @@ uint8 Item::GetGemCountWithID(uint32 GemID) const uint8 Item::GetGemCountWithLimitCategory(uint32 limitCategory) const { uint8 count = 0; - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) + for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) { uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot)); if(!enchant_id) diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/game/ItemEnchantmentMgr.cpp index b40a398a782..58c7744c0de 100644 --- a/src/game/ItemEnchantmentMgr.cpp +++ b/src/game/ItemEnchantmentMgr.cpp @@ -103,7 +103,7 @@ uint32 GetItemEnchantMod(uint32 entry) double dRoll = rand_chance(); float fCount = 0; - for(EnchStoreList::const_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::const_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/ItemHandler.cpp b/src/game/ItemHandler.cpp index 129766b35f0..ad9b1a7de4b 100644 --- a/src/game/ItemHandler.cpp +++ b/src/game/ItemHandler.cpp @@ -337,14 +337,14 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data ) data << int32(pProto->Stackable); data << pProto->ContainerSlots; data << pProto->StatsCount; // item stats count - for(uint32 i = 0; i < pProto->StatsCount; ++i) + for (uint32 i = 0; i < pProto->StatsCount; ++i) { data << pProto->ItemStat[i].ItemStatType; data << pProto->ItemStat[i].ItemStatValue; } data << pProto->ScalingStatDistribution; // scaling stats distribution data << pProto->ScalingStatValue; // some kind of flags used to determine stat values column - for(int i = 0; i < MAX_ITEM_PROTO_DAMAGES; ++i) + for (int i = 0; i < MAX_ITEM_PROTO_DAMAGES; ++i) { data << pProto->Damage[i].DamageMin; data << pProto->Damage[i].DamageMax; @@ -364,7 +364,7 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data ) data << pProto->AmmoType; data << pProto->RangedModRange; - for(int s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s) + for (int s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s) { // send DBC data for cooldowns in same way as it used in Spell::SendSpellCooldown // use `item_template` or if not set then only use spell cooldowns @@ -418,7 +418,7 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data ) data << pProto->Map; // Added in 1.12.x & 2.0.1 client branch data << pProto->BagFamily; data << pProto->TotemCategory; - for(int s = 0; s < MAX_ITEM_PROTO_SOCKETS; ++s) + for (int s = 0; s < MAX_ITEM_PROTO_SOCKETS; ++s) { data << pProto->Socket[s].Color; data << pProto->Socket[s].Content; @@ -656,7 +656,7 @@ void WorldSession::HandleBuyItemInSlotOpcode( WorldPacket & recv_data ) bag = INVENTORY_SLOT_BAG_0; else { - for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END;++i) + for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) { if (Bag *pBag = (Bag*)_player->GetItemByPos(INVENTORY_SLOT_BAG_0,i)) { @@ -737,7 +737,7 @@ void WorldSession::SendListInventory( uint64 vendorguid ) float discountMod = _player->GetReputationPriceDiscount(pCreature); - for(int i = 0; i < numitems; ++i ) + for (int i = 0; i < numitems; ++i ) { if(VendorItem const* crItem = vItems->GetItem(i)) { @@ -1123,7 +1123,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) if(!item_guid) return; - for(int i = 0; i < MAX_GEM_SOCKETS; ++i) + for (int i = 0; i < MAX_GEM_SOCKETS; ++i) recv_data >> gem_guids[i]; //cheat -> tried to socket same gem multiple times @@ -1143,14 +1143,14 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) uint8 slot = itemTarget->IsEquipped() ? itemTarget->GetSlot() : uint8(NULL_SLOT); Item *Gems[MAX_GEM_SOCKETS]; - for(int i = 0; i < MAX_GEM_SOCKETS; ++i) + for (int i = 0; i < MAX_GEM_SOCKETS; ++i) Gems[i] = gem_guids[i] ? _player->GetItemByGuid(gem_guids[i]) : NULL; GemPropertiesEntry const *GemProps[MAX_GEM_SOCKETS]; - for(int i = 0; i < MAX_GEM_SOCKETS; ++i) //get geminfo from dbc storage + for (int i = 0; i < MAX_GEM_SOCKETS; ++i) //get geminfo from dbc storage GemProps[i] = (Gems[i]) ? sGemPropertiesStore.LookupEntry(Gems[i]->GetProto()->GemProperties) : NULL; - for(int i = 0; i < MAX_GEM_SOCKETS; ++i) //check for hack maybe + for (int i = 0; i < MAX_GEM_SOCKETS; ++i) //check for hack maybe { if (!GemProps[i]) continue; @@ -1180,14 +1180,14 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) uint32 GemEnchants[MAX_GEM_SOCKETS]; uint32 OldEnchants[MAX_GEM_SOCKETS]; - for(int i = 0; i < MAX_GEM_SOCKETS; ++i) //get new and old enchantments + for (int i = 0; i < MAX_GEM_SOCKETS; ++i) //get new and old enchantments { GemEnchants[i] = (GemProps[i]) ? GemProps[i]->spellitemenchantement : 0; OldEnchants[i] = itemTarget->GetEnchantmentId(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT+i)); } // check unique-equipped conditions - for(int i = 0; i < MAX_GEM_SOCKETS; ++i) + for (int i = 0; i < MAX_GEM_SOCKETS; ++i) { if(!Gems[i]) continue; @@ -1284,10 +1284,10 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) //if a meta gem is being equipped, all information has to be written to the item before testing if the conditions for the gem are met //remove ALL enchants - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) + for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) _player->ApplyEnchantment(itemTarget,EnchantmentSlot(enchant_slot),false); - for(int i = 0; i < MAX_GEM_SOCKETS; ++i) + for (int i = 0; i < MAX_GEM_SOCKETS; ++i) { if(GemEnchants[i]) { @@ -1297,7 +1297,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) } } - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) + for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) _player->ApplyEnchantment(itemTarget,EnchantmentSlot(enchant_slot),true); bool SocketBonusToBeActivated = itemTarget->GemsFitSockets();//current socketbonus state diff --git a/src/game/LFGHandler.cpp b/src/game/LFGHandler.cpp index ae0baf1b15b..1a44b1b68ff 100644 --- a/src/game/LFGHandler.cpp +++ b/src/game/LFGHandler.cpp @@ -34,7 +34,7 @@ static void AttemptJoin(Player* _player) //TODO: Guard Player Map HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers(); - for(HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter) + for (HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter) { Player *plr = iter->second; @@ -94,7 +94,7 @@ static void AttemptAddMore(Player* _player) //TODO: Guard Player map HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers(); - for(HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter) + for (HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter) { Player *plr = iter->second; @@ -188,7 +188,7 @@ void WorldSession::HandleLfgClearOpcode( WorldPacket & /*recv_data */ ) // empty packet sLog.outDebug("CMSG_CLEAR_LOOKING_FOR_GROUP"); - for(int i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i) + for (int i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i) _player->m_lookingForGroup.slots[i].Clear(); if( sWorld.getConfig(CONFIG_RESTRICTED_LFG_CHANNEL) && _player->GetSession()->GetSecurity() == SEC_PLAYER ) @@ -305,7 +305,7 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type) //TODO: Guard Player map HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers(); - for(HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter) + for (HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter) { Player *plr = iter->second; @@ -331,7 +331,7 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type) data << uint8(plr->getClass()); data << uint8(plr->getRace()); - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) data << uint8(0); // spent talents count in specific tab data << uint32(0); // resistances1 @@ -379,7 +379,7 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type) if(flags & 0x80) { - for(uint8 j = 0; j < MAX_LOOKING_FOR_GROUP_SLOT; ++j) + for (uint8 j = 0; j < MAX_LOOKING_FOR_GROUP_SLOT; ++j) { data << uint32(plr->m_lookingForGroup.slots[j].entry | (plr->m_lookingForGroup.slots[j].type << 24)); } diff --git a/src/game/Language.h b/src/game/Language.h index e38d58f109e..432b456f1e1 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -878,7 +878,6 @@ enum TrinityStrings LANG_WORLD_CLOSED = 7523, LANG_WORLD_OPENED = 7524, - // Use for not-in-offcial-sources patches // 10000-10999 // opvp hp diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index 890e8a9c3c9..cdfa3517bfa 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -78,7 +78,7 @@ bool ChatHandler::HandleStartCommand(const char* /*args*/) SetSentErrorMessage(true); return false; } - + if((chr->isDead()) || (chr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))) { // if player is dead and stuck, send ghost to graveyard @@ -168,7 +168,7 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/) HashMapHolder<Player>::MapType &m = HashMapHolder<Player>::GetContainer(); HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); - for(; itr != m.end(); ++itr) + for (; itr != m.end(); ++itr) { AccountTypes itr_sec = itr->second->GetSession()->GetSecurity(); if ((itr->second->isGameMaster() || (itr_sec > SEC_PLAYER && itr_sec <= sWorld.getConfig(CONFIG_GM_LEVEL_IN_GM_LIST))) && diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 160d65cd5cf..826503d03b8 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -297,7 +297,7 @@ std::string ChatHandler::PGetParseString(int32 entry, ...) bool ChatHandler::HandleGMTicketListCommand(const char* args) { SendSysMessage(LANG_COMMAND_TICKETSHOWLIST); - for(GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) + for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) { if((*itr)->closed != 0) continue; @@ -316,11 +316,10 @@ bool ChatHandler::HandleGMTicketListCommand(const char* args) return true; } - bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args) { SendSysMessage(LANG_COMMAND_TICKETSHOWONLINELIST); - for(GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) + for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) { if((*itr)->closed != 0 || !objmgr.GetPlayer((*itr)->playerGuid)) continue; @@ -343,7 +342,7 @@ bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args) bool ChatHandler::HandleGMTicketListClosedCommand(const char* args) { SendSysMessage(LANG_COMMAND_TICKETSHOWCLOSEDLIST); - for(GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) + for (GmTicketList::iterator itr = objmgr.m_GMTicketList.begin(); itr != objmgr.m_GMTicketList.end(); ++itr) { if((*itr)->closed == 0) continue; @@ -409,7 +408,7 @@ bool ChatHandler::HandleGMTicketGetByNameCommand(const char* args) SendSysMessage(LANG_NO_PLAYERS_FOUND); return true; } - + GM_Ticket *ticket = objmgr.GetGMTicketByPlayer(plr->GetGUID()); if(!ticket) { @@ -682,8 +681,6 @@ bool ChatHandler::HandleGMVisibleCommand(const char* args) return false; } - - bool ChatHandler::HandleGPSCommand(const char* args) { WorldObject *obj = NULL; @@ -909,7 +906,6 @@ bool ChatHandler::HandleGonameCommand(const char* args) return false; } - if (target) { // check online security @@ -1094,7 +1090,7 @@ bool ChatHandler::HandleModifyKnownTitlesCommand(const char* args) uint64 titles2 = titles; - for(uint32 i = 1; i < sCharTitlesStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sCharTitlesStore.GetNumRows(); ++i) if(CharTitlesEntry const* tEntry = sCharTitlesStore.LookupEntry(i)) titles2 &= ~(uint64(1) << tEntry->bit_index); @@ -2289,7 +2285,7 @@ bool ChatHandler::HandleLookupAreaCommand(const char* args) if (!Utf8FitTo (name, wnamepart)) { loc = 0; - for(; loc < MAX_LOCALE; ++loc) + for (; loc < MAX_LOCALE; ++loc) { if (loc==GetSessionDbcLocale ()) continue; @@ -2352,7 +2348,7 @@ bool ChatHandler::HandleLookupTeleCommand(const char * args) std::ostringstream reply; GameTeleMap const & teleMap = objmgr.GetGameTeleMap(); - for(GameTeleMap::const_iterator itr = teleMap.begin(); itr != teleMap.end(); ++itr) + for (GameTeleMap::const_iterator itr = teleMap.begin(); itr != teleMap.end(); ++itr) { GameTele const* tele = &itr->second; @@ -2582,7 +2578,7 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args) return false; } - for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { Player *pl = itr->getSource(); @@ -2657,7 +2653,7 @@ bool ChatHandler::HandleGroupgoCommand(const char* args) return false; } - for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next()) { Player *pl = itr->getSource(); diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index b6cf14402c6..51677bb11ac 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -57,7 +57,7 @@ bool ChatHandler::HandleMuteCommand(const char* args) std::string mutereasonstr = "No reason"; if(mutereason != NULL) mutereasonstr = mutereason; - + Player* target; uint64 target_guid; std::string target_name; @@ -68,10 +68,8 @@ bool ChatHandler::HandleMuteCommand(const char* args) // find only player from same account if any if(!target) - { if(WorldSession* session = sWorld.FindSession(account_id)) target = session->GetPlayer(); - } uint32 notspeaktime = (uint32) atoi(delayStr); @@ -109,10 +107,8 @@ bool ChatHandler::HandleUnmuteCommand(const char* args) // find only player from same account if any if(!target) - { if(WorldSession* session = sWorld.FindSession(account_id)) target = session->GetPlayer(); - } // must have strong lesser security level if(HasLowerSecurity (target,target_guid,true)) @@ -345,10 +341,8 @@ bool ChatHandler::HandleGoCreatureCommand(const char* args) SetSentErrorMessage(true); return false; } - if( result->GetRowCount() > 1 ) - { + if (result->GetRowCount() > 1) SendSysMessage(LANG_COMMAND_GOCREATMULTIPLE); - } Field *fields = result->Fetch(); float x = fields[0].GetFloat(); @@ -1966,7 +1960,6 @@ bool ChatHandler::HandleDeMorphCommand(const char* /*args*/) if(!target) target = m_session->GetPlayer(); - // check online security else if (target->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player*)target, 0)) return false; @@ -2074,7 +2067,7 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args) } std::string nameLink = playerLink(name); - + if(sWorld.KickPlayer(name)) { if(sWorld.getConfig(CONFIG_SHOW_KICK_IN_WORLD) == 1) @@ -2463,7 +2456,7 @@ bool ChatHandler::HandleWpEventCommand(const char* args) char* arg_id = strtok(NULL, " "); uint32 id = 0; - + if(show == "add") { if(arg_id) @@ -2581,7 +2574,7 @@ bool ChatHandler::HandleWpEventCommand(const char* args) SendSysMessage("|cffff33ffERROR: No argument present.|r"); return true; } - + std::string arg_string = arg_2; if( (arg_string != "setid") && (arg_string != "delay") && (arg_string != "command") @@ -2850,7 +2843,6 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) return true; } // move - const char *text = arg_str; if( text == 0 ) @@ -2872,7 +2864,6 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) return true; } - bool ChatHandler::HandleWpShowCommand(const char* args) { sLog.outDebug("DEBUG: HandleWpShowCommand"); @@ -3291,7 +3282,7 @@ bool ChatHandler::HandleCharacterReputationCommand(const char* args) LocaleConstant loc = GetSessionDbcLocale(); FactionStateList const& targetFSL = target->GetReputationMgr().GetStateList(); - for(FactionStateList::const_iterator itr = targetFSL.begin(); itr != targetFSL.end(); ++itr) + for (FactionStateList::const_iterator itr = targetFSL.begin(); itr != targetFSL.end(); ++itr) { FactionEntry const *factionEntry = sFactionStore.LookupEntry(itr->second.ID); char const* factionName = factionEntry ? factionEntry->name[loc] : "#Not found#"; @@ -3412,7 +3403,7 @@ bool ChatHandler::HandleLookupEventCommand(const char* args) GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap(); GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList(); - for(uint32 id = 0; id < events.size(); ++id ) + for (uint32 id = 0; id < events.size(); ++id ) { GameEventData const& eventData = events[id]; @@ -3449,7 +3440,7 @@ bool ChatHandler::HandleEventActiveListCommand(const char* args) char const* active = GetTrinityString(LANG_ACTIVE); - for(GameEventMgr::ActiveEvents::const_iterator itr = activeEvents.begin(); itr != activeEvents.end(); ++itr ) + for (GameEventMgr::ActiveEvents::const_iterator itr = activeEvents.begin(); itr != activeEvents.end(); ++itr ) { uint32 event_id = *itr; GameEventData const& eventData = events[event_id]; @@ -3650,7 +3641,7 @@ void ChatHandler::HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id) } bool ChatHandler::HandleLearnAllCraftsCommand(const char* /*args*/) -{ +{ for (uint32 i = 0; i < sSkillLineStore.GetNumRows(); ++i) { @@ -3693,7 +3684,6 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) // converting string that we try to find to lower case wstrToLower( wnamepart ); - std::string name; @@ -3717,7 +3707,7 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) if (!Utf8FitTo(name, wnamepart)) { loc = 0; - for(; loc < MAX_LOCALE; ++loc) + for (; loc < MAX_LOCALE; ++loc) { if(loc==GetSessionDbcLocale()) continue; @@ -3946,7 +3936,7 @@ bool ChatHandler::HandleCreatePetCommand(const char* args) if(!pet) return false; - + if(!pet->CreateBaseAtCreature(creatureTarget)) { delete pet; @@ -4151,7 +4141,7 @@ bool ChatHandler::HandleTempGameObjectCommand(const char* args) if( spawntime ) spawntm = atoi((char*)spawntime); - + float x = chr->GetPositionX(); float y = chr->GetPositionY(); float z = chr->GetPositionZ(); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 21f3c995dce..47346daba61 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -2418,7 +2418,7 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/) // search highest talent rank uint32 spellId = 0; - for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) + for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { if(talentInfo->RankID[rank] != 0) { @@ -2494,7 +2494,7 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) // search highest talent rank uint32 spellid = 0; - for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) + for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { if(talentInfo->RankID[rank]!=0) { @@ -2521,7 +2521,7 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/) bool ChatHandler::HandleLearnAllLangCommand(const char* /*args*/) { // skipping UNIVERSAL language (0) - for(uint8 i = 1; i < LANGUAGES_COUNT; ++i) + for (uint8 i = 1; i < LANGUAGES_COUNT; ++i) m_session->GetPlayer()->learnSpell(lang_description[i].spell_id,false); SendSysMessage(LANG_COMMAND_LEARN_ALL_LANG); @@ -2679,7 +2679,7 @@ bool ChatHandler::HandleAddItemCommand(const char* args) // remove binding (let GM give it to another player later) if(pl==plTarget) - for(ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr) + for (ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr) if(Item* item1 = pl->GetItemByPos(itr->pos)) item1->SetBinding( false ); @@ -3303,7 +3303,7 @@ bool ChatHandler::HandleLookupItemSetCommand(const char* args) if (!Utf8FitTo(name, wnamepart)) { loc = 0; - for(; loc < MAX_LOCALE; ++loc) + for (; loc < MAX_LOCALE; ++loc) { if(loc==GetSessionDbcLocale()) continue; @@ -3368,7 +3368,7 @@ bool ChatHandler::HandleLookupSkillCommand(const char* args) if (!Utf8FitTo(name, wnamepart)) { loc = 0; - for(; loc < MAX_LOCALE; ++loc) + for (; loc < MAX_LOCALE; ++loc) { if(loc==GetSessionDbcLocale()) continue; @@ -3447,7 +3447,7 @@ bool ChatHandler::HandleLookupSpellCommand(const char* args) if (!Utf8FitTo(name, wnamepart)) { loc = 0; - for(; loc < MAX_LOCALE; ++loc) + for (; loc < MAX_LOCALE; ++loc) { if(loc==GetSessionDbcLocale()) continue; @@ -3662,7 +3662,7 @@ bool ChatHandler::HandleLookupCreatureCommand(const char* args) if(!found) found = true; - + continue; } } @@ -3729,7 +3729,7 @@ bool ChatHandler::HandleLookupObjectCommand(const char* args) PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, id, id, name.c_str()); else PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, id, name.c_str()); - + if(!found) found = true; @@ -3795,7 +3795,7 @@ bool ChatHandler::HandleLookupFactionCommand(const char* args) if (!Utf8FitTo(name, wnamepart)) { loc = 0; - for(; loc < MAX_LOCALE; ++loc) + for (; loc < MAX_LOCALE; ++loc) { if(loc==GetSessionDbcLocale()) continue; @@ -3885,7 +3885,7 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) if (!Utf8FitTo(name, wnamepart)) { loc = 0; - for(; loc < MAX_LOCALE; ++loc) + for (; loc < MAX_LOCALE; ++loc) { if(loc==GetSessionDbcLocale()) continue; @@ -3936,7 +3936,7 @@ bool ChatHandler::HandleLookupMapCommand(const char* args) bool found = false; // search in Map.dbc - for(uint32 id = 0; id < sMapStore.GetNumRows(); id++) + for (uint32 id = 0; id < sMapStore.GetNumRows(); id++) { MapEntry const* MapInfo = sMapStore.LookupEntry(id); if(MapInfo) @@ -3950,7 +3950,7 @@ bool ChatHandler::HandleLookupMapCommand(const char* args) if(!Utf8FitTo(name, wnamepart)) { loc = LOCALE_enUS; - for(; loc < MAX_LOCALE; loc++) + for (; loc < MAX_LOCALE; loc++) { if(m_session && loc == m_session->GetSessionDbcLocale()) continue; @@ -4370,7 +4370,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) @@ -5381,7 +5381,7 @@ bool ChatHandler::HandleResetAllCommand(const char * args) CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'",atLogin,atLogin); HashMapHolder<Player>::MapType const& plist = ObjectAccessor::Instance().GetPlayers(); - for(HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr) + for (HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr) itr->second->SetAtLoginFlag(atLogin); return true; @@ -5615,7 +5615,7 @@ bool ChatHandler::HandleQuestRemove(const char* args) } // remove all quest entries for 'entry' from quest log - for(uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot ) + for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot ) { uint32 quest = player->GetQuestSlotQuestId(slot); if(quest==entry) @@ -5666,7 +5666,7 @@ bool ChatHandler::HandleQuestComplete(const char* args) } // Add quest items for quests that require items - for(uint8 x = 0; x < QUEST_OBJECTIVES_COUNT; ++x) + for (uint8 x = 0; x < QUEST_OBJECTIVES_COUNT; ++x) { uint32 id = pQuest->ReqItemId[x]; uint32 count = pQuest->ReqItemCount[x]; @@ -5685,25 +5685,25 @@ 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]; if(uint32 spell_id = pQuest->ReqSpell[i]) { - for(uint16 z = 0; z < creaturecount; ++z) + for (uint16 z = 0; z < creaturecount; ++z) player->CastedCreatureOrGO(creature,0,spell_id); } else if(creature > 0) { if(CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(creature)) - for(uint16 z = 0; z < creaturecount; ++z) + for (uint16 z = 0; z < creaturecount; ++z) player->KilledMonster(cInfo,0); } else if(creature < 0) { - for(uint16 z = 0; z < creaturecount; ++z) + for (uint16 z = 0; z < creaturecount; ++z) player->CastedCreatureOrGO(creature,0,0); } } @@ -6419,7 +6419,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) PSendSysMessage(LANG_MOVEGENS_LIST,(unit->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature" ),unit->GetGUIDLow()); MotionMaster* mm = unit->GetMotionMaster(); - for(uint8 i = 0; i < MAX_MOTION_SLOT; ++i) + for (uint8 i = 0; i < MAX_MOTION_SLOT; ++i) { MovementGenerator* mg = mm->GetMotionSlot(i); if(!mg) @@ -6791,10 +6791,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::const_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)); @@ -6807,10 +6807,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::const_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)); @@ -6835,10 +6835,10 @@ 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();) + for (Player::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end(); ) { if(itr->first != player->GetMapId()) { @@ -7102,7 +7102,7 @@ bool ChatHandler::HandleSendItemsCommand(const char* args) // fill mail MailItemsInfo mi; // item list preparing - for(ItemPairs::const_iterator itr = items.begin(); itr != items.end(); ++itr) + for (ItemPairs::const_iterator itr = items.begin(); itr != items.end(); ++itr) { if(Item* item = Item::CreateItem(itr->first,itr->second,m_session ? m_session->GetPlayer() : 0)) { diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp index e4ee8bffc6f..de464cf050e 100644 --- a/src/game/LootHandler.cpp +++ b/src/game/LootHandler.cpp @@ -217,7 +217,7 @@ void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ ) Group *group = player->GetGroup(); std::vector<Player*> playersNear; - for(GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* playerGroup = itr->getSource(); if(!playerGroup) @@ -511,7 +511,6 @@ void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data ) item.count=0; item.is_looted=true; - pLoot->NotifyItemRemoved(slotid); --pLoot->unlootedCount; } diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index df11d909dd0..29c19a4eecf 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -50,7 +50,6 @@ LootStore LootTemplates_Reference( "reference_loot_template", "reference i LootStore LootTemplates_Skinning( "skinning_loot_template", "creature skinning id", true); LootStore LootTemplates_Spell( "spell_loot_template", "spell id (random item creating)",false); - class LootTemplate::LootGroup // A set of loot definitions for items (refs are not allowed) { public: @@ -128,7 +127,6 @@ void LootStore::LoadLootTable() continue; // error already printed to log/console. } - if(!PlayerCondition::IsValid(condition,cond_value1, cond_value2)) { sLog.outErrorDb("... in table '%s' entry %u item %u", GetName(), entry, item); @@ -212,20 +210,20 @@ void LootStore::LoadAndCollectLootIds(LootIdSet& ids_set) { LoadLootTable(); - for(LootTemplateMap::const_iterator tab = m_LootTemplates.begin(); tab != m_LootTemplates.end(); ++tab) + for (LootTemplateMap::const_iterator tab = m_LootTemplates.begin(); tab != m_LootTemplates.end(); ++tab) ids_set.insert(tab->first); } void LootStore::CheckLootRefs(LootIdSet* ref_set) const { - for(LootTemplateMap::const_iterator ltItr = m_LootTemplates.begin(); ltItr != m_LootTemplates.end(); ++ltItr) + for (LootTemplateMap::const_iterator ltItr = m_LootTemplates.begin(); ltItr != m_LootTemplates.end(); ++ltItr) ltItr->second->CheckLootRefs(m_LootTemplates,ref_set); } void LootStore::ReportUnusedIds(LootIdSet const& ids_set) const { // all still listed ids isn't referenced - for(LootIdSet::const_iterator itr = ids_set.begin(); itr != ids_set.end(); ++itr) + for (LootIdSet::const_iterator itr = ids_set.begin(); itr != ids_set.end(); ++itr) sLog.outErrorDb("Table '%s' entry %d isn't %s and not referenced from loot, and then useless.", GetName(), *itr,GetEntryName()); } @@ -412,7 +410,7 @@ void Loot::FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner, Group * pGroup=loot_owner->GetGroup(); if(!personal && pGroup) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) if(Player* pl = itr->getSource()) FillNotNormalLootFor(pl); } @@ -442,7 +440,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 +464,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) ) @@ -500,7 +498,7 @@ QuestItemList* Loot::FillNonQuestNonFFAConditionalLoot(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.conditionId && item.AllowedForPlayer(player)) @@ -530,7 +528,7 @@ void Loot::NotifyItemRemoved(uint8 lootIndex) // notify all players that are looting this that the item was removed // convert the index to the slot the player sees std::set<uint64>::iterator i_next; - for(std::set<uint64>::iterator i = PlayersLooting.begin(); i != PlayersLooting.end(); i = i_next) + for (std::set<uint64>::iterator i = PlayersLooting.begin(); i != PlayersLooting.end(); i = i_next) { i_next = i; ++i_next; @@ -545,7 +543,7 @@ void Loot::NotifyMoneyRemoved() { // notify all players that are looting this that the money was removed std::set<uint64>::iterator i_next; - for(std::set<uint64>::iterator i = PlayersLooting.begin(); i != PlayersLooting.end(); i = i_next) + for (std::set<uint64>::iterator i = PlayersLooting.begin(); i != PlayersLooting.end(); i = i_next) { i_next = i; ++i_next; @@ -564,7 +562,7 @@ void Loot::NotifyQuestItemRemoved(uint8 questIndex) // bit inefficient but isn't called often std::set<uint64>::iterator i_next; - for(std::set<uint64>::iterator i = PlayersLooting.begin(); i != PlayersLooting.end(); i = i_next) + for (std::set<uint64>::iterator i = PlayersLooting.begin(); i != PlayersLooting.end(); i = i_next) { i_next = i; ++i_next; @@ -629,7 +627,7 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite QuestItemMap::const_iterator itr = PlayerFFAItems.find(player->GetGUIDLow()); if (itr != PlayerFFAItems.end()) { - for(QuestItemList::const_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 +643,7 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite QuestItemMap::const_iterator itr = PlayerNonQuestNonFFAConditionalItems.find(player->GetGUIDLow()); if (itr != PlayerNonQuestNonFFAConditionalItems.end()) { - for(QuestItemList::const_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) { @@ -1059,7 +1057,7 @@ void LootTemplate::Verify(LootStore const& lootstore, uint32 id) const void LootTemplate::CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_set) const { - for(LootStoreItemList::const_iterator ieItr = Entries.begin(); ieItr != Entries.end(); ++ieItr) + for (LootStoreItemList::const_iterator ieItr = Entries.begin(); ieItr != Entries.end(); ++ieItr) { if(ieItr->mincountOrRef < 0) { @@ -1070,7 +1068,7 @@ void LootTemplate::CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_se } } - for(LootGroups::const_iterator grItr = Groups.begin(); grItr != Groups.end(); ++grItr) + for (LootGroups::const_iterator grItr = Groups.begin(); grItr != Groups.end(); ++grItr) grItr->CheckLootRefs(store,ref_set); } @@ -1080,7 +1078,7 @@ void LoadLootTemplates_Creature() LootTemplates_Creature.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i ) + for (uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i ) { if(CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i)) { @@ -1093,7 +1091,7 @@ void LoadLootTemplates_Creature() } } } - for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) + for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) ids_set.erase(*itr); // output error for any still listed (not referenced from appropriate table) ids @@ -1106,7 +1104,7 @@ void LoadLootTemplates_Disenchant() LootTemplates_Disenchant.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i ) + for (uint32 i = 1; i < sItemStorage.MaxEntry; ++i ) { if(ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i)) { @@ -1119,7 +1117,7 @@ void LoadLootTemplates_Disenchant() } } } - for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) + for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) ids_set.erase(*itr); // output error for any still listed (not referenced from appropriate table) ids LootTemplates_Disenchant.ReportUnusedIds(ids_set); @@ -1131,7 +1129,7 @@ void LoadLootTemplates_Fishing() LootTemplates_Fishing.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sAreaStore.GetNumRows(); ++i ) + for (uint32 i = 1; i < sAreaStore.GetNumRows(); ++i ) { if(AreaTableEntry const* areaEntry = sAreaStore.LookupEntry(i)) if(ids_set.count(areaEntry->ID)) @@ -1148,7 +1146,7 @@ void LoadLootTemplates_Gameobject() LootTemplates_Gameobject.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sGOStorage.MaxEntry; ++i ) + for (uint32 i = 1; i < sGOStorage.MaxEntry; ++i ) { if(GameObjectInfo const* gInfo = sGOStorage.LookupEntry<GameObjectInfo>(i)) { @@ -1161,7 +1159,7 @@ void LoadLootTemplates_Gameobject() } } } - for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) + for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) ids_set.erase(*itr); // output error for any still listed (not referenced from appropriate table) ids @@ -1174,7 +1172,7 @@ void LoadLootTemplates_Item() LootTemplates_Item.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i ) + for (uint32 i = 1; i < sItemStorage.MaxEntry; ++i ) if(ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i)) if(ids_set.count(proto->ItemId)) ids_set.erase(proto->ItemId); @@ -1189,7 +1187,7 @@ void LoadLootTemplates_Milling() LootTemplates_Milling.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i ) + for (uint32 i = 1; i < sItemStorage.MaxEntry; ++i ) { ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i); if(!proto) @@ -1212,7 +1210,7 @@ void LoadLootTemplates_Pickpocketing() LootTemplates_Pickpocketing.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i ) + for (uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i ) { if(CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i)) { @@ -1225,7 +1223,7 @@ void LoadLootTemplates_Pickpocketing() } } } - for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) + for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) ids_set.erase(*itr); // output error for any still listed (not referenced from appropriate table) ids @@ -1238,7 +1236,7 @@ void LoadLootTemplates_Prospecting() LootTemplates_Prospecting.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i ) + for (uint32 i = 1; i < sItemStorage.MaxEntry; ++i ) { ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i); if(!proto) @@ -1262,7 +1260,7 @@ void LoadLootTemplates_QuestMail() // remove real entries and check existence loot ObjectMgr::QuestMap const& questMap = objmgr.GetQuestTemplates(); - for(ObjectMgr::QuestMap::const_iterator itr = questMap.begin(); itr != questMap.end(); ++itr ) + for (ObjectMgr::QuestMap::const_iterator itr = questMap.begin(); itr != questMap.end(); ++itr ) { if(!itr->second->GetRewMailTemplateId()) continue; @@ -1285,7 +1283,7 @@ void LoadLootTemplates_Skinning() LootTemplates_Skinning.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i ) + for (uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i ) { if(CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i)) { @@ -1298,7 +1296,7 @@ void LoadLootTemplates_Skinning() } } } - for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) + for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr) ids_set.erase(*itr); // output error for any still listed (not referenced from appropriate table) ids @@ -1311,7 +1309,7 @@ void LoadLootTemplates_Spell() LootTemplates_Spell.LoadAndCollectLootIds(ids_set); // remove real entries and check existence loot - for(uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id) + for (uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id) { SpellEntry const* spellInfo = sSpellStore.LookupEntry (spell_id); if(!spellInfo) diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp index c50b16104f2..16f337136ea 100644 --- a/src/game/Mail.cpp +++ b/src/game/Mail.cpp @@ -85,7 +85,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data ) if(items_count) { - for(uint8 i = 0; i < items_count; ++i) + for (uint8 i = 0; i < items_count; ++i) { uint8 item_slot; uint64 item_guid; @@ -178,7 +178,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data ) if (items_count) { - for(MailItemMap::iterator mailItemIter = mi.begin(); mailItemIter != mi.end(); ++mailItemIter) + for (MailItemMap::iterator mailItemIter = mi.begin(); mailItemIter != mi.end(); ++mailItemIter) { MailItem& mailItem = mailItemIter->second; @@ -238,7 +238,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data ) { if (items_count > 0) { - for(MailItemMap::iterator mailItemIter = mi.begin(); mailItemIter != mi.end(); ++mailItemIter) + for (MailItemMap::iterator mailItemIter = mi.begin(); mailItemIter != mi.end(); ++mailItemIter) { MailItem& mailItem = mailItemIter->second; if(!mailItem.item) @@ -365,7 +365,7 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data ) if(m->HasItems()) { - for(std::vector<MailItemInfo>::iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2) + for (std::vector<MailItemInfo>::iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2) { Item *item = pl->GetMItem(itr2->item_guid); if(item) @@ -422,7 +422,7 @@ void WorldSession::SendReturnToSender(uint8 messageType, uint32 sender_acc, uint // set owner to new receiver (to prevent delete item with sender char deleting) CharacterDatabase.BeginTransaction(); - for(MailItemMap::iterator mailItemIter = mi->begin(); mailItemIter != mi->end(); ++mailItemIter) + for (MailItemMap::iterator mailItemIter = mi->begin(); mailItemIter != mi->end(); ++mailItemIter) { MailItem& mailItem = mailItemIter->second; mailItem.item->SaveToDB(); // item not in inventory and can be save standalone @@ -590,7 +590,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data ) data << uint8(0); // mail's count time_t cur_time = time(NULL); - for(PlayerMails::iterator itr = pl->GetmailBegin(); itr != pl->GetmailEnd(); ++itr) + for (PlayerMails::iterator itr = pl->GetmailBegin(); itr != pl->GetmailEnd(); ++itr) { // skip deleted or not delivered (deliver delay not expired) mails if ((*itr)->state == MAIL_STATE_DELETED || cur_time < (*itr)->deliver_time) @@ -642,7 +642,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data ) data << (uint8) item_count; // client limit is 0x10 - for(uint8 i = 0; i < item_count; ++i) + for (uint8 i = 0; i < item_count; ++i) { Item *item = pl->GetMItem((*itr)->items[i].item_guid); // item index (0-6?) @@ -651,7 +651,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data ) data << (uint32) (item ? item->GetGUIDLow() : 0); // entry data << (uint32) (item ? item->GetEntry() : 0); - for(uint8 j = 0; j < MAX_INSPECTED_ENCHANTMENT_SLOT; ++j) + for (uint8 j = 0; j < MAX_INSPECTED_ENCHANTMENT_SLOT; ++j) { // unsure data << (uint32) (item ? item->GetEnchantmentCharges((EnchantmentSlot)j) : 0); @@ -771,7 +771,7 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/ ) uint32 count = 0; time_t now = time(NULL); - for(PlayerMails::iterator itr = _player->GetmailBegin(); itr != _player->GetmailEnd(); ++itr) + for (PlayerMails::iterator itr = _player->GetmailBegin(); itr != _player->GetmailEnd(); ++itr) { Mail *m = (*itr); // must be not checked yet @@ -872,7 +872,7 @@ void WorldSession::SendMailTo(Player* receiver, uint8 messageType, uint8 station if(mi) { - for(MailItemMap::iterator mailItemIter = mi->begin(); mailItemIter != mi->end(); ++mailItemIter) + for (MailItemMap::iterator mailItemIter = mi->begin(); mailItemIter != mi->end(); ++mailItemIter) { MailItem& mailItem = mailItemIter->second; if(mailItem.item) @@ -894,7 +894,7 @@ void WorldSession::SendMailTo(Player* receiver, uint8 messageType, uint8 station if(mi) { - for(MailItemMap::const_iterator mailItemIter = mi->begin(); mailItemIter != mi->end(); ++mailItemIter) + for (MailItemMap::const_iterator mailItemIter = mi->begin(); mailItemIter != mi->end(); ++mailItemIter) { MailItem const& mailItem = mailItemIter->second; CharacterDatabase.PExecute("INSERT INTO mail_items (mail_id,item_guid,item_template,receiver) VALUES ('%u', '%u', '%u','%u')", mailId, mailItem.item_guidlow, mailItem.item_template,receiver_guidlow); diff --git a/src/game/Mail.h b/src/game/Mail.h index 8cbe46e6396..8107f879e6a 100644 --- a/src/game/Mail.h +++ b/src/game/Mail.h @@ -126,7 +126,7 @@ class MailItemsInfo void deleteIncludedItems(bool inDB = false) { - for(MailItemMap::iterator mailItemIter = begin(); mailItemIter != end(); ++mailItemIter) + for (MailItemMap::iterator mailItemIter = begin(); mailItemIter != end(); ++mailItemIter) { MailItem& mailItem = mailItemIter->second; mailItem.deleteItem(inDB); @@ -165,7 +165,7 @@ struct Mail void AddAllItems(MailItemsInfo& pMailItemsInfo) { - for(MailItemMap::iterator mailItemIter = pMailItemsInfo.begin(); mailItemIter != pMailItemsInfo.end(); ++mailItemIter) + for (MailItemMap::iterator mailItemIter = pMailItemsInfo.begin(); mailItemIter != pMailItemsInfo.end(); ++mailItemIter) { MailItem& mailItem = mailItemIter->second; AddItem(mailItem.item_guidlow, mailItem.item_template); @@ -174,7 +174,7 @@ struct Mail bool RemoveItem(uint32 item_guid) { - for(std::vector<MailItemInfo>::iterator itr = items.begin(); itr != items.end(); ++itr) + for (std::vector<MailItemInfo>::iterator itr = items.begin(); itr != items.end(); ++itr) { if(itr->item_guid == item_guid) { diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 2f8c4d0e152..2c9030a4608 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -217,20 +217,20 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode, Map* _par { m_notifyTimer.SetInterval(IN_MILISECONDS/2); - for(unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx) + for (unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx) { - for(unsigned int j=0; j < MAX_NUMBER_OF_GRIDS; ++j) + for (unsigned int j=0; j < MAX_NUMBER_OF_GRIDS; ++j) { //z code GridMaps[idx][j] =NULL; setNGrid(NULL, idx, j); } } - + //lets initialize visibility distance for map Map::InitVisibilityDistance(); } - + void Map::InitVisibilityDistance() { //init visibility for continents @@ -501,43 +501,43 @@ Map::Add(T *obj) void Map::MessageBroadcast(Player *player, WorldPacket *msg, bool to_self) { CellPair p = MaNGOS::ComputeCellPair(player->GetPositionX(), player->GetPositionY()); - + if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP ) { sLog.outError("Map::MessageBroadcast: Player (GUID: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", player->GetGUIDLow(), player->GetPositionX(), player->GetPositionY(), p.x_coord, p.y_coord); return; } - + Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - + if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) ) return; - + MaNGOS::MessageDeliverer post_man(*player, msg, to_self); TypeContainerVisitor<MaNGOS::MessageDeliverer, WorldTypeMapContainer > message(post_man); CellLock<ReadGuard> cell_lock(cell, p); cell_lock->Visit(cell_lock, message, *this, *player, GetVisibilityDistance()); } - + void Map::MessageBroadcast(WorldObject *obj, WorldPacket *msg) { CellPair p = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY()); - + if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP ) { sLog.outError("Map::MessageBroadcast: Object (GUID: %u TypeId: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord); return; } - + Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - + if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) ) return; - + //TODO: currently on continents when Visibility.Distance.InFlight > Visibility.Distance.Continents //we have alot of blinking mobs because monster move packet send is broken... MaNGOS::ObjectMessageDeliverer post_man(*obj,msg); @@ -549,43 +549,43 @@ void Map::MessageBroadcast(WorldObject *obj, WorldPacket *msg) void Map::MessageDistBroadcast(Player *player, WorldPacket *msg, float dist, bool to_self, bool own_team_only) { CellPair p = MaNGOS::ComputeCellPair(player->GetPositionX(), player->GetPositionY()); - + if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP ) { sLog.outError("Map::MessageBroadcast: Player (GUID: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", player->GetGUIDLow(), player->GetPositionX(), player->GetPositionY(), p.x_coord, p.y_coord); return; } - + Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - + if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) ) return; - + MaNGOS::MessageDistDeliverer post_man(*player, msg, dist, to_self, own_team_only); TypeContainerVisitor<MaNGOS::MessageDistDeliverer , WorldTypeMapContainer > message(post_man); CellLock<ReadGuard> cell_lock(cell, p); cell_lock->Visit(cell_lock, message, *this, *player, dist); } - + void Map::MessageDistBroadcast(WorldObject *obj, WorldPacket *msg, float dist) { CellPair p = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY()); - + if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP ) { sLog.outError("Map::MessageBroadcast: Object (GUID: %u TypeId: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord); return; } - + Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - + if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) ) return; - + MaNGOS::ObjectMessageDistDeliverer post_man(*obj, msg, dist); TypeContainerVisitor<MaNGOS::ObjectMessageDistDeliverer, WorldTypeMapContainer > message(post_man); CellLock<ReadGuard> cell_lock(cell, p); @@ -603,7 +603,7 @@ void Map::RelocationNotify() i_notifyLock = true; //Notify - for(std::vector<Unit*>::iterator iter = i_unitsToNotify.begin(); iter != i_unitsToNotify.end(); ++iter) + for (std::vector<Unit*>::iterator iter = i_unitsToNotify.begin(); iter != i_unitsToNotify.end(); ++iter) { Unit *unit = *iter; if(!unit) @@ -639,7 +639,7 @@ void Map::RelocationNotify() VisitAll(unit->GetPositionX(), unit->GetPositionY(), GetVisibilityDistance() + dist, notifier); } } - for(std::vector<Unit*>::iterator iter = i_unitsToNotify.begin(); iter != i_unitsToNotify.end(); ++iter) + for (std::vector<Unit*>::iterator iter = i_unitsToNotify.begin(); iter != i_unitsToNotify.end(); ++iter) if(*iter) (*iter)->m_Notified = false; i_unitsToNotify.clear(); @@ -697,7 +697,7 @@ void Map::RemoveUnitFromNotify(Unit *unit) void Map::Update(const uint32 &t_diff) { /// update players at tick - for(m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) + for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) { Player* plr = m_mapRefIter->getSource(); if(plr && plr->IsInWorld()) @@ -722,7 +722,7 @@ void Map::Update(const uint32 &t_diff) // the player iterator is stored in the map object // to make sure calls to Map::Remove don't invalidate it - for(m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) + for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) { Player* plr = m_mapRefIter->getSource(); @@ -742,9 +742,9 @@ void Map::Update(const uint32 &t_diff) CellArea area = Cell::CalculateCellArea(*plr, GetVisibilityDistance()); area.ResizeBorders(begin_cell, end_cell); - for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x) + for (uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x) { - for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) + for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) { // marked cells are those that have been visited // don't visit the same cell twice @@ -770,7 +770,7 @@ void Map::Update(const uint32 &t_diff) // non-player active objects if(!m_activeNonPlayers.empty()) { - for(m_activeNonPlayersIter = m_activeNonPlayers.begin(); m_activeNonPlayersIter != m_activeNonPlayers.end(); ) + for (m_activeNonPlayersIter = m_activeNonPlayers.begin(); m_activeNonPlayersIter != m_activeNonPlayers.end(); ) { // skip not in world WorldObject* obj = *m_activeNonPlayersIter; @@ -794,9 +794,9 @@ void Map::Update(const uint32 &t_diff) begin_cell << 1; begin_cell -= 1; // upper left end_cell >> 1; end_cell += 1; // lower right - for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x) + for (uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x) { - for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) + for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) { // marked cells are those that have been visited // don't visit the same cell twice @@ -974,7 +974,7 @@ Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang if(creature->IsVehicle()) { - for(SeatMap::iterator itr = creature->GetVehicleKit()->m_Seats.begin(); itr != creature->GetVehicleKit()->m_Seats.end(); ++itr) + for (SeatMap::iterator itr = creature->GetVehicleKit()->m_Seats.begin(); itr != creature->GetVehicleKit()->m_Seats.end(); ++itr) if(Unit *passenger = itr->second.passenger) { if(passenger->GetTypeId() == TYPEID_PLAYER) @@ -1204,7 +1204,7 @@ void Map::RemoveAllPlayers() { if(HavePlayers()) { - for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) { Player* plr = itr->getSource(); if(!plr->IsBeingTeleportedFar()) @@ -2118,10 +2118,10 @@ void Map::UpdateObjectVisibility( WorldObject* obj, Cell cell, CellPair cellpair void Map::UpdatePlayerVisibility( Player* player, Cell cell, CellPair cellpair ) { cell.data.Part.reserved = ALL_DISTRICT; - + MaNGOS::PlayerNotifier pl_notifier(*player); TypeContainerVisitor<MaNGOS::PlayerNotifier, WorldTypeMapContainer > player_notifier(pl_notifier); - + CellLock<ReadGuard> cell_lock(cell, cellpair); cell_lock->Visit(cell_lock, player_notifier, *this, *player, GetVisibilityDistance()); } @@ -2129,7 +2129,7 @@ void Map::UpdatePlayerVisibility( Player* player, Cell cell, CellPair cellpair ) void Map::UpdateObjectsVisibilityFor( Player* player, Cell cell, CellPair cellpair ) { MaNGOS::VisibleNotifier notifier(*player); - + cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); TypeContainerVisitor<MaNGOS::VisibleNotifier, WorldTypeMapContainer > world_notifier(notifier); @@ -2137,34 +2137,34 @@ void Map::UpdateObjectsVisibilityFor( Player* player, Cell cell, CellPair cellpa CellLock<GridReadGuard> cell_lock(cell, cellpair); cell_lock->Visit(cell_lock, world_notifier, *this, *player, GetVisibilityDistance()); cell_lock->Visit(cell_lock, grid_notifier, *this, *player, GetVisibilityDistance()); - + // send data notifier.Notify(); } - + void Map::PlayerRelocationNotify( Player* player, Cell cell, CellPair cellpair ) { CellLock<ReadGuard> cell_lock(cell, cellpair); MaNGOS::PlayerRelocationNotifier relocationNotifier(*player); cell.data.Part.reserved = ALL_DISTRICT; - + TypeContainerVisitor<MaNGOS::PlayerRelocationNotifier, GridTypeMapContainer > p2grid_relocation(relocationNotifier); TypeContainerVisitor<MaNGOS::PlayerRelocationNotifier, WorldTypeMapContainer > p2world_relocation(relocationNotifier); - + cell_lock->Visit(cell_lock, p2grid_relocation, *this, *player, MAX_CREATURE_ATTACK_RADIUS); cell_lock->Visit(cell_lock, p2world_relocation, *this, *player, MAX_CREATURE_ATTACK_RADIUS); } - + void Map::CreatureRelocationNotify(Creature *creature, Cell cell, CellPair cellpair) { CellLock<ReadGuard> cell_lock(cell, cellpair); MaNGOS::CreatureRelocationNotifier relocationNotifier(*creature); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); // not trigger load unloaded grids at notifier call - + TypeContainerVisitor<MaNGOS::CreatureRelocationNotifier, WorldTypeMapContainer > c2world_relocation(relocationNotifier); TypeContainerVisitor<MaNGOS::CreatureRelocationNotifier, GridTypeMapContainer > c2grid_relocation(relocationNotifier); - + cell_lock->Visit(cell_lock, c2world_relocation, *this, *creature, MAX_CREATURE_ATTACK_RADIUS); cell_lock->Visit(cell_lock, c2grid_relocation, *this, *creature, MAX_CREATURE_ATTACK_RADIUS); } @@ -2188,7 +2188,7 @@ void Map::SendInitSelf( Player * player ) // build other passengers at transport also (they always visible and marked as visible and will not send at visibility update at add to map if(Transport* transport = player->GetTransport()) { - for(Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin();itr!=transport->GetPassengers().end();++itr) + for (Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin(); itr!=transport->GetPassengers().end(); ++itr) { if(player!=(*itr) && player->HaveAtClient(*itr)) { @@ -2364,7 +2364,7 @@ void Map::RemoveAllObjectsInRemoveList() uint32 Map::GetPlayersCountExceptGMs() const { uint32 count = 0; - for(MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) if(!itr->getSource()->isGameMaster()) ++count; return count; @@ -2372,7 +2372,7 @@ uint32 Map::GetPlayersCountExceptGMs() const void Map::SendToPlayers(WorldPacket const* data) const { - for(MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) itr->getSource()->GetSession()->SendPacket(data); } @@ -2380,20 +2380,20 @@ bool Map::ActiveObjectsNearGrid(uint32 x, uint32 y) const { ASSERT(x < MAX_NUMBER_OF_GRIDS); ASSERT(y < MAX_NUMBER_OF_GRIDS); - + CellPair cell_min(x*MAX_NUMBER_OF_CELLS, y*MAX_NUMBER_OF_CELLS); CellPair cell_max(cell_min.x_coord + MAX_NUMBER_OF_CELLS, cell_min.y_coord+MAX_NUMBER_OF_CELLS); - + //we must find visible range in cells so we unload only non-visible cells... float viewDist = GetVisibilityDistance(); int cell_range = (int)ceilf(viewDist / SIZE_OF_GRID_CELL) + 1; - + cell_min << cell_range; cell_min -= cell_range; cell_max >> cell_range; cell_max += cell_range; - for(MapRefManager::const_iterator iter = m_mapRefManager.begin(); iter != m_mapRefManager.end(); ++iter) + for (MapRefManager::const_iterator iter = m_mapRefManager.begin(); iter != m_mapRefManager.end(); ++iter) { Player* plr = iter->getSource(); @@ -2403,7 +2403,7 @@ bool Map::ActiveObjectsNearGrid(uint32 x, uint32 y) const return true; } - for(ActiveNonPlayers::const_iterator iter = m_activeNonPlayers.begin(); iter != m_activeNonPlayers.end(); ++iter) + for (ActiveNonPlayers::const_iterator iter = m_activeNonPlayers.begin(); iter != m_activeNonPlayers.end(); ++iter) { WorldObject* obj = *iter; @@ -2707,7 +2707,7 @@ bool InstanceMap::Reset(uint8 method) if(method == INSTANCE_RESET_ALL) { // notify the players to leave the instance so it can be reset - for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) itr->getSource()->SendResetFailedNotify(GetId()); } else @@ -2715,7 +2715,7 @@ bool InstanceMap::Reset(uint8 method) if(method == INSTANCE_RESET_GLOBAL) { // set the homebind timer for players inside (1 minute) - for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) itr->getSource()->m_InstanceValid = false; } @@ -2749,7 +2749,7 @@ void InstanceMap::PermBindAllPlayers(Player *player) Group *group = player->GetGroup(); // group members outside the instance group don't get bound - for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) { Player* plr = itr->getSource(); // players inside an instance cannot be bound to other instances @@ -2781,7 +2781,7 @@ void InstanceMap::UnloadAll() void InstanceMap::SendResetWarnings(uint32 timeLeft) const { - for(MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) itr->getSource()->SendInstanceResetWarning(GetId(), itr->getSource()->GetDifficulty(), timeLeft); } @@ -2870,7 +2870,7 @@ void BattleGroundMap::RemoveAllPlayers() { if(HavePlayers()) { - for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) { Player* plr = itr->getSource(); if(!plr->IsBeingTeleportedFar()) diff --git a/src/game/Map.h b/src/game/Map.h index a8d94d350e7..5bd7e4d4c30 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -52,7 +52,6 @@ struct ScriptInfo; struct ScriptAction; struct Position; - typedef ACE_RW_Thread_Mutex GridRWLock; template<class MUTEX, class LOCK_TYPE> @@ -289,7 +288,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj void MessageDistBroadcast(Player *, WorldPacket *, float dist, bool to_self, bool own_team_only = false); void MessageDistBroadcast(WorldObject *, WorldPacket *, float dist); */ - + float GetVisibilityDistance() const { return m_VisibleDistance; } //function for setting up visibility distance for maps on per-type/per-Id basis virtual void InitVisibilityDistance(); @@ -517,7 +516,6 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj ActiveNonPlayers m_activeNonPlayers; ActiveNonPlayers::iterator m_activeNonPlayersIter; - private: time_t i_gridExpiry; diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index 0da5b19eb93..55d20c3f762 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -50,10 +50,10 @@ MapManager::MapManager() : i_gridCleanUpDelay(sWorld.getConfig(CONFIG_INTERVAL_G MapManager::~MapManager() { - for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter) + for (MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter) delete iter->second; - for(TransportSet::iterator i = m_Transports.begin(); i != m_Transports.end(); ++i) + for (TransportSet::iterator i = m_Transports.begin(); i != m_Transports.end(); ++i) delete *i; Map::DeleteStateMachine(); @@ -66,7 +66,7 @@ MapManager::Initialize() // debugging code, should be deleted some day { - for(int i=0;i<MAX_GRID_STATE; i++) + for (int i=0; i<MAX_GRID_STATE; i++) { i_GridStates[i] = si_GridStates[i]; } @@ -78,7 +78,7 @@ MapManager::Initialize() void MapManager::InitializeVisibilityDistanceInfo() { - for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter) + for (MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter) (*iter).second->InitVisibilityDistance(); } @@ -86,7 +86,7 @@ void MapManager::InitializeVisibilityDistanceInfo() void MapManager::checkAndCorrectGridStatesArray() { bool ok = true; - for(int i=0;i<MAX_GRID_STATE; i++) + for (int i=0; i<MAX_GRID_STATE; i++) { if(i_GridStates[i] != si_GridStates[i]) { @@ -262,14 +262,14 @@ MapManager::Update(uint32 diff) MapMapType::iterator iter; std::vector<Map*> update_queue(i_maps.size()); int omp_set_num_threads(sWorld.getConfig(CONFIG_NUMTHREADS)); - for(iter = i_maps.begin(), i=0;iter != i_maps.end(); ++iter, i++) + for (iter = i_maps.begin(), i=0; iter != i_maps.end(); ++iter, i++) update_queue[i]=iter->second; /* gomp in gcc <4.4 version cannot parallelise loops using random access iterators so until gcc 4.4 isnt standard, we need the update_queue workaround */ #pragma omp parallel for schedule(dynamic) private(i) shared(update_queue) - for(int32 i = 0; i < i_maps.size(); ++i) + for (int32 i = 0; i < i_maps.size(); ++i) { checkAndCorrectGridStatesArray(); // debugging code, should be deleted some day update_queue[i]->Update(i_timer.GetCurrent()); @@ -277,14 +277,14 @@ MapManager::Update(uint32 diff) // sLog.outError("This is thread %d out of %d threads,updating map %u",omp_get_thread_num(),omp_get_num_threads(),iter->second->GetId()); } #else - for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter) + for (MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter) { iter->second->Update(i_timer.GetCurrent()); sWorld.RecordTimeDiff("UpdateMap %u", iter->second->GetId()); } #endif - for(MapMapType::iterator iter = i_maps.begin(); iter != i_maps.end(); ++iter) + for (MapMapType::iterator iter = i_maps.begin(); iter != i_maps.end(); ++iter) iter->second->DelayedUpdate(i_timer.GetCurrent()); ObjectAccessor::Instance().Update(i_timer.GetCurrent()); @@ -302,13 +302,13 @@ void MapManager::DoDelayedMovesAndRemoves() int i =0; std::vector<Map*> update_queue(i_maps.size()); MapMapType::iterator iter; - for(iter = i_maps.begin();iter != i_maps.end(); ++iter, i++) + for (iter = i_maps.begin(); iter != i_maps.end(); ++iter, i++) update_queue[i] = iter->second; omp_set_num_threads(sWorld.getConfig(CONFIG_NUMTHREADS)); - + #pragma omp parallel for schedule(dynamic) private(i) shared(update_queue) - for(i=0;i<i_maps.size();i++) + for (i=0; i<i_maps.size(); i++) update_queue[i]->DoDelayedMovesAndRemoves(); */ } @@ -332,7 +332,7 @@ bool MapManager::IsValidMAP(uint32 mapid) void MapManager::UnloadAll() { - for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter) + for (MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter) iter->second->UnloadAll(); while(!i_maps.empty()) @@ -357,12 +357,12 @@ void MapManager::InitMaxInstanceId() uint32 MapManager::GetNumInstances() { uint32 ret = 0; - for(MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) + for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) { Map *map = itr->second; if(!map->Instanceable()) continue; MapInstanced::InstancedMaps &maps = ((MapInstanced *)map)->GetInstancedMaps(); - for(MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr) + for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr) if(mitr->second->IsDungeon()) ret++; } return ret; @@ -371,12 +371,12 @@ uint32 MapManager::GetNumInstances() uint32 MapManager::GetNumPlayersInInstances() { uint32 ret = 0; - for(MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) + for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) { Map *map = itr->second; if(!map->Instanceable()) continue; MapInstanced::InstancedMaps &maps = ((MapInstanced *)map)->GetInstancedMaps(); - for(MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr) + for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr) if(mitr->second->IsDungeon()) ret += ((InstanceMap*)mitr->second)->GetPlayers().getSize(); } diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 56070f27e19..e568deae695 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -169,7 +169,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data ) if(zones_count > 10) return; // can't be received from real client or broken packet - 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... @@ -185,7 +185,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) { std::string temp; recv_data >> temp; // user entered string, it used as universal search pattern(guild+player name)? @@ -221,7 +221,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data ) //TODO: Guard Player map HashMapHolder<Player>::MapType& m = ObjectAccessor::Instance().GetPlayers(); - for(HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) + for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { if (security == SEC_PLAYER) { @@ -260,7 +260,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) { @@ -296,7 +296,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()) { @@ -1177,8 +1177,8 @@ void WorldSession::HandleInspectOpcode(WorldPacket& recv_data) return; uint32 talent_points = 0x47; - uint32 guid_size = plr->GetPackGUID().wpos(); - WorldPacket data(SMSG_INSPECT_TALENT, guid_size+4+talent_points); + uint32 guid_size = plr->GetPackGUID().wpos(); + WorldPacket data(SMSG_INSPECT_TALENT, guid_size+4+talent_points); data.append(plr->GetPackGUID()); if(sWorld.getConfig(CONFIG_TALENTS_INSPECTING) || _player->isGameMaster()) diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp index e32fffaa8ac..626440f8d1e 100644 --- a/src/game/MotionMaster.cpp +++ b/src/game/MotionMaster.cpp @@ -530,11 +530,11 @@ void MotionMaster::MoveRotate(uint32 time, RotateDirection direction) void MotionMaster::propagateSpeedChange() { /*Impl::container_type::iterator it = Impl::c.begin(); - for ( ;it != end(); ++it) + for (; it != end(); ++it) { (*it)->unitSpeedChanged(); }*/ - for(int i = 0; i <= i_top; ++i) + for (int i = 0; i <= i_top; ++i) { if(Impl[i]) Impl[i]->unitSpeedChanged(); @@ -585,7 +585,7 @@ bool MotionMaster::GetDestination(float &x, float &y, float &z) { if(empty()) return false; - + return top()->GetDestination(x,y,z); } diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h index c6755bfa167..8923950fe7e 100644 --- a/src/game/MotionMaster.h +++ b/src/game/MotionMaster.h @@ -98,7 +98,7 @@ class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *> explicit MotionMaster(Unit *unit) : i_owner(unit), m_expList(NULL), m_cleanFlag(MMCF_NONE), i_top(-1) { - for(uint8 i = 0; i < MAX_MOTION_SLOT; ++i) + for (uint8 i = 0; i < MAX_MOTION_SLOT; ++i) { Impl[i] = NULL; needInit[i] = true; diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index e3cc490adb4..e29fde825c3 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -486,7 +486,7 @@ void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recv_data) else { sLog.outError("HandleSetActiveMoverOpcode: incorrect mover guid: mover is " UI64FMTD " and should be " UI64FMTD, guid, _player->m_mover->GetGUID()); - GetPlayer()->SetMover(GetPlayer()); + GetPlayer()->SetMover(GetPlayer()); } } diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp index 4e15fd77595..57f9391176c 100644 --- a/src/game/NPCHandler.cpp +++ b/src/game/NPCHandler.cpp @@ -154,7 +154,7 @@ void WorldSession::SendTrainerList( uint64 guid, const std::string& strTitle ) bool can_learn_primary_prof = GetPlayer()->GetFreePrimaryProfessionPoints() > 0; uint32 count = 0; - for(TrainerSpellMap::const_iterator itr = trainer_spells->spellList.begin(); itr != trainer_spells->spellList.end(); ++itr) + for (TrainerSpellMap::const_iterator itr = trainer_spells->spellList.begin(); itr != trainer_spells->spellList.end(); ++itr) { TrainerSpell const* tSpell = &itr->second; diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 6c892ff1d5d..6d46834fea2 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -353,7 +353,7 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const uint32 poscount = uint32(path.Size()); *data << uint32(poscount); // points count - for(uint32 i = 0; i < poscount; ++i) + for (uint32 i = 0; i < poscount; ++i) { *data << path.GetNodes()[i].x; *data << path.GetNodes()[i].y; @@ -527,7 +527,7 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask // 2 specialized loops for speed optimization in non-unit case if(isType(TYPEMASK_UNIT)) // unit (creature/player) case { - for( uint16 index = 0; index < m_valuesCount; ++index ) + for (uint16 index = 0; index < m_valuesCount; ++index ) { if( updateMask->GetBit( index ) ) { @@ -639,7 +639,7 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask } else *data << m_uint32Values[ index ]; - } + } else { // send in current format (float as float, uint32 as uint32) @@ -650,7 +650,7 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask } else if(isType(TYPEMASK_GAMEOBJECT)) // gameobject case { - for( uint16 index = 0; index < m_valuesCount; ++index ) + for (uint16 index = 0; index < m_valuesCount; ++index ) { if( updateMask->GetBit( index ) ) { @@ -691,7 +691,7 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask } else // other objects case (no special index checks) { - for( uint16 index = 0; index < m_valuesCount; ++index ) + for (uint16 index = 0; index < m_valuesCount; ++index ) { if( updateMask->GetBit( index ) ) { @@ -752,7 +752,7 @@ void Object::_SetUpdateBits(UpdateMask *updateMask, Player* /*target*/) const uint32 *value = m_uint32Values; uint32 *mirror = m_uint32Values_mirror; - for(uint16 index = 0; index < m_valuesCount; ++index, ++value, ++mirror) + for (uint16 index = 0; index < m_valuesCount; ++index, ++value, ++mirror) { if(*mirror != *value) updateMask->SetBit(index); @@ -763,7 +763,7 @@ void Object::_SetCreateBits(UpdateMask *updateMask, Player* /*target*/) const { uint32 *value = m_uint32Values; - for(uint16 index = 0; index < m_valuesCount; ++index, ++value) + for (uint16 index = 0; index < m_valuesCount; ++index, ++value) { if(*value) updateMask->SetBit(index); @@ -1551,7 +1551,7 @@ void WorldObject::MonsterYellToZone(int32 textId, uint32 language, uint64 Target uint32 zoneid = GetZoneId(); Map::PlayerList const& pList = GetMap()->GetPlayers(); - for(Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr) + for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr) if(itr->getSource()->GetZoneId()==zoneid) say_do(itr->getSource()); } @@ -1783,7 +1783,7 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy { // Remove Demonic Sacrifice auras (known pet) Unit::AuraEffectList const& auraClassScripts = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(Unit::AuraEffectList::const_iterator itr = auraClassScripts.begin();itr!=auraClassScripts.end();) + for (Unit::AuraEffectList::const_iterator itr = auraClassScripts.begin(); itr!=auraClassScripts.end(); ) { if((*itr)->GetMiscValue()==2228) { @@ -1864,7 +1864,7 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy { // Remove Demonic Sacrifice auras (known pet) Unit::AuraEffectList const& auraClassScripts = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(Unit::AuraEffectList::const_iterator itr = auraClassScripts.begin();itr!=auraClassScripts.end();) + for (Unit::AuraEffectList::const_iterator itr = auraClassScripts.begin(); itr!=auraClassScripts.end(); ) { if((*itr)->GetMiscValue()==2228) { @@ -2238,7 +2238,7 @@ void WorldObject::DestroyForNearbyPlayers() Trinity::AnyUnitInObjectRangeCheck check(this, GetMap()->GetVisibilityDistance()); Trinity::UnitListSearcher<Trinity::AnyUnitInObjectRangeCheck> searcher(this, targets, check); VisitNearbyWorldObject(GetMap()->GetVisibilityDistance(), searcher); - for(std::list<Unit*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter) + for (std::list<Unit*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter) { Player *plr = dynamic_cast<Player*>(*iter); if(!plr) @@ -2252,8 +2252,8 @@ void WorldObject::DestroyForNearbyPlayers() if(isType(TYPEMASK_UNIT) && ((Unit*)this)->GetCharmerGUID() == plr->GetGUID()) // TODO: this is for puppet continue; - - DestroyForPlayer(plr); - plr->m_clientGUIDs.erase(GetGUID()); + + DestroyForPlayer(plr); + plr->m_clientGUIDs.erase(GetGUID()); } } diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index 7a12b4784e4..9eaf674eaeb 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -48,7 +48,7 @@ INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex); ObjectAccessor::ObjectAccessor() {} ObjectAccessor::~ObjectAccessor() { - for(Player2CorpsesMapType::const_iterator itr = i_player2corpse.begin(); itr != i_player2corpse.end(); ++itr) + for (Player2CorpsesMapType::const_iterator itr = i_player2corpse.begin(); itr != i_player2corpse.end(); ++itr) delete itr->second; } @@ -164,7 +164,7 @@ ObjectAccessor::FindPlayerByName(const char *name) //TODO: Player Guard HashMapHolder<Player>::MapType& m = HashMapHolder<Player>::GetContainer(); HashMapHolder<Player>::MapType::iterator iter = m.begin(); - for(; iter != m.end(); ++iter) + for (; iter != m.end(); ++iter) if(iter->second->IsInWorld() && ( ::strcmp(name, iter->second->GetName()) == 0 )) return iter->second; return NULL; @@ -176,7 +176,7 @@ ObjectAccessor::SaveAllPlayers() Guard guard(*HashMapHolder<Player*>::GetLock()); HashMapHolder<Player>::MapType& m = HashMapHolder<Player>::GetContainer(); HashMapHolder<Player>::MapType::iterator itr = m.begin(); - for(; itr != m.end(); ++itr) + for (; itr != m.end(); ++itr) itr->second->SaveToDB(); } @@ -187,7 +187,7 @@ ObjectAccessor::UpdateObject(Object* obj, Player* exceptPlayer) obj->BuildUpdate(update_players); WorldPacket packet; - for(UpdateDataMapType::iterator iter = update_players.begin(); iter != update_players.end(); ++iter) + for (UpdateDataMapType::iterator iter = update_players.begin(); iter != update_players.end(); ++iter) { if(iter->first == exceptPlayer) continue; @@ -303,7 +303,7 @@ void ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map* map) { Guard guard(i_corpseGuard); - for(Player2CorpsesMapType::iterator iter = i_player2corpse.begin(); iter != i_player2corpse.end(); ++iter) + for (Player2CorpsesMapType::iterator iter = i_player2corpse.begin(); iter != i_player2corpse.end(); ++iter) if(iter->second->GetGrid() == gridpair) { // verify, if the corpse in our instance (add only corpses which are) @@ -407,7 +407,7 @@ ObjectAccessor::Update(uint32 diff) } WorldPacket packet; // here we allocate a std::vector with a size of 0x10000 - for(UpdateDataMapType::iterator iter = update_players.begin(); iter != update_players.end(); ++iter) + for (UpdateDataMapType::iterator iter = update_players.begin(); iter != update_players.end(); ++iter) { iter->second.BuildPacket(&packet); iter->first->GetSession()->SendPacket(&packet); @@ -418,13 +418,13 @@ ObjectAccessor::Update(uint32 diff) void ObjectAccessor::WorldObjectChangeAccumulator::Visit(PlayerMapType &m) { - for(PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { BuildPacket(iter->getSource()); if (!iter->getSource()->GetSharedVisionList().empty()) { SharedVisionList::const_iterator it = iter->getSource()->GetSharedVisionList().begin(); - for ( ; it != iter->getSource()->GetSharedVisionList().end(); ++it) + for (; it != iter->getSource()->GetSharedVisionList().end(); ++it) BuildPacket(*it); } } @@ -433,12 +433,12 @@ ObjectAccessor::WorldObjectChangeAccumulator::Visit(PlayerMapType &m) void ObjectAccessor::WorldObjectChangeAccumulator::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { if (!iter->getSource()->GetSharedVisionList().empty()) { SharedVisionList::const_iterator it = iter->getSource()->GetSharedVisionList().begin(); - for ( ; it != iter->getSource()->GetSharedVisionList().end(); ++it) + for (; it != iter->getSource()->GetSharedVisionList().end(); ++it) BuildPacket(*it); } } @@ -447,7 +447,7 @@ ObjectAccessor::WorldObjectChangeAccumulator::Visit(CreatureMapType &m) void ObjectAccessor::WorldObjectChangeAccumulator::Visit(DynamicObjectMapType &m) { - for(DynamicObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter) + for (DynamicObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { uint64 guid = iter->getSource()->GetCasterGUID(); if(IS_PLAYER_GUID(guid)) diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h index 655b44b98f2..67ef5efef89 100644 --- a/src/game/ObjectAccessor.h +++ b/src/game/ObjectAccessor.h @@ -133,7 +133,6 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, return GetObjectInWorld(guid, ((Unit*)NULL)); } - template<class T> static T* GetObjectInWorld(uint32 mapid, float x, float y, uint64 guid, T* /*fake*/) { T* obj = HashMapHolder<T>::Find(guid); diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp index 6a11fe44f86..9a8d89d1120 100644 --- a/src/game/ObjectGridLoader.cpp +++ b/src/game/ObjectGridLoader.cpp @@ -54,7 +54,7 @@ ObjectGridRespawnMover::Visit(CreatureMapType &m) // creature in unloading grid can have respawn point in another grid // if it will be unloaded then it will not respawn in original grid until unload/load original grid // move to respawn point to prevent this case. For player view in respawn grid this will be normal respawn. - for(CreatureMapType::iterator iter = m.begin(); iter != m.end();) + for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ) { Creature * c = iter->getSource(); ++iter; @@ -124,7 +124,7 @@ void AddObjectHelper(CellPair &cell, GridRefManager<T> &m, uint32 &count, Map* m template <class T> void LoadHelper(CellGuidSet const& guid_set, CellPair &cell, GridRefManager<T> &m, uint32 &count, Map* map) { - for(CellGuidSet::const_iterator i_guid = guid_set.begin(); i_guid != guid_set.end(); ++i_guid) + for (CellGuidSet::const_iterator i_guid = guid_set.begin(); i_guid != guid_set.end(); ++i_guid) { T* obj = new T; uint32 guid = *i_guid; @@ -144,7 +144,7 @@ void LoadHelper(CellCorpseSet const& cell_corpses, CellPair &cell, CorpseMapType if(cell_corpses.empty()) return; - for(CellCorpseSet::const_iterator itr = cell_corpses.begin(); itr != cell_corpses.end(); ++itr) + for (CellCorpseSet::const_iterator itr = cell_corpses.begin(); itr != cell_corpses.end(); ++itr) { if(itr->second != map->GetInstanceId()) continue; @@ -224,10 +224,10 @@ void ObjectGridLoader::LoadN(void) { i_gameObjects = 0; i_creatures = 0; i_corpses = 0; i_cell.data.Part.cell_y = 0; - for(unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) + for (unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) { i_cell.data.Part.cell_x = x; - for(unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) + for (unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) { i_cell.data.Part.cell_y = y; GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> loader; @@ -239,9 +239,9 @@ void ObjectGridLoader::LoadN(void) void ObjectGridUnloader::MoveToRespawnN() { - for(unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) + for (unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) { - for(unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) + for (unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) { ObjectGridRespawnMover mover; mover.Move(i_grid(x, y)); @@ -282,7 +282,7 @@ void ObjectGridStoper::Visit(CreatureMapType &m) { // stop any fights at grid de-activation and remove dynobjects created at cast by creatures - for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { iter->getSource()->RemoveAllDynObjects(); if(iter->getSource()->isInCombat()) @@ -304,7 +304,7 @@ ObjectGridCleaner::Stop(GridType &grid) void ObjectGridCleaner::Visit(CreatureMapType &m) { - for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) + for (CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) iter->getSource()->CleanupsBeforeDelete(); } @@ -312,7 +312,7 @@ template<class T> void ObjectGridCleaner::Visit(GridRefManager<T> &m) { - for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) + for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) iter->getSource()->RemoveFromWorld(); } diff --git a/src/game/ObjectGridLoader.h b/src/game/ObjectGridLoader.h index 768f1f994db..1b047e76653 100644 --- a/src/game/ObjectGridLoader.h +++ b/src/game/ObjectGridLoader.h @@ -64,9 +64,9 @@ class TRINITY_DLL_DECL ObjectGridUnloader void MoveToRespawnN(); void UnloadN() { - for(unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) + for (unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) { - for(unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) + for (unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) { GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> loader; loader.Unload(i_grid(x, y), *this); @@ -87,9 +87,9 @@ class TRINITY_DLL_DECL ObjectGridStoper void StopN() { - for(unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) + for (unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) { - for(unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) + for (unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) { GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> loader; loader.Stop(i_grid(x, y), *this); @@ -112,9 +112,9 @@ class TRINITY_DLL_DECL ObjectGridCleaner void CleanN() { - for(unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) + for (unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x) { - for(unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) + for (unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y) { GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> loader; loader.Stop(i_grid(x, y), *this); diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 588722213cb..f8b915c0189 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -67,7 +67,7 @@ bool normalizePlayerName(std::string& name) return false; wstr_buf[0] = wcharToUpper(wstr_buf[0]); - for(size_t i = 1; i < wstr_len; ++i) + for (size_t i = 1; i < wstr_len; ++i) wstr_buf[i] = wcharToLower(wstr_buf[i]); if(!WStrToUtf8(wstr_buf,wstr_len,name)) @@ -101,7 +101,7 @@ LanguageDesc lang_description[LANGUAGES_COUNT] = LanguageDesc const* GetLanguageDescByID(uint32 lang) { - for(uint8 i = 0; i < LANGUAGES_COUNT; ++i) + for (uint8 i = 0; i < LANGUAGES_COUNT; ++i) { if(uint32(lang_description[i].lang_id) == lang) return &lang_description[i]; @@ -184,10 +184,10 @@ ObjectMgr::ObjectMgr() ObjectMgr::~ObjectMgr() { - for( QuestMap::iterator i = mQuestTemplates.begin( ); i != mQuestTemplates.end( ); ++i ) + for (QuestMap::iterator i = mQuestTemplates.begin( ); i != mQuestTemplates.end( ); ++i ) delete i->second; - for(PetLevelInfoMap::iterator i = petInfo.begin( ); i != petInfo.end( ); ++i ) + for (PetLevelInfoMap::iterator i = petInfo.begin( ); i != petInfo.end( ); ++i ) delete[] i->second; // free only if loaded @@ -276,7 +276,7 @@ PCachePlayerInfo ObjectMgr::GetPlayerInfoFromCache(uint32 unPlayerGuid) const Group * ObjectMgr::GetGroupByLeader(const uint64 &guid) const { - for(GroupSet::const_iterator itr = mGroupSet.begin(); itr != mGroupSet.end(); ++itr) + for (GroupSet::const_iterator itr = mGroupSet.begin(); itr != mGroupSet.end(); ++itr) if ((*itr)->GetLeaderGUID() == guid) return *itr; @@ -294,7 +294,7 @@ Guild * ObjectMgr::GetGuildById(uint32 GuildId) const Guild * ObjectMgr::GetGuildByName(const std::string& guildname) const { - for(GuildMap::const_iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr) + for (GuildMap::const_iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr) if (itr->second->GetName() == guildname) return itr->second; @@ -312,7 +312,7 @@ std::string ObjectMgr::GetGuildNameById(uint32 GuildId) const Guild* ObjectMgr::GetGuildByLeader(const uint64 &guid) const { - for(GuildMap::const_iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr) + for (GuildMap::const_iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr) if (itr->second->GetLeader() == guid) return itr->second; @@ -340,7 +340,7 @@ ArenaTeam* ObjectMgr::GetArenaTeamById(uint32 arenateamid) const ArenaTeam* ObjectMgr::GetArenaTeamByName(const std::string& arenateamname) const { - for(ArenaTeamMap::const_iterator itr = mArenaTeamMap.begin(); itr != mArenaTeamMap.end(); ++itr) + for (ArenaTeamMap::const_iterator itr = mArenaTeamMap.begin(); itr != mArenaTeamMap.end(); ++itr) if (itr->second->GetName() == arenateamname) return itr->second; @@ -349,7 +349,7 @@ ArenaTeam* ObjectMgr::GetArenaTeamByName(const std::string& arenateamname) const ArenaTeam* ObjectMgr::GetArenaTeamByCaptain(uint64 const& guid) const { - for(ArenaTeamMap::const_iterator itr = mArenaTeamMap.begin(); itr != mArenaTeamMap.end(); ++itr) + for (ArenaTeamMap::const_iterator itr = mArenaTeamMap.begin(); itr != mArenaTeamMap.end(); ++itr) if (itr->second->GetCaptain() == guid) return itr->second; @@ -399,7 +399,7 @@ void ObjectMgr::LoadCreatureLocales() CreatureLocale& data = mCreatureLocaleMap[entry]; - for(uint8 i = 1; i < MAX_LOCALE; ++i) + for (uint8 i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[1+2*(i-1)].GetCppString(); if(!str.empty()) @@ -467,7 +467,7 @@ void ObjectMgr::LoadNpcOptionLocales() NpcOptionLocale& data = mNpcOptionLocaleMap[entry]; - for(uint8 i = 1; i < MAX_LOCALE; ++i) + for (uint8 i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[1+2*(i-1)].GetCppString(); if(!str.empty()) @@ -530,7 +530,7 @@ void ObjectMgr::LoadPointOfInterestLocales() PointOfInterestLocale& data = mPointOfInterestLocaleMap[entry]; - for(uint8 i = 1; i < MAX_LOCALE; ++i) + for (uint8 i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[i].GetCppString(); if(str.empty()) @@ -574,7 +574,7 @@ void ObjectMgr::LoadCreatureTemplates() std::set<uint32> hasHeroicEntries; // already loaded creatures with heroic entry values // check data correctness - for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i) + for (uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i) { CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i); if (!cInfo) @@ -737,7 +737,7 @@ void ObjectMgr::LoadCreatureTemplates() if (!displayScaleEntry) sLog.outErrorDb("Creature (Entry: %u) not has any existed display id in Modelid1/Modelid2/Modelid3/Modelid4", cInfo->Entry); - for(int k = 0; k < MAX_KILL_CREDIT; ++k) + for (int k = 0; k < MAX_KILL_CREDIT; ++k) { if(cInfo->KillCredit[k]) { @@ -799,7 +799,7 @@ void ObjectMgr::LoadCreatureTemplates() sLog.outErrorDb("Creature (Entry: %u) has non-existing PetSpellDataId (%u)", cInfo->Entry, cInfo->PetSpellDataId); } - for(uint8 j = 0; j < CREATURE_MAX_SPELLS; ++j) + for (uint8 j = 0; j < CREATURE_MAX_SPELLS; ++j) { if(cInfo->spells[j] && !sSpellStore.LookupEntry(cInfo->spells[j])) { @@ -879,7 +879,7 @@ void ObjectMgr::ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const* const_cast<CreatureDataAddonAura*&>(addon->auras) = new CreatureDataAddonAura[val.size()/2+1]; uint32 i=0; - for(uint32 j = 0; j < val.size()/2;++j) + for (uint32 j = 0; j < val.size()/2; ++j) { CreatureDataAddonAura& cAura = const_cast<CreatureDataAddonAura&>(addon->auras[i]); cAura.spell_id = (uint32)val[2*j+0]; @@ -919,7 +919,7 @@ void ObjectMgr::LoadCreatureAddons(SQLStorage& creatureaddons, char const* entry sLog.outString(); // check data correctness and convert 'auras' - for(uint32 i = 1; i < creatureaddons.MaxEntry; ++i) + for (uint32 i = 1; i < creatureaddons.MaxEntry; ++i) { CreatureDataAddon const* addon = creatureaddons.LookupEntry<CreatureDataAddon>(i); if(!addon) @@ -952,7 +952,7 @@ void ObjectMgr::LoadCreatureAddons() LoadCreatureAddons(sCreatureInfoAddonStorage,"Entry","creature template addons"); // check entry ids - for(uint32 i = 1; i < sCreatureInfoAddonStorage.MaxEntry; ++i) + for (uint32 i = 1; i < sCreatureInfoAddonStorage.MaxEntry; ++i) if(CreatureDataAddon const* addon = sCreatureInfoAddonStorage.LookupEntry<CreatureDataAddon>(i)) if(!sCreatureStorage.LookupEntry<CreatureInfo>(addon->guidOrEntry)) sLog.outErrorDb("Creature (Entry: %u) does not exist but has a record in `%s`",addon->guidOrEntry, sCreatureInfoAddonStorage.GetTableName()); @@ -960,7 +960,7 @@ void ObjectMgr::LoadCreatureAddons() LoadCreatureAddons(sCreatureDataAddonStorage,"GUID","creature addons"); // check entry ids - for(uint32 i = 1; i < sCreatureDataAddonStorage.MaxEntry; ++i) + for (uint32 i = 1; i < sCreatureDataAddonStorage.MaxEntry; ++i) if(CreatureDataAddon const* addon = sCreatureDataAddonStorage.LookupEntry<CreatureDataAddon>(i)) if(mCreatureDataMap.find(addon->guidOrEntry)==mCreatureDataMap.end()) sLog.outErrorDb("Creature (GUID: %u) does not exist but has a record in `creature_addon`",addon->guidOrEntry); @@ -975,14 +975,14 @@ void ObjectMgr::LoadEquipmentTemplates() { sEquipmentStorage.Load(); - for(uint32 i=0; i< sEquipmentStorage.MaxEntry; ++i) + for (uint32 i=0; i< sEquipmentStorage.MaxEntry; ++i) { EquipmentInfo const* eqInfo = sEquipmentStorage.LookupEntry<EquipmentInfo>(i); if(!eqInfo) continue; - for(uint8 j=0; j<3; j++) + for (uint8 j=0; j<3; j++) { if(!eqInfo->equipentry[j]) continue; @@ -1080,7 +1080,7 @@ void ObjectMgr::LoadCreatureModelInfo() sCreatureModelStorage.Load(); // post processing - for(uint32 i = 1; i < sCreatureModelStorage.MaxEntry; ++i) + for (uint32 i = 1; i < sCreatureModelStorage.MaxEntry; ++i) { CreatureModelInfo const *minfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(i); if (!minfo) @@ -1106,7 +1106,7 @@ void ObjectMgr::LoadCreatureModelInfo() sLog.outString(); // check if combat_reach is valid - for(uint32 i = 1; i < sCreatureModelStorage.MaxEntry; ++i) + for (uint32 i = 1; i < sCreatureModelStorage.MaxEntry; ++i) { CreatureModelInfo const* mInfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(i); if(!mInfo) @@ -1124,7 +1124,7 @@ bool ObjectMgr::CheckCreatureLinkedRespawn(uint32 guid, uint32 linkedGuid) const { const CreatureData* const slave = GetCreatureData(guid); const CreatureData* const master = GetCreatureData(linkedGuid); - + if(!slave || !master) // they must have a corresponding entry in db { sLog.outError("LinkedRespawn: Creature '%u' linking to '%u' which doesn't exist",guid,linkedGuid); @@ -1132,7 +1132,7 @@ bool ObjectMgr::CheckCreatureLinkedRespawn(uint32 guid, uint32 linkedGuid) const } const MapEntry* const map = sMapStore.LookupEntry(master->mapid); - + if(master->mapid != slave->mapid // link only to same map && (!map || map->Instanceable())) // or to unistanced world { @@ -1233,7 +1233,7 @@ void ObjectMgr::LoadCreatures() // build single time for check creature data std::set<uint32> heroicCreatures; - for(uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i) + for (uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i) if(CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i)) if(cInfo->HeroicEntry) heroicCreatures.insert(cInfo->HeroicEntry); @@ -1384,7 +1384,7 @@ void ObjectMgr::LoadCreatures() void ObjectMgr::AddCreatureToGrid(uint32 guid, CreatureData const* data) { uint8 mask = data->spawnMask; - for(uint8 i = 0; mask != 0; i++, mask >>= 1) + for (uint8 i = 0; mask != 0; i++, mask >>= 1) { if(mask & 1) { @@ -1400,7 +1400,7 @@ void ObjectMgr::AddCreatureToGrid(uint32 guid, CreatureData const* data) void ObjectMgr::RemoveCreatureFromGrid(uint32 guid, CreatureData const* data) { uint8 mask = data->spawnMask; - for(uint8 i = 0; mask != 0; i++, mask >>= 1) + for (uint8 i = 0; mask != 0; i++, mask >>= 1) { if(mask & 1) { @@ -1510,7 +1510,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 team, uint32 mapId, float x, f } } - return guid; + return guid; } void ObjectMgr::LoadGameobjects() @@ -1632,7 +1632,7 @@ void ObjectMgr::LoadGameobjects() void ObjectMgr::AddGameobjectToGrid(uint32 guid, GameObjectData const* data) { uint8 mask = data->spawnMask; - for(uint8 i = 0; mask != 0; i++, mask >>= 1) + for (uint8 i = 0; mask != 0; i++, mask >>= 1) { if(mask & 1) { @@ -1648,7 +1648,7 @@ void ObjectMgr::AddGameobjectToGrid(uint32 guid, GameObjectData const* data) void ObjectMgr::RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data) { uint8 mask = data->spawnMask; - for(uint8 i = 0; mask != 0; i++, mask >>= 1) + for (uint8 i = 0; mask != 0; i++, mask >>= 1) { if(mask & 1) { @@ -1857,7 +1857,7 @@ void ObjectMgr::LoadItemLocales() ItemLocale& data = mItemLocaleMap[entry]; - for(uint8 i = 1; i < MAX_LOCALE; ++i) + for (uint8 i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[1+2*(i-1)].GetCppString(); if(!str.empty()) @@ -1910,7 +1910,7 @@ void ObjectMgr::LoadItemPrototypes() sLog.outString(); // check data correctness - for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i) + for (uint32 i = 1; i < sItemStorage.MaxEntry; ++i) { ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype >(i); ItemEntry const *dbcitem = sItemStore.LookupEntry(i); @@ -2253,7 +2253,7 @@ void ObjectMgr::LoadItemPrototypes() if(proto->BagFamily) { // check bits - for(uint32 j = 0; j < sizeof(proto->BagFamily)*8; ++j) + for (uint32 j = 0; j < sizeof(proto->BagFamily)*8; ++j) { uint32 mask = 1 << j; if((proto->BagFamily & mask)==0) @@ -2354,7 +2354,7 @@ void ObjectMgr::LoadItemRequiredTarget() bool bIsItemSpellValid = false; - for(uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) + for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) { if (SpellEntry const* pSpellInfo = sSpellStore.LookupEntry(pItemProto->Spells[i].SpellId)) { @@ -2741,8 +2741,8 @@ void ObjectMgr::LoadPlayerInfo() uint32 max_race = current_race ? current_race + 1 : MAX_RACES; uint32 min_class = current_class ? current_class : 1; uint32 max_class = current_class ? current_class + 1 : MAX_CLASSES; - for(uint32 r = min_race; r < max_race; ++r) - for(uint32 c = min_class; c < max_class; ++c) + for (uint32 r = min_race; r < max_race; ++r) + for (uint32 c = min_class; c < max_class; ++c) playerInfo[r][c].spell.push_back(fields[2].GetUInt32()); } else @@ -3121,7 +3121,7 @@ void ObjectMgr::BuildPlayerLevelInfo(uint8 race, uint8 _class, uint8 level, Play *info = playerInfo[race][_class].levelInfo[sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)-1]; // if conversion from uint32 to uint8 causes unexpected behaviour, change lvl to uint32 - for(uint8 lvl = sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)-1; lvl < level; ++lvl) + for (uint8 lvl = sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)-1; lvl < level; ++lvl) { switch(_class) { @@ -3369,7 +3369,7 @@ void ObjectMgr::LoadGroups() // clean groups // TODO: maybe delete from the DB before loading in this case - for(GroupSet::iterator itr = mGroupSet.begin(); itr != mGroupSet.end();) + for (GroupSet::iterator itr = mGroupSet.begin(); itr != mGroupSet.end(); ) { if((*itr)->GetMembersCount() < 2) { @@ -3440,7 +3440,7 @@ void ObjectMgr::LoadGroups() void ObjectMgr::LoadQuests() { // For reload case - for(QuestMap::const_iterator itr=mQuestTemplates.begin(); itr != mQuestTemplates.end(); ++itr) + for (QuestMap::const_iterator itr=mQuestTemplates.begin(); itr != mQuestTemplates.end(); ++itr) delete itr->second; mQuestTemplates.clear(); @@ -3538,7 +3538,7 @@ void ObjectMgr::LoadQuests() if(qinfo->QuestFlags & QUEST_FLAGS_AUTO_REWARDED) { // at auto-reward can be rewarded only RewChoiceItemId[0] - for(uint8 j = 1; j < QUEST_REWARD_CHOICES_COUNT; ++j ) + for (uint8 j = 1; j < QUEST_REWARD_CHOICES_COUNT; ++j ) { if(uint32 id = qinfo->RewChoiceItemId[j]) { @@ -3732,7 +3732,7 @@ void ObjectMgr::LoadQuests() } } - for(uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j ) + for (uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j ) { uint32 id = qinfo->ReqItemId[j]; if(id) @@ -3761,7 +3761,7 @@ void ObjectMgr::LoadQuests() } } - for(uint8 j = 0; j < QUEST_SOURCE_ITEM_IDS_COUNT; ++j ) + for (uint8 j = 0; j < QUEST_SOURCE_ITEM_IDS_COUNT; ++j ) { uint32 id = qinfo->ReqSourceId[j]; if(id) @@ -3784,7 +3784,7 @@ void ObjectMgr::LoadQuests() } } - for(uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j ) + for (uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j ) { uint32 id = qinfo->ReqSpell[j]; if(id) @@ -3800,7 +3800,7 @@ void ObjectMgr::LoadQuests() if(!qinfo->ReqCreatureOrGOId[j]) { bool found = false; - for(uint8 k = 0; k < 3; ++k) + for (uint8 k = 0; k < 3; ++k) { if ((spellInfo->Effect[k] == SPELL_EFFECT_QUEST_COMPLETE && uint32(spellInfo->EffectMiscValue[k]) == qinfo->QuestId) || spellInfo->Effect[k] == SPELL_EFFECT_SEND_EVENT) @@ -3830,7 +3830,7 @@ void ObjectMgr::LoadQuests() } } - for(uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j ) + for (uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j ) { int32 id = qinfo->ReqCreatureOrGOId[j]; if(id < 0 && !sGOStorage.LookupEntry<GameObjectInfo>(-id)) @@ -3868,7 +3868,7 @@ void ObjectMgr::LoadQuests() } } - for(uint8 j = 0; j < QUEST_REWARD_CHOICES_COUNT; ++j ) + for (uint8 j = 0; j < QUEST_REWARD_CHOICES_COUNT; ++j ) { uint32 id = qinfo->RewChoiceItemId[j]; if(id) @@ -3895,7 +3895,7 @@ void ObjectMgr::LoadQuests() } } - for(uint8 j = 0; j < QUEST_REWARDS_COUNT; ++j ) + for (uint8 j = 0; j < QUEST_REWARDS_COUNT; ++j ) { uint32 id = qinfo->RewItemId[j]; if(id) @@ -3922,7 +3922,7 @@ void ObjectMgr::LoadQuests() } } - for(uint8 j = 0; j < QUEST_REPUTATIONS_COUNT; ++j) + for (uint8 j = 0; j < QUEST_REPUTATIONS_COUNT; ++j) { if(qinfo->RewRepFaction[j]) { @@ -4064,7 +4064,7 @@ void ObjectMgr::LoadQuests() if(!spellInfo) continue; - for(uint8 j = 0; j < 3; ++j) + for (uint8 j = 0; j < 3; ++j) { if(spellInfo->Effect[j] != SPELL_EFFECT_QUEST_COMPLETE) continue; @@ -4129,7 +4129,7 @@ void ObjectMgr::LoadQuestLocales() QuestLocale& data = mQuestLocaleMap[entry]; - for(uint8 i = 1; i < MAX_LOCALE; ++i) + for (uint8 i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[1+10*(i-1)].GetCppString(); if(!str.empty()) @@ -4203,7 +4203,7 @@ void ObjectMgr::LoadQuestLocales() data.EndText[idx] = str; } } - for(uint8 k = 0; k < 4; ++k) + for (uint8 k = 0; k < 4; ++k) { str = fields[1+10*(i-1)+6+k].GetCppString(); if(!str.empty()) @@ -4486,7 +4486,7 @@ void ObjectMgr::LoadGameObjectScripts() LoadScripts(sGameObjectScripts, "gameobject_scripts"); // check ids - for(ScriptMapMap::const_iterator itr = sGameObjectScripts.begin(); itr != sGameObjectScripts.end(); ++itr) + for (ScriptMapMap::const_iterator itr = sGameObjectScripts.begin(); itr != sGameObjectScripts.end(); ++itr) { if(!GetGOData(itr->first)) sLog.outErrorDb("Table `gameobject_scripts` has not existing gameobject (GUID: %u) as script id",itr->first); @@ -4498,7 +4498,7 @@ void ObjectMgr::LoadQuestEndScripts() LoadScripts(sQuestEndScripts, "quest_end_scripts"); // check ids - for(ScriptMapMap::const_iterator itr = sQuestEndScripts.begin(); itr != sQuestEndScripts.end(); ++itr) + for (ScriptMapMap::const_iterator itr = sQuestEndScripts.begin(); itr != sQuestEndScripts.end(); ++itr) { if(!GetQuestTemplate(itr->first)) sLog.outErrorDb("Table `quest_end_scripts` has not existing quest (Id: %u) as script id",itr->first); @@ -4510,7 +4510,7 @@ void ObjectMgr::LoadQuestStartScripts() LoadScripts(sQuestStartScripts,"quest_start_scripts"); // check ids - for(ScriptMapMap::const_iterator itr = sQuestStartScripts.begin(); itr != sQuestStartScripts.end(); ++itr) + for (ScriptMapMap::const_iterator itr = sQuestStartScripts.begin(); itr != sQuestStartScripts.end(); ++itr) { if(!GetQuestTemplate(itr->first)) sLog.outErrorDb("Table `quest_start_scripts` has not existing quest (Id: %u) as script id",itr->first); @@ -4522,7 +4522,7 @@ void ObjectMgr::LoadSpellScripts() LoadScripts(sSpellScripts, "spell_scripts"); // check ids - for(ScriptMapMap::const_iterator itr = sSpellScripts.begin(); itr != sSpellScripts.end(); ++itr) + for (ScriptMapMap::const_iterator itr = sSpellScripts.begin(); itr != sSpellScripts.end(); ++itr) { SpellEntry const* spellInfo = sSpellStore.LookupEntry(itr->first); @@ -4534,7 +4534,7 @@ void ObjectMgr::LoadSpellScripts() //check for correct spellEffect bool found = false; - for(uint8 i=0; i<3; ++i) + for (uint8 i=0; i<3; ++i) { // skip empty effects if( !spellInfo->Effect[i] ) @@ -4558,7 +4558,7 @@ void ObjectMgr::LoadEventScripts() std::set<uint32> evt_scripts; // Load all possible script entries from gameobjects - for(uint32 i = 1; i < sGOStorage.MaxEntry; ++i) + for (uint32 i = 1; i < sGOStorage.MaxEntry; ++i) { GameObjectInfo const * goInfo = sGOStorage.LookupEntry<GameObjectInfo>(i); if (goInfo) @@ -4582,12 +4582,12 @@ void ObjectMgr::LoadEventScripts() } } // Load all possible script entries from spells - for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) { SpellEntry const * spell = sSpellStore.LookupEntry(i); if (spell) { - for(uint8 j=0; j<3; ++j) + for (uint8 j=0; j<3; ++j) { if( spell->Effect[j] == SPELL_EFFECT_SEND_EVENT ) { @@ -4598,7 +4598,7 @@ void ObjectMgr::LoadEventScripts() } } // Then check if all scripts are in above list of possible script entries - for(ScriptMapMap::const_iterator itr = sEventScripts.begin(); itr != sEventScripts.end(); ++itr) + for (ScriptMapMap::const_iterator itr = sEventScripts.begin(); itr != sEventScripts.end(); ++itr) { std::set<uint32>::const_iterator itr2 = evt_scripts.find(itr->first); if (itr2 == evt_scripts.end()) @@ -4612,7 +4612,7 @@ void ObjectMgr::LoadWaypointScripts() { LoadScripts(sWaypointScripts, "waypoint_scripts"); - for(ScriptMapMap::const_iterator itr = sWaypointScripts.begin(); itr != sWaypointScripts.end(); ++itr) + for (ScriptMapMap::const_iterator itr = sWaypointScripts.begin(); itr != sWaypointScripts.end(); ++itr) { QueryResult *query = WorldDatabase.PQuery("SELECT * FROM waypoint_scripts WHERE id = %u", itr->first); if(!query || !query->GetRowCount()) @@ -4665,7 +4665,7 @@ void ObjectMgr::LoadPageTexts() sLog.outString( ">> Loaded %u page texts", sPageTextStore.RecordCount ); sLog.outString(); - for(uint32 i = 1; i < sPageTextStore.MaxEntry; ++i) + for (uint32 i = 1; i < sPageTextStore.MaxEntry; ++i) { // check data correctness PageText const* page = sPageTextStore.LookupEntry<PageText>(i); @@ -4680,7 +4680,7 @@ void ObjectMgr::LoadPageTexts() // detect circular reference std::set<uint32> checkedPages; - for(PageText const* pageItr = page; pageItr; pageItr = sPageTextStore.LookupEntry<PageText>(pageItr->Next_Page)) + for (PageText const* pageItr = page; pageItr; pageItr = sPageTextStore.LookupEntry<PageText>(pageItr->Next_Page)) { if(!pageItr->Next_Page) break; @@ -4689,7 +4689,7 @@ void ObjectMgr::LoadPageTexts() { std::ostringstream ss; ss<< "The text page(s) "; - for (std::set<uint32>::iterator itr= checkedPages.begin();itr!=checkedPages.end(); ++itr) + for (std::set<uint32>::iterator itr= checkedPages.begin(); itr!=checkedPages.end(); ++itr) ss << *itr << " "; ss << "create(s) a circular reference, which can cause the server to freeze. Changing Next_Page of page " << pageItr->Page_ID <<" to 0"; @@ -4729,7 +4729,7 @@ void ObjectMgr::LoadPageTextLocales() PageTextLocale& data = mPageTextLocaleMap[entry]; - for(uint8 i = 1; i < MAX_LOCALE; ++i) + for (uint8 i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[i].GetCppString(); if(str.empty()) @@ -4767,7 +4767,7 @@ void ObjectMgr::LoadInstanceTemplate() SQLInstanceLoader loader; loader.Load(sInstanceTemplate); - for(uint32 i = 0; i < sInstanceTemplate.MaxEntry; i++) + for (uint32 i = 0; i < sInstanceTemplate.MaxEntry; i++) { InstanceTemplate* temp = (InstanceTemplate*)GetInstanceTemplate(i); if(!temp) continue; @@ -4860,7 +4860,7 @@ void ObjectMgr::LoadGossipText() gText.Options[i].Language = fields[cic++].GetUInt32(); gText.Options[i].Probability = fields[cic++].GetFloat(); - for(uint8 j=0; j < 3; ++j) + for (uint8 j=0; j < 3; ++j) { gText.Options[i].Emotes[j]._Delay = fields[cic++].GetUInt32(); gText.Options[i].Emotes[j]._Emote = fields[cic++].GetUInt32(); @@ -4910,9 +4910,9 @@ void ObjectMgr::LoadNpcTextLocales() NpcTextLocale& data = mNpcTextLocaleMap[entry]; - for(uint8 i=1; i<MAX_LOCALE; ++i) + for (uint8 i=1; i<MAX_LOCALE; ++i) { - for(uint8 j=0; j<8; ++j) + for (uint8 j=0; j<8; ++j) { std::string str0 = fields[1+8*2*(i-1)+2*j].GetCppString(); if(!str0.empty()) @@ -5026,7 +5026,7 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) if (m->messageType != MAIL_NORMAL || (m->checked & (MAIL_CHECK_MASK_AUCTION | MAIL_CHECK_MASK_COD_PAYMENT | MAIL_CHECK_MASK_RETURNED))) { // mail open and then not returned - for(std::vector<MailItemInfo>::iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2) + for (std::vector<MailItemInfo>::iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2) CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", itr2->item_guid); } else @@ -5213,7 +5213,7 @@ uint32 ObjectMgr::GetNearestTaxiNode( float x, float y, float z, uint32 mapid, u float dist; uint32 id = 0; - for(uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i) { TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i); if(!node || node->map_id != mapid || !node->MountCreatureID[team == ALLIANCE ? 1 : 0] && node->MountCreatureID[0] != 32981) // dk flight @@ -5321,7 +5321,7 @@ void ObjectMgr::GetTaxiPathNodes( uint32 path, Path &pathnodes, std::vector<uint pathnodes.Resize(nodeList.size()); mapIds.resize(nodeList.size()); - for(size_t i = 0; i < nodeList.size(); ++i) + for (size_t i = 0; i < nodeList.size(); ++i) { pathnodes[ i ].x = nodeList[i].x; pathnodes[ i ].y = nodeList[i].y; @@ -5340,7 +5340,7 @@ void ObjectMgr::GetTransportPathNodes( uint32 path, TransportPath &pathnodes ) pathnodes.Resize(nodeList.size()); - for(size_t i = 0; i < nodeList.size(); ++i) + for (size_t i = 0; i < nodeList.size(); ++i) { pathnodes[ i ].mapid = nodeList[i].mapid; pathnodes[ i ].x = nodeList[i].x; @@ -5456,7 +5456,7 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float MapEntry const* mapEntry = sMapStore.LookupEntry(MapId); - for(GraveYardMap::const_iterator itr = graveLow; itr != graveUp; ++itr) + for (GraveYardMap::const_iterator itr = graveLow; itr != graveUp; ++itr) { GraveYardData const& data = itr->second; @@ -5539,7 +5539,7 @@ GraveYardData const* ObjectMgr::FindGraveYardData(uint32 id, uint32 zoneId) GraveYardMap::const_iterator graveLow = mGraveYardMap.lower_bound(zoneId); GraveYardMap::const_iterator graveUp = mGraveYardMap.upper_bound(zoneId); - for(GraveYardMap::const_iterator itr = graveLow; itr != graveUp; ++itr) + for (GraveYardMap::const_iterator itr = graveLow; itr != graveUp; ++itr) { if(itr->second.safeLocId==id) return &itr->second; @@ -5584,7 +5584,7 @@ void ObjectMgr::RemoveGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool GraveYardMap::iterator itr; - for(itr = graveLow; itr != graveUp; ++itr) + for (itr = graveLow; itr != graveUp; ++itr) { GraveYardData & data = itr->second; @@ -5617,7 +5617,6 @@ void ObjectMgr::RemoveGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool return; } - void ObjectMgr::LoadAreaTriggerTeleports() { mAreaTriggers.clear(); // need for reload case @@ -6100,7 +6099,7 @@ void ObjectMgr::LoadGameObjectLocales() GameObjectLocale& data = mGameObjectLocaleMap[entry]; - for(uint8 i = 1; i < MAX_LOCALE; ++i) + for (uint8 i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[i].GetCppString(); if(!str.empty()) @@ -6116,7 +6115,7 @@ void ObjectMgr::LoadGameObjectLocales() } } - for(uint8 i = 1; i < MAX_LOCALE; ++i) + for (uint8 i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[i+(MAX_LOCALE-1)].GetCppString(); if(!str.empty()) @@ -6220,7 +6219,7 @@ void ObjectMgr::LoadGameobjectInfo() loader.Load(sGOStorage); // some checks - for(uint32 id = 1; id < sGOStorage.MaxEntry; id++) + for (uint32 id = 1; id < sGOStorage.MaxEntry; id++) { GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(id); if (!goInfo) @@ -6826,7 +6825,7 @@ void ObjectMgr::LoadWeatherZoneChances() WeatherZoneChances& wzc = mWeatherZoneMap[zone_id]; - for(uint8 season = 0; season < WEATHER_SEASONS; ++season) + for (uint8 season = 0; season < WEATHER_SEASONS; ++season) { wzc.data[season].rainChance = fields[season * (MAX_WEATHER_TYPE-1) + 1].GetUInt32(); wzc.data[season].snowChance = fields[season * (MAX_WEATHER_TYPE-1) + 2].GetUInt32(); @@ -6890,7 +6889,7 @@ void ObjectMgr::DeleteRespawnTimeForInstance(uint32 instance) { RespawnTimes::iterator next; - for(RespawnTimes::iterator itr = mGORespawnTimes.begin(); itr != mGORespawnTimes.end(); itr = next) + for (RespawnTimes::iterator itr = mGORespawnTimes.begin(); itr != mGORespawnTimes.end(); itr = next) { next = itr; ++next; @@ -6899,7 +6898,7 @@ void ObjectMgr::DeleteRespawnTimeForInstance(uint32 instance) mGORespawnTimes.erase(itr); } - for(RespawnTimes::iterator itr = mCreatureRespawnTimes.begin(); itr != mCreatureRespawnTimes.end(); itr = next) + for (RespawnTimes::iterator itr = mCreatureRespawnTimes.begin(); itr != mCreatureRespawnTimes.end(); itr = next) { next = itr; ++next; @@ -6986,7 +6985,7 @@ void ObjectMgr::LoadGameobjectQuestRelations() { LoadQuestRelationsHelper(mGOQuestRelations,"gameobject_questrelation"); - for(QuestRelations::iterator itr = mGOQuestRelations.begin(); itr != mGOQuestRelations.end(); ++itr) + for (QuestRelations::iterator itr = mGOQuestRelations.begin(); itr != mGOQuestRelations.end(); ++itr) { GameObjectInfo const* goInfo = GetGameObjectInfo(itr->first); if(!goInfo) @@ -7000,7 +6999,7 @@ void ObjectMgr::LoadGameobjectInvolvedRelations() { LoadQuestRelationsHelper(mGOQuestInvolvedRelations,"gameobject_involvedrelation"); - for(QuestRelations::iterator itr = mGOQuestInvolvedRelations.begin(); itr != mGOQuestInvolvedRelations.end(); ++itr) + for (QuestRelations::iterator itr = mGOQuestInvolvedRelations.begin(); itr != mGOQuestInvolvedRelations.end(); ++itr) { GameObjectInfo const* goInfo = GetGameObjectInfo(itr->first); if(!goInfo) @@ -7014,7 +7013,7 @@ void ObjectMgr::LoadCreatureQuestRelations() { LoadQuestRelationsHelper(mCreatureQuestRelations,"creature_questrelation"); - for(QuestRelations::iterator itr = mCreatureQuestRelations.begin(); itr != mCreatureQuestRelations.end(); ++itr) + for (QuestRelations::iterator itr = mCreatureQuestRelations.begin(); itr != mCreatureQuestRelations.end(); ++itr) { CreatureInfo const* cInfo = GetCreatureTemplate(itr->first); if(!cInfo) @@ -7028,7 +7027,7 @@ void ObjectMgr::LoadCreatureInvolvedRelations() { LoadQuestRelationsHelper(mCreatureQuestInvolvedRelations,"creature_involvedrelation"); - for(QuestRelations::iterator itr = mCreatureQuestInvolvedRelations.begin(); itr != mCreatureQuestInvolvedRelations.end(); ++itr) + for (QuestRelations::iterator itr = mCreatureQuestInvolvedRelations.begin(); itr != mCreatureQuestInvolvedRelations.end(); ++itr) { CreatureInfo const* cInfo = GetCreatureTemplate(itr->first); if(!cInfo) @@ -7231,7 +7230,7 @@ int ObjectMgr::GetIndexForLocale( LocaleConstant loc ) if(loc==LOCALE_enUS) return -1; - for(size_t i=0;i < m_LocalForIndex.size(); ++i) + for (size_t i=0; i < m_LocalForIndex.size(); ++i) if(m_LocalForIndex[i]==loc) return i; @@ -7251,7 +7250,7 @@ int ObjectMgr::GetOrNewIndexForLocale( LocaleConstant loc ) if(loc==LOCALE_enUS) return -1; - for(size_t i=0;i < m_LocalForIndex.size(); ++i) + for (size_t i=0; i < m_LocalForIndex.size(); ++i) if(m_LocalForIndex[i]==loc) return i; @@ -7276,7 +7275,7 @@ void ObjectMgr::LoadGameObjectForQuests() uint32 count = 0; // collect GO entries for GO that must activated - for(uint32 go_entry = 1; go_entry < sGOStorage.MaxEntry; ++go_entry) + for (uint32 go_entry = 1; go_entry < sGOStorage.MaxEntry; ++go_entry) { bar.step(); GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(go_entry); @@ -7344,7 +7343,7 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi } // cleanup affected map part for reloading case - for(TrinityStringLocaleMap::iterator itr = mTrinityStringLocaleMap.begin(); itr != mTrinityStringLocaleMap.end();) + for (TrinityStringLocaleMap::iterator itr = mTrinityStringLocaleMap.begin(); itr != mTrinityStringLocaleMap.end(); ) { if (itr->first >= start_value && itr->first < end_value) mTrinityStringLocaleMap.erase(itr++); @@ -7404,7 +7403,7 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi // 0 -> default, idx in to idx+1 data.Content[0] = fields[1].GetCppString(); - for(uint8 i = 1; i < MAX_LOCALE; ++i) + for (uint8 i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[i+1].GetCppString(); if (!str.empty()) @@ -7570,7 +7569,7 @@ uint16 ObjectMgr::GetConditionId( ConditionType condition, uint32 value1, uint32 bool ObjectMgr::CheckDeclinedNames( std::wstring mainpart, DeclinedName const& names ) { - for(uint8 i =0; i < MAX_DECLINED_NAME_CASES; ++i) + for (uint8 i =0; i < MAX_DECLINED_NAME_CASES; ++i) { std::wstring wname; if(!Utf8toWStr(names.name[i],wname)) @@ -7627,7 +7626,7 @@ bool PlayerCondition::Meets(Player const * player) const case CONDITION_AD_COMMISSION_AURA: { Unit::AuraMap const& auras = player->GetAuras(); - for(Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) + for (Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) if((itr->second->GetSpellProto()->Attributes & 0x1000010) && itr->second->GetSpellProto()->SpellVisual[0]==3580) return true; return false; @@ -7901,7 +7900,7 @@ GameTele const* ObjectMgr::GetGameTele(const std::string& name) const // Alternative first GameTele what contains wnameLow as substring in case no GameTele location found const GameTele* alt = NULL; - for(GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr) + for (GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr) { if(itr->second.wnameLow == wname) return &itr->second; @@ -7916,7 +7915,7 @@ bool ObjectMgr::AddGameTele(GameTele& tele) { // find max id uint32 new_id = 0; - for(GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr) + for (GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr) if(itr->first > new_id) new_id = itr->first; @@ -7944,7 +7943,7 @@ bool ObjectMgr::DeleteGameTele(const std::string& name) // converting string that we try to find to lower case wstrToLower( wname ); - for(GameTeleMap::iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr) + for (GameTeleMap::iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr) { if(itr->second.wnameLow == wname) { @@ -8048,7 +8047,7 @@ void ObjectMgr::LoadTrainerSpell() // calculate learned spell for profession case when stored cast-spell trainerSpell.learnedSpell = spell; - for(uint8 i = 0; i <3; ++i) + for (uint8 i = 0; i <3; ++i) { if(spellinfo->Effect[i] != SPELL_EFFECT_LEARN_SPELL) continue; @@ -8388,9 +8387,9 @@ uint32 ObjectMgr::GetScriptId(const char *name) void ObjectMgr::CheckScripts(ScriptMapMap const& scripts,std::set<int32>& ids) { - for(ScriptMapMap::const_iterator itrMM = scripts.begin(); itrMM != scripts.end(); ++itrMM) + for (ScriptMapMap::const_iterator itrMM = scripts.begin(); itrMM != scripts.end(); ++itrMM) { - for(ScriptMap::const_iterator itrM = itrMM->second.begin(); itrM != itrMM->second.end(); ++itrM) + for (ScriptMap::const_iterator itrM = itrMM->second.begin(); itrM != itrMM->second.end(); ++itrM) { switch(itrM->second.command) { @@ -8413,7 +8412,7 @@ void ObjectMgr::LoadDbScriptStrings() std::set<int32> ids; - for(int32 i = MIN_DB_SCRIPT_STRING_ID; i < MAX_DB_SCRIPT_STRING_ID; ++i) + for (int32 i = MIN_DB_SCRIPT_STRING_ID; i < MAX_DB_SCRIPT_STRING_ID; ++i) if(GetTrinityStringLocale(i)) ids.insert(i); @@ -8425,7 +8424,7 @@ void ObjectMgr::LoadDbScriptStrings() CheckScripts(sWaypointScripts,ids); - for(std::set<int32>::const_iterator itr = ids.begin(); itr != ids.end(); ++itr) + for (std::set<int32>::const_iterator itr = ids.begin(); itr != ids.end(); ++itr) sLog.outErrorDb( "Table `db_script_string` has unused string id %u", *itr); } @@ -8522,9 +8521,9 @@ uint64 ObjectMgr::GenerateGMTicketId() void ObjectMgr::LoadGMTickets() { m_GMTicketList.clear(); - + QueryResult *result = CharacterDatabase.Query( "SELECT guid, playerGuid, name, message, createtime, map, posX, posY, posZ, timestamp, closed, assignedto, comment FROM gm_tickets" ); - + if(!result) { sLog.outString(" \n>> GM Tickets table is empty, no tickets were loaded.\n" ); @@ -8559,7 +8558,7 @@ void ObjectMgr::LoadGMTickets() } while( result->NextRow() ); result = CharacterDatabase.PQuery("SELECT MAX(guid) from gm_tickets"); - m_GMticketid = (*result)[0].GetUInt64(); + m_GMticketid = (*result)[0].GetUInt64(); sLog.outString(">>> %u GM Tickets loaded from the database.", count); delete result; @@ -8569,13 +8568,13 @@ void ObjectMgr::AddOrUpdateGMTicket(GM_Ticket &ticket, bool create) { if(create) m_GMTicketList.push_back(&ticket); - - _AddOrUpdateGMTicket(ticket); + + _AddOrUpdateGMTicket(ticket); } void ObjectMgr::_AddOrUpdateGMTicket(GM_Ticket &ticket) { - std::string msg(ticket.message), name(ticket.name), comment(ticket.comment); + std::string msg(ticket.message), name(ticket.name), comment(ticket.comment); CharacterDatabase.escape_string(msg); CharacterDatabase.escape_string(name); CharacterDatabase.escape_string(comment); @@ -8601,7 +8600,7 @@ void ObjectMgr::_AddOrUpdateGMTicket(GM_Ticket &ticket) void ObjectMgr::RemoveGMTicket(GM_Ticket *ticket, int64 source, bool permanently) { - for(GmTicketList::iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i) + for (GmTicketList::iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i) if((*i)->guid == ticket->guid) { if(permanently) diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index b0e1bce8367..ca47ff52ac1 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -140,7 +140,6 @@ typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapOb typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes; - // mangos string ranges #define MIN_TRINITY_STRING_ID 1 // 'mangos_string' #define MAX_TRINITY_STRING_ID 2000000000 @@ -173,7 +172,7 @@ typedef std::pair<ItemRequiredTargetMap::const_iterator, ItemRequiredTargetMap:: struct PetLevelInfo { - PetLevelInfo() : health(0), mana(0) { for(uint8 i=0; i < MAX_STATS; ++i ) stats[i] = 0; } + PetLevelInfo() : health(0), mana(0) { for (uint8 i=0; i < MAX_STATS; ++i ) stats[i] = 0; } uint16 stats[MAX_STATS]; uint16 health; @@ -847,24 +846,24 @@ class ObjectMgr { return ItemRequiredTargetMapBounds(m_ItemRequiredTarget.lower_bound(uiItemEntry),m_ItemRequiredTarget.upper_bound(uiItemEntry)); } - + GM_Ticket *GetGMTicket(uint64 ticketGuid) { - for(GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i) + for (GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i) if((*i) && (*i)->guid == ticketGuid) return (*i); - + return NULL; } GM_Ticket *GetGMTicketByPlayer(uint64 playerGuid) { - for(GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i) + for (GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i) if((*i) && (*i)->playerGuid == playerGuid && (*i)->closed == 0) return (*i); - - return NULL; + + return NULL; } - + void AddOrUpdateGMTicket(GM_Ticket &ticket, bool create = false); void _AddOrUpdateGMTicket(GM_Ticket &ticket); void RemoveGMTicket(uint64 ticketGuid, int64 source = -1, bool permanently = false); diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp index 75b794c0452..ada95b8c683 100644 --- a/src/game/OutdoorPvP.cpp +++ b/src/game/OutdoorPvP.cpp @@ -212,16 +212,16 @@ bool OPvPCapturePoint::DelCapturePoint() void OPvPCapturePoint::DeleteSpawns() { - for(std::map<uint32,uint64>::iterator i = m_Objects.begin(); i != m_Objects.end(); ++i) + for (std::map<uint32,uint64>::iterator i = m_Objects.begin(); i != m_Objects.end(); ++i) DelObject(i->first); - for(std::map<uint32,uint64>::iterator i = m_Creatures.begin(); i != m_Creatures.end(); ++i) + for (std::map<uint32,uint64>::iterator i = m_Creatures.begin(); i != m_Creatures.end(); ++i) DelCreature(i->first); DelCapturePoint(); } void OutdoorPvP::DeleteSpawns() { - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) itr->second->DeleteSpawns(); } @@ -242,7 +242,7 @@ void OutdoorPvP::HandlePlayerEnterZone(Player * plr, uint32 zone) void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 zone) { // inform the objectives of the leaving - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) itr->second->HandlePlayerLeave(plr); // remove the world state information from the player (we can't keep everyone up to date, so leave out those who are not in the concerning zones) if(!plr->GetSession()->PlayerLogout()) @@ -254,7 +254,7 @@ void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 zone) bool OutdoorPvP::Update(uint32 diff) { bool objective_changed = false; - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) { if(itr->second->Update(diff)) objective_changed = true; @@ -269,9 +269,9 @@ bool OPvPCapturePoint::Update(uint32 diff) float radius = m_capturePoint->GetGOInfo()->capturePoint.radius; - for(uint32 team = 0; team < 2; ++team) + for (uint32 team = 0; team < 2; ++team) { - for(PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end();) + for (PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end(); ) { Player *player = *itr; ++itr; @@ -285,7 +285,7 @@ bool OPvPCapturePoint::Update(uint32 diff) Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(m_capturePoint, players, checker); m_capturePoint->VisitNearbyWorldObject(radius, searcher); - for(std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr) + for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr) { if((*itr)->IsOutdoorPvPActive()) { @@ -384,17 +384,17 @@ bool OPvPCapturePoint::Update(uint32 diff) void OutdoorPvP::SendUpdateWorldState(uint32 field, uint32 value) { if(m_sendUpdate) - for(int i = 0; i < 2; ++i) - for(PlayerSet::iterator itr = m_players[i].begin(); itr != m_players[i].end(); ++itr) + for (int i = 0; i < 2; ++i) + for (PlayerSet::iterator itr = m_players[i].begin(); itr != m_players[i].end(); ++itr) (*itr)->SendUpdateWorldState(field, value); } void OPvPCapturePoint::SendUpdateWorldState(uint32 field, uint32 value) { - for(uint32 team = 0; team < 2; ++team) + for (uint32 team = 0; team < 2; ++team) { // send to all players present in the area - for(PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end(); ++itr) + for (PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end(); ++itr) { (*itr)->SendUpdateWorldState(field,value); } @@ -417,7 +417,7 @@ void OPvPCapturePoint::SendObjectiveComplete(uint32 id,uint64 guid) } // send to all players present in the area - for(PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end(); ++itr) + for (PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end(); ++itr) (*itr)->KilledMonsterCredit(id, guid); } @@ -425,7 +425,7 @@ void OutdoorPvP::HandleKill(Player *killer, Unit * killed) { if(Group * pGroup = killer->GetGroup()) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player *pGroupGuy = itr->getSource(); @@ -456,7 +456,7 @@ void OutdoorPvP::HandleKill(Player *killer, Unit * killed) bool OutdoorPvP::IsInsideObjective(Player *plr) const { - for(OPvPCapturePointMap::const_iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::const_iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if(itr->second->IsInsideObjective(plr)) return true; @@ -470,7 +470,7 @@ bool OPvPCapturePoint::IsInsideObjective(Player *plr) const bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) { - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if(itr->second->HandleCustomSpell(plr,spellId,go)) return true; @@ -486,7 +486,7 @@ bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 spellId, GameObject bool OutdoorPvP::HandleOpenGo(Player *plr, uint64 guid) { - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if(itr->second->HandleOpenGo(plr,guid) >= 0) return true; @@ -495,7 +495,7 @@ bool OutdoorPvP::HandleOpenGo(Player *plr, uint64 guid) bool OutdoorPvP::HandleGossipOption(Player * plr, uint64 guid, uint32 id) { - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if(itr->second->HandleGossipOption(plr, guid, id)) return true; @@ -504,7 +504,7 @@ bool OutdoorPvP::HandleGossipOption(Player * plr, uint64 guid, uint32 id) bool OutdoorPvP::CanTalkTo(Player * plr, Creature * c, GossipOption &gso) { - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if(itr->second->CanTalkTo(plr, c, gso)) return true; @@ -513,7 +513,7 @@ bool OutdoorPvP::CanTalkTo(Player * plr, Creature * c, GossipOption &gso) bool OutdoorPvP::HandleDropFlag(Player * plr, uint32 id) { - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) if(itr->second->HandleDropFlag(plr, id)) return true; @@ -553,8 +553,8 @@ bool OutdoorPvP::HandleAreaTrigger(Player *plr, uint32 trigger) void OutdoorPvP::BroadcastPacket(WorldPacket &data) const { // This is faster than sWorld.SendZoneMessage - for(uint32 team = 0; team < 2; ++team) - for(PlayerSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) + for (uint32 team = 0; team < 2; ++team) + for (PlayerSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) (*itr)->GetSession()->SendPacket(&data); } @@ -571,10 +571,10 @@ bool OutdoorPvP::HasPlayer(Player *plr) const void OutdoorPvP::TeamCastSpell(TeamId team, int32 spellId) { if(spellId > 0) - for(PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) + for (PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) (*itr)->CastSpell(*itr, (uint32)spellId, true); else - for(PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) + for (PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) (*itr)->RemoveAura((uint32)-spellId); // by stack? } diff --git a/src/game/OutdoorPvPEP.cpp b/src/game/OutdoorPvPEP.cpp index c108c733f04..44b81dd6719 100644 --- a/src/game/OutdoorPvPEP.cpp +++ b/src/game/OutdoorPvPEP.cpp @@ -101,7 +101,6 @@ void OPvPCapturePointEP_EWT::ChangeState() flag2->SendUpdateObjectToAllExcept(NULL); } - UpdateTowerState(); // complete quest objective @@ -173,7 +172,7 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team) else ct=EP_EWT_Summons_H; - for(int i = 0; i < EP_EWT_NUM_CREATURES; ++i) + for (int i = 0; i < EP_EWT_NUM_CREATURES; ++i) { DelCreature(i); AddCreature(i,ct[i].entry,ct[i].teamval,ct[i].map,ct[i].x,ct[i].y,ct[i].z,ct[i].o,1000000); @@ -708,7 +707,7 @@ OutdoorPvPEP::OutdoorPvPEP() bool OutdoorPvPEP::SetupOutdoorPvP() { - for(int i = 0; i < EPBuffZonesNum; ++i) + for (int i = 0; i < EPBuffZonesNum; ++i) RegisterZone(EPBuffZones[i]); AddCapturePoint(new OPvPCapturePointEP_EWT(this)); @@ -724,7 +723,7 @@ bool OutdoorPvPEP::Update(uint32 diff) { m_AllianceTowersControlled = 0; m_HordeTowersControlled = 0; - for(int i = 0; i < EP_TOWER_NUM; ++i) + for (int i = 0; i < EP_TOWER_NUM; ++i) { if(EP_Controls[i] == ALLIANCE) ++m_AllianceTowersControlled; @@ -760,12 +759,12 @@ void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone) // remove buffs if(plr->GetTeam() == ALLIANCE) { - for(int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]); } else { - for(int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]); } OutdoorPvP::HandlePlayerLeaveZone(plr, zone); @@ -773,21 +772,21 @@ void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone) void OutdoorPvPEP::BuffTeams() { - for(PlayerSet::iterator itr = m_players[0].begin(); itr != m_players[0].end(); ++itr) + for (PlayerSet::iterator itr = m_players[0].begin(); itr != m_players[0].end(); ++itr) { Player * plr = *itr; { - for(int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]); if(m_AllianceTowersControlled && m_AllianceTowersControlled < 5) plr->CastSpell(plr,EP_AllianceBuffs[m_AllianceTowersControlled-1],true); } } - for(PlayerSet::iterator itr = m_players[1].begin(); itr != m_players[1].end(); ++itr) + for (PlayerSet::iterator itr = m_players[1].begin(); itr != m_players[1].end(); ++itr) { Player * plr = *itr; { - for(int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]); if(m_HordeTowersControlled && m_HordeTowersControlled < 5) plr->CastSpell(plr,EP_HordeBuffs[m_HordeTowersControlled-1],true); @@ -802,7 +801,7 @@ void OutdoorPvPEP::FillInitialWorldStates(WorldPacket & data) data << EP_UI_TOWER_SLIDER_DISPLAY << uint32(0); data << EP_UI_TOWER_SLIDER_POS << uint32(50); data << EP_UI_TOWER_SLIDER_N << uint32(100); - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) { itr->second->FillInitialWorldStates(data); } diff --git a/src/game/OutdoorPvPHP.cpp b/src/game/OutdoorPvPHP.cpp index a25cb86dc21..bdfd6fbd640 100644 --- a/src/game/OutdoorPvPHP.cpp +++ b/src/game/OutdoorPvPHP.cpp @@ -69,7 +69,7 @@ bool OutdoorPvPHP::SetupOutdoorPvP() m_AllianceTowersControlled = 0; m_HordeTowersControlled = 0; // add the zones affected by the pvp buff - for(int i = 0; i < OutdoorPvPHPBuffZonesNum; ++i) + for (int i = 0; i < OutdoorPvPHPBuffZonesNum; ++i) RegisterZone(OutdoorPvPHPBuffZones[i]); AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_BROKEN_HILL)); @@ -140,7 +140,7 @@ void OutdoorPvPHP::SendRemoveWorldStates(Player *plr) plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N,0); plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS,0); plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY,0); - for(int i = 0; i < HP_TOWER_NUM; ++i) + for (int i = 0; i < HP_TOWER_NUM; ++i) { plr->SendUpdateWorldState(HP_MAP_N[i],0); plr->SendUpdateWorldState(HP_MAP_A[i],0); @@ -157,7 +157,7 @@ void OutdoorPvPHP::FillInitialWorldStates(WorldPacket &data) data << uint32(HP_UI_TOWER_SLIDER_DISPLAY) << uint32(0); data << uint32(HP_UI_TOWER_SLIDER_POS) << uint32(50); data << uint32(HP_UI_TOWER_SLIDER_N) << uint32(100); - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) { itr->second->FillInitialWorldStates(data); } diff --git a/src/game/OutdoorPvPMgr.cpp b/src/game/OutdoorPvPMgr.cpp index 8a59b438d5b..bf94d686f88 100644 --- a/src/game/OutdoorPvPMgr.cpp +++ b/src/game/OutdoorPvPMgr.cpp @@ -38,7 +38,7 @@ OutdoorPvPMgr::OutdoorPvPMgr() OutdoorPvPMgr::~OutdoorPvPMgr() { //sLog.outDebug("Deleting OutdoorPvPMgr"); - for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) + for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { (*itr)->DeleteSpawns(); } @@ -60,7 +60,6 @@ void OutdoorPvPMgr::InitOutdoorPvP() sLog.outDebug("OutdoorPvP : HP successfully initiated."); } - pOP = new OutdoorPvPNA; // respawn, init variables if(!pOP->SetupOutdoorPvP()) @@ -74,7 +73,6 @@ void OutdoorPvPMgr::InitOutdoorPvP() sLog.outDebug("OutdoorPvP : NA successfully initiated."); } - pOP = new OutdoorPvPTF; // respawn, init variables if(!pOP->SetupOutdoorPvP()) @@ -146,7 +144,6 @@ void OutdoorPvPMgr::AddZone(uint32 zoneid, OutdoorPvP *handle) m_OutdoorPvPMap[zoneid] = handle; } - void OutdoorPvPMgr::HandlePlayerEnterZone(Player *plr, uint32 zoneid) { OutdoorPvPMap::iterator itr = m_OutdoorPvPMap.find(zoneid); @@ -190,7 +187,7 @@ void OutdoorPvPMgr::Update(uint32 diff) m_UpdateTimer += diff; if(m_UpdateTimer > OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL) { - for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) + for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) (*itr)->Update(m_UpdateTimer); m_UpdateTimer = 0; } @@ -198,7 +195,7 @@ void OutdoorPvPMgr::Update(uint32 diff) bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) { - for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) + for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { if((*itr)->HandleCustomSpell(plr,spellId,go)) return true; @@ -217,7 +214,7 @@ ZoneScript * OutdoorPvPMgr::GetZoneScript(uint32 zoneId) bool OutdoorPvPMgr::HandleOpenGo(Player *plr, uint64 guid) { - for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) + for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { if((*itr)->HandleOpenGo(plr,guid)) return true; @@ -227,7 +224,7 @@ bool OutdoorPvPMgr::HandleOpenGo(Player *plr, uint64 guid) void OutdoorPvPMgr::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid) { - for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) + for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { if((*itr)->HandleGossipOption(plr,guid,gossipid)) return; @@ -236,7 +233,7 @@ void OutdoorPvPMgr::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid bool OutdoorPvPMgr::CanTalkTo(Player * plr, Creature * c, GossipOption & gso) { - for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) + for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { if((*itr)->CanTalkTo(plr,c,gso)) return true; @@ -246,7 +243,7 @@ bool OutdoorPvPMgr::CanTalkTo(Player * plr, Creature * c, GossipOption & gso) void OutdoorPvPMgr::HandleDropFlag(Player *plr, uint32 spellId) { - for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) + for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { if((*itr)->HandleDropFlag(plr,spellId)) return; diff --git a/src/game/OutdoorPvPMgr.h b/src/game/OutdoorPvPMgr.h index d3b1af92e97..6ecf129165a 100644 --- a/src/game/OutdoorPvPMgr.h +++ b/src/game/OutdoorPvPMgr.h @@ -51,7 +51,7 @@ public: bool HandleCustomSpell(Player * plr, uint32 spellId, GameObject* go); // handle custom go if registered bool HandleOpenGo(Player * plr, uint64 guid); - + ZoneScript * GetZoneScript(uint32 zoneId); void AddZone(uint32 zoneid, OutdoorPvP * handle); diff --git a/src/game/OutdoorPvPNA.cpp b/src/game/OutdoorPvPNA.cpp index 035d6ce9405..84cecd55f31 100644 --- a/src/game/OutdoorPvPNA.cpp +++ b/src/game/OutdoorPvPNA.cpp @@ -44,7 +44,7 @@ void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit * killed) uint32 OPvPCapturePointNA::GetAliveGuardsCount() { uint32 cnt = 0; - for(std::map<uint32, uint64>::iterator itr = m_Creatures.begin(); itr != m_Creatures.end(); ++itr) + for (std::map<uint32, uint64>::iterator itr = m_Creatures.begin(); itr != m_Creatures.end(); ++itr) { switch(itr->first) { @@ -92,13 +92,13 @@ void OPvPCapturePointNA::SpawnNPCsForTeam(uint32 team) creatures=HordeControlNPCs; else return; - for(int i = 0; i < NA_CONTROL_NPC_NUM; ++i) + for (int i = 0; i < NA_CONTROL_NPC_NUM; ++i) AddCreature(i,creatures[i].entry,creatures[i].teamval,creatures[i].map,creatures[i].x,creatures[i].y,creatures[i].z,creatures[i].o,1000000); } void OPvPCapturePointNA::DeSpawnNPCs() { - for(int i = 0; i < NA_CONTROL_NPC_NUM; ++i) + for (int i = 0; i < NA_CONTROL_NPC_NUM; ++i) DelCreature(i); } @@ -111,7 +111,7 @@ void OPvPCapturePointNA::SpawnGOsForTeam(uint32 team) gos=HordeControlGOs; else return; - for(int i = 0; i < NA_CONTROL_GO_NUM; ++i) + for (int i = 0; i < NA_CONTROL_GO_NUM; ++i) { if( i == NA_ROOST_S || i == NA_ROOST_W || @@ -128,7 +128,7 @@ void OPvPCapturePointNA::SpawnGOsForTeam(uint32 team) void OPvPCapturePointNA::DeSpawnGOs() { - for(int i = 0; i < NA_CONTROL_GO_NUM; ++i) + for (int i = 0; i < NA_CONTROL_GO_NUM; ++i) { DelObject(i); } diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp index e60888c7e08..8f63fd881dc 100644 --- a/src/game/OutdoorPvPSI.cpp +++ b/src/game/OutdoorPvPSI.cpp @@ -57,7 +57,7 @@ void OutdoorPvPSI::UpdateWorldState() bool OutdoorPvPSI::SetupOutdoorPvP() { - for(int i = 0; i < OutdoorPvPSIBuffZonesNum; ++i) + for (int i = 0; i < OutdoorPvPSIBuffZonesNum; ++i) RegisterZone(OutdoorPvPSIBuffZones[i]); return true; } @@ -162,7 +162,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) delete go; return true; } - + if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY)) { delete go; diff --git a/src/game/OutdoorPvPTF.cpp b/src/game/OutdoorPvPTF.cpp index 5a8483a2c11..c2a9db0d4bd 100644 --- a/src/game/OutdoorPvPTF.cpp +++ b/src/game/OutdoorPvPTF.cpp @@ -60,7 +60,7 @@ void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data) data << TF_UI_LOCKED_DISPLAY_HORDE << uint32(m_IsLocked && (m_HordeTowersControlled > m_AllianceTowersControlled)); data << TF_UI_LOCKED_DISPLAY_ALLIANCE << uint32(m_IsLocked && (m_HordeTowersControlled < m_AllianceTowersControlled)); - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) { itr->second->FillInitialWorldStates(data); } @@ -84,7 +84,7 @@ void OutdoorPvPTF::SendRemoveWorldStates(Player * plr) plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0)); plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0)); - for(int i = 0; i < TF_TOWER_NUM; ++i) + for (int i = 0; i < TF_TOWER_NUM; ++i) { plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n),uint32(0)); plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].h),uint32(0)); @@ -220,7 +220,7 @@ bool OutdoorPvPTF::SetupOutdoorPvP() first_digit = 0; // add the zones affected by the pvp buff - for(int i = 0; i < OutdoorPvPTFBuffZonesNum; ++i) + for (int i = 0; i < OutdoorPvPTFBuffZonesNum; ++i) RegisterZone(OutdoorPvPTFBuffZones[i]); AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NW)); diff --git a/src/game/OutdoorPvPZM.cpp b/src/game/OutdoorPvPZM.cpp index 550dbcccdc8..4f3f0a08a2c 100644 --- a/src/game/OutdoorPvPZM.cpp +++ b/src/game/OutdoorPvPZM.cpp @@ -179,7 +179,7 @@ bool OutdoorPvPZM::SetupOutdoorPvP() m_HordeTowersControlled = 0; // add the zones affected by the pvp buff - for(int i = 0; i < OutdoorPvPZMBuffZonesNum; ++i) + for (int i = 0; i < OutdoorPvPZMBuffZonesNum; ++i) RegisterZone(OutdoorPvPZMBuffZones[i]); AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_WEST)); @@ -391,7 +391,7 @@ bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * plr, uint32 spellId) void OutdoorPvPZM::FillInitialWorldStates(WorldPacket &data) { data << ZM_WORLDSTATE_UNK_1 << uint32(1); - for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) + for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) { itr->second->FillInitialWorldStates(data); } diff --git a/src/game/Path.h b/src/game/Path.h index 2fd6723b01c..b4fa5f9da0c 100644 --- a/src/game/Path.h +++ b/src/game/Path.h @@ -46,7 +46,7 @@ class Path float GetTotalLength(uint32 start, uint32 end) const { float len = 0, xd, yd, zd; - for(unsigned int idx=start+1; idx < end; ++idx) + for (unsigned int idx=start+1; idx < end; ++idx) { xd = i_nodes[ idx ].x - i_nodes[ idx-1 ].x; yd = i_nodes[ idx ].y - i_nodes[ idx-1 ].y; @@ -59,7 +59,7 @@ class Path float GetPassedLength(uint32 curnode, float x, float y, float z) { float len = 0, xd, yd, zd; - for(unsigned int idx=1; idx < curnode; ++idx) + for (unsigned int idx=1; idx < curnode; ++idx) { xd = i_nodes[ idx ].x - i_nodes[ idx-1 ].x; yd = i_nodes[ idx ].y - i_nodes[ idx-1 ].y; diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 47d406f6453..7df9deabc6f 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -339,7 +339,7 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool m_declinedname = new DeclinedName; Field *fields2 = result->Fetch(); - for(uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) { m_declinedname->name[i] = fields2[i].GetCppString(); } @@ -436,7 +436,7 @@ void Pet::SavePetToDB(PetSaveMode mode) << GetPower(POWER_HAPPINESS) << ", '"; // save only spell slots from action bar - for(uint32 i = ACTION_BAR_INDEX_PET_SPELL_START; i < ACTION_BAR_INDEX_PET_SPELL_END; ++i) + for (uint32 i = ACTION_BAR_INDEX_PET_SPELL_START; i < ACTION_BAR_INDEX_PET_SPELL_END; ++i) { ss << uint32(m_charmInfo->GetActionBarEntry(i)->GetType()) << " " << uint32(m_charmInfo->GetActionBarEntry(i)->GetAction()) << " "; @@ -567,7 +567,7 @@ void Pet::Update(uint32 diff) m_regenTimer = 0; break; } - } + } } if(getPetType() != HUNTER_PET) @@ -619,7 +619,7 @@ void Creature::Regenerate(Powers power) // Apply modifiers (if any). AuraEffectList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT); - for(AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i) + for (AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i) if ((*i)->GetMiscValue() == power) addvalue *= ((*i)->GetAmount() + 100) / 100.0f; @@ -669,7 +669,7 @@ bool Pet::CanTakeMoreActiveSpells(uint32 spellid) uint8 x; - for(x = 0; x < activecount; x++) + for (x = 0; x < activecount; x++) { if(chainstart == chainstartstore[x]) break; @@ -872,7 +872,7 @@ bool Guardian::InitStatsForLevel(uint32 petlevel) if(pInfo->armor > 0) SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, float(pInfo->armor)); - for(uint8 stat = 0; stat < MAX_STATS; ++stat) + for (uint8 stat = 0; stat < MAX_STATS; ++stat) SetCreateStat(Stats(stat), float(pInfo->stats[stat])); } else // not exist in DB, use some default fake data @@ -1095,7 +1095,7 @@ void Pet::_SaveSpellCooldowns() time_t curTime = time(NULL); // remove oudated and save active - for(CreatureSpellCooldowns::iterator itr = m_CreatureSpellCooldowns.begin();itr != m_CreatureSpellCooldowns.end();) + for (CreatureSpellCooldowns::iterator itr = m_CreatureSpellCooldowns.begin(); itr != m_CreatureSpellCooldowns.end(); ) { if(itr->second <= curTime) m_CreatureSpellCooldowns.erase(itr++); @@ -1225,7 +1225,7 @@ void Pet::_SaveAuras() CharacterDatabase.PExecute("DELETE FROM pet_aura WHERE guid = '%u'", m_charmInfo->GetPetNumber()); AuraMap const& auras = GetAuras(); - for(AuraMap::const_iterator itr = auras.begin(); itr !=auras.end() ; ++itr) + for (AuraMap::const_iterator itr = auras.begin(); itr !=auras.end() ; ++itr) { if(!itr->second->CanBeSaved()) continue; @@ -1309,7 +1309,7 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel { if(TalentEntry const *talentInfo = sTalentStore.LookupEntry( talentPos->talent_id )) { - for(uint8 i=0; i < MAX_TALENT_RANK; ++i) + for (uint8 i=0; i < MAX_TALENT_RANK; ++i) { // skip learning spell and no rank spell case uint32 rankSpellId = talentInfo->RankID[i]; @@ -1395,7 +1395,7 @@ void Pet::InitLevelupSpellsForLevel() if(PetLevelupSpellSet const *levelupSpells = GetCreatureInfo()->family ? spellmgr.GetPetLevelupSpellList(GetCreatureInfo()->family) : NULL) { // PetLevelupSpellSet ordered by levels, process in reversed order - for(PetLevelupSpellSet::const_reverse_iterator itr = levelupSpells->rbegin(); itr != levelupSpells->rend(); ++itr) + for (PetLevelupSpellSet::const_reverse_iterator itr = levelupSpells->rbegin(); itr != levelupSpells->rend(); ++itr) { // will called first if level down if(itr->first > level) @@ -1411,7 +1411,7 @@ void Pet::InitLevelupSpellsForLevel() // default spells (can be not learned if pet level (as owner level decrease result for example) less first possible in normal game) if(PetDefaultSpellsEntry const *defSpells = spellmgr.GetPetDefaultSpellsEntry(petSpellsId)) { - for(uint8 i = 0; i < MAX_CREATURE_SPELL_DATA_SLOT; ++i) + for (uint8 i = 0; i < MAX_CREATURE_SPELL_DATA_SLOT; ++i) { SpellEntry const* spellEntry = sSpellStore.LookupEntry(defSpells->spellid[i]); if(!spellEntry) @@ -1493,10 +1493,9 @@ bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab) return true; } - void Pet::CleanupActionBar() { - for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) + for (uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) if(UnitActionBarEntry const* ab = m_charmInfo->GetActionBarEntry(i)) if(ab->GetAction() && ab->IsActionBarForSpell()) { @@ -1577,7 +1576,7 @@ bool Pet::resetTalents(bool no_cost) for (int j = 0; j < MAX_TALENT_RANK; j++) { - for(PetSpellMap::const_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) { @@ -1855,7 +1854,7 @@ void Pet::LearnPetPassives() // For general hunter pets skill 270 // Passive 01~10, Passive 00 (20782, not used), Ferocious Inspiration (34457) // Scale 01~03 (34902~34904, bonus from owner, not used) - for(PetFamilySpellsSet::const_iterator petSet = petStore->second.begin(); petSet != petStore->second.end(); ++petSet) + for (PetFamilySpellsSet::const_iterator petSet = petStore->second.begin(); petSet != petStore->second.end(); ++petSet) addSpell(*petSet, ACT_DECIDE, PETSPELL_NEW, PETSPELL_FAMILY); } } @@ -1869,7 +1868,7 @@ void Pet::CastPetAuras(bool current) if(!IsPermanentPetFor((Player*)owner)) return; - for(PetAuraSet::const_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 534500e51ea..fc305d5f122 100644 --- a/src/game/PetAI.cpp +++ b/src/game/PetAI.cpp @@ -171,7 +171,7 @@ void PetAI::UpdateAI(const uint32 diff) else { bool spellUsed = false; - for(std::set<uint64>::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar) + for (std::set<uint64>::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar) { Unit* Target = ObjectAccessor::GetUnit(*m_creature,*tar); @@ -220,7 +220,7 @@ void PetAI::UpdateAI(const uint32 diff) } // deleted cached Spell objects - for(TargetSpellList::const_iterator itr = targetSpellStore.begin(); itr != targetSpellStore.end(); ++itr) + for (TargetSpellList::const_iterator itr = targetSpellStore.begin(); itr != targetSpellStore.end(); ++itr) delete itr->second; } } @@ -248,7 +248,7 @@ void PetAI::UpdateAllies() m_AllySet.insert(m_creature->GetGUID()); if(pGroup) //add group { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); if(!Target || !pGroup->SameSubGroup((Player*)owner, Target)) diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 733a857373b..41cafc3c7a4 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -69,10 +69,10 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) { //If a pet is dismissed, m_Controlled will change std::vector<Unit*> controlled; - for(Unit::ControlList::iterator itr = GetPlayer()->m_Controlled.begin(); itr != GetPlayer()->m_Controlled.end(); ++itr) + for (Unit::ControlList::iterator itr = GetPlayer()->m_Controlled.begin(); itr != GetPlayer()->m_Controlled.end(); ++itr) if((*itr)->GetEntry() == pet->GetEntry() && (*itr)->isAlive()) controlled.push_back(*itr); - for(std::vector<Unit*>::iterator itr = controlled.begin(); itr != controlled.end(); ++itr) + for (std::vector<Unit*>::iterator itr = controlled.begin(); itr != controlled.end(); ++itr) HandlePetActionHelper(*itr, guid1, spellid, flag, guid2); } } @@ -140,7 +140,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid return; } - + pet->clearUnitState(UNIT_STAT_FOLLOW); // This is true if pet has no target or has target but targets differs. if(pet->getVictim() != TargetUnit || ( pet->getVictim() == TargetUnit && !pet->GetCharmInfo()->IsCommandAttack() )) @@ -238,7 +238,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_UNIT_AREA_ENEMY_SRC || spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_AREA_ENEMY_DST || spellInfo->EffectImplicitTargetA[i] == TARGET_DEST_DYNOBJ_ENEMY) return; @@ -366,7 +366,7 @@ void WorldSession::SendPetNameQuery( uint64 petguid, uint32 petnumber) if( pet->isPet() && ((Pet*)pet)->GetDeclinedNames() ) { data << uint8(1); - for(uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) data << ((Pet*)pet)->GetDeclinedNames()->name[i]; } else @@ -400,7 +400,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) { uint32 position; uint32 data; @@ -487,7 +487,7 @@ void WorldSession::HandlePetRename( WorldPacket & recv_data ) if(isdeclined) { - for(uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) { recv_data >> declinedname.name[i]; } @@ -504,7 +504,7 @@ void WorldSession::HandlePetRename( WorldPacket & recv_data ) CharacterDatabase.BeginTransaction(); if(isdeclined) { - for(uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) CharacterDatabase.escape_string(declinedname.name[i]); CharacterDatabase.PExecute("DELETE FROM character_pet_declinedname WHERE owner = '%u' AND id = '%u'", _player->GetGUIDLow(), pet->GetCharmInfo()->GetPetNumber()); CharacterDatabase.PExecute("INSERT INTO character_pet_declinedname (id, owner, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u','%u','%s','%s','%s','%s','%s')", @@ -720,7 +720,7 @@ void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, Dec if(declinedName) { data << uint8(1); - for(uint32 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + for (uint32 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) data << declinedName->name[i]; } else @@ -752,7 +752,7 @@ void WorldSession::HandleLearnPreviewTalentsPet( WorldPacket & recv_data ) uint32 talentId, talentRank; - for(uint32 i = 0; i < talentsCount; ++i) + for (uint32 i = 0; i < talentsCount; ++i) { recv_data >> talentId >> talentRank; diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp index fe719b1b671..718f063beca 100644 --- a/src/game/PetitionsHandler.cpp +++ b/src/game/PetitionsHandler.cpp @@ -272,7 +272,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(); @@ -673,7 +673,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(); @@ -818,7 +818,7 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data) objmgr.AddGuild(guild); // add members - for(uint8 i = 0; i < signs; ++i) + for (uint8 i = 0; i < signs; ++i) { Field* fields = result->Fetch(); guild->AddMember(fields[0].GetUInt64(), guild->GetLowestRank()); @@ -846,7 +846,7 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data) sLog.outDebug("PetitonsHandler: arena team added to objmrg"); // add members - for(uint8 i = 0; i < signs; ++i) + for (uint8 i = 0; i < signs; ++i) { Field* fields = result->Fetch(); uint64 memberGUID = fields[0].GetUInt64(); @@ -937,7 +937,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.cpp b/src/game/Player.cpp index 2d49a7559e9..2abac550ca9 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -140,7 +140,7 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint32 leve { case CLASS_DEATH_KNIGHT: { - for(uint8 i = 0; i < TaxiMaskSize; ++i) + for (uint8 i = 0; i < TaxiMaskSize; ++i) m_taximask[i] |= sOldContinentsNodesMask[i]; break; } @@ -207,7 +207,7 @@ bool PlayerTaxi::LoadTaxiDestinationsFromString( const std::string& values, uint Tokens tokens = StrSplit(values," "); - for(Tokens::iterator iter = tokens.begin(); iter != tokens.end(); ++iter) + for (Tokens::iterator iter = tokens.begin(); iter != tokens.end(); ++iter) { uint32 node = uint32(atol(iter->c_str())); AddTaxiDestination(node); @@ -220,7 +220,7 @@ bool PlayerTaxi::LoadTaxiDestinationsFromString( const std::string& values, uint if(m_TaxiDestinations.size() < 2) return false; - for(size_t i = 1; i < m_TaxiDestinations.size(); ++i) + for (size_t i = 1; i < m_TaxiDestinations.size(); ++i) { uint32 cost; uint32 path; @@ -243,7 +243,7 @@ std::string PlayerTaxi::SaveTaxiDestinationsToString() std::ostringstream ss; - for(size_t i=0; i < m_TaxiDestinations.size(); ++i) + for (size_t i=0; i < m_TaxiDestinations.size(); ++i) ss << m_TaxiDestinations[i] << " "; return ss.str(); @@ -265,7 +265,7 @@ uint32 PlayerTaxi::GetCurrentTaxiPath() const std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi) { ss << "'"; - for(uint8 i = 0; i < TaxiMaskSize; ++i) + for (uint8 i = 0; i < TaxiMaskSize; ++i) ss << taxi.m_taximask[i] << " "; ss << "'"; return ss; @@ -485,7 +485,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa m_ChampioningFaction = 0; - for(int i = 0; i < MAX_POWERS; ++i) + for (int i = 0; i < MAX_POWERS; ++i) m_powerFraction[i] = 0; } @@ -495,7 +495,7 @@ Player::~Player () //m_social = NULL; // Note: buy back item already deleted from DB when player was saved - for(uint8 i = 0; i < PLAYER_SLOTS_COUNT; ++i) + for (uint8 i = 0; i < PLAYER_SLOTS_COUNT; ++i) { if(m_items[i]) delete m_items[i]; @@ -512,7 +512,7 @@ Player::~Player () } //all mailed items should be deleted, also all mail should be deallocated - for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end();++itr) + for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr) delete *itr; for (ItemMap::iterator iter = mMitems.begin(); iter != mMitems.end(); ++iter) @@ -520,7 +520,7 @@ Player::~Player () delete PlayerTalkClass; - for(size_t x = 0; x < ItemSetEff.size(); x++) + for (size_t x = 0; x < ItemSetEff.size(); x++) if(ItemSetEff[x]) delete ItemSetEff[x]; @@ -541,8 +541,8 @@ void Player::CleanupsBeforeDelete() m_transport->RemovePassenger(this); // clean up player-instance binds, may unload some instance saves - for(uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i) - for(BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr) + for (uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i) + for (BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr) itr->second.save->RemovePlayer(this); } @@ -737,7 +737,7 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8 if(oEntry) { - for(int j = 0; j < MAX_OUTFIT_ITEMS; ++j) + for (int j = 0; j < MAX_OUTFIT_ITEMS; ++j) { if(oEntry->ItemId[j] <= 0) continue; @@ -784,7 +784,7 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8 // bags and main-hand weapon must equipped at this moment // now second pass for not equipped (offhand weapon/shield if it attempt equipped before main-hand weapon) // or ammo not equipped in special bag - for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) { if(Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { @@ -936,7 +936,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer) return DISABLED_MIRROR_TIMER; int32 UnderWaterTime = 3*MINUTE*IN_MILISECONDS; AuraEffectList const& mModWaterBreathing = GetAurasByType(SPELL_AURA_MOD_WATER_BREATHING); - for(AuraEffectList::const_iterator i = mModWaterBreathing.begin(); i != mModWaterBreathing.end(); ++i) + for (AuraEffectList::const_iterator i = mModWaterBreathing.begin(); i != mModWaterBreathing.end(); ++i) UnderWaterTime = uint32(UnderWaterTime * (100.0f + (*i)->GetAmount()) / 100.0f); return UnderWaterTime; } @@ -1285,7 +1285,7 @@ void Player::Update( uint32 p_time ) } } } - + if (m_weaponChangeTimer > 0) { if(p_time >= m_weaponChangeTimer) @@ -1574,7 +1574,7 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data ) SpellItemEnchantmentEntry const *enchant = NULL; uint32 enchants = GetUInt32ValueFromArray(data, visualbase + 1); - for(uint8 enchantSlot = PERM_ENCHANTMENT_SLOT; enchantSlot <= TEMP_ENCHANTMENT_SLOT; ++enchantSlot) + for (uint8 enchantSlot = PERM_ENCHANTMENT_SLOT; enchantSlot <= TEMP_ENCHANTMENT_SLOT; ++enchantSlot) { // values stored in 2 uint16 uint32 enchantId = 0x0000FFFF & (enchants >> enchantSlot*16); @@ -1975,7 +1975,7 @@ void Player::AddToWorld() ///- The player should only be added when logging in Unit::AddToWorld(); - for(uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i) + for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i) { if(m_items[i]) m_items[i]->AddToWorld(); @@ -1999,7 +1999,7 @@ void Player::RemoveFromWorld() ///- The player should only be removed when logging out Unit::RemoveFromWorld(); - for(uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i) + for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i) { if(m_items[i]) m_items[i]->RemoveFromWorld(); @@ -2022,13 +2022,13 @@ void Player::RegenerateAll() { //if (m_regenTimer <= 500) // return; - + m_regenTimerCount += m_regenTimer; Regenerate( POWER_ENERGY ); Regenerate( POWER_MANA ); - + if(m_regenTimerCount >= 2000) { // Not in combat or they have regeneration @@ -2057,7 +2057,7 @@ void Player::Regenerate(Powers power) { if(power == POWER_RUNE) { - for(uint32 i = 0; i < MAX_RUNES; ++i) + for (uint32 i = 0; i < MAX_RUNES; ++i) if(uint8 cd = GetRuneCooldown(i)) // if we have cooldown, reduce it... SetRuneCooldown(i, cd - 1); // ... by 2 sec (because update is every 2 sec) } @@ -2117,7 +2117,7 @@ void Player::Regenerate(Powers power) if(power != POWER_MANA) { AuraEffectList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT); - for(AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i) + for (AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i) if ((*i)->GetMiscValue() == power) addvalue *= ((*i)->GetAmount() + 100) / 100.0f; } @@ -2148,7 +2148,7 @@ void Player::Regenerate(Powers power) { curValue = 0; m_powerFraction[power] = 0; - } + } } if(m_regenTimerCount >= 2000) SetPower(power, curValue); @@ -2177,7 +2177,7 @@ void Player::RegenerateHealth() if (!isInCombat()) { AuraEffectList const& mModHealthRegenPct = GetAurasByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT); - for(AuraEffectList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i) + for (AuraEffectList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i) addvalue *= (100.0f + (*i)->GetAmount()) / 100.0f; } else if(HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT)) @@ -2520,7 +2520,7 @@ void Player::GiveLevel(uint32 level) WorldPacket data(SMSG_LEVELUP_INFO, (4+4+MAX_POWERS*4+MAX_STATS*4)); data << uint32(level); data << uint32(int32(classInfo.basehealth) - int32(GetCreateHealth())); - // for(int i = 0; i < MAX_POWERS; ++i) // Powers loop (0-6) + // for (int i = 0; i < MAX_POWERS; ++i) // Powers loop (0-6) data << uint32(int32(classInfo.basemana) - int32(GetCreateMana())); data << uint32(0); data << uint32(0); @@ -2529,7 +2529,7 @@ void Player::GiveLevel(uint32 level) data << uint32(0); data << uint32(0); // end for - for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) // Stats loop (0-4) + for (uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) // Stats loop (0-4) data << uint32(int32(info.stats[i]) - GetCreateStat(Stats(i))); GetSession()->SendPacket(&data); @@ -2546,7 +2546,7 @@ void Player::GiveLevel(uint32 level) UpdateSkillsForLevel (); // save base values (bonuses already included in stored stats - for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) + for (uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) SetCreateStat(Stats(i), info.stats[i]); SetCreateHealth(classInfo.basehealth); @@ -2642,10 +2642,10 @@ void Player::InitStatsForLevel(bool reapplyMods) SetFloatValue(OBJECT_FIELD_SCALE_X,1.0f); // save base values (bonuses already included in stored stats - for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) + for (uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) SetCreateStat(Stats(i), info.stats[i]); - for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) + for (uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) SetStat(Stats(i), info.stats[i]); SetCreateHealth(classInfo.basehealth); @@ -2658,7 +2658,7 @@ void Player::InitStatsForLevel(bool reapplyMods) InitStatBuffMods(); //reset rating fields values - for(uint16 index = PLAYER_FIELD_COMBAT_RATING_1; index < PLAYER_FIELD_COMBAT_RATING_1 + MAX_COMBAT_RATING; ++index) + for (uint16 index = PLAYER_FIELD_COMBAT_RATING_1; index < PLAYER_FIELD_COMBAT_RATING_1 + MAX_COMBAT_RATING; ++index) SetUInt32Value(index, 0); SetUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS,0); @@ -2718,13 +2718,13 @@ void Player::InitStatsForLevel(bool reapplyMods) SetUInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE,0); SetUInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE,0); - for(uint8 i = 0; i < MAX_SPELL_SCHOOL; ++i) + for (uint8 i = 0; i < MAX_SPELL_SCHOOL; ++i) { SetUInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i,0); SetFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER+i,0.0f); } // Reset no reagent cost field - for(uint8 i = 0; i < 3; i++) + for (uint8 i = 0; i < 3; i++) SetUInt32Value(PLAYER_NO_REAGENT_COST_1 + i, 0); // Init data for form but skip reapply item mods for form InitDataForForm(reapplyMods); @@ -2807,7 +2807,7 @@ void Player::SendInitialSpells() uint16 spellCooldowns = m_spellCooldowns.size(); data << uint16(spellCooldowns); - for(SpellCooldowns::const_iterator itr=m_spellCooldowns.begin(); itr!=m_spellCooldowns.end(); ++itr) + for (SpellCooldowns::const_iterator itr=m_spellCooldowns.begin(); itr!=m_spellCooldowns.end(); ++itr) { SpellEntry const *sEntry = sSpellStore.LookupEntry(itr->first); if(!sEntry) @@ -2847,7 +2847,7 @@ void Player::SendInitialSpells() void Player::RemoveMail(uint32 id) { - for(PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end();++itr) + for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr) { if ((*itr)->messageID == id) { @@ -2889,7 +2889,7 @@ void Player::UpdateNextMailTimeAndUnreads() time_t cTime = time(NULL); m_nextMailDelivereTime = 0; unReadMails = 0; - for(PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr) + for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr) { if((*itr)->deliver_time > cTime) { @@ -2955,7 +2955,7 @@ bool Player::AddTalent(uint32 spell_id, uint8 spec, bool learning) { if(TalentEntry const *talentInfo = sTalentStore.LookupEntry( talentPos->talent_id )) { - for(uint8 rank = 0; rank < MAX_TALENT_RANK; ++rank) + for (uint8 rank = 0; rank < MAX_TALENT_RANK; ++rank) { // skip learning spell and no rank spell case uint32 rankSpellId = talentInfo->RankID[rank]; @@ -2972,7 +2972,7 @@ bool Player::AddTalent(uint32 spell_id, uint8 spec, bool learning) PlayerSpellState state = learning ? PLAYERSPELL_NEW : PLAYERSPELL_UNCHANGED; PlayerTalent *newtalent = new PlayerTalent(); - + newtalent->state = state; newtalent->spec = spec; @@ -3136,7 +3136,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen { if(TalentEntry const *talentInfo = sTalentStore.LookupEntry( talentPos->talent_id )) { - for(uint8 rank = 0; rank < MAX_TALENT_RANK; ++rank) + for (uint8 rank = 0; rank < MAX_TALENT_RANK; ++rank) { // skip learning spell and no rank spell case uint32 rankSpellId = talentInfo->RankID[rank]; @@ -3165,7 +3165,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen // replace spells in action bars and spellbook to bigger rank if only one spell rank must be accessible if(newspell->active && !newspell->disabled && !SpellMgr::canStackSpellRanks(spellInfo) && spellmgr.GetSpellRank(spellInfo->Id) != 0) { - for( PlayerSpellMap::iterator itr2 = m_spells.begin(); itr2 != m_spells.end(); ++itr2 ) + for (PlayerSpellMap::iterator itr2 = m_spells.begin(); itr2 != m_spells.end(); ++itr2 ) { if(itr2->second->state == PLAYERSPELL_REMOVED) continue; SpellEntry const *i_spellInfo = sSpellStore.LookupEntry(itr2->first); @@ -3274,7 +3274,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen else { // not ranked skills - for(SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx) + for (SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx) { SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId); if (!pSkill) @@ -3308,7 +3308,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen // learn dependent spells SpellLearnSpellMapBounds spell_bounds = spellmgr.GetSpellLearnSpellMapBounds(spell_id); - for(SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2) + for (SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2) { if (!itr2->second.autoLearned) { @@ -3322,7 +3322,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen if (!GetSession()->PlayerLoading()) { // not ranked skills - for(SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx) + for (SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx) { GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LINE,_spell_idx->second->skillId); GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS,_spell_idx->second->skillId); @@ -3421,7 +3421,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) //unlearn spells dependent from recently removed spells SpellsRequiringSpellMap const& reqMap = spellmgr.GetSpellsRequiringSpell(); SpellsRequiringSpellMap::const_iterator itr2 = reqMap.find(spell_id); - for (uint32 i=reqMap.count(spell_id);i>0;i--,itr2++) + for (uint32 i=reqMap.count(spell_id); i>0; i--,itr2++) removeSpell(itr2->second,disabled,false); // re-search, it can be corrupted in prev loop @@ -3452,7 +3452,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) RemoveAurasDueToSpell(spell_id); // remove pet auras - for(int i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (int i = 0; i < MAX_SPELL_EFFECTS; ++i) if(PetAura const* petSpell = spellmgr.GetPetAura(spell_id, i)) RemovePetAura(petSpell); @@ -3516,7 +3516,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) // not ranked skills SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spell_id); - for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) + for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) { SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId); if (!pSkill) @@ -3540,7 +3540,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) // remove dependent spells SpellLearnSpellMapBounds spell_bounds = spellmgr.GetSpellLearnSpellMapBounds(spell_id); - for(SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2) + for (SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2) removeSpell(itr2->second.spell, disabled); // activate lesser rank in spellbook/action bar, and cast it if need @@ -3587,7 +3587,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) } } } - + if(spell_id == 46917 && m_canTitanGrip) SetCanTitanGrip(false); @@ -3616,7 +3616,7 @@ void Player::RemoveCategoryCooldown( uint32 cat ) { SpellCategoryStore::const_iterator i_scstore = sSpellCategoryStore.find(cat); if(i_scstore != sSpellCategoryStore.end()) - for(SpellCategorySet::const_iterator i_scset = i_scstore->second.begin(); i_scset != i_scstore->second.end(); ++i_scset) + for (SpellCategorySet::const_iterator i_scset = i_scstore->second.begin(); i_scset != i_scstore->second.end(); ++i_scset) RemoveSpellCooldown(*i_scset, true); } @@ -3627,7 +3627,7 @@ void Player::RemoveSpellCategoryCooldown(uint32 cat, bool update /* = false */) return; const SpellCategorySet& ct_set = ct->second; - for (SpellCooldowns::const_iterator i = m_spellCooldowns.begin(); i != m_spellCooldowns.end();) + for (SpellCooldowns::const_iterator i = m_spellCooldowns.begin(); i != m_spellCooldowns.end(); ) { if (ct_set.find(i->first) != ct_set.end()) RemoveSpellCooldown((i++)->first, update); @@ -3641,7 +3641,7 @@ void Player::RemoveArenaSpellCooldowns() // remove cooldowns on spells that has < 15 min CD SpellCooldowns::iterator itr, next; // iterate spell cooldowns - for(itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end(); itr = next) + for (itr = m_spellCooldowns.begin(); itr != m_spellCooldowns.end(); itr = next) { next = itr; ++next; @@ -3661,7 +3661,7 @@ void Player::RemoveAllSpellCooldown() { if(!m_spellCooldowns.empty()) { - for(SpellCooldowns::const_iterator itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end(); ++itr) + for (SpellCooldowns::const_iterator itr = m_spellCooldowns.begin(); itr != m_spellCooldowns.end(); ++itr) SendClearCooldown(itr->first, this); m_spellCooldowns.clear(); @@ -3714,7 +3714,7 @@ void Player::_SaveSpellCooldowns() time_t infTime = curTime + infinityCooldownDelayCheck; // remove outdated and save active - for(SpellCooldowns::iterator itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end();) + for (SpellCooldowns::iterator itr = m_spellCooldowns.begin(); itr != m_spellCooldowns.end(); ) { if(itr->second.end <= curTime) m_spellCooldowns.erase(itr++); @@ -3804,11 +3804,11 @@ bool Player::resetTalents(bool no_cost) // to prevent unexpected lost normal learned spell skip another class talents if( (getClassMask() & talentTabInfo->ClassMask) == 0 ) continue; - + // Re-use pre-dual talent way of resetting talents, to ensure talents aren't being stored in spell storage. - for(uint8 rank = 0; rank < MAX_TALENT_RANK; ++rank) + for (uint8 rank = 0; rank < MAX_TALENT_RANK; ++rank) { - for(PlayerSpellMap::iterator itr = GetSpellMap().begin(); itr != GetSpellMap().end();) + for (PlayerSpellMap::iterator itr = GetSpellMap().begin(); itr != GetSpellMap().end(); ) { if(itr->second->state == PLAYERSPELL_REMOVED || itr->second->disabled) { @@ -3871,7 +3871,7 @@ bool Player::resetTalents(bool no_cost) Mail* Player::GetMail(uint32 id) { - for(PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr) + for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr) { if ((*itr)->messageID == id) { @@ -3889,7 +3889,7 @@ void Player::_SetCreateBits(UpdateMask *updateMask, Player *target) const } else { - for(uint16 index = 0; index < m_valuesCount; index++) + for (uint16 index = 0; index < m_valuesCount; index++) { if(GetUInt32Value(index) != 0 && updateVisualBits.GetBit(index)) updateMask->SetBit(index); @@ -3982,11 +3982,11 @@ void Player::InitVisibleBits() updateVisualBits.SetBit(PLAYER_GUILD_TIMESTAMP); // PLAYER_QUEST_LOG_x also visible bit on official (but only on party/raid)... - for(uint16 i = PLAYER_QUEST_LOG_1_1; i < PLAYER_QUEST_LOG_25_2; i += 4) + for (uint16 i = PLAYER_QUEST_LOG_1_1; i < PLAYER_QUEST_LOG_25_2; i += 4) updateVisualBits.SetBit(i); // Players visible items are not inventory stuff - for(uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i) + for (uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i) { uint16 offset = i * 2; @@ -4001,7 +4001,7 @@ void Player::InitVisibleBits() void Player::BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const { - for(uint8 i = 0; i < EQUIPMENT_SLOT_END; i++) + for (uint8 i = 0; i < EQUIPMENT_SLOT_END; i++) { if(m_items[i] == NULL) continue; @@ -4011,14 +4011,14 @@ void Player::BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) if(target == this) { - for(uint8 i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { if(m_items[i] == NULL) continue; m_items[i]->BuildCreateUpdateBlockForPlayer( data, target ); } - for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { if(m_items[i] == NULL) continue; @@ -4034,7 +4034,7 @@ void Player::DestroyForPlayer( Player *target, bool anim ) const { Unit::DestroyForPlayer( target, anim ); - for(uint8 i = 0; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = 0; i < INVENTORY_SLOT_BAG_END; i++) { if(m_items[i] == NULL) continue; @@ -4044,14 +4044,14 @@ void Player::DestroyForPlayer( Player *target, bool anim ) const if(target == this) { - for(uint8 i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { if(m_items[i] == NULL) continue; m_items[i]->DestroyForPlayer( target ); } - for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { if(m_items[i] == NULL) continue; @@ -4585,25 +4585,25 @@ Corpse* Player::GetCorpse() const void Player::DurabilityLossAll(double percent, bool inventory) { - for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++) if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) DurabilityLoss(pItem,percent); if(inventory) { // bags not have durability - // for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + // for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) - for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) DurabilityLoss(pItem,percent); // keys not have durability - //for(int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++) + //for (int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++) - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) if(Item* pItem = GetItemByPos( i, j )) DurabilityLoss(pItem,percent); } @@ -4629,25 +4629,25 @@ void Player::DurabilityLoss(Item* item, double percent) void Player::DurabilityPointsLossAll(int32 points, bool inventory) { - for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++) if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) DurabilityPointsLoss(pItem,points); if(inventory) { // bags not have durability - // for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + // for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) - for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) DurabilityPointsLoss(pItem,points); // keys not have durability - //for(int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++) + //for (int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++) - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) if(Item* pItem = GetItemByPos( i, j )) DurabilityPointsLoss(pItem,points); } @@ -4690,14 +4690,14 @@ uint32 Player::DurabilityRepairAll(bool cost, float discountMod, bool guildBank) { uint32 TotalCost = 0; // equipped, backpack, bags itself - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) TotalCost += DurabilityRepair(( (INVENTORY_SLOT_BAG_0 << 8) | i ),cost,discountMod, guildBank); // bank, buyback and keys not repaired // items in inventory bags - for(uint8 j = INVENTORY_SLOT_BAG_START; j < INVENTORY_SLOT_BAG_END; j++) - for(uint8 i = 0; i < MAX_BAG_SIZE; i++) + for (uint8 j = INVENTORY_SLOT_BAG_START; j < INVENTORY_SLOT_BAG_END; j++) + for (uint8 i = 0; i < MAX_BAG_SIZE; i++) TotalCost += DurabilityRepair(( (j << 8) | i ),cost,discountMod, guildBank); return TotalCost; } @@ -4881,7 +4881,7 @@ void Player::UpdateLocalChannels(uint32 newZone ) std::string current_zone_name = current_zone->area_name[GetSession()->GetSessionDbcLocale()]; - for(JoinedChannelsList::iterator i = m_channels.begin(), next; i != m_channels.end(); i = next) + for (JoinedChannelsList::iterator i = m_channels.begin(), next; i != m_channels.end(); i = next) { next = i; ++next; @@ -4917,7 +4917,7 @@ void Player::UpdateLocalChannels(uint32 newZone ) void Player::LeaveLFGChannel() { - for(JoinedChannelsList::iterator i = m_channels.begin(); i != m_channels.end(); ++i ) + for (JoinedChannelsList::iterator i = m_channels.begin(); i != m_channels.end(); ++i ) { if((*i)->IsLFG()) { @@ -5200,7 +5200,7 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply) // Apply bonus from SPELL_AURA_MOD_RATING_FROM_STAT // stat used stored in miscValueB for this aura AuraEffectList const& modRatingFromStat = GetAurasByType(SPELL_AURA_MOD_RATING_FROM_STAT); - for(AuraEffectList::const_iterator i = modRatingFromStat.begin();i != modRatingFromStat.end(); ++i) + for (AuraEffectList::const_iterator i = modRatingFromStat.begin(); i != modRatingFromStat.end(); ++i) if ((*i)->GetMiscValue() & (1<<cr)) amount += int32(GetStat(Stats((*i)->GetMiscBValue())) * (*i)->GetAmount() / 100.0f); if (amount < 0) @@ -5294,7 +5294,7 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply) void Player::SetRegularAttackTime() { - for(uint8 i = 0; i < MAX_ATTACK; ++i) + for (uint8 i = 0; i < MAX_ATTACK; ++i) { Item *tmpitem = GetWeaponForAttack(WeaponAttackType(i)); if(tmpitem && !tmpitem->IsBroken()) @@ -5360,7 +5360,7 @@ bool Player::UpdateCraftSkill(uint32 spellid) SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spellid); - for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) + for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) { if (_spell_idx->second->skillId) { @@ -5466,7 +5466,7 @@ bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step) new_value = MaxValue; SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i),MAKE_SKILL_VALUE(new_value,MaxValue)); - for(uint32* bsl = &bonusSkillLevels[0]; *bsl; ++bsl) + for (uint32* bsl = &bonusSkillLevels[0]; *bsl; ++bsl) { if((SkillValue < *bsl && new_value >= *bsl)) { @@ -5696,13 +5696,13 @@ void Player::SetSkill(uint32 id, uint16 currVal, uint16 maxVal) // temporary bonuses AuraEffectList const& mModSkill = GetAurasByType(SPELL_AURA_MOD_SKILL); - for(AuraEffectList::const_iterator j = mModSkill.begin(); j != mModSkill.end(); ++j) + for (AuraEffectList::const_iterator j = mModSkill.begin(); j != mModSkill.end(); ++j) if ((*j)->GetMiscValue() == int32(id)) (*j)->ApplyModifier(true); // permanent bonuses AuraEffectList const& mModSkillTalent = GetAurasByType(SPELL_AURA_MOD_SKILL_TALENT); - for(AuraEffectList::const_iterator j = mModSkillTalent.begin(); j != mModSkillTalent.end(); ++j) + for (AuraEffectList::const_iterator j = mModSkillTalent.begin(); j != mModSkillTalent.end(); ++j) if ((*j)->GetMiscValue() == int32(id)) (*j)->ApplyModifier(true); @@ -5843,7 +5843,7 @@ void Player::SendActionButtons(uint32 state) const WorldPacket data(SMSG_ACTION_BUTTONS, 1+(MAX_ACTION_BUTTONS*4)); data << uint8(state); // can be 0, 1, 2 - for(int button = 0; button < MAX_ACTION_BUTTONS; ++button) + for (int button = 0; button < MAX_ACTION_BUTTONS; ++button) { ActionButtonList::const_iterator itr = m_actionButtons.find(button); if(itr != m_actionButtons.end() && itr->second.uState != ACTIONBUTTON_DELETED) @@ -5896,7 +5896,6 @@ ActionButton* Player::addActionButton(uint8 button, uint32 action, uint8 type) break; // pther cases not checked at this moment } - // it create new button (NEW state) if need or return existed ActionButton& ab = m_actionButtons[button]; @@ -5915,9 +5914,9 @@ void Player::removeActionButton(uint8 button) if (!buttonItr->second.canRemoveByClient) { - buttonItr->second.canRemoveByClient = true; + buttonItr->second.canRemoveByClient = true; return; - } + } if(buttonItr->second.uState==ACTIONBUTTON_NEW) m_actionButtons.erase(buttonItr); // new and not saved else @@ -6266,7 +6265,7 @@ void Player::RewardReputation(Unit *pVictim, float rate) void Player::RewardReputation(Quest const *pQuest) { // quest reputation reward/loss - for(uint8 i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) + for (uint8 i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) { if(pQuest->RewRepFaction[i] && pQuest->RewRepValue[i] ) { @@ -6809,7 +6808,7 @@ void Player::DuelComplete(DuelCompleteType type) /* remove auras */ AuraMap &itsAuras = duel->opponent->GetAuras(); - for(AuraMap::iterator i = itsAuras.begin(); i != itsAuras.end();) + for (AuraMap::iterator i = itsAuras.begin(); i != itsAuras.end(); ) { if (!i->second->IsPositive() && i->second->GetCasterGUID() == GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) { @@ -6820,7 +6819,7 @@ void Player::DuelComplete(DuelCompleteType type) } AuraMap &myAuras = GetAuras(); - for(AuraMap::iterator i = myAuras.begin(); i != myAuras.end();) + for (AuraMap::iterator i = myAuras.begin(); i != myAuras.end(); ) { if (!i->second->IsPositive() && i->second->GetCasterGUID() == duel->opponent->GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) { @@ -7199,15 +7198,15 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl void Player::_ApplyWeaponDependentAuraMods(Item *item,WeaponAttackType attackType,bool apply) { AuraEffectList const& auraCritList = GetAurasByType(SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); - for(AuraEffectList::const_iterator itr = auraCritList.begin(); itr!=auraCritList.end();++itr) + for (AuraEffectList::const_iterator itr = auraCritList.begin(); itr!=auraCritList.end(); ++itr) _ApplyWeaponDependentAuraCritMod(item,attackType,*itr,apply); AuraEffectList const& auraDamageFlatList = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE); - for(AuraEffectList::const_iterator itr = auraDamageFlatList.begin(); itr!=auraDamageFlatList.end();++itr) + for (AuraEffectList::const_iterator itr = auraDamageFlatList.begin(); itr!=auraDamageFlatList.end(); ++itr) _ApplyWeaponDependentAuraDamageMod(item,attackType,*itr,apply); AuraEffectList const& auraDamagePCTList = GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); - for(AuraEffectList::const_iterator itr = auraDamagePCTList.begin(); itr!=auraDamagePCTList.end();++itr) + for (AuraEffectList::const_iterator itr = auraDamagePCTList.begin(); itr!=auraDamagePCTList.end(); ++itr) _ApplyWeaponDependentAuraDamageMod(item,attackType,*itr,apply); } @@ -7306,7 +7305,7 @@ void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply if(form_change) // check aura active state from other form { AuraMap const& auras = GetAuras(); - for(AuraMap::const_iterator itr = auras.lower_bound(spellInfo->Id); itr != auras.upper_bound(spellInfo->Id); ++itr) + for (AuraMap::const_iterator itr = auras.lower_bound(spellInfo->Id); itr != auras.upper_bound(spellInfo->Id); ++itr) if(!item || itr->second->GetCastItemGUID()==item->GetGUID()) return; } @@ -7343,13 +7342,13 @@ void Player::UpdateEquipSpellsAtFormChange() } // item set bonuses not dependent from item broken state - for(size_t setindex = 0; setindex < ItemSetEff.size(); ++setindex) + for (size_t setindex = 0; setindex < ItemSetEff.size(); ++setindex) { ItemSetEffect* eff = ItemSetEff[setindex]; if(!eff) continue; - for(uint32 y=0;y<8; ++y) + for (uint32 y=0; y<8; ++y) { SpellEntry const* spellInfo = eff->spells[y]; if(!spellInfo) @@ -7365,7 +7364,7 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 if(!target || !target->isAlive() || target == this) return; - for(int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++) + for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++) { // If usable, try to cast item spell if (Item * item = ((Player*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0,i)) @@ -7457,12 +7456,12 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 } // item combat enchantments - for(int e_slot = 0; e_slot < MAX_ENCHANTMENT_SLOT; ++e_slot) + for (int e_slot = 0; e_slot < MAX_ENCHANTMENT_SLOT; ++e_slot) { uint32 enchant_id = item->GetEnchantmentId(EnchantmentSlot(e_slot)); SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id); if(!pEnchant) continue; - for (int s=0;s<3;s++) + for (int s=0; s<3; s++) { if(pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL) continue; @@ -7543,7 +7542,7 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c int count = 0; // item spells casted at use - for(int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) + for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) { _Spell const& spellData = proto->Spells[i]; @@ -7572,12 +7571,12 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c } // Item enchantments spells casted at use - for(int e_slot = 0; e_slot < MAX_ENCHANTMENT_SLOT; ++e_slot) + for (int e_slot = 0; e_slot < MAX_ENCHANTMENT_SLOT; ++e_slot) { uint32 enchant_id = item->GetEnchantmentId(EnchantmentSlot(e_slot)); SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id); if(!pEnchant) continue; - for (int s=0;s<3;s++) + for (int s=0; s<3; s++) { if(pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_USE_SPELL) continue; @@ -8889,7 +8888,7 @@ uint8 Player::CanUnequipItems( uint32 item, uint32 count ) const uint8 res = EQUIP_ERR_OK; - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++) { pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem->GetEntry() == item ) @@ -8905,7 +8904,7 @@ uint8 Player::CanUnequipItems( uint32 item, uint32 count ) const res = ires; } } - for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) { pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem->GetEntry() == item ) @@ -8915,7 +8914,7 @@ uint8 Player::CanUnequipItems( uint32 item, uint32 count ) const return EQUIP_ERR_OK; } } - for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem->GetEntry() == item ) @@ -8926,12 +8925,12 @@ uint8 Player::CanUnequipItems( uint32 item, uint32 count ) const } } Bag *pBag; - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pBag ) { - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { pItem = GetItemByPos( i, j ); if( pItem && pItem->GetEntry() == item ) @@ -8951,19 +8950,19 @@ uint8 Player::CanUnequipItems( uint32 item, uint32 count ) const uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) const { uint32 count = 0; - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem != skipItem && pItem->GetEntry() == item ) count += pItem->GetCount(); } - for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem != skipItem && pItem->GetEntry() == item ) count += pItem->GetCount(); } - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pBag ) @@ -8972,7 +8971,7 @@ uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) cons if(skipItem && skipItem->GetProto()->GemProperties) { - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem != skipItem && pItem->GetProto()->Socket[0].Color ) @@ -8982,13 +8981,13 @@ uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) cons if(inBankAlso) { - for(uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++) + for (uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++) { Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem != skipItem && pItem->GetEntry() == item ) count += pItem->GetCount(); } - for(uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) + for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pBag ) @@ -8997,7 +8996,7 @@ uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) cons if(skipItem && skipItem->GetProto()->GemProperties) { - for(uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++) + for (uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++) { Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem != skipItem && pItem->GetProto()->Socket[0].Color ) @@ -9011,25 +9010,25 @@ uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) cons Item* Player::GetItemByGuid( uint64 guid ) const { - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem->GetGUID() == guid ) return pItem; } - for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem->GetGUID() == guid ) return pItem; } - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pBag ) { - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { Item* pItem = pBag->GetItemByPos( j ); if( pItem && pItem->GetGUID() == guid ) @@ -9037,12 +9036,12 @@ Item* Player::GetItemByGuid( uint64 guid ) const } } } - for(uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) + for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pBag ) { - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { Item* pItem = pBag->GetItemByPos( j ); if( pItem && pItem->GetGUID() == guid ) @@ -9240,11 +9239,10 @@ bool Player::IsValidPos( uint8 bag, uint8 slot ) return false; } - bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const { uint32 tempcount = 0; - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem->GetEntry() == item ) @@ -9254,7 +9252,7 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const return true; } } - for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem->GetEntry() == item ) @@ -9264,11 +9262,11 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const return true; } } - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { Item* pItem = GetItemByPos( i, j ); if( pItem && pItem->GetEntry() == item ) @@ -9283,7 +9281,7 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const if(inBankAlso) { - for(uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++) + for (uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++) { Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && pItem->GetEntry() == item ) @@ -9293,11 +9291,11 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const return true; } } - for(uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) + for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { Item* pItem = GetItemByPos( i, j ); if( pItem && pItem->GetEntry() == item ) @@ -9317,7 +9315,7 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except_slot ) const { uint32 tempcount = 0; - for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) + for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) { if(i == except_slot) continue; @@ -9334,7 +9332,7 @@ bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except ItemPrototype const *pProto = objmgr.GetItemPrototype(item); if (pProto && pProto->GemProperties) { - for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) + for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) { if(i == except_slot) continue; @@ -9355,7 +9353,7 @@ bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except bool Player::HasItemOrGemWithLimitCategoryEquipped( uint32 limitCategory, uint32 count, uint8 except_slot ) const { uint32 tempcount = 0; - for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) + for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) { if(i == except_slot) continue; @@ -9415,23 +9413,23 @@ uint8 Player::_CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, bool Player::HasItemTotemCategory( uint32 TotemCategory ) const { Item *pItem; - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i) { pItem = GetUseableItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && IsTotemCategoryCompatiableWith(pItem->GetProto()->TotemCategory,TotemCategory )) return true; } - for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { pItem = GetUseableItemByPos( INVENTORY_SLOT_BAG_0, i ); if( pItem && IsTotemCategoryCompatiableWith(pItem->GetProto()->TotemCategory,TotemCategory )) return true; } - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) { if(Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { - for(uint32 j = 0; j < pBag->GetBagSize(); ++j) + for (uint32 j = 0; j < pBag->GetBagSize(); ++j) { pItem = GetUseableItemByPos( i, j ); if( pItem && IsTotemCategoryCompatiableWith(pItem->GetProto()->TotemCategory,TotemCategory )) @@ -9537,7 +9535,7 @@ uint8 Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, ItemPrototy if (!ItemCanGoIntoBag(pProto,pBagProto)) return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG; - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { // skip specific slot already processed in first called _CanStoreItem_InSpecificSlot if (j==skip_slot) @@ -9594,7 +9592,7 @@ uint8 Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, ItemPrototy uint8 Player::_CanStoreItem_InInventorySlots( uint8 slot_begin, uint8 slot_end, ItemPosCountVec &dest, ItemPrototype const *pProto, uint32& count, bool merge, Item* pSrcItem, uint8 skip_bag, uint8 skip_slot ) const { - for(uint32 j = slot_begin; j < slot_end; j++) + for (uint32 j = slot_begin; j < slot_end; j++) { // skip specific slot already processed in first called _CanStoreItem_InSpecificSlot if (INVENTORY_SLOT_BAG_0==skip_bag && j==skip_slot) @@ -9925,7 +9923,7 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3 if (pProto->BagFamily) { - for(uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { res = _CanStoreItem_InBag(i,dest,pProto,count,true,false,pItem,bag,slot); if (res!=EQUIP_ERR_OK) @@ -9943,7 +9941,7 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3 } } - for(uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { res = _CanStoreItem_InBag(i,dest,pProto,count,true,true,pItem,bag,slot); if (res!=EQUIP_ERR_OK) @@ -10006,7 +10004,7 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3 } } - for(uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { res = _CanStoreItem_InBag(i,dest,pProto,count,false,false,pItem,bag,slot); if (res!=EQUIP_ERR_OK) @@ -10043,7 +10041,7 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3 return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS; } - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { res = _CanStoreItem_InBag(i,dest,pProto,count,false,true,pItem,bag,slot); if (res!=EQUIP_ERR_OK) @@ -10082,7 +10080,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const memset(inv_keys,0,sizeof(int)*(KEYRING_SLOT_END-KEYRING_SLOT_START)); memset(inv_tokens,0,sizeof(int)*(CURRENCYTOKEN_SLOT_END-CURRENCYTOKEN_SLOT_START)); - for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) { pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); @@ -10092,7 +10090,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const } } - for(uint8 i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++) + for (uint8 i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++) { pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); @@ -10102,7 +10100,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const } } - for(uint8 i = CURRENCYTOKEN_SLOT_START; i < CURRENCYTOKEN_SLOT_END; i++) + for (uint8 i = CURRENCYTOKEN_SLOT_START; i < CURRENCYTOKEN_SLOT_END; i++) { pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); @@ -10112,11 +10110,11 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const } } - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { pItem2 = GetItemByPos( i, j ); if (pItem2 && !pItem2->IsInTrade()) @@ -10159,7 +10157,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const { bool b_found = false; - for(int t = KEYRING_SLOT_START; t < KEYRING_SLOT_END; ++t) + for (int t = KEYRING_SLOT_START; t < KEYRING_SLOT_END; ++t) { pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t ); if( pItem2 && pItem2->GetEntry() == pItem->GetEntry() && inv_keys[t-KEYRING_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize()) @@ -10171,7 +10169,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const } if (b_found) continue; - for(int t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t) + for (int t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t) { pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t ); if( pItem2 && pItem2->GetEntry() == pItem->GetEntry() && inv_tokens[t-CURRENCYTOKEN_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize()) @@ -10183,7 +10181,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const } if (b_found) continue; - for(int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t) + for (int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t) { pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t ); if( pItem2 && pItem2->GetEntry() == pItem->GetEntry() && inv_slot_items[t-INVENTORY_SLOT_ITEM_START] + pItem->GetCount() <= pProto->GetMaxStackSize()) @@ -10195,12 +10193,12 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const } if (b_found) continue; - for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t) + for (int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t) { pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, t ); if( pBag && ItemCanGoIntoBag(pItem->GetProto(), pBag->GetProto())) { - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { pItem2 = GetItemByPos( t, j ); if( pItem2 && pItem2->GetEntry() == pItem->GetEntry() && inv_bags[t-INVENTORY_SLOT_BAG_START][j] + pItem->GetCount() <= pProto->GetMaxStackSize()) @@ -10222,7 +10220,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const if(pProto->BagFamily & BAG_FAMILY_MASK_KEYS) { uint32 keyringSize = GetMaxKeyringSize(); - for(uint32 t = KEYRING_SLOT_START; t < KEYRING_SLOT_START+keyringSize; ++t) + for (uint32 t = KEYRING_SLOT_START; t < KEYRING_SLOT_START+keyringSize; ++t) { if( inv_keys[t-KEYRING_SLOT_START] == 0 ) { @@ -10237,7 +10235,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const if(pProto->BagFamily & BAG_FAMILY_MASK_CURRENCY_TOKENS) { - for(uint32 t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t) + for (uint32 t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t) { if( inv_tokens[t-CURRENCYTOKEN_SLOT_START] == 0 ) { @@ -10250,7 +10248,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const if (b_found) continue; - for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t) + for (int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t) { pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, t ); if( pBag ) @@ -10261,7 +10259,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const if( pBagProto && (pBagProto->Class != ITEM_CLASS_CONTAINER || pBagProto->SubClass != ITEM_SUBCLASS_CONTAINER) && ItemCanGoIntoBag(pProto,pBagProto) ) { - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { if( inv_bags[t-INVENTORY_SLOT_BAG_START][j] == 0 ) { @@ -10278,7 +10276,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const // search free slot bool b_found = false; - for(int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t) + for (int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t) { if( inv_slot_items[t-INVENTORY_SLOT_ITEM_START] == 0 ) { @@ -10290,7 +10288,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const if (b_found) continue; // search free slot in bags - for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t) + for (int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t) { pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, t ); if( pBag ) @@ -10301,7 +10299,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const if( pBagProto && (pBagProto->Class != ITEM_CLASS_CONTAINER || pBagProto->SubClass != ITEM_SUBCLASS_CONTAINER)) continue; - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { if( inv_bags[t-INVENTORY_SLOT_BAG_START][j] == 0 ) { @@ -10403,7 +10401,7 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo // check unique-equipped special item classes if (pProto->Class == ITEM_CLASS_QUIVER) { - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) { if (Item* pBag = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) { @@ -10628,7 +10626,7 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p // in special bags if( pProto->BagFamily ) { - for(uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) + for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { res = _CanStoreItem_InBag(i,dest,pProto,count,true,false,pItem,bag,slot); if(res!=EQUIP_ERR_OK) @@ -10639,7 +10637,7 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p } } - for(uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) + for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { res = _CanStoreItem_InBag(i,dest,pProto,count,true,true,pItem,bag,slot); if(res!=EQUIP_ERR_OK) @@ -10653,7 +10651,7 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p // search free place in special bag if( pProto->BagFamily ) { - for(uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) + for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { res = _CanStoreItem_InBag(i,dest,pProto,count,false,false,pItem,bag,slot); if(res!=EQUIP_ERR_OK) @@ -10672,7 +10670,7 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p if(count==0) return EQUIP_ERR_OK; - for(uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) + for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { res = _CanStoreItem_InBag(i,dest,pProto,count,false,true,pItem,bag,slot); if(res!=EQUIP_ERR_OK) @@ -10836,7 +10834,7 @@ void Player::RemoveAmmo() Item* Player::StoreNewItem( ItemPosCountVec const& dest, uint32 item, bool update,int32 randomPropertyId ) { uint32 count = 0; - for(ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr) + for (ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr) count += itr->count; Item *pItem = Item::CreateItem( item, count, this ); @@ -10857,7 +10855,7 @@ Item* Player::StoreItem( ItemPosCountVec const& dest, Item* pItem, bool update ) Item* lastItem = pItem; uint32 entry = pItem->GetEntry(); - for(ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ) + for (ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ) { uint16 pos = itr->pos; uint32 count = itr->count; @@ -11371,7 +11369,7 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq uint32 remcount = 0; // in inventory - for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) { if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { @@ -11399,7 +11397,7 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq } } - for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { @@ -11428,11 +11426,11 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq } // in inventory bags - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { if(Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) { if(Item* pItem = pBag->GetItemByPos(j)) { @@ -11463,7 +11461,7 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq } // in equipment and bag list - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++) { if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) { @@ -11499,26 +11497,26 @@ void Player::DestroyZoneLimitedItem( bool update, uint32 new_zone ) sLog.outDebug( "STORAGE: DestroyZoneLimitedItem in map %u and area %u", GetMapId(), new_zone ); // in inventory - for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone)) DestroyItem( INVENTORY_SLOT_BAG_0, i, update); - for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone)) DestroyItem( INVENTORY_SLOT_BAG_0, i, update); // in inventory bags - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) if (Item* pItem = pBag->GetItemByPos(j)) if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone)) DestroyItem(i, j, update); // in equipment and bag list - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++) if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone)) DestroyItem( INVENTORY_SLOT_BAG_0, i, update); @@ -11531,21 +11529,21 @@ void Player::DestroyConjuredItems( bool update ) sLog.outDebug( "STORAGE: DestroyConjuredItems" ); // in inventory - for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) + for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) if (pItem->IsConjuredConsumable()) DestroyItem( INVENTORY_SLOT_BAG_0, i, update); // in inventory bags - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) if (Item* pItem = pBag->GetItemByPos(j)) if (pItem->IsConjuredConsumable()) DestroyItem( i, j, update); // in equipment and bag list - for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++) + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++) if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i )) if (pItem->IsConjuredConsumable()) DestroyItem( INVENTORY_SLOT_BAG_0, i, update); @@ -11920,7 +11918,7 @@ void Player::SwapItem( uint16 src, uint16 dst ) uint32 count = 0; - for(uint32 i=0; i < fullBag->GetBagSize(); ++i) + for (uint32 i=0; i < fullBag->GetBagSize(); ++i) { Item *bagItem = fullBag->GetItemByPos(i); if (!bagItem) @@ -11937,7 +11935,6 @@ void Player::SwapItem( uint16 src, uint16 dst ) ++count; } - if (count > emptyBag->GetBagSize()) { // too small targeted bag @@ -11947,7 +11944,7 @@ void Player::SwapItem( uint16 src, uint16 dst ) // Items swap count = 0; // will pos in new bag - for(uint32 i = 0; i< fullBag->GetBagSize(); ++i) + for (uint32 i = 0; i< fullBag->GetBagSize(); ++i) { Item *bagItem = fullBag->GetItemByPos(i); if (!bagItem) @@ -11996,7 +11993,7 @@ void Player::AddItemToBuyBackSlot( Item *pItem ) uint32 oldest_time = GetUInt32Value( PLAYER_FIELD_BUYBACK_TIMESTAMP_1 ); uint32 oldest_slot = BUYBACK_SLOT_START; - for(uint32 i = BUYBACK_SLOT_START+1; i < BUYBACK_SLOT_END; ++i ) + for (uint32 i = BUYBACK_SLOT_START+1; i < BUYBACK_SLOT_END; ++i ) { // found empty if (!m_items[i]) @@ -12126,7 +12123,7 @@ void Player::ClearTrade() { tradeGold = 0; acceptTrade = false; - for(uint8 i = 0; i < TRADE_SLOT_COUNT; i++) + for (uint8 i = 0; i < TRADE_SLOT_COUNT; i++) tradeItems[i] = NULL_SLOT; } @@ -12159,7 +12156,7 @@ void Player::UpdateItemDuration(uint32 time, bool realtimeonly) sLog.outDebug("Player::UpdateItemDuration(%u,%u)", time, realtimeonly); - for(ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); ) + for (ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); ) { Item* item = *itr; ++itr; // current element can be erased in UpdateDuration @@ -12171,7 +12168,7 @@ void Player::UpdateItemDuration(uint32 time, bool realtimeonly) void Player::UpdateEnchantTime(uint32 time) { - for(EnchantDurationList::iterator itr = m_enchantDuration.begin(),next;itr != m_enchantDuration.end();itr=next) + for (EnchantDurationList::iterator itr = m_enchantDuration.begin(),next; itr != m_enchantDuration.end(); itr=next) { assert(itr->item); next = itr; @@ -12195,7 +12192,7 @@ void Player::UpdateEnchantTime(uint32 time) void Player::AddEnchantmentDurations(Item *item) { - for(int x = 0; x < MAX_ENCHANTMENT_SLOT; ++x) + for (int x = 0; x < MAX_ENCHANTMENT_SLOT; ++x) { if (!item->GetEnchantmentId(EnchantmentSlot(x))) continue; @@ -12208,7 +12205,7 @@ void Player::AddEnchantmentDurations(Item *item) void Player::RemoveEnchantmentDurations(Item *item) { - for(EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end();) + for (EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ) { if (itr->item == item) { @@ -12224,7 +12221,7 @@ void Player::RemoveEnchantmentDurations(Item *item) void Player::RemoveArenaEnchantments(EnchantmentSlot slot) { // remove enchantments from equipped items first to clean up the m_enchantDuration list - for(EnchantDurationList::iterator itr = m_enchantDuration.begin(), next; itr != m_enchantDuration.end(); itr = next) + for (EnchantDurationList::iterator itr = m_enchantDuration.begin(), next; itr != m_enchantDuration.end(); itr = next) { next = itr; if (itr->slot == slot) @@ -12252,15 +12249,15 @@ void Player::RemoveArenaEnchantments(EnchantmentSlot slot) // remove enchants from inventory items // NOTE: no need to remove these from stats, since these aren't equipped // in inventory - for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i) + for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i) if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) if (pItem->GetEnchantmentId(slot)) pItem->ClearEnchantment(slot); // in inventory bags - for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i )) - for(uint32 j = 0; j < pBag->GetBagSize(); j++) + for (uint32 j = 0; j < pBag->GetBagSize(); j++) if (Item* pItem = pBag->GetItemByPos(j)) if (pItem->GetEnchantmentId(slot)) pItem->ClearEnchantment(slot); @@ -12275,7 +12272,7 @@ void Player::AddEnchantmentDuration(Item *item,EnchantmentSlot slot,uint32 durat if (slot >= MAX_ENCHANTMENT_SLOT) return; - for(EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr) + for (EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr) { if (itr->item == item && itr->slot == slot) { @@ -12293,7 +12290,7 @@ void Player::AddEnchantmentDuration(Item *item,EnchantmentSlot slot,uint32 durat void Player::ApplyEnchantment(Item *item,bool apply) { - for(uint32 slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot) + for (uint32 slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot) ApplyEnchantment(item, EnchantmentSlot(slot), apply); } @@ -12626,7 +12623,6 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool if(slot == TEMP_ENCHANTMENT_SLOT) SetUInt16Value(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + (item->GetSlot() * 2), 1, apply ? item->GetEnchantmentId(slot) : 0); - if(apply_dur) { if(apply) @@ -12646,7 +12642,7 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool void Player::SendEnchantmentDurations() { - for(EnchantDurationList::const_iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr) + for (EnchantDurationList::const_iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr) { GetSession()->SendItemEnchantTimeUpdate(GetGUID(), itr->item->GetGUID(), itr->slot, uint32(itr->leftduration) / 1000); } @@ -12654,7 +12650,7 @@ void Player::SendEnchantmentDurations() void Player::SendItemDurations() { - for(ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); ++itr) + for (ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); ++itr) { (*itr)->SendTimeUpdate(this); } @@ -12724,7 +12720,7 @@ void Player::PrepareQuestMenu( uint64 guid ) QuestMenu &qm = PlayerTalkClass->GetQuestMenu(); qm.ClearMenu(); - for(QuestRelations::const_iterator i = pObjectQIR->lower_bound(pObject->GetEntry()); i != pObjectQIR->upper_bound(pObject->GetEntry()); ++i) + for (QuestRelations::const_iterator i = pObjectQIR->lower_bound(pObject->GetEntry()); i != pObjectQIR->upper_bound(pObject->GetEntry()); ++i) { uint32 quest_id = i->second; QuestStatus status = GetQuestStatus( quest_id ); @@ -12736,7 +12732,7 @@ void Player::PrepareQuestMenu( uint64 guid ) // qm.AddMenuItem(quest_id, DIALOG_STATUS_CHAT); } - for(QuestRelations::const_iterator i = pObjectQR->lower_bound(pObject->GetEntry()); i != pObjectQR->upper_bound(pObject->GetEntry()); ++i) + for (QuestRelations::const_iterator i = pObjectQR->lower_bound(pObject->GetEntry()); i != pObjectQR->upper_bound(pObject->GetEntry()); ++i) { uint32 quest_id = i->second; Quest const* pQuest = objmgr.GetQuestTemplate(quest_id); @@ -12880,7 +12876,7 @@ Quest const * Player::GetNextQuest( uint64 guid, Quest const *pQuest ) } uint32 nextQuestID = pQuest->GetNextQuestInChain(); - for(QuestRelations::const_iterator itr = pObjectQR->lower_bound(pObject->GetEntry()); itr != pObjectQR->upper_bound(pObject->GetEntry()); ++itr) + for (QuestRelations::const_iterator itr = pObjectQR->lower_bound(pObject->GetEntry()); itr != pObjectQR->upper_bound(pObject->GetEntry()); ++itr) { if (itr->second == nextQuestID) return objmgr.GetQuestTemplate(nextQuestID); @@ -12958,7 +12954,7 @@ bool Player::CanCompleteQuest( uint32 quest_id ) if ( qInfo->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) ) { - for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) + for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) { if( qInfo->ReqItemCount[i]!= 0 && q_status.m_itemcount[i] < qInfo->ReqItemCount[i] ) return false; @@ -12967,7 +12963,7 @@ bool Player::CanCompleteQuest( uint32 quest_id ) if ( qInfo->HasFlag(QUEST_TRINITY_FLAGS_KILL_OR_CAST | QUEST_TRINITY_FLAGS_SPEAKTO) ) { - for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) + for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) { if( qInfo->ReqCreatureOrGOId[i] == 0 ) continue; @@ -13008,7 +13004,7 @@ bool Player::CanCompleteRepeatableQuest( Quest const *pQuest ) return false; if (pQuest->HasFlag( QUEST_TRINITY_FLAGS_DELIVER) ) - for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) + for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) if( pQuest->ReqItemId[i] && pQuest->ReqItemCount[i] && !HasItemCount(pQuest->ReqItemId[i],pQuest->ReqItemCount[i]) ) return false; @@ -13035,7 +13031,7 @@ bool Player::CanRewardQuest( Quest const *pQuest, bool msg ) // prevent receive reward with quest items in bank if ( pQuest->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) ) { - for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) + for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) { if( pQuest->ReqItemCount[i]!= 0 && GetItemCount(pQuest->ReqItemId[i]) < pQuest->ReqItemCount[i] ) @@ -13110,13 +13106,13 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver ) if ( pQuest->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) ) { - for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) + for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) questStatusData.m_itemcount[i] = 0; } if ( pQuest->HasFlag(QUEST_TRINITY_FLAGS_KILL_OR_CAST | QUEST_TRINITY_FLAGS_SPEAKTO) ) { - for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) + for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) questStatusData.m_creatureOrGOcount[i] = 0; } @@ -13159,7 +13155,7 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver ) uint32 zone, area; GetZoneAndAreaId(zone,area); - for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) + for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) if(itr->second->autocast && itr->second->IsFitToRequirements(this,zone,area)) if( !HasAura(itr->second->spellId) ) CastSpell(this,itr->second->spellId,true); @@ -13216,7 +13212,7 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver TakeQuestSourceItem(quest_id, true); // take quest src item from player on completing quest - for(uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) + for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) { if (pQuest->ReqSourceId[i]) { @@ -13269,7 +13265,7 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver // handle SPELL_AURA_MOD_XP_QUEST_PCT auras Unit::AuraEffectList const& ModXPPctAuras = GetAurasByType(SPELL_AURA_MOD_XP_QUEST_PCT); - for(Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin(); i != ModXPPctAuras.end(); ++i) XP = uint32(XP*(1.0f + (*i)->GetAmount() / 100.0f)); if (getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)) @@ -13344,7 +13340,7 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver MailItemsInfo mi; // item list preparing uint32 max_slot = questMailLoot.GetMaxSlotInLootFor(this); - for(uint32 i = 0; mi.size() < MAX_MAIL_ITEMS && i < max_slot; ++i) + for (uint32 i = 0; mi.size() < MAX_MAIL_ITEMS && i < max_slot; ++i) { if (LootItem* lootitem = questMailLoot.LootItemInSlot(i,this)) { @@ -13397,7 +13393,7 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver { GetZoneAndAreaId(zone,area); - for(SpellAreaForAreaMap::const_iterator itr = saEndBounds.first; itr != saEndBounds.second; ++itr) + for (SpellAreaForAreaMap::const_iterator itr = saEndBounds.first; itr != saEndBounds.second; ++itr) if(!itr->second->IsFitToRequirements(this,zone,area)) RemoveAurasDueToSpell(itr->second->spellId); } @@ -13409,7 +13405,7 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver if(!zone || !area) GetZoneAndAreaId(zone,area); - for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) + for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) if(itr->second->autocast && itr->second->IsFitToRequirements(this,zone,area)) if( !HasAura(itr->second->spellId) ) CastSpell(this,itr->second->spellId,true); @@ -13525,7 +13521,7 @@ bool Player::SatisfyQuestPreviousQuest( Quest const* qInfo, bool msg ) if( qInfo->prevQuests.empty()) return true; - for(Quest::PrevQuests::const_iterator iter = qInfo->prevQuests.begin(); iter != qInfo->prevQuests.end(); ++iter ) + for (Quest::PrevQuests::const_iterator iter = qInfo->prevQuests.begin(); iter != qInfo->prevQuests.end(); ++iter ) { uint32 prevId = abs(*iter); @@ -13548,7 +13544,7 @@ bool Player::SatisfyQuestPreviousQuest( Quest const* qInfo, bool msg ) assert(iter2!=end); // always must be found if qPrevInfo->ExclusiveGroup != 0 - for(; iter2 != end; ++iter2) + for (; iter2 != end; ++iter2) { uint32 exclude_Id = iter2->second; @@ -13583,7 +13579,7 @@ bool Player::SatisfyQuestPreviousQuest( Quest const* qInfo, bool msg ) assert(iter2!=end); // always must be found if qPrevInfo->ExclusiveGroup != 0 - for(; iter2 != end; ++iter2) + for (; iter2 != end; ++iter2) { uint32 exclude_Id = iter2->second; @@ -13685,7 +13681,7 @@ bool Player::SatisfyQuestExclusiveGroup( Quest const* qInfo, bool msg ) assert(iter!=end); // always must be found if qInfo->ExclusiveGroup != 0 - for(; iter != end; ++iter) + for (; iter != end; ++iter) { uint32 exclude_Id = iter->second; @@ -13743,7 +13739,7 @@ bool Player::SatisfyQuestPrevChain( Quest const* qInfo, bool msg ) if( qInfo->prevChainQuests.empty()) return true; - for(Quest::PrevChainQuests::const_iterator iter = qInfo->prevChainQuests.begin(); iter != qInfo->prevChainQuests.end(); ++iter ) + for (Quest::PrevChainQuests::const_iterator iter = qInfo->prevChainQuests.begin(); iter != qInfo->prevChainQuests.end(); ++iter ) { uint32 prevId = *iter; @@ -13777,7 +13773,7 @@ bool Player::SatisfyQuestDay( Quest const* qInfo, bool msg ) return true; bool have_slot = false; - for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) + for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) { uint32 id = GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx); if(qInfo->GetQuestId()==id) @@ -13925,7 +13921,7 @@ void Player::AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& ques { if ( pQuest->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) ) { - for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) + for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) { uint32 reqitemcount = pQuest->ReqItemCount[i]; if( reqitemcount != 0 ) @@ -13941,7 +13937,7 @@ void Player::AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& ques uint16 Player::FindQuestSlot( uint32 quest_id ) const { - for ( uint16 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint16 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) if ( GetQuestSlotQuestId(i) == quest_id ) return i; @@ -13974,7 +13970,7 @@ void Player::GroupEventHappens( uint32 questId, WorldObject const* pEventObject { if( Group *pGroup = GetGroup() ) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player *pGroupGuy = itr->getSource(); @@ -13989,7 +13985,7 @@ void Player::GroupEventHappens( uint32 questId, WorldObject const* pEventObject void Player::ItemAddedQuestCheck( uint32 entry, uint32 count ) { - for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) { uint32 questid = GetQuestSlotQuestId(i); if ( questid == 0 ) @@ -14030,7 +14026,7 @@ void Player::ItemAddedQuestCheck( uint32 entry, uint32 count ) void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count ) { - for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) { uint32 questid = GetQuestSlotQuestId(i); if(!questid) @@ -14074,7 +14070,7 @@ void Player::KilledMonster( CreatureInfo const* cInfo, uint64 guid ) if(cInfo->Entry) KilledMonsterCredit(cInfo->Entry,guid); - for(int i = 0; i < MAX_KILL_CREDIT; ++i) + for (int i = 0; i < MAX_KILL_CREDIT; ++i) if(cInfo->KillCredit[i]) KilledMonsterCredit(cInfo->KillCredit[i],guid); } @@ -14083,7 +14079,7 @@ void Player::KilledMonsterCredit( uint32 entry, uint64 guid ) { uint32 addkillcount = 1; GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, entry, addkillcount); - for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) { uint32 questid = GetQuestSlotQuestId(i); if(!questid) @@ -14138,7 +14134,7 @@ void Player::CastedCreatureOrGO( uint32 entry, uint64 guid, uint32 spell_id ) bool isCreature = IS_CRE_OR_VEH_GUID(guid); uint32 addCastCount = 1; - for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i) + for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i) { uint32 questid = GetQuestSlotQuestId(i); if(!questid) @@ -14205,7 +14201,7 @@ void Player::CastedCreatureOrGO( uint32 entry, uint64 guid, uint32 spell_id ) void Player::TalkedToCreature( uint32 entry, uint64 guid ) { uint32 addTalkCount = 1; - for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) { uint32 questid = GetQuestSlotQuestId(i); if(!questid) @@ -14260,7 +14256,7 @@ void Player::TalkedToCreature( uint32 entry, uint64 guid ) void Player::MoneyChanged( uint32 count ) { - for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) { uint32 questid = GetQuestSlotQuestId(i); if (!questid) @@ -14290,7 +14286,7 @@ void Player::MoneyChanged( uint32 count ) void Player::ReputationChanged(FactionEntry const* factionEntry ) { - for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) { if(uint32 questid = GetQuestSlotQuestId(i)) { @@ -14318,7 +14314,7 @@ void Player::ReputationChanged(FactionEntry const* factionEntry ) bool Player::HasQuestForItem( uint32 itemid ) const { - for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) { uint32 questid = GetQuestSlotQuestId(i); if ( questid == 0 ) @@ -14561,7 +14557,7 @@ void Player::_LoadDeclinedNames(QueryResult* result) m_declinedname = new DeclinedName; Field *fields = result->Fetch(); - for(uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) m_declinedname->name[i] = fields[i].GetCppString(); delete result; @@ -14621,7 +14617,7 @@ void Player::_LoadEquipmentSets(QueryResult *result) eqSet.IconName = fields[3].GetCppString(); eqSet.state = EQUIPMENT_SET_UNCHANGED; - for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) + for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) eqSet.Items[i] = fields[4+i].GetUInt32(); m_EquipmentSets[index] = eqSet; @@ -14822,7 +14818,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) InitDisplayIds(); // cleanup inventory related item value fields (its will be filled correctly in _LoadInventory) - for(uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) + for (uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) { SetUInt64Value( PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), 0 ); SetVisibleItemSlot(slot, NULL); @@ -14875,7 +14871,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) SetUInt32Value(PLAYER_FIELD_ARENA_CURRENCY, arena_currency); // check arena teams integrity - for(uint32 arena_slot = 0; arena_slot < MAX_ARENA_SLOT; ++arena_slot) + for (uint32 arena_slot = 0; arena_slot < MAX_ARENA_SLOT; ++arena_slot) { uint32 arena_team_id = GetArenaTeamId(arena_slot); if(!arena_team_id) @@ -14886,7 +14882,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) continue; // arena team not exist or not member, cleanup fields - for(int j = 0; j < 6; ++j) + for (int j = 0; j < 6; ++j) SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arena_slot * 6 + j, 0); } @@ -15195,7 +15191,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) // remember loaded power/health values to restore after stats initialization and modifier applying uint32 savedHealth = GetHealth(); uint32 savedPower[MAX_POWERS]; - for(uint32 i = 0; i < MAX_POWERS; ++i) + for (uint32 i = 0; i < MAX_POWERS; ++i) savedPower[i] = GetPower(Powers(i)); // reset stats before loading any modifiers @@ -15208,11 +15204,11 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) //mails are loaded only when needed ;-) - when player in game click on mailbox. //_LoadMail(); - + m_specsCount = fields[42].GetUInt32(); m_activeSpec = fields[43].GetUInt32(); delete result; - + // sanity check if (m_specsCount > MAX_TALENT_SPECS || m_activeSpec > MAX_TALENT_SPEC || m_specsCount < MIN_TALENT_SPECS || m_activeSpec < MIN_TALENT_SPEC ) // if (m_specsCount < 2) is not logical @@ -15220,7 +15216,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) m_activeSpec = 0; sLog.outError("Player %s(GUID: %u) has SpecCount = %u and ActiveSpec = %u.", GetName(), GetGUIDLow(), m_specsCount, m_activeSpec); } - + _LoadTalents(holder->GetResult(PLAYER_LOGIN_QUERY_LOADTALENTS)); _LoadSpells(holder->GetResult(PLAYER_LOGIN_QUERY_LOADSPELLS)); @@ -15278,7 +15274,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) // restore remembered power/health values (but not more max values) SetHealth(savedHealth > GetMaxHealth() ? GetMaxHealth() : savedHealth); - for(uint32 i = 0; i < MAX_POWERS; ++i) + for (uint32 i = 0; i < MAX_POWERS; ++i) SetPower(Powers(i),savedPower[i] > GetMaxPower(Powers(i)) ? GetMaxPower(Powers(i)) : savedPower[i]); sLog.outDebug("The value of player %s after load item and aura is: ", m_name.c_str()); @@ -15670,7 +15666,7 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff) // fill mail MailItemsInfo mi; // item list preparing - for(uint8 i = 0; !problematicItems.empty() && i < MAX_MAIL_ITEMS; ++i) + for (uint8 i = 0; !problematicItems.empty() && i < MAX_MAIL_ITEMS; ++i) { Item* item = problematicItems.front(); problematicItems.pop_front(); @@ -15882,7 +15878,7 @@ void Player::_LoadQuestStatus(QueryResult *result) if (questStatusData.m_status == QUEST_STATUS_FAILED) SetQuestSlotState(slot, QUEST_STATE_FAIL); - for(uint8 idx = 0; idx < QUEST_OBJECTIVES_COUNT; ++idx) + for (uint8 idx = 0; idx < QUEST_OBJECTIVES_COUNT; ++idx) if(questStatusData.m_creatureOrGOcount[idx]) SetQuestSlotCounter(slot, idx, questStatusData.m_creatureOrGOcount[idx]); @@ -15914,13 +15910,13 @@ void Player::_LoadQuestStatus(QueryResult *result) } // clear quest log tail - for ( uint16 i = slot; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint16 i = slot; i < MAX_QUEST_LOG_SIZE; ++i ) SetQuestSlot(i, 0); } void Player::_LoadDailyQuestStatus(QueryResult *result) { - for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) + for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,0); //QueryResult *result = CharacterDatabase.PQuery("SELECT quest,time FROM character_queststatus_daily WHERE guid = '%u'", GetGUIDLow()); @@ -16002,7 +15998,7 @@ void Player::_LoadGroup(QueryResult *result) void Player::_LoadBoundInstances(QueryResult *result) { - for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++) + for (uint8 i = 0; i < TOTAL_DIFFICULTIES; i++) m_boundInstances[i].clear(); Group *group = GetGroup(); @@ -16129,7 +16125,7 @@ void Player::SendRaidInfo() time_t now = time(NULL); - 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(); ++itr) { @@ -16157,7 +16153,7 @@ void Player::SendSavedInstances() bool hasBeenSaved = false; WorldPacket data; - 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(); ++itr) { @@ -16177,7 +16173,7 @@ void Player::SendSavedInstances() if(!hasBeenSaved) return; - 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(); ++itr) { @@ -16205,9 +16201,9 @@ void Player::ConvertInstancesToGroup(Player *player, Group *group, uint64 player if(player) { - for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++) + for (uint8 i = 0; i < TOTAL_DIFFICULTIES; i++) { - for (BoundInstancesMap::iterator itr = player->m_boundInstances[i].begin(); itr != player->m_boundInstances[i].end();) + for (BoundInstancesMap::iterator itr = player->m_boundInstances[i].begin(); itr != player->m_boundInstances[i].end(); ) { has_binds = true; if(group) group->BindToInstance(itr->second.save, itr->second.perm, true); @@ -16419,7 +16415,7 @@ void Player::SaveToDB() } uint16 i; - for( i = 0; i < m_valuesCount; i++ ) + for (i = 0; i < m_valuesCount; i++ ) { ss << GetUInt32Value(i) << " "; } @@ -16513,7 +16509,7 @@ void Player::SaveGoldToDB() void Player::_SaveActions() { - for(ActionButtonList::iterator itr = m_actionButtons.begin(); itr != m_actionButtons.end(); ) + for (ActionButtonList::iterator itr = m_actionButtons.begin(); itr != m_actionButtons.end(); ) { switch (itr->second.uState) { @@ -16545,13 +16541,13 @@ void Player::_SaveAuras() CharacterDatabase.PExecute("DELETE FROM character_aura WHERE guid = '%u'",GetGUIDLow()); AuraMap const& auras = GetAuras(); - for(AuraMap::const_iterator itr = auras.begin(); itr !=auras.end() ; ++itr) + for (AuraMap::const_iterator itr = auras.begin(); itr !=auras.end() ; ++itr) { if(!itr->second->CanBeSaved()) continue; int32 amounts[MAX_SPELL_EFFECTS]; - for (uint8 i=0;i<MAX_SPELL_EFFECTS;++i) + for (uint8 i=0; i<MAX_SPELL_EFFECTS; ++i) { if (AuraEffect * partAura = itr->second->GetPartAura(i)) amounts[i]=partAura->GetAmount(); @@ -16581,7 +16577,7 @@ void Player::_SaveInventory() } // update enchantment durations - for(EnchantDurationList::iterator itr = m_enchantDuration.begin();itr != m_enchantDuration.end();++itr) + for (EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr) { itr->item->SetEnchantmentDuration(itr->slot,itr->leftduration); } @@ -16591,7 +16587,7 @@ void Player::_SaveInventory() // do not save if the update queue is corrupt bool error = false; - for(size_t i = 0; i < m_itemUpdateQueue.size(); i++) + for (size_t i = 0; i < m_itemUpdateQueue.size(); i++) { Item *item = m_itemUpdateQueue[i]; if(!item || item->GetState() == ITEM_REMOVED) continue; @@ -16617,7 +16613,7 @@ void Player::_SaveInventory() return; } - for(size_t i = 0; i < m_itemUpdateQueue.size(); i++) + for (size_t i = 0; i < m_itemUpdateQueue.size(); i++) { Item *item = m_itemUpdateQueue[i]; if(!item) continue; @@ -16659,7 +16655,7 @@ void Player::_SaveMail() m->itemTextId, m->HasItems() ? 1 : 0, (uint64)m->expire_time, (uint64)m->deliver_time, m->money, m->COD, m->checked, m->messageID); if(m->removedItems.size()) { - for(std::vector<uint32>::iterator itr2 = m->removedItems.begin(); itr2 != m->removedItems.end(); ++itr2) + for (std::vector<uint32>::iterator itr2 = m->removedItems.begin(); itr2 != m->removedItems.end(); ++itr2) CharacterDatabase.PExecute("DELETE FROM mail_items WHERE item_guid = '%u'", *itr2); m->removedItems.clear(); } @@ -16668,7 +16664,7 @@ void Player::_SaveMail() else if (m->state == MAIL_STATE_DELETED) { if (m->HasItems()) - for(std::vector<MailItemInfo>::iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2) + for (std::vector<MailItemInfo>::iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2) CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", itr2->item_guid); if (m->itemTextId) CharacterDatabase.PExecute("DELETE FROM item_text WHERE id = '%u'", m->itemTextId); @@ -16697,7 +16693,7 @@ void Player::_SaveMail() void Player::_SaveQuestStatus() { // we don't need transactions here. - for( QuestStatusMap::iterator i = mQuestStatus.begin( ); i != mQuestStatus.end( ); ++i ) + for (QuestStatusMap::iterator i = mQuestStatus.begin( ); i != mQuestStatus.end( ); ++i ) { switch (i->second.uState) { @@ -16728,7 +16724,7 @@ void Player::_SaveDailyQuestStatus() // we don't need transactions here. CharacterDatabase.PExecute("DELETE FROM character_queststatus_daily WHERE guid = '%u'",GetGUIDLow()); - for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) + for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) if(GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx)) CharacterDatabase.PExecute("INSERT INTO character_queststatus_daily (guid,quest,time) VALUES ('%u', '%u','" UI64FMTD "')", GetGUIDLow(), GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx),uint64(m_lastDailyQuestTime)); @@ -16736,7 +16732,7 @@ void Player::_SaveDailyQuestStatus() void Player::_SaveSpells() { - for (PlayerSpellMap::iterator itr = m_spells.begin(), next = m_spells.begin(); itr != m_spells.end();) + for (PlayerSpellMap::iterator itr = m_spells.begin(), next = m_spells.begin(); itr != m_spells.end(); ) { if (itr->second->state == PLAYERSPELL_REMOVED || itr->second->state == PLAYERSPELL_CHANGED) CharacterDatabase.PExecute("DELETE FROM character_spell WHERE guid = '%u' and spell = '%u'", GetGUIDLow(), itr->first); @@ -16843,7 +16839,7 @@ void Player::SaveDataFieldToDB() std::ostringstream ss; ss<<"UPDATE characters SET data='"; - for(uint16 i = 0; i < m_valuesCount; i++ ) + for (uint16 i = 0; i < m_valuesCount; i++ ) { ss << GetUInt32Value(i) << " "; } @@ -16982,7 +16978,7 @@ void Player::ResetInstances(uint8 method) // we assume that when the difficulty changes, all instances that can be reset will be uint8 dif = GetDifficulty(); - for (BoundInstancesMap::iterator itr = m_boundInstances[dif].begin(); itr != m_boundInstances[dif].end();) + for (BoundInstancesMap::iterator itr = m_boundInstances[dif].begin(); itr != m_boundInstances[dif].end(); ) { InstanceSave *p = itr->second.save; const MapEntry *entry = sMapStore.LookupEntry(itr->first); @@ -17128,7 +17124,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) if(spellInfo) { - for(uint32 i = 0; i < 7; ++i) + for (uint32 i = 0; i < 7; ++i) { if(spellInfo->Reagent[i] > 0) { @@ -17347,7 +17343,7 @@ void Player::PetSpellInitialize() time_t curTime = time(NULL); - for(CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureSpellCooldowns.begin(); itr != pet->m_CreatureSpellCooldowns.end(); ++itr) + for (CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureSpellCooldowns.begin(); itr != pet->m_CreatureSpellCooldowns.end(); ++itr) { time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0; @@ -17357,7 +17353,7 @@ void Player::PetSpellInitialize() data << uint32(0); // category cooldown } - for(CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureCategoryCooldowns.begin(); itr != pet->m_CreatureCategoryCooldowns.end(); ++itr) + for (CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureCategoryCooldowns.begin(); itr != pet->m_CreatureCategoryCooldowns.end(); ++itr) { time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0; @@ -17412,7 +17408,7 @@ void Player::VehicleSpellInitialize() data << uint32(0); data << uint32(0x00000101); - for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i) + for (uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i) { uint32 spellId = ((Creature*)veh)->m_spells[i]; if(!spellId) @@ -17431,7 +17427,7 @@ void Player::VehicleSpellInitialize() data << uint16(spellId) << uint8(0) << uint8(i+8); } - for(uint32 i = CREATURE_MAX_SPELLS; i < MAX_SPELL_CONTROL_BAR; ++i) + for (uint32 i = CREATURE_MAX_SPELLS; i < MAX_SPELL_CONTROL_BAR; ++i) data << uint16(0) << uint8(0) << uint8(i+8); data << uint8(0); @@ -17458,7 +17454,7 @@ void Player::CharmSpellInitialize() CreatureInfo const *cinfo = ((Creature*)charm)->GetCreatureInfo(); //if(cinfo && cinfo->type == CREATURE_TYPE_DEMON && getClass() == CLASS_WARLOCK) { - for(uint32 i = 0; i < MAX_SPELL_CHARM; ++i) + for (uint32 i = 0; i < MAX_SPELL_CHARM; ++i) { if(charmInfo->GetCharmSpell(i)->GetAction()) ++addlist; @@ -17482,7 +17478,7 @@ void Player::CharmSpellInitialize() if(addlist) { - for(uint32 i = 0; i < MAX_SPELL_CHARM; ++i) + for (uint32 i = 0; i < MAX_SPELL_CHARM; ++i) { CharmSpellEntry *cspell = charmInfo->GetCharmSpell(i); if(cspell->GetAction()) @@ -17558,9 +17554,9 @@ void Player::RestoreSpellMods(Spell * spell) if (!spell || spell->m_appliedMods.empty()) return; - for(uint8 i=0;i<MAX_SPELLMOD;++i) + for (uint8 i=0; i<MAX_SPELLMOD; ++i) { - for (SpellModList::iterator itr = m_spellMods[i].begin(); itr != m_spellMods[i].end();++itr) + for (SpellModList::iterator itr = m_spellMods[i].begin(); itr != m_spellMods[i].end(); ++itr) { SpellModifier *mod = *itr; @@ -17600,7 +17596,7 @@ void Player::RemoveSpellMods(Spell * spell) std::set <Aura *> checkedSpells; AuraEffectList const & auraList = GetAurasByType(SPELL_AURA_ABILITY_IGNORE_AURASTATE); - for(AuraEffectList::const_iterator itr = auraList.begin(); itr != auraList.end();) + for (AuraEffectList::const_iterator itr = auraList.begin(); itr != auraList.end(); ) { AuraEffect * aur = *itr; ++itr; @@ -17627,9 +17623,9 @@ void Player::RemoveSpellMods(Spell * spell) if (spell->m_appliedMods.empty()) return; - for(uint8 i=0;i<MAX_SPELLMOD;++i) + for (uint8 i=0; i<MAX_SPELLMOD; ++i) { - for (SpellModList::iterator itr = m_spellMods[i].begin(); itr != m_spellMods[i].end();) + for (SpellModList::iterator itr = m_spellMods[i].begin(); itr != m_spellMods[i].end(); ) { SpellModifier *mod = *itr; ++itr; @@ -17944,7 +17940,7 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc uint32 prevnode = sourcenode; uint32 lastnode = 0; - for(uint32 i = 1; i < nodes.size(); ++i) + for (uint32 i = 1; i < nodes.size(); ++i) { uint32 path, cost; @@ -18070,7 +18066,7 @@ void Player::ContinueTaxiFlight() (nodeList[0].y-GetPositionY())*(nodeList[0].y-GetPositionY())+ (nodeList[0].z-GetPositionZ())*(nodeList[0].z-GetPositionZ()); - for(uint32 i = 1; i < nodeList.size(); ++i) + for (uint32 i = 1; i < nodeList.size(); ++i) { TaxiPathNode const& node = nodeList[i]; TaxiPathNode const& prevNode = nodeList[i-1]; @@ -18108,7 +18104,7 @@ void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs ) data << GetGUID(); data << uint8(0x0); // flags (0x1, 0x2) time_t curTime = time(NULL); - for(PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr) + for (PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr) { if (itr->second->state == PLAYERSPELL_REMOVED) continue; @@ -18430,7 +18426,7 @@ uint32 Player::GetMaxPersonalArenaRatingRequirement() // the personal rating of the arena team must match the required limit as well // so return max[in arenateams](min(personalrating[teamtype], teamrating[teamtype])) uint32 max_personal_rating = 0; - for(uint8 i = 0; i < MAX_ARENA_SLOT; ++i) + for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i) { if(ArenaTeam * at = objmgr.GetArenaTeamById(GetArenaTeamId(i))) { @@ -18492,14 +18488,14 @@ void Player::UpdatePvPState(bool onlyFFA) if(!HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP)) { SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); - for(ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) (*itr)->SetByteValue(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); } } else if(HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP)) { RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); - for(ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) (*itr)->RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); } @@ -18549,7 +18545,7 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it { if(ItemPrototype const* proto = ObjectMgr::GetItemPrototype(itemId)) { - for(uint8 idx = 0; idx < 5; ++idx) + for (uint8 idx = 0; idx < 5; ++idx) { if(proto->Spells[idx].SpellId == spellInfo->Id) { @@ -18619,7 +18615,7 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it SpellCategoryStore::const_iterator i_scstore = sSpellCategoryStore.find(cat); if(i_scstore != sSpellCategoryStore.end()) { - for(SpellCategorySet::const_iterator i_scset = i_scstore->second.begin(); i_scset != i_scstore->second.end(); ++i_scset) + for (SpellCategorySet::const_iterator i_scset = i_scstore->second.begin(); i_scset != i_scstore->second.end(); ++i_scset) { if(*i_scset == spellInfo->Id) // skip main spell, already handled above continue; @@ -18661,7 +18657,7 @@ void Player::UpdatePotionCooldown(Spell* spell) { // spell/item pair let set proper cooldown (except not existed charged spell cooldown spellmods for potions) if(ItemPrototype const* proto = ObjectMgr::GetItemPrototype(m_lastPotionId)) - for(uint8 idx = 0; idx < 5; ++idx) + for (uint8 idx = 0; idx < 5; ++idx) if(proto->Spells[idx].SpellId && proto->Spells[idx].SpellTrigger == ITEM_SPELLTRIGGER_ON_USE) if(SpellEntry const* spellInfo = sSpellStore.LookupEntry(proto->Spells[idx].SpellId)) SendCooldownEvent(spellInfo,m_lastPotionId); @@ -18687,14 +18683,14 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot) uint8 curcount[4] = {0, 0, 0, 0}; //counting current equipped gem colors - for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) + for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) { if(i == slot) continue; Item *pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i ); if(pItem2 && pItem2->GetProto()->Socket[0].Color) { - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) + for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) { uint32 enchant_id = pItem2->GetEnchantmentId(EnchantmentSlot(enchant_slot)); if(!enchant_id) @@ -18718,7 +18714,7 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot) uint8 GemColor = gemProperty->color; - for(uint8 b = 0, tmpcolormask = 1; b < 4; b++, tmpcolormask <<= 1) + for (uint8 b = 0, tmpcolormask = 1; b < 4; b++, tmpcolormask <<= 1) { if(tmpcolormask & GemColor) ++curcount[b]; @@ -18729,7 +18725,7 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot) bool activate = true; - for(uint8 i = 0; i < 5; i++) + for (uint8 i = 0; i < 5; i++) { if(!Condition->Color[i]) continue; @@ -18761,7 +18757,7 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot) void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply) { //cycle all equipped items - for(uint32 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) + for (uint32 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) { //enchants for the slot being socketed are handled by Player::ApplyItemMods if(slot == exceptslot) @@ -18772,7 +18768,7 @@ void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply) if(!pItem || !pItem->GetProto()->Socket[0].Color) continue; - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) + for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) { uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(enchant_slot)); if(!enchant_id) @@ -18803,7 +18799,7 @@ void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply) void Player::ToggleMetaGemsActive(uint8 exceptslot, bool apply) { //cycle all equipped items - for(int slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) + for (int slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) { //enchants for the slot being socketed are handled by WorldSession::HandleSocketOpcode(WorldPacket& recv_data) if(slot == exceptslot) @@ -18815,7 +18811,7 @@ void Player::ToggleMetaGemsActive(uint8 exceptslot, bool apply) continue; //cycle all (gem)enchants - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) + for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) { uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(enchant_slot)); if(!enchant_id) //if no enchant go to next enchant(slot) @@ -19178,7 +19174,7 @@ void Player::UpdateVisibilityOf(WorldObject* target) { //if(target->isType(TYPEMASK_UNIT) && ((Unit*)target)->m_Vehicle) // UpdateVisibilityOf(((Unit*)target)->m_Vehicle); - + target->SendUpdateToPlayer(this); UpdateVisibilityOf_helper(m_clientGUIDs, target); @@ -19422,7 +19418,7 @@ void Player::SendInitialPacketsAfterAddToMap() SPELL_AURA_FEATHER_FALL, SPELL_AURA_HOVER, SPELL_AURA_SAFE_FALL, SPELL_AURA_FLY, SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED, SPELL_AURA_NONE }; - for(AuraType const* itr = &auratypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr) + for (AuraType const* itr = &auratypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr) { Unit::AuraEffectList const& auraList = GetAurasByType(*itr); if(!auraList.empty()) @@ -19503,7 +19499,7 @@ void Player::SendInstanceResetWarning( uint32 mapid, uint32 difficulty, uint32 t void Player::ApplyEquipCooldown( Item * pItem ) { - for(uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) + for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) { _Spell const& spellData = pItem->GetProto()->Spells[i]; @@ -19544,7 +19540,7 @@ void Player::resetSpells(bool myClassOnly) family = clsEntry->spellfamily; } - for(PlayerSpellMap::const_iterator iter = smap.begin();iter != smap.end(); ++iter) + for (PlayerSpellMap::const_iterator iter = smap.begin(); iter != smap.end(); ++iter) { if(myClassOnly) { @@ -19609,7 +19605,7 @@ void Player::learnQuestRewardedSpells(Quest const* quest) // check learned spells state bool found = false; - for(uint8 i=0; i < 3; ++i) + for (uint8 i=0; i < 3; ++i) { if(spellInfo->Effect[i] == SPELL_EFFECT_LEARN_SPELL && !HasSpell(spellInfo->EffectTriggerSpell[i])) { @@ -19641,7 +19637,7 @@ void Player::learnQuestRewardedSpells(Quest const* quest) if(learnedInfo->Effect[0]==SPELL_EFFECT_TRADE_SKILL && learnedInfo->Effect[1]==0 && profSpell) { // search other specialization for same prof - for(PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr) + for (PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr) { if(itr->second->state == PLAYERSPELL_REMOVED || itr->first==learned_0) continue; @@ -19667,7 +19663,7 @@ void Player::learnQuestRewardedSpells(Quest const* quest) void Player::learnQuestRewardedSpells() { // learn spells received from quest completing - for(QuestStatusMap::const_iterator itr = mQuestStatus.begin(); itr != mQuestStatus.end(); ++itr) + for (QuestStatusMap::const_iterator itr = mQuestStatus.begin(); itr != mQuestStatus.end(); ++itr) { // skip no rewarded quests if(!itr->second.m_rewarded) @@ -19720,7 +19716,7 @@ void Player::SendAurasForTarget(Unit *target) data.append(target->GetPackGUID()); Unit::VisibleAuraMap const *visibleAuras = target->GetVisibleAuras(); - for(Unit::VisibleAuraMap::const_iterator itr = visibleAuras->begin(); itr != visibleAuras->end(); ++itr) + for (Unit::VisibleAuraMap::const_iterator itr = visibleAuras->begin(); itr != visibleAuras->end(); ++itr) { Aura * aura=itr->second; data << uint8(aura->GetAuraSlot()); @@ -19753,7 +19749,7 @@ void Player::SendAurasForTarget(Unit *target) void Player::SetDailyQuestStatus( uint32 quest_id ) { - for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) + for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) { if(!GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx)) { @@ -19767,7 +19763,7 @@ void Player::SetDailyQuestStatus( uint32 quest_id ) void Player::ResetDailyQuestStatus() { - for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) + for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,0); // DB data deleted in caller @@ -19843,7 +19839,7 @@ bool Player::IsSpellFitByClassAndRace( uint32 spell_id ) const if (bounds.first==bounds.second) return true; - for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) + for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) { // skip wrong race skills if (_spell_idx->second->racemask && (_spell_idx->second->racemask & racemask) == 0) @@ -19861,7 +19857,7 @@ bool Player::IsSpellFitByClassAndRace( uint32 spell_id ) const bool Player::HasQuestForGO(int32 GOId) const { - for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) + for (uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i ) { uint32 questid = GetQuestSlotQuestId(i); if ( questid == 0 ) @@ -19902,7 +19898,7 @@ void Player::UpdateForQuestWorldObjects() UpdateData udata; WorldPacket packet; - for(ClientGUIDs::iterator itr=m_clientGUIDs.begin(); itr!=m_clientGUIDs.end(); ++itr) + for (ClientGUIDs::iterator itr=m_clientGUIDs.begin(); itr!=m_clientGUIDs.end(); ++itr) { if(IS_GAMEOBJECT_GUID(*itr)) { @@ -19921,7 +19917,7 @@ void Player::UpdateForQuestWorldObjects() continue; SpellClickInfoMapBounds clickPair = objmgr.GetSpellClickInfoMapBounds(obj->GetEntry()); - for(SpellClickInfoMap::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr) + for (SpellClickInfoMap::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr) { if(_itr->second.questStart || _itr->second.questEnd) { @@ -19968,7 +19964,7 @@ void Player::SummonIfPossible(bool agree) void Player::RemoveItemDurations( Item *item ) { - for(ItemDurationList::iterator itr = m_itemDuration.begin();itr != m_itemDuration.end(); ++itr) + for (ItemDurationList::iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); ++itr) { if(*itr==item) { @@ -20035,7 +20031,7 @@ bool Player::HasItemFitToSpellReqirements(SpellEntry const* spellInfo, Item cons { case ITEM_CLASS_WEAPON: { - for(uint8 i= EQUIPMENT_SLOT_MAINHAND; i < EQUIPMENT_SLOT_TABARD; ++i) + for (uint8 i= EQUIPMENT_SLOT_MAINHAND; i < EQUIPMENT_SLOT_TABARD; ++i) if(Item *item = GetUseableItemByPos( INVENTORY_SLOT_BAG_0, i )) if(item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo)) return true; @@ -20044,7 +20040,7 @@ bool Player::HasItemFitToSpellReqirements(SpellEntry const* spellInfo, Item cons case ITEM_CLASS_ARMOR: { // tabard not have dependent spells - for(uint8 i= EQUIPMENT_SLOT_START; i< EQUIPMENT_SLOT_MAINHAND; ++i) + for (uint8 i= EQUIPMENT_SLOT_START; i< EQUIPMENT_SLOT_MAINHAND; ++i) if(Item *item = GetUseableItemByPos( INVENTORY_SLOT_BAG_0, i )) if(item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo)) return true; @@ -20090,7 +20086,7 @@ bool Player::CanNoReagentCast(SpellEntry const* spellInfo) const void Player::RemoveItemDependentAurasAndCasts( Item * pItem ) { AuraMap& auras = GetAuras(); - for(AuraMap::iterator itr = auras.begin(); itr != auras.end(); ) + for (AuraMap::iterator itr = auras.begin(); itr != auras.end(); ) { Aura* aura = itr->second; @@ -20126,7 +20122,7 @@ uint32 Player::GetResurrectionSpellId() uint32 prio = 0; uint32 spell_id = 0; AuraEffectList const& dummyAuras = GetAurasByType(SPELL_AURA_DUMMY); - for(AuraEffectList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr) + for (AuraEffectList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr) { // Soulstone Resurrection // prio: 3 (max, non death persistent) if( prio < 2 && (*itr)->GetSpellProto()->SpellVisual[0] == 99 && (*itr)->GetSpellProto()->SpellIconID == 92 ) @@ -20210,7 +20206,7 @@ bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim) bool is_dungeon = PvP ? false : sMapStore.LookupEntry(GetMapId())->IsDungeon(); float group_rate = Trinity::XP::xp_in_group_rate(count,is_raid); - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupGuy = itr->getSource(); if(!pGroupGuy) @@ -20240,7 +20236,7 @@ bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim) // handle SPELL_AURA_MOD_XP_PCT auras Unit::AuraEffectList const& ModXPPctAuras = GetAurasByType(SPELL_AURA_MOD_XP_PCT); - for(Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin(); i != ModXPPctAuras.end(); ++i) itr_xp = uint32(itr_xp*(1.0f + (*i)->GetAmount() / 100.0f)); pGroupGuy->GiveXP(itr_xp, pVictim); @@ -20274,7 +20270,7 @@ bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim) // handle SPELL_AURA_MOD_XP_PCT auras Unit::AuraEffectList const& ModXPPctAuras = GetAurasByType(SPELL_AURA_MOD_XP_PCT); - for(Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin(); i != ModXPPctAuras.end(); ++i) xp = uint32(xp*(1.0f + (*i)->GetAmount() / 100.0f)); GiveXP(xp, pVictim); @@ -20297,7 +20293,7 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar // prepare data for near group iteration if(Group *pGroup = GetGroup()) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupGuy = itr->getSource(); if(!pGroupGuy) @@ -20387,7 +20383,7 @@ void Player::UpdateZoneDependentAuras( uint32 newZone ) { // Some spells applied at enter into zone (with subzones), aura removed in UpdateAreaDependentAuras that called always at zone->area update SpellAreaForAreaMapBounds saBounds = spellmgr.GetSpellAreaForAreaMapBounds(newZone); - for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) + for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) if(itr->second->autocast && itr->second->IsFitToRequirements(this,newZone,0)) if( !HasAura(itr->second->spellId) ) CastSpell(this,itr->second->spellId,true); @@ -20396,7 +20392,7 @@ void Player::UpdateZoneDependentAuras( uint32 newZone ) void Player::UpdateAreaDependentAuras( uint32 newArea ) { // remove auras from spells with area limitations - for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();) + for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); ) { // use m_zoneUpdateId for speed: UpdateArea called from UpdateZone or instead UpdateZone in both cases m_zoneUpdateId up-to-date if(spellmgr.GetSpellAllowedInLocationError(iter->second->GetSpellProto(),GetMapId(),m_zoneUpdateId,newArea,this) != SPELL_CAST_OK) @@ -20407,7 +20403,7 @@ void Player::UpdateAreaDependentAuras( uint32 newArea ) // some auras applied at subzone enter SpellAreaForAreaMapBounds saBounds = spellmgr.GetSpellAreaForAreaMapBounds(newArea); - for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) + for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) if(itr->second->autocast && itr->second->IsFitToRequirements(this,m_zoneUpdateId,newArea)) if( !HasAura(itr->second->spellId) ) CastSpell(this,itr->second->spellId,true); @@ -20521,7 +20517,7 @@ Player* Player::GetNextRandomRaidMember(float radius) std::vector<Player*> nearMembers; nearMembers.reserve(pGroup->GetMembersCount()); - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -20654,7 +20650,7 @@ void Player::SetCanBlock( bool value ) bool ItemPosCount::isContainedIn(ItemPosCountVec const& vec) const { - for(ItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end();++itr) + for (ItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end(); ++itr) if(itr->pos == pos) return true; return false; @@ -20783,7 +20779,7 @@ uint32 Player::GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 n void Player::InitGlyphsForLevel() { - for(uint32 i = 0; i < sGlyphSlotStore.GetNumRows(); ++i) + for (uint32 i = 0; i < sGlyphSlotStore.GetNumRows(); ++i) if(GlyphSlotEntry const * gs = sGlyphSlotStore.LookupEntry(i)) if(gs->Order) SetGlyphSlot(gs->Order - 1, gs->Id); @@ -20811,7 +20807,7 @@ bool Player::isTotalImmune() AuraEffectList const& immune = GetAurasByType(SPELL_AURA_SCHOOL_IMMUNITY); uint32 immuneMask = 0; - for(AuraEffectList::const_iterator itr = immune.begin(); itr != immune.end(); ++itr) + for (AuraEffectList::const_iterator itr = immune.begin(); itr != immune.end(); ++itr) { immuneMask |= (*itr)->GetMiscValue(); if( immuneMask & SPELL_SCHOOL_MASK_ALL ) // total immunity @@ -20861,7 +20857,7 @@ bool Player::isTotalImmunity() { AuraEffectList const& immune = GetAurasByType(SPELL_AURA_SCHOOL_IMMUNITY); - for(AuraEffectList::const_iterator itr = immune.begin(); itr != immune.end(); ++itr) + for (AuraEffectList::const_iterator itr = immune.begin(); itr != immune.end(); ++itr) { if (((*itr)->GetMiscValue() & SPELL_SCHOOL_MASK_ALL) !=0) // total immunity { @@ -20869,7 +20865,7 @@ bool Player::isTotalImmunity() } if (((*itr)->GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL) !=0) // physical damage immunity { - for(AuraEffectList::const_iterator i = immune.begin(); i != immune.end(); ++i) + for (AuraEffectList::const_iterator i = immune.begin(); i != immune.end(); ++i) { if (((*i)->GetMiscValue() & SPELL_SCHOOL_MASK_MAGIC) !=0) // magic immunity { @@ -20890,7 +20886,7 @@ void Player::UpdateCharmedAI() if(charmer->IsInEvadeMode()) { AuraEffectList const& auras = GetAurasByType(SPELL_AURA_MOD_CHARM); - for(AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) + for (AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) if((*iter)->GetCasterGUID() == charmer->GetGUID() && (*iter)->GetParentAura()->IsPermanent()) { charmer->DealDamage(this, GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -20926,7 +20922,7 @@ void Player::ConvertRune(uint8 index, RuneType newType) void Player::ResyncRunes(uint8 count) { WorldPacket data(SMSG_RESYNC_RUNES, count * 2); - for(uint32 i = 0; i < count; ++i) + for (uint32 i = 0; i < count; ++i) { data << uint8(GetCurrentRune(i)); // rune type data << uint8(255 - (GetRuneCooldown(i) * 51)); // passed cooldown time (0-255) @@ -20960,7 +20956,7 @@ void Player::InitRunes() m_runes->runeState = 0; m_runes->lastUsedRune = RUNE_BLOOD; - for(uint32 i = 0; i < MAX_RUNES; ++i) + for (uint32 i = 0; i < MAX_RUNES; ++i) { SetBaseRune(i, runeSlotTypes[i]); // init base types SetCurrentRune(i, runeSlotTypes[i]); // init current types @@ -20968,13 +20964,13 @@ void Player::InitRunes() m_runes->SetRuneState(i); } - for(uint32 i = 0; i < NUM_RUNE_TYPES; ++i) + for (uint32 i = 0; i < NUM_RUNE_TYPES; ++i) SetFloatValue(PLAYER_RUNE_REGEN_1 + i, 0.1f); } bool Player::IsBaseRuneSlotsOnCooldown(RuneType runeType) const { - for(uint32 i = 0; i < MAX_RUNES; ++i) + for (uint32 i = 0; i < MAX_RUNES; ++i) if (GetBaseRune(i) == runeType && GetRuneCooldown(i) == 0) return false; @@ -20987,7 +20983,7 @@ void Player::AutoStoreLoot(uint8 bag, uint8 slot, uint32 loot_id, LootStore cons loot.FillLoot (loot_id,store,this,true); uint32 max_slot = loot.GetMaxSlotInLootFor(this); - for(uint32 i = 0; i < max_slot; ++i) + for (uint32 i = 0; i < max_slot; ++i) { LootItem* lootItem = loot.LootItemInSlot(i,this); @@ -21135,7 +21131,7 @@ uint8 Player::CanEquipUniqueItem(Item* pItem, uint8 eslot, uint32 limit_count) c return res; // check unique-equipped on gems - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) + for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) { uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(enchant_slot)); if(!enchant_id) @@ -21271,7 +21267,7 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank) // find current max talent rank (0~5) uint8 curtalent_maxrank = 0; // 0 = not learned any rank - for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) + for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { if(talentInfo->RankID[rank] && HasSpell(talentInfo->RankID[rank])) { @@ -21408,7 +21404,7 @@ void Player::LearnPetTalent(uint64 petGuid, uint32 talentId, uint32 talentRank) // find current max talent rank (0~5) uint8 curtalent_maxrank = 0; // 0 = not learned any rank - for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) + for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { if(talentInfo->RankID[rank] && pet->HasSpell(talentInfo->RankID[rank])) { @@ -21556,7 +21552,7 @@ bool Player::canSeeSpellClickOn(Creature const *c) const if(clickPair.first == clickPair.second) return true; - for(SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr) + for (SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr) if(itr->second.IsFitToRequirements(this, c)) return true; @@ -21572,7 +21568,7 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data) if(m_specsCount) { // loop through all specs (only 1 for now) - for(uint32 specIdx = 0; specIdx < m_specsCount; ++specIdx) + for (uint32 specIdx = 0; specIdx < m_specsCount; ++specIdx) { uint8 talentIdCount = 0; size_t pos = data->wpos(); @@ -21581,11 +21577,11 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data) // find class talent tabs (all players have 3 talent tabs) uint32 const* talentTabIds = GetTalentTabPages(getClass()); - for(uint8 i = 0; i < 3; ++i) + for (uint8 i = 0; i < 3; ++i) { uint32 talentTabId = talentTabIds[i]; - for(uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId) + for (uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId) { TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId); if(!talentInfo) @@ -21597,7 +21593,7 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data) // find max talent rank (0~4) int8 curtalent_maxrank = -1; - for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) + for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { if(talentInfo->RankID[rank] && HasTalent(talentInfo->RankID[rank], specIdx)) { @@ -21621,7 +21617,7 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data) *data << uint8(MAX_GLYPH_SLOT_INDEX); // glyphs count - for(uint8 i = 0; i < MAX_GLYPH_SLOT_INDEX; ++i) + for (uint8 i = 0; i < MAX_GLYPH_SLOT_INDEX; ++i) *data << uint16(m_Glyphs[specIdx][i]); // GlyphProperties.dbc } } @@ -21653,7 +21649,7 @@ void Player::BuildPetTalentsInfoData(WorldPacket *data) if(!pet_family || pet_family->petTalentType < 0) return; - for(uint32 talentTabId = 1; talentTabId < sTalentTabStore.GetNumRows(); ++talentTabId) + for (uint32 talentTabId = 1; talentTabId < sTalentTabStore.GetNumRows(); ++talentTabId) { TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentTabId ); if(!talentTabInfo) @@ -21662,7 +21658,7 @@ void Player::BuildPetTalentsInfoData(WorldPacket *data) if(!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask)) continue; - for(uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId) + for (uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId) { TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId); if(!talentInfo) @@ -21674,7 +21670,7 @@ void Player::BuildPetTalentsInfoData(WorldPacket *data) // find max talent rank (0~4) int8 curtalent_maxrank = -1; - for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) + for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { if(talentInfo->RankID[rank] && pet->HasSpell(talentInfo->RankID[rank])) { @@ -21716,7 +21712,7 @@ void Player::BuildEnchantmentsInfoData(WorldPacket *data) size_t slotUsedMaskPos = data->wpos(); *data << uint32(slotUsedMask); // slotUsedMask < 0x80000 - for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) + for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) { Item *item = GetItemByPos(INVENTORY_SLOT_BAG_0, i); @@ -21731,7 +21727,7 @@ void Player::BuildEnchantmentsInfoData(WorldPacket *data) size_t enchantmentMaskPos = data->wpos(); *data << uint16(enchantmentMask); // enchantmentMask < 0x1000 - for(uint32 j = 0; j < MAX_ENCHANTMENT_SLOT; ++j) + for (uint32 j = 0; j < MAX_ENCHANTMENT_SLOT; ++j) { uint32 enchId = item->GetEnchantmentId(EnchantmentSlot(j)); @@ -21745,7 +21741,6 @@ void Player::BuildEnchantmentsInfoData(WorldPacket *data) data->put<uint16>(enchantmentMaskPos, enchantmentMask); - *data << uint16(0); // unknown data->appendPackGUID(item->GetUInt64Value(ITEM_FIELD_CREATOR)); // item creator *data << uint32(0); // seed? @@ -21760,7 +21755,7 @@ void Player::SendEquipmentSetList() WorldPacket data(SMSG_EQUIPMENT_SET_LIST, 4); size_t count_pos = data.wpos(); data << uint32(count); // count placeholder - for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr) + for (EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr) { if(itr->second.state==EQUIPMENT_SET_DELETED) continue; @@ -21768,7 +21763,7 @@ void Player::SendEquipmentSetList() data << uint32(itr->first); data << itr->second.Name; data << itr->second.IconName; - for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) + for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) data.appendPackGUID(MAKE_NEW_GUID(itr->second.Items[i], 0, HIGHGUID_ITEM)); ++count; // client have limit but it checked at loading and set @@ -21783,7 +21778,7 @@ void Player::SetEquipmentSet(uint32 index, EquipmentSet eqset) { bool found = false; - for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr) + for (EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr) { if((itr->second.Guid == eqset.Guid) && (itr->first == index)) { @@ -21820,7 +21815,7 @@ void Player::SetEquipmentSet(uint32 index, EquipmentSet eqset) void Player::_SaveEquipmentSets() { - for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end();) + for (EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ) { uint32 index = itr->first; EquipmentSet& eqset = itr->second; @@ -21865,7 +21860,7 @@ void Player::_SaveBGData() void Player::DeleteEquipmentSet(uint64 setGuid) { - for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr) + for (EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr) { if(itr->second.Guid == setGuid) { @@ -21932,7 +21927,7 @@ void Player::_LoadGlyphs(QueryResult *result) m_Glyphs[spec][3] = fields[4].GetUInt32(); m_Glyphs[spec][4] = fields[5].GetUInt32(); m_Glyphs[spec][5] = fields[6].GetUInt32(); - + } while (result->NextRow()); delete result; @@ -21969,7 +21964,7 @@ void Player::_SaveTalents() { for (uint8 i = 0; i < MAX_TALENT_SPECS; ++i) { - for (PlayerTalentMap::iterator itr = m_talents[i]->begin(), next = m_talents[i]->begin(); itr != m_talents[i]->end();) + for (PlayerTalentMap::iterator itr = m_talents[i]->begin(), next = m_talents[i]->begin(); itr != m_talents[i]->end(); ) { if (itr->second->state == PLAYERSPELL_REMOVED || itr->second->state == PLAYERSPELL_CHANGED) CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = '%u' and spell = '%u' and spec = '%u'", GetGUIDLow(), itr->first, itr->second->spec); @@ -22006,7 +22001,7 @@ void Player::UpdateSpecCount(uint8 count) else if (count == MAX_TALENT_SPECS) { _SaveActions(); // make sure the button list is cleaned up - for(ActionButtonList::iterator itr = m_actionButtons.begin(); itr != m_actionButtons.end(); ++itr) + for (ActionButtonList::iterator itr = m_actionButtons.begin(); itr != m_actionButtons.end(); ++itr) { CharacterDatabase.PExecute("INSERT INTO character_action (guid,button,action,type,spec) VALUES ('%u', '%u', '%u', '%u', '%u')", GetGUIDLow(), (uint32)itr->first, (uint32)itr->second.GetAction(), (uint32)itr->second.GetType(), 1 ); @@ -22036,11 +22031,11 @@ void Player::ActivateSpec(uint8 spec) RemoveAllAuras(this->GetGUID(), NULL, false, true); // remove all positive auras (ie: buffs from another spec) _SaveActions(); - + UnsummonPetTemporaryIfAny(); - + uint32 const* talentTabIds = GetTalentTabPages(getClass()); - + for (uint8 i = 0; i < 3; ++i) { uint32 talentTabId = talentTabIds[i]; @@ -22071,7 +22066,7 @@ void Player::ActivateSpec(uint8 spec) SetActiveSpec(spec); uint32 spentTalents = 0; - + for (uint8 i = 0; i < 3; ++i) { uint32 talentTabId = talentTabIds[i]; @@ -22099,7 +22094,7 @@ void Player::ActivateSpec(uint8 spec) } // set glyphs - for (uint8 slot = 0; slot < MAX_GLYPH_SLOT_INDEX; ++slot) + for (uint8 slot = 0; slot < MAX_GLYPH_SLOT_INDEX; ++slot) { uint32 glyph = m_Glyphs[m_activeSpec][slot]; @@ -22117,14 +22112,14 @@ void Player::ActivateSpec(uint8 spec) m_actionButtons.clear(); if (QueryResult *result = CharacterDatabase.PQuery("SELECT button,action,type FROM character_action WHERE guid = '%u' AND spec = '%u' ORDER BY button", GetGUIDLow(), m_activeSpec)) _LoadActions(result, false); - + ResummonPetTemporaryUnSummonedIfAny(); SendActionButtons(1); Powers pw = getPowerType(); if (pw != POWER_MANA) SetPower(POWER_MANA, 0); // what on earth is this for?! - + SetPower(pw, 0); } diff --git a/src/game/Player.h b/src/game/Player.h index 1a218879aa6..6d94ae4ad83 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -208,7 +208,7 @@ struct PlayerClassInfo struct PlayerLevelInfo { - PlayerLevelInfo() { for(uint8 i=0; i < MAX_STATS; ++i ) stats[i] = 0; } + PlayerLevelInfo() { for (uint8 i=0; i < MAX_STATS; ++i ) stats[i] = 0; } uint8 stats[MAX_STATS]; }; @@ -316,7 +316,7 @@ struct Runes struct EnchantDuration { EnchantDuration() : item(NULL), slot(MAX_ENCHANTMENT_SLOT), leftduration(0) {}; - EnchantDuration(Item * _item, EnchantmentSlot _slot, uint32 _leftduration) : item(_item), slot(_slot), + EnchantDuration(Item * _item, EnchantmentSlot _slot, uint32 _leftduration) : item(_item), slot(_slot), leftduration(_leftduration){ assert(item); }; Item * item; @@ -366,7 +366,7 @@ struct LookingForGroup bool HaveInSlot(LookingForGroupSlot const& slot) const { return HaveInSlot(slot.entry, slot.type); } bool HaveInSlot(uint32 _entry, uint32 _type) const { - for(uint8 i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i) + for (uint8 i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i) if(slots[i].Is(_entry, _type)) return true; return false; @@ -374,7 +374,7 @@ struct LookingForGroup bool canAutoJoin() const { - for(uint8 i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i) + for (uint8 i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i) if(slots[i].canAutoJoin()) return true; return false; @@ -382,7 +382,7 @@ struct LookingForGroup bool Empty() const { - for(uint8 i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i) + for (uint8 i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i) if(!slots[i].Empty()) return false; return more.Empty(); @@ -520,8 +520,6 @@ enum ActivateTaxiReplies ERR_TAXINOTSTANDING = 12 }; - - enum MirrorTimerType { FATIGUE_TIMER = 0, @@ -671,7 +669,7 @@ struct EquipmentSet { EquipmentSet() : Guid(0), state(EQUIPMENT_SET_NEW) { - for(uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i) + for (uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i) Items[i] = 0; } @@ -904,7 +902,6 @@ struct BGData BGData() : bgInstanceID(0), bgTypeID(BATTLEGROUND_TYPE_NONE), bgAfkReportedCount(0), bgAfkReportedTimer(0), bgTeam(0), mountSpell(0) { ClearTaxiPath(); } - uint32 bgInstanceID; ///< This variable is set to bg->m_InstanceID, /// when player is teleported to BG - (it is battleground's GUID) BattleGroundTypeId bgTypeID; @@ -915,7 +912,6 @@ struct BGData uint32 bgTeam; ///< What side the player will be added to - uint32 mountSpell; uint32 taxiPath[2]; @@ -1497,9 +1493,9 @@ class MANGOS_DLL_SPEC Player : public Unit void SetGlyphSlot(uint8 slot, uint32 slottype) { SetUInt32Value(PLAYER_FIELD_GLYPH_SLOTS_1 + slot, slottype); } uint32 GetGlyphSlot(uint8 slot) { return GetUInt32Value(PLAYER_FIELD_GLYPH_SLOTS_1 + slot); } void SetGlyph(uint8 slot, uint32 glyph) - { + { m_Glyphs[m_activeSpec][slot] = glyph; - SetUInt32Value(PLAYER_FIELD_GLYPHS_1 + slot, glyph); + SetUInt32Value(PLAYER_FIELD_GLYPHS_1 + slot, glyph); } uint32 GetGlyph(uint8 slot) { return m_Glyphs[m_activeSpec][slot]; } @@ -1583,7 +1579,7 @@ class MANGOS_DLL_SPEC Player : public Unit void SetPvP(bool state) { Unit::SetPvP(state); - for(ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) (*itr)->SetPvP(state); } void UpdatePvP(bool state, bool override=false); @@ -1870,7 +1866,7 @@ class MANGOS_DLL_SPEC Player : public Unit float GetTotalPercentageModValue(BaseModGroup modGroup) const { return m_auraBaseMod[modGroup][FLAT_MOD] + m_auraBaseMod[modGroup][PCT_MOD]; } void _ApplyAllStatBonuses(); void _RemoveAllStatBonuses(); - + void _ApplyWeaponDependentAuraMods(Item *item, WeaponAttackType attackType, bool apply); void _ApplyWeaponDependentAuraCritMod(Item *item, WeaponAttackType attackType, AuraEffect* aura, bool apply); void _ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType attackType, AuraEffect* aura, bool apply); @@ -1921,7 +1917,6 @@ class MANGOS_DLL_SPEC Player : public Unit BattleGroundTypeId GetBattleGroundTypeId() const { return m_bgData.bgTypeID; } BattleGround* GetBattleGround() const; - BGQueueIdBasedOnLevel GetBattleGroundQueueIdFromLevel(BattleGroundTypeId bgTypeId) const; bool InBattleGroundQueue() const @@ -2253,7 +2248,7 @@ Spell * m_spellModTakingSpell; /*********************************************************/ /*** QUEST SYSTEM ***/ /*********************************************************/ - + //We allow only one timed quest active at the same time. Below can then be simple value instead of set. std::set<uint32> m_timedquests; diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp index 12544c62e41..4a34b7f5102 100644 --- a/src/game/PlayerDump.cpp +++ b/src/game/PlayerDump.cpp @@ -69,7 +69,7 @@ static bool findtoknth(std::string &str, int n, std::string::size_type &s, std:: { int i; s = e = 0; std::string::size_type size = str.size(); - for(i = 1; s < size && i < n; s++) if(str[s] == ' ') ++i; + for (i = 1; s < size && i < n; s++) if(str[s] == ' ') ++i; if (i < n) return false; @@ -98,7 +98,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 { @@ -203,7 +203,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 << ", '"; @@ -229,7 +229,7 @@ std::string PlayerDumpWriter::GenerateWhereStr(char const* field, GUIDs const& g { std::ostringstream wherestr; wherestr << field << " IN ('"; - for(; itr != guids.end(); ++itr) + for (; itr != guids.end(); ++itr) { wherestr << *itr; @@ -348,7 +348,7 @@ std::string PlayerDumpWriter::GetDump(uint32 guid) { QueryFieldNames const& namesMap = result->GetFieldNames(); std::string reqName; - for(QueryFieldNames::const_iterator itr = namesMap.begin(); itr != namesMap.end(); ++itr) + for (QueryFieldNames::const_iterator itr = namesMap.begin(); itr != namesMap.end(); ++itr) { if(itr->substr(0,9)=="required_") { @@ -370,7 +370,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.. @@ -508,7 +508,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) { @@ -542,7 +542,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s std::string vals = getnth(line, 3); if(!changetoknth(vals, OBJECT_FIELD_GUID+1, newguid)) ROLLBACK(DUMP_FILE_BROKEN); - for(uint16 field = PLAYER_FIELD_INV_SLOT_HEAD; field < PLAYER_FARSIGHT; field++) + for (uint16 field = PLAYER_FIELD_INV_SLOT_HEAD; field < PLAYER_FARSIGHT; field++) if(!changetokGuid(vals, field+1, items, objmgr.m_hiItemGuid, true)) ROLLBACK(DUMP_FILE_BROKEN); if(!changenth(line, 3, vals.c_str())) diff --git a/src/game/PoolHandler.cpp b/src/game/PoolHandler.cpp index 03b09f9a483..e12fc048e97 100644 --- a/src/game/PoolHandler.cpp +++ b/src/game/PoolHandler.cpp @@ -329,7 +329,6 @@ bool PoolGroup<Pool>::ReSpawn1Object(uint32 /*guid*/) return true; } - //////////////////////////////////////////////////////////// // Methods of class PoolHandler @@ -578,10 +577,10 @@ void PoolHandler::LoadFromDB() } while( result->NextRow() ); // Now check for circular reference - for(uint16 i=0; i<max_pool_id; ++i) + for (uint16 i=0; i<max_pool_id; ++i) { std::set<uint16> checkedPools; - for(SearchMap::iterator poolItr = mPoolSearchMap.find(i); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second)) + for (SearchMap::iterator poolItr = mPoolSearchMap.find(i); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second)) { checkedPools.insert(poolItr->first); if(checkedPools.find(poolItr->second) != checkedPools.end()) diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp index ebd5e773c12..37f2887cd20 100644 --- a/src/game/QueryHandler.cpp +++ b/src/game/QueryHandler.cpp @@ -51,7 +51,7 @@ void WorldSession::SendNameQueryOpcode(Player *p) if(DeclinedName const* names = p->GetDeclinedNames()) { data << uint8(1); // is declined - for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i) data << names->name[i]; } else @@ -117,7 +117,7 @@ void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult *result, uint32 if(sWorld.getConfig(CONFIG_DECLINED_NAMES_USED) && fields[5].GetCppString() != "") { data << uint8(1); // is declined - for(int i = 5; i < MAX_DECLINED_NAME_CASES+5; ++i) + for (int i = 5; i < MAX_DECLINED_NAME_CASES+5; ++i) data << fields[i].GetCppString(); } else @@ -197,7 +197,7 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data ) data << float(ci->unk16); // unk data << float(ci->unk17); // unk data << uint8(ci->RacialLeader); - for(uint32 i = 0; i < 4; ++i) + for (uint32 i = 0; i < 4; ++i) data << uint32(ci->questItems[i]); // itemId[4], quest drop data << uint32(ci->movementId); // CreatureMovementInfo.dbc SendPacket( &data ); @@ -259,7 +259,7 @@ void WorldSession::HandleGameObjectQueryOpcode( WorldPacket & recv_data ) data << info->unk1; // 2.0.3, string data.append(info->raw.data, 24); data << float(info->size); // go size - for(uint32 i = 0; i < 4; ++i) + for (uint32 i = 0; i < 4; ++i) data << uint32(info->questItems[i]); // itemId[4], quest drop SendPacket( &data ); sLog.outDebug( "WORLD: Sent SMSG_GAMEOBJECT_QUERY_RESPONSE" ); @@ -347,7 +347,7 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data ) if (!pGossip) { - for(uint32 i = 0; i < 8; ++i) + for (uint32 i = 0; i < 8; ++i) { data << float(0); data << "Greetings $N"; @@ -402,7 +402,7 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data ) data << pGossip->Options[i].Language; - for(int j = 0; j < 3; ++j) + for (int j = 0; j < 3; ++j) { data << pGossip->Options[i].Emotes[j]._Delay; data << pGossip->Options[i].Emotes[j]._Emote; diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index a803c49d6fd..7589c8a3712 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -173,7 +173,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)) { @@ -431,7 +431,7 @@ void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket) { if (Group* pGroup = _player->GetGroup()) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player *pPlayer = itr->getSource(); @@ -526,7 +526,7 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32 return DIALOG_STATUS_NONE; } - for(QuestRelations::const_iterator i = qir->lower_bound(questgiver->GetEntry()); i != qir->upper_bound(questgiver->GetEntry()); ++i ) + for (QuestRelations::const_iterator i = qir->lower_bound(questgiver->GetEntry()); i != qir->upper_bound(questgiver->GetEntry()); ++i ) { uint32 result2 = 0; uint32 quest_id = i->second; @@ -549,7 +549,7 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32 result = result2; } - for(QuestRelations::const_iterator i = qr->lower_bound(questgiver->GetEntry()); i != qr->upper_bound(questgiver->GetEntry()); ++i ) + for (QuestRelations::const_iterator i = qr->lower_bound(questgiver->GetEntry()); i != qr->upper_bound(questgiver->GetEntry()); ++i ) { uint32 result2 = 0; uint32 quest_id = i->second; @@ -597,7 +597,7 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket WorldPacket data(SMSG_QUESTGIVER_STATUS_MULTIPLE, 4); data << uint32(count); // placeholder - for(Player::ClientGUIDs::const_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/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp index f50e6af4709..c8872c6fef6 100644 --- a/src/game/RandomMovementGenerator.cpp +++ b/src/game/RandomMovementGenerator.cpp @@ -61,7 +61,7 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature) bool is_water_ok = creature.canSwim(); bool is_air_ok = creature.canFly(); - for(uint32 i = 0;; ++i) + for (uint32 i = 0; ; ++i) { const float angle = rand_norm()*(M_PI*2); diff --git a/src/game/ReputationMgr.cpp b/src/game/ReputationMgr.cpp index 35bf2304fe4..bdd6af49ccc 100644 --- a/src/game/ReputationMgr.cpp +++ b/src/game/ReputationMgr.cpp @@ -128,7 +128,7 @@ void ReputationMgr::SendForceReactions() WorldPacket data; data.Initialize(SMSG_SET_FORCED_REACTIONS, 4+m_forcedReactions.size()*(4+4)); data << uint32(m_forcedReactions.size()); - for(ForcedReactions::const_iterator itr = m_forcedReactions.begin(); itr != m_forcedReactions.end(); ++itr) + for (ForcedReactions::const_iterator itr = m_forcedReactions.begin(); itr != m_forcedReactions.end(); ++itr) { data << uint32(itr->first); // faction_id (Faction.dbc) data << uint32(itr->second); // reputation rank @@ -187,7 +187,7 @@ void ReputationMgr::SendInitialReputations() void ReputationMgr::SendStates() const { - for(FactionStateList::const_iterator itr = m_factions.begin(); itr != m_factions.end(); ++itr) + for (FactionStateList::const_iterator itr = m_factions.begin(); itr != m_factions.end(); ++itr) SendState(&(itr->second)); } @@ -210,7 +210,7 @@ void ReputationMgr::Initialize() m_reveredFactionCount = 0; m_exaltedFactionCount = 0; - for(unsigned int i = 1; i < sFactionStore.GetNumRows(); i++) + for (unsigned int i = 1; i < sFactionStore.GetNumRows(); i++) { FactionEntry const *factionEntry = sFactionStore.LookupEntry(i); @@ -249,14 +249,14 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi towards other reputations for that group. */ uint32 team = factionEntry->team; - + int32 sharedStanding = standing; // Here we decide what the amount is to send to the others of the group. switch(factionEntry->ID) { case 1037: // Alliance Vanguard case 1052: // Horde Expedition extraTarget = -1; // Make possible to earn rep with this two factions - break; + break; } switch(team) @@ -270,7 +270,7 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi case 1052: // Horde Expedition sharedStanding *= 0.5f; // Half of the reputation earned by any of the four subfactions of this team will extraTarget = 2; // be added to the main faction. (http://www.wowwiki.com/Alliance_Vanguard) - break; + break; } FactionEntry const *targetFaction = NULL; @@ -281,7 +281,7 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi for (SimpleFactionsList::const_iterator itr = flist->begin(); itr != flist->end(); ++itr) { targetFaction = sFactionStore.LookupEntry(*itr); - ASSERT(targetFaction != NULL); + ASSERT(targetFaction != NULL); res = SetOneFactionReputation(targetFaction, sharedStanding, incremental); } return res; @@ -292,9 +292,9 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi { if((*itr) == factionEntry->ID) // Not to self continue; - + targetFaction = sFactionStore.LookupEntry(*itr); - ASSERT(targetFaction != NULL); + ASSERT(targetFaction != NULL); res = SetOneFactionReputation(targetFaction, sharedStanding, incremental); } }break; @@ -520,7 +520,7 @@ void ReputationMgr::LoadFromDB(QueryResult *result) void ReputationMgr::SaveToDB() { - for(FactionStateList::iterator itr = m_factions.begin(); itr != m_factions.end(); ++itr) + for (FactionStateList::iterator itr = m_factions.begin(); itr != m_factions.end(); ++itr) { if (itr->second.Changed) { diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 0ccab173166..c21ac2069a8 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -183,7 +183,7 @@ enum SpellSchoolMask inline SpellSchools GetFirstSchoolInMask(SpellSchoolMask mask) { - for(int i = 0; i < MAX_SPELL_SCHOOL; ++i) + for (int i = 0; i < MAX_SPELL_SCHOOL; ++i) if(mask & (1 << i)) return SpellSchools(i); @@ -221,7 +221,6 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = { 0xffe6cc80 //LIGHT YELLOW }; - // *********************************** // Spell Attributes definitions // *********************************** diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp index b1e16897b18..ed6041f216d 100644 --- a/src/game/SkillDiscovery.cpp +++ b/src/game/SkillDiscovery.cpp @@ -126,7 +126,7 @@ void LoadSkillDiscoveryTable() continue; } - for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) + for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) SkillDiscoveryStore[-int32(_spell_idx->second->skillId)].push_back( SkillDiscoveryEntry(spellId, reqSkillValue, chance) ); } else @@ -146,7 +146,7 @@ void LoadSkillDiscoveryTable() sLog.outErrorDb("Some items can't be successfully discovered: have in chance field value < 0.000001 in `skill_discovery_template` DB table . List:\n%s",ssNonDiscoverableEntries.str().c_str()); // report about empty data for explicit discovery spells - for(uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id) + for (uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id) { SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell_id); if (!spellEntry) @@ -173,7 +173,7 @@ uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player) uint32 skillvalue = bounds.first != bounds.second ? player->GetSkillValue(bounds.first->second->skillId) : 0; float full_chance = 0; - for(SkillDiscoveryList::const_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; @@ -181,7 +181,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::const_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; @@ -207,7 +207,7 @@ uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player) if (tab != SkillDiscoveryStore.end()) { - for(SkillDiscoveryList::const_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 && @@ -225,7 +225,7 @@ uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player) tab = SkillDiscoveryStore.find(-(int32)skillId); if (tab != SkillDiscoveryStore.end()) { - for(SkillDiscoveryList::const_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/SkillHandler.cpp b/src/game/SkillHandler.cpp index e8ee75ab86b..22bbbcf8e3d 100644 --- a/src/game/SkillHandler.cpp +++ b/src/game/SkillHandler.cpp @@ -46,7 +46,7 @@ void WorldSession::HandleLearnPreviewTalents(WorldPacket& recvPacket) uint32 talentId, talentRank; - for(uint32 i = 0; i < talentsCount; ++i) + for (uint32 i = 0; i < talentsCount; ++i) { recvPacket >> talentId >> talentRank; diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index 2331b7ad839..482f3e62dd5 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -43,7 +43,7 @@ PlayerSocial::~PlayerSocial() uint32 PlayerSocial::GetNumberOfSocialsWithFlag(SocialFlag flag) { uint32 counter = 0; - for(PlayerSocialMap::const_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; @@ -132,7 +132,7 @@ void PlayerSocial::SendSocialList() data << uint32(7); // unk flag (0x1, 0x2, 0x4), 0x7 if it include ignore list data << uint32(size); // friends count - for(PlayerSocialMap::iterator itr = m_playerSocialMap.begin(); itr != m_playerSocialMap.end(); ++itr) + for (PlayerSocialMap::iterator itr = m_playerSocialMap.begin(); itr != m_playerSocialMap.end(); ++itr) { sSocialMgr.GetFriendInfo(plr, itr->first, itr->second); @@ -276,7 +276,7 @@ void SocialMgr::BroadcastToFriendListers(Player *player, WorldPacket *packet) AccountTypes gmLevelInWhoList = AccountTypes(sWorld.getConfig(CONFIG_GM_LEVEL_IN_WHO_LIST)); bool allowTwoSideWhoList = sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_WHO_LIST); - for(SocialMap::const_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/Spell.cpp b/src/game/Spell.cpp index cb0236967ab..14d142e680b 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -426,7 +426,7 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 origi if(m_originalCaster && !m_originalCaster->IsInWorld()) m_originalCaster = NULL; } - for(int i=0; i <3; ++i) + for (int i=0; i <3; ++i) m_currentBasePoints[i] = m_spellValue->EffectBasePoints[i]; m_spellState = SPELL_STATE_NULL; @@ -462,7 +462,7 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 origi if(m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MAGIC && !IsAreaOfEffectSpell(m_spellInfo) && !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_CANT_REFLECTED)) { - for(int j = 0;j < 3; ++j) + for (int j = 0; j < 3; ++j) { if (m_spellInfo->Effect[j] == 0) continue; @@ -520,7 +520,7 @@ WorldObject* Spell::FindCorpseUsing() void Spell::SelectSpellTargets() { - for(uint32 i = 0; i < 3; ++i) + for (uint32 i = 0; i < 3; ++i) { // not call for empty effect. // Also some spells use not used effect targets for store targets for dummy effect in triggered spells @@ -713,7 +713,7 @@ void Spell::SelectSpellTargets() if(IsChanneledSpell(m_spellInfo)) { uint8 mask = (1<<i); - for(std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { if(ihit->effectMask & mask) { @@ -725,7 +725,7 @@ void Spell::SelectSpellTargets() else if (m_auraScaleMask) { bool checkLvl = !m_UniqueTargetInfo.empty(); - for(std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end();) + for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ) { // remove targets which did not pass min level check if(m_auraScaleMask && ihit->effectMask == m_auraScaleMask) @@ -793,7 +793,7 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura) } break; default: - if (m_spellInfo->EquippedItemClass == ITEM_CLASS_WEAPON && + if (m_spellInfo->EquippedItemClass == ITEM_CLASS_WEAPON && m_spellInfo->EquippedItemSubClassMask & (1<<ITEM_SUBCLASS_WEAPON_WAND) && m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG) // Wands auto attack { @@ -826,7 +826,7 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura) // Ranged autorepeat attack is set as triggered spell - ignore it if (!(m_procAttacker & PROC_FLAG_SUCCESSFUL_RANGED_HIT)) { - if (m_IsTriggeredSpell && + if (m_IsTriggeredSpell && (m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER || m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_TRIGGERED_CAN_TRIGGER_2)) m_procEx |= PROC_EX_INTERNAL_CANT_PROC; @@ -862,7 +862,7 @@ void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex) uint64 targetGUID = pVictim->GetGUID(); // Lookup target in already in list - for(std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { if (targetGUID == ihit->targetGUID) // Found in list { @@ -958,7 +958,7 @@ void Spell::AddGOTarget(GameObject* pVictim, uint32 effIndex) uint64 targetGUID = pVictim->GetGUID(); // Lookup target in already in list - for(std::list<GOTargetInfo>::iterator ihit = m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end(); ++ihit) + for (std::list<GOTargetInfo>::iterator ihit = m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end(); ++ihit) { if (targetGUID == ihit->targetGUID) // Found in list { @@ -1004,7 +1004,7 @@ void Spell::AddItemTarget(Item* pitem, uint32 effIndex) return; // Lookup target in already in list - for(std::list<ItemTargetInfo>::iterator ihit = m_UniqueItemInfo.begin(); ihit != m_UniqueItemInfo.end(); ++ihit) + for (std::list<ItemTargetInfo>::iterator ihit = m_UniqueItemInfo.begin(); ihit != m_UniqueItemInfo.end(); ++ihit) { if (pitem == ihit->item) // Found in list { @@ -1023,7 +1023,7 @@ void Spell::AddItemTarget(Item* pitem, uint32 effIndex) void Spell::DoAllEffectOnTarget(TargetInfo *target) { - if (target->processed) // Check target + if (!target || target->processed) // Check target return; target->processed = true; // Target checked in apply effects procedure @@ -1233,7 +1233,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) // Needs to be called after dealing damage/healing to not remove breaking on damage auras DoTriggersOnSpellHit(spellHitTarget); - + // if target is fallged for pvp also flag caster if a player if(unit->IsPvP()) { @@ -1394,7 +1394,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool } } - for(uint32 effectNumber = 0; effectNumber < 3; ++effectNumber) + for (uint32 effectNumber = 0; effectNumber < 3; ++effectNumber) { if (effectMask & (1<<effectNumber)) HandleEffects(unit,NULL,NULL,effectNumber); @@ -1425,7 +1425,7 @@ void Spell::DoTriggersOnSpellHit(Unit *unit) if (m_ChanceTriggerSpells.size() && (!((m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_CANT_PROC_FROM_SELFCAST) && unit==m_caster))) { int _duration=0; - for(ChanceTriggerSpells::const_iterator i = m_ChanceTriggerSpells.begin(); i != m_ChanceTriggerSpells.end(); ++i) + for (ChanceTriggerSpells::const_iterator i = m_ChanceTriggerSpells.begin(); i != m_ChanceTriggerSpells.end(); ++i) { // SPELL_AURA_ADD_TARGET_TRIGGER auras shouldn't trigger auras without duration // set duration equal to triggering spell @@ -1454,7 +1454,7 @@ void Spell::DoTriggersOnSpellHit(Unit *unit) if(m_customAttr & SPELL_ATTR_CU_LINK_HIT) { if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id + SPELL_LINK_HIT)) - for(std::vector<int32>::const_iterator i = spell_triggered->begin(); i != spell_triggered->end(); ++i) + for (std::vector<int32>::const_iterator i = spell_triggered->begin(); i != spell_triggered->end(); ++i) if(*i < 0) unit->RemoveAurasDueToSpell(-(*i)); else @@ -1476,7 +1476,7 @@ void Spell::DoAllEffectOnTarget(GOTargetInfo *target) if(!go) return; - for(uint32 effectNumber = 0; effectNumber < 3; ++effectNumber) + for (uint32 effectNumber = 0; effectNumber < 3; ++effectNumber) if (effectMask & (1 << effectNumber)) HandleEffects(NULL, NULL, go, effectNumber); @@ -1495,7 +1495,7 @@ void Spell::DoAllEffectOnTarget(ItemTargetInfo *target) if(!target->item || !effectMask) return; - for(uint32 effectNumber = 0; effectNumber < 3; ++effectNumber) + for (uint32 effectNumber = 0; effectNumber < 3; ++effectNumber) if (effectMask & (1 << effectNumber)) HandleEffects(NULL, target->item, NULL, effectNumber); } @@ -1522,7 +1522,7 @@ bool Spell::UpdateChanneledTargetList() modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, range, this); } - for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { if( ihit->missCondition == SPELL_MISS_NONE && (needAliveTargetMask & ihit->effectMask) ) { @@ -1607,7 +1607,7 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin // Get spell max affected targets /*uint32 unMaxTargets = m_spellInfo->MaxAffectedTargets; Unit::AuraList const& mod = m_caster->GetAurasByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS); - for(Unit::AuraList::const_iterator m = mod.begin(); m != mod.end(); ++m) + for (Unit::AuraList::const_iterator m = mod.begin(); m != mod.end(); ++m) { if (!(*m)->isAffectedOnSpell(m_spellInfo)) continue; @@ -1733,12 +1733,12 @@ WorldObject* Spell::SearchNearbyTarget(float range, SpellTargets TargetType) Creature* creatureScriptTarget = NULL; GameObject* goScriptTarget = NULL; - for(SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST) + for (SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST) { switch(i_spellST->second.type) { case SPELL_TARGET_TYPE_CONTROLLED: - for(Unit::ControlList::iterator itr = m_caster->m_Controlled.begin(); itr != m_caster->m_Controlled.end(); ++itr) + for (Unit::ControlList::iterator itr = m_caster->m_Controlled.begin(); itr != m_caster->m_Controlled.end(); ++itr) if ((*itr)->GetEntry() == i_spellST->second.targetEntry && (*itr)->IsWithinDistInMap(m_caster, range)) { goScriptTarget = NULL; @@ -1958,7 +1958,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) else pushType = PUSH_IN_FRONT; break; - + case TARGET_TYPE_DEST_CASTER: //4+8+2 { if(cur == TARGET_SRC_CASTER) @@ -2219,8 +2219,8 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) SearchChainTarget(unitList, range, maxTargets, SPELL_TARGETS_CHAINHEAL); break; } - - for(std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr) + + for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr) AddUnitTarget(*itr, i); } else @@ -2299,7 +2299,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) // Search for ghoul if our ghoul or dead body not valid unit target if (!(m_targets.getUnitTarget() && (m_targets.getUnitTarget()->GetEntry() == 26125 && m_targets.getUnitTarget()->GetOwnerGUID() == m_caster->GetGUID() || (m_targets.getUnitTarget()->getDeathState() == CORPSE - && m_targets.getUnitTarget()->GetDisplayId() == m_targets.getUnitTarget()->GetNativeDisplayId() + && m_targets.getUnitTarget()->GetDisplayId() == m_targets.getUnitTarget()->GetNativeDisplayId() && m_targets.getUnitTarget()->GetTypeId()== TYPEID_UNIT && !((Creature*)m_targets.getUnitTarget())->isDeadByDefault() && !(m_targets.getUnitTarget()->GetCreatureTypeMask() & CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL)) @@ -2343,14 +2343,14 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) // let it be done in one check? else { - for(SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST) + for (SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST) { if(i_spellST->second.type == SPELL_TARGET_TYPE_CREATURE) SearchAreaTarget(unitList, radius, pushType, SPELL_TARGETS_ENTRY, i_spellST->second.targetEntry); else if (i_spellST->second.type == SPELL_TARGET_TYPE_CONTROLLED) { - for(Unit::ControlList::iterator itr = m_caster->m_Controlled.begin(); itr != m_caster->m_Controlled.end(); ++itr) - if ((*itr)->GetEntry() == i_spellST->second.targetEntry && + for (Unit::ControlList::iterator itr = m_caster->m_Controlled.begin(); itr != m_caster->m_Controlled.end(); ++itr) + if ((*itr)->GetEntry() == i_spellST->second.targetEntry && /*(*itr)->IsWithinDistInMap(m_caster, radius)*/ (*itr)->IsInMap(m_caster)) // For 60243 and 52173 need skip radius check or use range (no radius entry for effect) unitList.push_back(*itr); } @@ -2390,7 +2390,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) std::list<GameObject*> goList; Trinity::GameObjectListSearcher<Trinity::GameObjectInRangeCheck> searcher(m_caster, goList, check); m_caster->GetMap()->VisitGrid(x, y, radius, searcher); - for(std::list<GameObject*>::iterator itr = goList.begin(); itr != goList.end(); ++itr) + for (std::list<GameObject*>::iterator itr = goList.begin(); itr != goList.end(); ++itr) AddGOTarget(*itr, i); break; } @@ -2411,7 +2411,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) Group* pGroup = targetPlayer ? targetPlayer->GetGroup() : NULL; if(pGroup) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -2436,7 +2436,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) if(uint32 maxTargets = m_spellValue->MaxAffectedTargets) { Unit::AuraEffectList const& Auras = m_caster->GetAurasByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS); - for(Unit::AuraEffectList::const_iterator j = Auras.begin();j != Auras.end(); ++j) + for (Unit::AuraEffectList::const_iterator j = Auras.begin(); j != Auras.end(); ++j) if((*j)->isAffectedOnSpell(m_spellInfo)) maxTargets += (*j)->GetAmount(); @@ -2459,7 +2459,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) { typedef std::priority_queue<PrioritizeManaUnitWraper, std::vector<PrioritizeManaUnitWraper>, PrioritizeMana> TopMana; TopMana manaUsers; - for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end();++itr) + for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end(); ++itr) { if ((*itr)->getPowerType() == POWER_MANA) { @@ -2480,7 +2480,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) { typedef std::priority_queue<PrioritizeHealthUnitWraper, std::vector<PrioritizeHealthUnitWraper>, PrioritizeHealth> TopHealth; TopHealth healedMembers; - for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end();++itr) + for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end(); ++itr) { PrioritizeHealthUnitWraper WTarget(*itr); healedMembers.push(WTarget); @@ -2500,7 +2500,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) { typedef std::priority_queue<PrioritizeHealthUnitWraper, std::vector<PrioritizeHealthUnitWraper>, PrioritizeHealth> TopHealth; TopHealth healedMembers; - for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end();++itr) + for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end(); ++itr) { if ((*itr)->IsInRaidWith(m_targets.getUnitTarget())) { @@ -2525,7 +2525,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags[0] & 0x00080000) { Unit * unit_to_add = NULL; - for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end();++itr) + for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end(); ++itr) { if ((*itr)->GetTypeId() == TYPEID_UNIT && (*itr)->GetOwnerGUID() == m_caster->GetGUID() @@ -2550,7 +2550,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) } } } - for(std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr) + for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr) AddUnitTarget(*itr, i); } } @@ -2701,7 +2701,7 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura if(!m_IsTriggeredSpell && isSpellBreakStealth(m_spellInfo) ) { m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CAST); - for(uint32 i = 0; i < 3; ++i) + for (uint32 i = 0; i < 3; ++i) { if(EffectTargetType[m_spellInfo->Effect[i]] == SPELL_REQUIRE_UNIT) { @@ -2745,7 +2745,7 @@ void Spell::cancel() case SPELL_STATE_CASTING: { - for(std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) if(ihit->missCondition == SPELL_MISS_NONE) if(Unit* unit = m_caster->GetGUID() == ihit->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, ihit->targetGUID)) if(unit->isAlive()) @@ -2784,7 +2784,7 @@ void Spell::cast(bool skipCheck) if(Unit *target = m_targets.getUnitTarget()) { // three check: prepare, cast (m_casttime > 0), hit (delayed) - if(m_casttime && target->isAlive() + if(m_casttime && target->isAlive() && (target->m_invisibilityMask || m_caster->m_invisibilityMask || target->GetVisibility() == VISIBILITY_GROUP_STEALTH) && !target->IsFriendlyTo(m_caster) && !m_caster->canSeeOrDetect(target, true)) @@ -2897,7 +2897,7 @@ void Spell::cast(bool skipCheck) // are there any spells need to be triggered after hit? // handle SPELL_AURA_ADD_TARGET_TRIGGER auras Unit::AuraEffectList const& targetTriggers = m_caster->GetAurasByType(SPELL_AURA_ADD_TARGET_TRIGGER); - for(Unit::AuraEffectList::const_iterator i = targetTriggers.begin(); i != targetTriggers.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = targetTriggers.begin(); i != targetTriggers.end(); ++i) { if (!(*i)->isAffectedOnSpell(m_spellInfo)) continue; @@ -2921,7 +2921,7 @@ void Spell::cast(bool skipCheck) if(m_customAttr & SPELL_ATTR_CU_CHARGE) { - for(uint32 i = 0; i < 3; ++i) + for (uint32 i = 0; i < 3; ++i) { switch(m_spellInfo->Effect[i]) { @@ -2960,7 +2960,7 @@ void Spell::cast(bool skipCheck) if(m_customAttr & SPELL_ATTR_CU_LINK_CAST) { if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id)) - for(std::vector<int32>::const_iterator i = spell_triggered->begin(); i != spell_triggered->end(); ++i) + for (std::vector<int32>::const_iterator i = spell_triggered->begin(); i != spell_triggered->end(); ++i) if(*i < 0) m_caster->RemoveAurasDueToSpell(-(*i)); else @@ -2995,10 +2995,10 @@ void Spell::handle_immediate() // process immediate effects (items, ground, etc.) also initialize some variables _handle_immediate_phase(); - for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) DoAllEffectOnTarget(&(*ihit)); - for(std::list<GOTargetInfo>::iterator ihit= m_UniqueGOTargetInfo.begin();ihit != m_UniqueGOTargetInfo.end();++ihit) + for (std::list<GOTargetInfo>::iterator ihit= m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end(); ++ihit) DoAllEffectOnTarget(&(*ihit)); // spell is finished, perform some last features of the spell here @@ -3029,7 +3029,7 @@ uint64 Spell::handle_delayed(uint64 t_offset) bool single_missile = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION); // now recheck units targeting correctness (need before any effects apply to prevent adding immunity at first effect not allow apply second spell effect and similar cases) - for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end();++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { if (ihit->processed == false) { @@ -3041,7 +3041,7 @@ uint64 Spell::handle_delayed(uint64 t_offset) } // now recheck gameobject targeting correctness - for(std::list<GOTargetInfo>::iterator ighit= m_UniqueGOTargetInfo.begin(); ighit != m_UniqueGOTargetInfo.end();++ighit) + for (std::list<GOTargetInfo>::iterator ighit= m_UniqueGOTargetInfo.begin(); ighit != m_UniqueGOTargetInfo.end(); ++ighit) { if (ighit->processed == false) { @@ -3079,7 +3079,7 @@ void Spell::_handle_immediate_phase() HandleThreatSpells(m_spellInfo->Id); m_needSpellLog = IsNeedSendToClient(); - for(uint32 j = 0; j < 3; ++j) + for (uint32 j = 0; j < 3; ++j) { if(m_spellInfo->Effect[j] == 0) continue; @@ -3101,14 +3101,14 @@ void Spell::_handle_immediate_phase() m_diminishGroup = DIMINISHING_NONE; // process items - for(std::list<ItemTargetInfo>::iterator ihit= m_UniqueItemInfo.begin();ihit != m_UniqueItemInfo.end();++ihit) + for (std::list<ItemTargetInfo>::iterator ihit= m_UniqueItemInfo.begin(); ihit != m_UniqueItemInfo.end(); ++ihit) DoAllEffectOnTarget(&(*ihit)); if(!m_originalCaster) return; uint8 oldEffMask = m_effectMask; // process ground - for(uint32 j = 0; j < 3; ++j) + for (uint32 j = 0; j < 3; ++j) { if(EffectTargetType[m_spellInfo->Effect[j]] == SPELL_REQUIRE_DEST) { @@ -3263,7 +3263,7 @@ void Spell::update(uint32 difftime) { if ( Player* p = m_caster->GetCharmerOrOwnerPlayerOrPlayerItself() ) { - for(std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { TargetInfo* target = &*ihit; if(!IS_CRE_OR_VEH_GUID(target->targetGUID)) @@ -3276,7 +3276,7 @@ void Spell::update(uint32 difftime) p->CastedCreatureOrGO(unit->GetEntry(), unit->GetGUID(), m_spellInfo->Id); } - for(std::list<GOTargetInfo>::iterator ihit = m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end(); ++ihit) + for (std::list<GOTargetInfo>::iterator ihit = m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end(); ++ihit) { GOTargetInfo* target = &*ihit; @@ -3509,7 +3509,7 @@ void Spell::SendSpellGo() // triggered spells with spell visual != 0 if((m_IsTriggeredSpell && !IsAutoRepeatRangedSpell(m_spellInfo)) || m_triggeredByAuraSpell) - castFlags |= CAST_FLAG_UNKNOWN0; + castFlags |= CAST_FLAG_UNKNOWN0; if(m_spellInfo->Attributes & SPELL_ATTR_REQ_AMMO) castFlags |= CAST_FLAG_AMMO; // arrows/bullets visual @@ -3550,7 +3550,7 @@ void Spell::SendSpellGo() uint8 v2 = ((Player*)m_caster)->GetRunesState(); data << uint8(v1); // runes state before data << uint8(v2); // runes state after - for(uint8 i = 0; i < MAX_RUNES; ++i) + for (uint8 i = 0; i < MAX_RUNES; ++i) { uint8 m = (1 << i); if(m & v1) // usable before... @@ -3660,7 +3660,7 @@ void Spell::WriteSpellGoTargets( WorldPacket * data ) // m_needAliveTargetMask req for stop channelig if one target die uint32 hit = m_UniqueGOTargetInfo.size(); // Always hits on GO uint32 miss = 0; - for(std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { if ((*ihit).effectMask == 0) // No effect apply - all immuned add state { @@ -3675,7 +3675,7 @@ void Spell::WriteSpellGoTargets( WorldPacket * data ) } *data << (uint8)hit; - for(std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { if ((*ihit).missCondition == SPELL_MISS_NONE) // Add only hits { @@ -3684,11 +3684,11 @@ void Spell::WriteSpellGoTargets( WorldPacket * data ) } } - for(std::list<GOTargetInfo>::const_iterator ighit = m_UniqueGOTargetInfo.begin(); ighit != m_UniqueGOTargetInfo.end(); ++ighit) + for (std::list<GOTargetInfo>::const_iterator ighit = m_UniqueGOTargetInfo.begin(); ighit != m_UniqueGOTargetInfo.end(); ++ighit) *data << uint64(ighit->targetGUID); // Always hits *data << (uint8)miss; - for(std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { if( ihit->missCondition != SPELL_MISS_NONE ) // Add only miss { @@ -3717,12 +3717,12 @@ void Spell::SendLogExecute() data << uint32(m_spellInfo->Id); uint32 count1 = 1; data << uint32(count1); // count1 (effect count?) - for(uint32 i = 0; i < count1; ++i) + for (uint32 i = 0; i < count1; ++i) { data << uint32(m_spellInfo->Effect[0]); // spell effect uint32 count2 = 1; data << uint32(count2); // count2 (target count?) - for(uint32 j = 0; j < count2; ++j) + for (uint32 j = 0; j < count2; ++j) { switch(m_spellInfo->Effect[0]) { @@ -3740,7 +3740,7 @@ void Spell::SendLogExecute() data.append(unit->GetPackGUID()); else data << uint8(0); - data << uint32(m_caster->m_extraAttacks); + data << uint32(m_caster->m_extraAttacks); break; case SPELL_EFFECT_INTERRUPT_CAST: if(Unit *unit = m_targets.getUnitTarget()) @@ -3853,7 +3853,7 @@ void Spell::SendChannelStart(uint32 duration) // select first not resisted target from target list for _0_ effect if(!m_UniqueTargetInfo.empty()) { - for(std::list<TargetInfo>::const_iterator itr = m_UniqueTargetInfo.begin(); itr != m_UniqueTargetInfo.end(); ++itr) + for (std::list<TargetInfo>::const_iterator itr = m_UniqueTargetInfo.begin(); itr != m_UniqueTargetInfo.end(); ++itr) { if( (itr->effectMask & (1 << 0)) && itr->reflectResult == SPELL_MISS_NONE && itr->targetGUID != m_caster->GetGUID()) { @@ -3864,7 +3864,7 @@ void Spell::SendChannelStart(uint32 duration) } else if(!m_UniqueGOTargetInfo.empty()) { - for(std::list<GOTargetInfo>::const_iterator itr = m_UniqueGOTargetInfo.begin(); itr != m_UniqueGOTargetInfo.end(); ++itr) + for (std::list<GOTargetInfo>::const_iterator itr = m_UniqueGOTargetInfo.begin(); itr != m_UniqueGOTargetInfo.end(); ++itr) { if(itr->effectMask & (1 << 0) ) { @@ -3988,7 +3988,7 @@ void Spell::TakePower() { if(m_spellInfo->powerType == POWER_RAGE || m_spellInfo->powerType == POWER_ENERGY) if(uint64 targetGUID = m_targets.getUnitTargetGUID()) - for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) if(ihit->targetGUID == targetGUID) { if(ihit->missCondition != SPELL_MISS_NONE && ihit->missCondition != SPELL_MISS_MISS/* && ihit->targetGUID!=m_caster->GetGUID()*/) @@ -4089,19 +4089,19 @@ SpellCastResult Spell::CheckRuneCost(uint32 runeCostID) int32 runeCost[NUM_RUNE_TYPES]; // blood, frost, unholy, death - for(uint32 i = 0; i < RUNE_DEATH; ++i) + for (uint32 i = 0; i < RUNE_DEATH; ++i) runeCost[i] = src->RuneCost[i]; runeCost[RUNE_DEATH] = MAX_RUNES; // calculated later - for(uint32 i = 0; i < MAX_RUNES; ++i) + for (uint32 i = 0; i < MAX_RUNES; ++i) { RuneType rune = plr->GetCurrentRune(i); if((plr->GetRuneCooldown(i) == 0) && (runeCost[rune] > 0)) runeCost[rune]--; } - for(uint32 i = 0; i < RUNE_DEATH; ++i) + for (uint32 i = 0; i < RUNE_DEATH; ++i) if(runeCost[i] > 0) runeCost[RUNE_DEATH] += runeCost[i]; @@ -4129,14 +4129,14 @@ void Spell::TakeRunePower() int32 runeCost[NUM_RUNE_TYPES]; // blood, frost, unholy, death - for(uint32 i = 0; i < RUNE_DEATH; ++i) + for (uint32 i = 0; i < RUNE_DEATH; ++i) { runeCost[i] = src->RuneCost[i]; } runeCost[RUNE_DEATH] = 0; // calculated later - for(uint32 i = 0; i < MAX_RUNES; ++i) + for (uint32 i = 0; i < MAX_RUNES; ++i) { RuneType rune = plr->GetCurrentRune(i); if((plr->GetRuneCooldown(i) == 0) && (runeCost[rune] > 0)) @@ -4151,7 +4151,7 @@ void Spell::TakeRunePower() if(runeCost[RUNE_DEATH] > 0) { - for(uint32 i = 0; i < MAX_RUNES; ++i) + for (uint32 i = 0; i < MAX_RUNES; ++i) { RuneType rune = plr->GetCurrentRune(i); if((plr->GetRuneCooldown(i) == 0) && (rune == RUNE_DEATH)) @@ -4167,7 +4167,7 @@ void Spell::TakeRunePower() // Remove rune from SPELL_AURA_CONVERT_RUNE when rune is used // To prevent overriding other rune convert effects Unit::AuraEffectList const& runeconvert = m_caster->GetAurasByType(SPELL_AURA_CONVERT_RUNE); - for(Unit::AuraEffectList::const_iterator itr = runeconvert.begin(); itr != runeconvert.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = runeconvert.begin(); itr != runeconvert.end(); ++itr) { // Remove rune of aura if avalible if ((*itr)->GetAmount() & (1<<i)) @@ -4185,7 +4185,7 @@ void Spell::TakeRunePower() // Decrease used rune count for dk talent auras // To prevent overriding other rune convert effects Unit::AuraEffectList const& runeconvert = m_caster->GetAurasByType(SPELL_AURA_CONVERT_RUNE); - for(Unit::AuraEffectList::const_iterator itr = runeconvert.begin(); itr != runeconvert.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = runeconvert.begin(); itr != runeconvert.end(); ++itr) { if (plr->GetBaseRune(i) != RUNE_DEATH) { @@ -4195,7 +4195,7 @@ void Spell::TakeRunePower() } // Blood of the North // Reaping - else if ((*itr)->GetSpellProto()->SpellIconID != 3041 && + else if ((*itr)->GetSpellProto()->SpellIconID != 3041 && (*itr)->GetSpellProto()->SpellIconID != 22) continue; @@ -4234,7 +4234,7 @@ void Spell::TakeReagents() if (p_caster->CanNoReagentCast(m_spellInfo)) return; - for(uint32 x = 0; x < 8; ++x) + for (uint32 x = 0; x < 8; ++x) { if(m_spellInfo->Reagent[x] <= 0) continue; @@ -4248,7 +4248,7 @@ void Spell::TakeReagents() ItemPrototype const *proto = m_CastItem->GetProto(); if( proto && proto->ItemId == itemid ) { - for(int s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s) + for (int s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s) { // CastItem will be used up and does not count as reagent int32 charges = m_CastItem->GetSpellCharges(s); @@ -4319,7 +4319,7 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar void Spell::TriggerSpell() { - for(TriggerSpells::iterator si=m_TriggerSpells.begin(); si!=m_TriggerSpells.end(); ++si) + for (TriggerSpells::iterator si=m_TriggerSpells.begin(); si!=m_TriggerSpells.end(); ++si) { Spell* spell = new Spell(m_caster, (*si), true, m_originalCasterGUID, m_selfContainer, true); spell->prepare(&m_targets); // use original spell original targets @@ -4357,7 +4357,7 @@ SpellCastResult Spell::CheckCast(bool strict) bool checkForm = true; // Ignore form req aura Unit::AuraEffectList const& ignore = m_caster->GetAurasByType(SPELL_AURA_MOD_IGNORE_SHAPESHIFT); - for(Unit::AuraEffectList::const_iterator i = ignore.begin(); i != ignore.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = ignore.begin(); i != ignore.end(); ++i) { if (!(*i)->isAffectedOnSpell(m_spellInfo)) continue; @@ -4378,7 +4378,7 @@ SpellCastResult Spell::CheckCast(bool strict) bool reqCombat=true; Unit::AuraEffectList const& stateAuras = m_caster->GetAurasByType(SPELL_AURA_ABILITY_IGNORE_AURASTATE); - for(Unit::AuraEffectList::const_iterator j = stateAuras.begin();j != stateAuras.end(); ++j) + for (Unit::AuraEffectList::const_iterator j = stateAuras.begin(); j != stateAuras.end(); ++j) { if((*j)->isAffectedOnSpell(m_spellInfo)) { @@ -4390,7 +4390,7 @@ SpellCastResult Spell::CheckCast(bool strict) } } - // caster state requirements + // caster state requirements // not for triggered spells (needed by execute) if (!m_IsTriggeredSpell) { @@ -4470,7 +4470,7 @@ SpellCastResult Spell::CheckCast(bool strict) } // check pet presents - for(int j = 0; j < 3; ++j) + for (int j = 0; j < 3; ++j) { if(m_spellInfo->EffectImplicitTargetA[j] == TARGET_UNIT_PET) { @@ -4595,7 +4595,7 @@ SpellCastResult Spell::CheckCast(bool strict) /*//ImpliciteTargetA-B = 38, If fact there is 0 Spell with ImpliciteTargetB=38 if(m_UniqueTargetInfo.empty()) // skip second CheckCast apply (for delayed spells for example) { - for(uint8 j = 0; j < 3; ++j) + for (uint8 j = 0; j < 3; ++j) { if( m_spellInfo->EffectImplicitTargetA[j] == TARGET_UNIT_NEARBY_ENTRY || m_spellInfo->EffectImplicitTargetB[j] == TARGET_UNIT_NEARBY_ENTRY && m_spellInfo->EffectImplicitTargetA[j] != TARGET_UNIT_CASTER || @@ -4613,7 +4613,7 @@ SpellCastResult Spell::CheckCast(bool strict) Creature* creatureScriptTarget = NULL; GameObject* goScriptTarget = NULL; - for(SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST) + for (SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST) { switch(i_spellST->second.type) { @@ -5231,7 +5231,7 @@ SpellCastResult Spell::CheckPetCast(Unit* target) if(!target && m_targets.getUnitTarget()) target = m_targets.getUnitTarget(); - for(uint32 i = 0; i < 3; ++i) + for (uint32 i = 0; i < 3; ++i) { if(SpellTargetType[m_spellInfo->EffectImplicitTargetA[i]] == TARGET_TYPE_UNIT_TARGET || SpellTargetType[m_spellInfo->EffectImplicitTargetA[i]] == TARGET_TYPE_DEST_TARGET) @@ -5274,7 +5274,7 @@ SpellCastResult Spell::CheckCasterAuras() const // We use bitmasks so the loop is done only once and not on every aura check below. if ( m_spellInfo->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY ) { - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { if(m_spellInfo->EffectApplyAuraName[i] == SPELL_AURA_SCHOOL_IMMUNITY) school_immune |= uint32(m_spellInfo->EffectMiscValue[i]); @@ -5310,7 +5310,7 @@ SpellCastResult Spell::CheckCasterAuras() const { //Checking auras is needed now, because you are prevented by some state but the spell grants immunity. Unit::AuraMap const& auras = m_caster->GetAuras(); - for(Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) + for (Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) { if(itr->second) { @@ -5323,7 +5323,7 @@ SpellCastResult Spell::CheckCasterAuras() const //Make a second check for spell failed so the right SPELL_FAILED message is returned. //That is needed when your casting is prevented by multiple states and you are only immune to some of them. - for (uint8 i=0;i<MAX_SPELL_EFFECTS;++i) + for (uint8 i=0; i<MAX_SPELL_EFFECTS; ++i) { if (AuraEffect * part = itr->second->GetPartAura(i)) { @@ -5367,7 +5367,7 @@ bool Spell::CanAutoCast(Unit* target) { uint64 targetguid = target->GetGUID(); - for(uint32 j = 0; j < 3; ++j) + for (uint32 j = 0; j < 3; ++j) { if(m_spellInfo->Effect[j] == SPELL_EFFECT_APPLY_AURA) { @@ -5396,7 +5396,7 @@ bool Spell::CanAutoCast(Unit* target) { SelectSpellTargets(); //check if among target units, our WANTED target is as well (->only self cast spells return false) - for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) if( ihit->targetGUID == targetguid ) return true; } @@ -5481,7 +5481,7 @@ SpellCastResult Spell::CheckPower() sLog.outError("Spell::CheckPower: Unknown power type '%d'", m_spellInfo->powerType); return SPELL_FAILED_UNKNOWN; } - + //check rune cost only if a spell has PowerType == POWER_RUNE if(m_spellInfo->powerType == POWER_RUNE) { @@ -5624,7 +5624,7 @@ SpellCastResult Spell::CheckItems() // check reagents (ignore triggered spells with reagents processed by original spell) and special reagent ignore case. if (!m_IsTriggeredSpell && !p_caster->CanNoReagentCast(m_spellInfo)) { - for(uint32 i=0;i<8;i++) + for (uint32 i=0; i<8; i++) { if(m_spellInfo->Reagent[i] <= 0) continue; @@ -5638,7 +5638,7 @@ SpellCastResult Spell::CheckItems() ItemPrototype const *proto = m_CastItem->GetProto(); if(!proto) return SPELL_FAILED_ITEM_NOT_READY; - for(int s=0; s < MAX_ITEM_PROTO_SPELLS; ++s) + for (int s=0; s < MAX_ITEM_PROTO_SPELLS; ++s) { // CastItem will be used up and does not count as reagent int32 charges = m_CastItem->GetSpellCharges(s); @@ -5656,7 +5656,7 @@ SpellCastResult Spell::CheckItems() // check totem-item requirements (items presence in inventory) uint32 totems = 2; - for(int i = 0; i < 2 ; ++i) + for (int i = 0; i < 2 ; ++i) { if(m_spellInfo->Totem[i] != 0) { @@ -5673,7 +5673,7 @@ SpellCastResult Spell::CheckItems() // Check items for TotemCategory (items presence in inventory) uint32 TotemCategory = 2; - for(int i= 0; i < 2; ++i) + for (int i= 0; i < 2; ++i) { if(m_spellInfo->TotemCategory[i] != 0) { @@ -5691,7 +5691,7 @@ SpellCastResult Spell::CheckItems() } // special checks for spell effects - for(int i = 0; i < 3; i++) + for (int i = 0; i < 3; i++) { switch (m_spellInfo->Effect[i]) { @@ -5710,7 +5710,7 @@ SpellCastResult Spell::CheckItems() break; } case SPELL_EFFECT_ENCHANT_ITEM: - if(m_spellInfo->EffectItemType[i] && m_targets.getItemTarget() + if(m_spellInfo->EffectItemType[i] && m_targets.getItemTarget() && (m_targets.getItemTarget()->IsWeaponVellum() || m_targets.getItemTarget()->IsArmorVellum())) { // cannot enchant vellum for other player @@ -6015,7 +6015,7 @@ void Spell::DelayedChannel() sLog.outDebug("Spell %u partially interrupted for %i ms, new duration: %u ms", m_spellInfo->Id, delaytime, m_timer); - for(std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { if ((*ihit).missCondition == SPELL_MISS_NONE) { @@ -6213,15 +6213,15 @@ bool Spell::IsNeedSendToClient() const bool Spell::HaveTargetsForEffect( uint8 effect ) const { - for(std::list<TargetInfo>::const_iterator itr = m_UniqueTargetInfo.begin(); itr != m_UniqueTargetInfo.end(); ++itr) + for (std::list<TargetInfo>::const_iterator itr = m_UniqueTargetInfo.begin(); itr != m_UniqueTargetInfo.end(); ++itr) if(itr->effectMask & (1 << effect)) return true; - for(std::list<GOTargetInfo>::const_iterator itr = m_UniqueGOTargetInfo.begin(); itr != m_UniqueGOTargetInfo.end(); ++itr) + for (std::list<GOTargetInfo>::const_iterator itr = m_UniqueGOTargetInfo.begin(); itr != m_UniqueGOTargetInfo.end(); ++itr) if(itr->effectMask & (1 << effect)) return true; - for(std::list<ItemTargetInfo>::const_iterator itr = m_UniqueItemInfo.begin(); itr != m_UniqueItemInfo.end(); ++itr) + for (std::list<ItemTargetInfo>::const_iterator itr = m_UniqueItemInfo.begin(); itr != m_UniqueItemInfo.end(); ++itr) if(itr->effectMask & (1 << effect)) return true; @@ -6367,7 +6367,7 @@ bool Spell::IsValidSingleTargetEffect(Unit const* target, Targets type) const bool Spell::IsValidSingleTargetSpell(Unit const* target) const { - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { if(!IsValidSingleTargetEffect(target, Targets(m_spellInfo->EffectImplicitTargetA[i]))) return false; @@ -6381,7 +6381,7 @@ bool Spell::IsValidSingleTargetSpell(Unit const* target) const void Spell::CalculateDamageDoneForAllTargets() { float multiplier[3]; - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { if ( m_applyMultiplierMask & (1 << i) ) { @@ -6396,13 +6396,13 @@ void Spell::CalculateDamageDoneForAllTargets() bool usesAmmo=true; Unit::AuraEffectList const& Auras = m_caster->GetAurasByType(SPELL_AURA_ABILITY_CONSUME_NO_AMMO); - for(Unit::AuraEffectList::const_iterator j = Auras.begin();j != Auras.end(); ++j) + for (Unit::AuraEffectList::const_iterator j = Auras.begin(); j != Auras.end(); ++j) { if((*j)->isAffectedOnSpell(m_spellInfo)) usesAmmo=false; } - for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { TargetInfo &target = *ihit; @@ -6417,7 +6417,7 @@ void Spell::CalculateDamageDoneForAllTargets() if (usesAmmo) { bool ammoTaken=false; - for (uint8 i=0;i<3;i++) + for (uint8 i=0; i<3; i++) { if (!(mask & 1<<i)) continue; @@ -6456,7 +6456,7 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul { int32 damageDone = 0; unitTarget = unit; - for(uint32 i = 0; i < 3; ++i) + for (uint32 i = 0; i < 3; ++i) { if (effectMask & (1<<i)) { @@ -6513,7 +6513,7 @@ SpellCastResult Spell::CanOpenLock(uint32 effIndex, uint32 lockId, SkillType& sk bool reqKey = false; // some locks not have reqs - for(int j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { switch(lockInfo->Type[j]) { @@ -6627,7 +6627,7 @@ void Spell::SelectTrajTargets() float bestDist = GetSpellMaxRange(m_spellInfo, false); UnitList::const_iterator itr = unitList.begin(); - for(; itr != unitList.end(); ++itr) + for (; itr != unitList.end(); ++itr) { if(m_caster == *itr || m_caster->IsOnVehicle(*itr) || (*itr)->GetVehicle())//(*itr)->IsOnVehicle(m_caster)) continue; @@ -6732,7 +6732,7 @@ void Spell::FillRaidOrPartyTargets( UnitList &TagUnitMap, Unit* target, float ra { uint8 subgroup = pTarget->GetSubGroup(); - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -6772,7 +6772,7 @@ void Spell::FillRaidOrPartyManaPriorityTargets( UnitList &TagUnitMap, Unit* targ FillRaidOrPartyTargets(TagUnitMap,target,radius,raid,withPets,withCaster); PrioritizeManaUnitQueue manaUsers; - for(UnitList::const_iterator itr = TagUnitMap.begin(); itr != TagUnitMap.end() && manaUsers.size() < count; ++itr) + for (UnitList::const_iterator itr = TagUnitMap.begin(); itr != TagUnitMap.end() && manaUsers.size() < count; ++itr) if ((*itr)->getPowerType() == POWER_MANA && !(*itr)->isDead()) manaUsers.push(PrioritizeManaUnitWraper(*itr)); @@ -6789,7 +6789,7 @@ void Spell::FillRaidOrPartyHealthPriorityTargets( UnitList &TagUnitMap, Unit* ta FillRaidOrPartyTargets(TagUnitMap,target,radius,raid,withPets,withCaster); PrioritizeHealthUnitQueue healthQueue; - for(UnitList::const_iterator itr = TagUnitMap.begin(); itr != TagUnitMap.end() && healthQueue.size() < count; ++itr) + for (UnitList::const_iterator itr = TagUnitMap.begin(); itr != TagUnitMap.end() && healthQueue.size() < count; ++itr) if (!(*itr)->isDead()) healthQueue.push(PrioritizeHealthUnitWraper(*itr)); diff --git a/src/game/Spell.h b/src/game/Spell.h index f045a1415e0..ecf6ed90c2a 100644 --- a/src/game/Spell.h +++ b/src/game/Spell.h @@ -206,7 +206,7 @@ struct SpellValue { explicit SpellValue(SpellEntry const *proto) { - for(uint32 i = 0; i < 3; ++i) + for (uint32 i = 0; i < 3; ++i) EffectBasePoints[i] = proto->EffectBasePoints[i]; MaxAffectedTargets = proto->MaxAffectedTargets; RadiusMod = 1.0f; @@ -682,7 +682,7 @@ namespace Trinity template<class T> inline void Visit(GridRefManager<T> &m) { - for(typename GridRefManager<T>::iterator itr = m.begin(); itr != m.end(); ++itr) + for (typename GridRefManager<T>::iterator itr = m.begin(); itr != m.end(); ++itr) { Unit *target = (Unit*)itr->getSource(); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 77b21f17562..799e54fccfa 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -401,7 +401,7 @@ Aura::Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObje !(m_spellProto->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT) && !(m_spellProto->Attributes & SPELL_ATTR_NOT_SHAPESHIFT)); - for (uint8 i=0 ;i<MAX_SPELL_EFFECTS;++i) + for (uint8 i=0 ; i<MAX_SPELL_EFFECTS; ++i) { if (m_auraFlags & (uint8(1) << i)) { @@ -422,7 +422,7 @@ Aura::Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObje else m_positive = !caster->IsHostileTo(m_target); - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if((1<<i & GetEffectMask()) && m_positive == IsPositiveEffect(GetId(), i)) { @@ -437,7 +437,7 @@ Aura::Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObje Aura::~Aura() { // free part auras memory - for (uint8 i=0 ; i<MAX_SPELL_EFFECTS;++i) + for (uint8 i=0 ; i<MAX_SPELL_EFFECTS; ++i) if (m_partAuras[i]) delete m_partAuras[i]; } @@ -753,7 +753,7 @@ void AreaAuraEffect::Update(uint32 diff) } } - for(std::list<Unit*>::iterator tIter = targets.begin(); tIter != targets.end(); tIter++) + for (std::list<Unit*>::iterator tIter = targets.begin(); tIter != targets.end(); tIter++) { if(Aura *aur = (*tIter)->GetAura(GetId(), GetCasterGUID())) { @@ -763,7 +763,7 @@ void AreaAuraEffect::Update(uint32 diff) else { bool skip = false; - for(Unit::AuraMap::iterator iter = (*tIter)->GetAuras().begin(); iter != (*tIter)->GetAuras().end();++iter) + for (Unit::AuraMap::iterator iter = (*tIter)->GetAuras().begin(); iter != (*tIter)->GetAuras().end(); ++iter) { if(!spellmgr.CanAurasStack(GetSpellProto(), iter->second->GetSpellProto(), iter->second->GetCasterGUID() == GetCasterGUID())) { @@ -933,7 +933,7 @@ void AuraEffect::CleanupTriggeredSpells() void Aura::ApplyAllModifiers(bool apply, bool Real) { - for (uint8 i = 0; i<MAX_SPELL_EFFECTS;++i) + for (uint8 i = 0; i<MAX_SPELL_EFFECTS; ++i) if (m_partAuras[i]) m_partAuras[i]->ApplyModifier(apply, Real); } @@ -958,7 +958,7 @@ void Aura::HandleAuraSpecificMods(bool apply) uint32 zone, area; m_target->GetZoneAndAreaId(zone,area); - for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) + for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) { // some auras remove at aura remove if(!itr->second->IsFitToRequirements((Player*)m_target,zone,area)) @@ -1046,7 +1046,7 @@ void Aura::HandleAuraSpecificMods(bool apply) caster->CastCustomSpell(m_target, 63675, &basepoints0, NULL, NULL, true, NULL, GetPartAura(0)); } } - // Renew + // Renew else if (GetSpellProto()->SpellFamilyFlags[0] & 0x00000040 && GetPartAura(0)) { Unit * caster = GetCaster(); @@ -1084,7 +1084,7 @@ void Aura::HandleAuraSpecificMods(bool apply) AuraEffect * aurEff = NULL; // Ebon Plaguebringer / Crypt Fever Unit::AuraEffectList const& TalentAuras = caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(Unit::AuraEffectList::const_iterator itr = TalentAuras.begin(); itr != TalentAuras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = TalentAuras.begin(); itr != TalentAuras.end(); ++itr) { if ((*itr)->GetMiscValue() == 7282) { @@ -1191,7 +1191,7 @@ void Aura::HandleAuraSpecificMods(bool apply) // Improved Presences Unit::AuraEffectList const& vDummyAuras = m_target->GetAurasByType(SPELL_AURA_DUMMY); - for(Unit::AuraEffectList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr) { switch((*itr)->GetId()) { @@ -1293,7 +1293,7 @@ void Aura::HandleAuraSpecificMods(bool apply) // aura remove - remove auras from all party members std::list<Unit*> PartyMembers; m_target->GetPartyMembers(PartyMembers); - for (std::list<Unit*>::iterator itr = PartyMembers.begin();itr!=PartyMembers.end();++itr) + for (std::list<Unit*>::iterator itr = PartyMembers.begin(); itr!=PartyMembers.end(); ++itr) { if ((*itr)!= m_target) (*itr)->RemoveAurasWithFamily(SPELLFAMILY_WARRIOR, 0, 0x2, 0, GetCasterGUID()); @@ -1632,7 +1632,7 @@ bool Aura::IsVisible() const return true; bool noneAreaAura = true; - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if(m_partAuras[i]) { @@ -1690,7 +1690,7 @@ void Aura::_AddAura() Unit::VisibleAuraMap const * visibleAuras= m_target->GetVisibleAuras(); // lookup for free slots in units visibleAuras Unit::VisibleAuraMap::const_iterator itr = visibleAuras->find(0); - for(uint32 freeSlot = 0; freeSlot < MAX_AURAS; ++itr , ++freeSlot) + for (uint32 freeSlot = 0; freeSlot < MAX_AURAS; ++itr , ++freeSlot) { if(itr == visibleAuras->end() || itr->first != freeSlot) { @@ -1730,7 +1730,7 @@ void Aura::_AddAura() if(spellmgr.GetSpellCustomAttr(id) & SPELL_ATTR_CU_LINK_AURA) { if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(id + SPELL_LINK_AURA)) - for(std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) + for (std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) { if(*itr < 0) m_target->ApplySpellImmune(id, IMMUNITY_ID, -(*itr), true); @@ -1806,7 +1806,7 @@ void Aura::_RemoveAura() if(customAttr & SPELL_ATTR_CU_LINK_REMOVE) { if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(-(int32)id)) - for(std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) + for (std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) { if(*itr < 0) m_target->RemoveAurasDueToSpell(-(*itr)); @@ -1817,7 +1817,7 @@ void Aura::_RemoveAura() if(customAttr & SPELL_ATTR_CU_LINK_AURA) { if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(id + SPELL_LINK_AURA)) - for(std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) + for (std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) { if(*itr < 0) m_target->ApplySpellImmune(id, IMMUNITY_ID, -(*itr), false); @@ -1861,7 +1861,7 @@ void Aura::SetStackAmount(uint8 stackAmount, bool applied) if (stackAmount != m_stackAmount) { m_stackAmount = stackAmount; - for (uint8 i=0;i<MAX_SPELL_EFFECTS;++i) + for (uint8 i=0; i<MAX_SPELL_EFFECTS; ++i) { if (AuraEffect * part = GetPartAura(i)) { @@ -1959,7 +1959,7 @@ bool Aura::IsPersistent() const { return IS_DYNAMICOBJECT_GUID(m_sourceGuid); /* - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if(m_partAuras[i] && m_partAuras[i]->IsPersistent()) return true; return false; @@ -1968,7 +1968,7 @@ bool Aura::IsPersistent() const bool Aura::IsAreaAura() const { - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if(m_partAuras[i] && m_partAuras[i]->IsAreaAura()) return true; return false; @@ -1976,7 +1976,7 @@ bool Aura::IsAreaAura() const bool Aura::IsAuraType(AuraType type) const { - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if(m_partAuras[i] && m_partAuras[i]->GetAuraName() == type) return true; @@ -1991,7 +1991,7 @@ void Aura::SetLoadedState(uint64 caster_guid,int32 maxduration,int32 duration,in m_duration = duration; m_procCharges = charges; m_stackAmount = stackamount; - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) if(m_partAuras[i]) m_partAuras[i]->SetAmount(amount[i]); } @@ -2110,7 +2110,7 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply) if (HotWSpellId) { Unit::AuraEffectList const& mModTotalStatPct = m_target->GetAurasByType(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE); - for(Unit::AuraEffectList::const_iterator i = mModTotalStatPct.begin(); i != mModTotalStatPct.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = mModTotalStatPct.begin(); i != mModTotalStatPct.end(); ++i) { if ((*i)->GetSpellProto()->SpellIconID == 240 && (*i)->GetMiscValue() == 3) { @@ -2190,7 +2190,7 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply) m_target->RemoveAurasDueToSpell(spellId2); Unit::AuraMap& tAuras = m_target->GetAuras(); - for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end();) + for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end(); ) { if (itr->second->IsRemovedOnShapeLost()) { @@ -2280,7 +2280,7 @@ void AuraEffect::HandleAddModifier(bool apply, bool Real, bool changeAmount) { uint64 guid = m_target->GetGUID(); Unit::AuraMap & auras = m_target->GetAuras(); - for(Unit::AuraMap::iterator iter = auras.begin(); iter != auras.end();++iter) + for (Unit::AuraMap::iterator iter = auras.begin(); iter != auras.end(); ++iter) { Aura * aur = iter->second; // only passive auras-active auras should have amount set on spellcast and not be affected @@ -2289,7 +2289,7 @@ void AuraEffect::HandleAddModifier(bool apply, bool Real, bool changeAmount) { if (modOp == SPELLMOD_ALL_EFFECTS) { - for (uint8 i = 0; i<MAX_SPELL_EFFECTS;++i) + for (uint8 i = 0; i<MAX_SPELL_EFFECTS; ++i) { if (AuraEffect * aurEff = aur->GetPartAura(i)) aurEff->RecalculateAmount(); @@ -2465,9 +2465,9 @@ void AuraEffect::TriggerSpell() case 34229: { // cast 24 spells 34269-34289, 34314-34316 - for(uint32 spell_id = 34269; spell_id != 34290; ++spell_id) + for (uint32 spell_id = 34269; spell_id != 34290; ++spell_id) caster->CastSpell(m_target,spell_id,true, NULL, this); - for(uint32 spell_id = 34314; spell_id != 34317; ++spell_id) + for (uint32 spell_id = 34314; spell_id != 34317; ++spell_id) caster->CastSpell(m_target,spell_id,true, NULL, this); return; } @@ -2587,7 +2587,7 @@ void AuraEffect::TriggerSpell() case 38443: { bool all = true; - for(int i = SUMMON_SLOT_TOTEM; i < MAX_TOTEM_SLOT; ++i) + for (int i = SUMMON_SLOT_TOTEM; i < MAX_TOTEM_SLOT; ++i) { if(!caster->m_SummonSlot[i]) { @@ -2695,7 +2695,7 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount) if(apply) { // Overpower - if (caster && m_spellProto->SpellFamilyName == SPELLFAMILY_WARRIOR && + if (caster && m_spellProto->SpellFamilyName == SPELLFAMILY_WARRIOR && m_spellProto->SpellFamilyFlags[0] & 0x4) { // Must be casting target @@ -3182,7 +3182,7 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount) // final heal //if(m_target->IsInWorld()) // This may be a hack, but we need a way to count healing bonus three times - //for(uint8 i = 0; i < GetParentAura()->GetStackAmount(); ++i) + //for (uint8 i = 0; i < GetParentAura()->GetStackAmount(); ++i) // Update: apparently not anymore, it should only count once, so.. commented out. m_target->CastCustomSpell(m_target,33778,&m_amount,NULL,NULL,true,NULL,this,GetCasterGUID()); @@ -3242,7 +3242,7 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount) uint32 zone, area; m_target->GetZoneAndAreaId(zone,area); - for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) + for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) { // some auras remove at aura remove if(!itr->second->IsFitToRequirements((Player*)m_target,zone,area)) @@ -3284,7 +3284,7 @@ void AuraEffect::HandleAuraMounted(bool apply, bool Real, bool /*changeAmount*/) display_id = minfo->modelid; //some spell has one aura of mount and one of vehicle - for(uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) if(GetSpellProto()->Effect[i] == SPELL_EFFECT_SUMMON && GetSpellProto()->EffectMiscValue[i] == GetMiscValue()) display_id = 0; @@ -3591,7 +3591,7 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun { // add dash if in cat-from Unit::AuraMap & auras = m_target->GetAuras(); - for (Unit::AuraMap::iterator iter = auras.begin(); iter != auras.end();++iter) + for (Unit::AuraMap::iterator iter = auras.begin(); iter != auras.end(); ++iter) { Aura * aur = iter->second; if (aur->GetSpellProto()->SpellFamilyName==SPELLFAMILY_DRUID && aur->GetSpellProto()->SpellFamilyFlags[2] & 0x8) @@ -3610,7 +3610,7 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun { SpellShapeshiftEntry const *shapeInfo = sSpellShapeshiftStore.LookupEntry(form); // Learn spells for shapeshift form - no need to send action bars or add spells to spellbook - for (uint8 i = 0;i<MAX_SHAPESHIFT_SPELLS;++i) + for (uint8 i = 0; i<MAX_SHAPESHIFT_SPELLS; ++i) { if (!shapeInfo->stanceSpell[i]) continue; @@ -3748,7 +3748,7 @@ void AuraEffect::HandleAuraTransform(bool apply, bool Real, bool /*changeAmount* { // look for other transform auras AuraEffect* handledAura = *otherTransforms.begin(); - for(Unit::AuraEffectList::const_iterator i = otherTransforms.begin();i != otherTransforms.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = otherTransforms.begin(); i != otherTransforms.end(); ++i) { // negative auras are preferred if (!IsPositiveSpell((*i)->GetSpellProto()->Id)) @@ -3914,7 +3914,7 @@ void AuraEffect::HandleAuraModPetTalentsPoints(bool Apply, bool Real, bool chang // Recalculate pet tlaent points if (Pet *pet = ((Player*)m_target)->GetPet()) - pet->InitTalentForLevel(); + pet->InitTalentForLevel(); } void AuraEffect::HandleModConfuse(bool apply, bool Real, bool /*changeAmount*/) @@ -3956,12 +3956,12 @@ void AuraEffect::HandleFeignDeath(bool apply, bool Real, bool /*changeAmount*/) Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(m_target, m_target, m_target->GetMap()->GetVisibilityDistance()); Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(m_target, targets, u_check); m_target->VisitNearbyObject(m_target->GetMap()->GetVisibilityDistance(), searcher); - for(std::list<Unit*>::iterator iter = targets.begin(); iter != targets.end(); ++iter) + for (std::list<Unit*>::iterator iter = targets.begin(); iter != targets.end(); ++iter) { if(!(*iter)->hasUnitState(UNIT_STAT_CASTING)) continue; - for(uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++) + for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++) { if((*iter)->GetCurrentSpell(i) && (*iter)->GetCurrentSpell(i)->m_targets.getUnitTargetGUID() == m_target->GetGUID()) @@ -4112,7 +4112,7 @@ void AuraEffect::HandleInvisibility(bool apply, bool Real, bool /*changeAmount*/ // recalculate value at modifier remove (current aura already removed) m_target->m_invisibilityMask = 0; Unit::AuraEffectList const& auras = m_target->GetAurasByType(SPELL_AURA_MOD_INVISIBILITY); - for(Unit::AuraEffectList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) m_target->m_invisibilityMask |= (1 << GetMiscValue()); // only at real aura remove and if not have different invisibility auras. @@ -4138,7 +4138,7 @@ void AuraEffect::HandleInvisibilityDetect(bool apply, bool Real, bool /*changeAm // recalculate value at modifier remove (current aura already removed) m_target->m_detectInvisibilityMask = 0; Unit::AuraEffectList const& auras = m_target->GetAurasByType(SPELL_AURA_MOD_INVISIBILITY_DETECTION); - for(Unit::AuraEffectList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) m_target->m_detectInvisibilityMask |= (1 << GetMiscValue()); } if(Real && m_target->GetTypeId()==TYPEID_PLAYER) @@ -4208,7 +4208,7 @@ void AuraEffect::HandleModThreat(bool apply, bool Real, bool changeAmount) } if (m_target->GetTypeId() == TYPEID_PLAYER) - for(int8 x=0;x < MAX_SPELL_SCHOOL;x++) + for (int8 x=0; x < MAX_SPELL_SCHOOL; x++) if (GetMiscValue() & int32(1<<x)) ApplyPercentModFloatVar(m_target->m_threatModifier[x], m_amount, apply); } @@ -4383,12 +4383,12 @@ void AuraEffect::HandleModStateImmunityMask(bool apply, bool Real, bool /*change if(apply && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY) { - for (std::list <AuraType>::iterator iter = immunity_list.begin(); iter != immunity_list.end();++iter) + for (std::list <AuraType>::iterator iter = immunity_list.begin(); iter != immunity_list.end(); ++iter) { m_target->RemoveAurasByType(*iter); } } - for (std::list <AuraType>::iterator iter = immunity_list.begin(); iter != immunity_list.end();++iter) + for (std::list <AuraType>::iterator iter = immunity_list.begin(); iter != immunity_list.end(); ++iter) { m_target->ApplySpellImmune(GetId(),IMMUNITY_STATE,*iter,apply); } @@ -4415,7 +4415,7 @@ void AuraEffect::HandleModMechanicImmunity(bool apply, bool Real, bool /*changeA if(apply && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY) { Unit::AuraMap& Auras = m_target->GetAuras(); - for(Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end();) + for (Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end(); ) { SpellEntry const *spell = iter->second->GetSpellProto(); if (spell->Id != GetId()) @@ -4496,7 +4496,7 @@ void AuraEffect::HandleAuraModSchoolImmunity(bool apply, bool Real, bool /*chang { uint32 school_mask = GetMiscValue(); Unit::AuraMap& Auras = m_target->GetAuras(); - for(Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end();) + for (Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end(); ) { SpellEntry const *spell = iter->second->GetSpellProto(); if((GetSpellSchoolMask(spell) & school_mask)//Check for school mask @@ -4684,7 +4684,7 @@ void AuraEffect::HandlePeriodicHealthFunnel(bool apply, bool Real, bool /*change void AuraEffect::HandleAuraModResistanceExclusive(bool apply, bool Rea, bool /*changeAmount*/) { - for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++) + for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; x++) { if(GetMiscValue() & int32(1<<x)) { @@ -4697,7 +4697,7 @@ void AuraEffect::HandleAuraModResistanceExclusive(bool apply, bool Rea, bool /*c void AuraEffect::HandleAuraModResistance(bool apply, bool Real, bool /*changeAmount*/) { - for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++) + for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; x++) { if(GetMiscValue() & int32(1<<x)) { @@ -4719,7 +4719,7 @@ void AuraEffect::HandleAuraModBaseResistancePCT(bool apply, bool Real, bool /*ch } else { - for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++) + for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; x++) { if(GetMiscValue() & int32(1<<x)) m_target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_PCT, float(m_amount), apply); @@ -4729,7 +4729,7 @@ void AuraEffect::HandleAuraModBaseResistancePCT(bool apply, bool Real, bool /*ch void AuraEffect::HandleModResistancePercent(bool apply, bool Real, bool /*changeAmount*/) { - for(int8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++) + for (int8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++) { if(GetMiscValue() & int32(1<<i)) { @@ -4754,7 +4754,7 @@ void AuraEffect::HandleModBaseResistance(bool apply, bool Real, bool /*changeAmo } else { - for(int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++) + for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++) if(GetMiscValue() & (1<<i)) m_target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_VALUE, float(m_amount), apply); } @@ -4772,7 +4772,7 @@ void AuraEffect::HandleAuraModStat(bool apply, bool Real, bool /*changeAmount*/) return; } - for(int32 i = STAT_STRENGTH; i < MAX_STATS; i++) + for (int32 i = STAT_STRENGTH; i < MAX_STATS; i++) { // -1 or -2 is all stats ( misc < -2 checked in function beginning ) if (GetMiscValue() < 0 || GetMiscValue() == i) @@ -5118,7 +5118,7 @@ void AuraEffect::HandleAuraModWeaponCritPercent(bool apply, bool Real, bool chan // apply item specific bonuses for already equipped weapon if(Real || changeAmount) { - for(int i = 0; i < MAX_ATTACK; ++i) + for (int i = 0; i < MAX_ATTACK; ++i) if(Item* pItem = ((Player*)m_target)->GetWeaponForAttack(WeaponAttackType(i))) ((Player*)m_target)->_ApplyWeaponDependentAuraCritMod(pItem,WeaponAttackType(i),this,apply); } @@ -5182,7 +5182,7 @@ void AuraEffect::HandleModSpellCritChanceShool(bool /*apply*/, bool Real, bool c if(m_target->GetTypeId() != TYPEID_PLAYER) return; - for(int school = SPELL_SCHOOL_NORMAL; school < MAX_SPELL_SCHOOL; ++school) + for (int school = SPELL_SCHOOL_NORMAL; school < MAX_SPELL_SCHOOL; ++school) if (GetMiscValue() & (1<<school)) ((Player*)m_target)->UpdateSpellCritChance(school); } @@ -5310,7 +5310,7 @@ void AuraEffect::HandleModDamageDone(bool apply, bool Real, bool changeAmount) // apply item specific bonuses for already equipped weapon if((Real || changeAmount) && m_target->GetTypeId()==TYPEID_PLAYER) { - for(int i = 0; i < MAX_ATTACK; ++i) + for (int i = 0; i < MAX_ATTACK; ++i) if(Item* pItem = ((Player*)m_target)->GetWeaponForAttack(WeaponAttackType(i))) ((Player*)m_target)->_ApplyWeaponDependentAuraDamageMod(pItem,WeaponAttackType(i),this,apply); } @@ -5366,7 +5366,7 @@ void AuraEffect::HandleModDamageDone(bool apply, bool Real, bool changeAmount) { if(m_amount > 0) { - for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; i++) + for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; i++) { if((GetMiscValue() & (1<<i)) != 0) m_target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i,m_amount,apply); @@ -5374,7 +5374,7 @@ void AuraEffect::HandleModDamageDone(bool apply, bool Real, bool changeAmount) } else { - for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; i++) + for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; i++) { if((GetMiscValue() & (1<<i)) != 0) m_target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+i,m_amount,apply); @@ -5392,7 +5392,7 @@ void AuraEffect::HandleModDamagePercentDone(bool apply, bool Real, bool changeAm // apply item specific bonuses for already equipped weapon if((Real || changeAmount) && m_target->GetTypeId()==TYPEID_PLAYER) { - for(int i = 0; i < MAX_ATTACK; ++i) + for (int i = 0; i < MAX_ATTACK; ++i) if(Item* pItem = ((Player*)m_target)->GetWeaponForAttack(WeaponAttackType(i))) ((Player*)m_target)->_ApplyWeaponDependentAuraDamageMod(pItem,WeaponAttackType(i),this,apply); } @@ -5440,7 +5440,7 @@ void AuraEffect::HandleModDamagePercentDone(bool apply, bool Real, bool changeAm // Magic damage percent modifiers implemented in Unit::SpellDamageBonus // Send info to client if(m_target->GetTypeId() == TYPEID_PLAYER) - for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i) + for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i) m_target->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+i,m_amount/100.0f,apply); } @@ -5466,7 +5466,7 @@ void AuraEffect::HandleModPowerCostPCT(bool apply, bool Real, bool changeAmount) return; float amount = m_amount /100.0f; - for(int i = 0; i < MAX_SPELL_SCHOOL; ++i) + for (int i = 0; i < MAX_SPELL_SCHOOL; ++i) if(GetMiscValue() & (1<<i)) m_target->ApplyModSignedFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER+i,amount,apply); } @@ -5477,7 +5477,7 @@ void AuraEffect::HandleModPowerCost(bool apply, bool Real, bool changeAmount) if(!Real && !changeAmount) return; - for(int i = 0; i < MAX_SPELL_SCHOOL; ++i) + for (int i = 0; i < MAX_SPELL_SCHOOL; ++i) if(GetMiscValue() & (1<<i)) m_target->ApplyModInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i,m_amount,apply); } @@ -5491,7 +5491,7 @@ void AuraEffect::HandleNoReagentUseAura(bool Apply, bool Real, bool /*changeAmou return; flag96 mask; Unit::AuraEffectList const& noReagent = m_target->GetAurasByType(SPELL_AURA_NO_REAGENT_USE); - for(Unit::AuraEffectList::const_iterator i = noReagent.begin(); i != noReagent.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = noReagent.begin(); i != noReagent.end(); ++i) mask |= (*i)->m_spellProto->EffectSpellClassMask[(*i)->m_effIndex]; m_target->SetUInt32Value(PLAYER_NO_REAGENT_COST_1 , mask[0]); @@ -5584,7 +5584,7 @@ void AuraEffect::HandleAuraAllowFlight(bool apply, bool Real, bool /*changeAmoun if(m_target->GetTypeId() == TYPEID_UNIT) m_target->SetFlying(apply); - + if(Player *plr = m_target->m_movedPlayer) { // allow fly @@ -6678,7 +6678,7 @@ void AuraEffect::PeriodicDummyTick() return; // Remove death rune added on proc - for (uint8 i=0;i<MAX_RUNES && m_amount;++i) + for (uint8 i=0; i<MAX_RUNES && m_amount; ++i) { if (m_spellProto->SpellIconID == 2622) { @@ -6788,7 +6788,7 @@ void AuraEffect::HandleAuraConvertRune(bool apply, bool Real, bool changeAmount) uint32 runes = 0; // convert number of runes specified in aura amount of rune type in miscvalue to runetype in miscvalueb - for(uint32 i = 0; i < MAX_RUNES && m_amount; ++i) + for (uint32 i = 0; i < MAX_RUNES && m_amount; ++i) { if(apply) { @@ -7074,7 +7074,7 @@ int32 AuraEffect::CalculateCrowdControlAuraAmount(Unit * caster) // Glyphs increasing damage cap Unit::AuraEffectList const& overrideClassScripts = caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(Unit::AuraEffectList::const_iterator itr = overrideClassScripts.begin();itr != overrideClassScripts.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = overrideClassScripts.begin(); itr != overrideClassScripts.end(); ++itr) { if((*itr)->isAffectedOnSpell(m_spellProto)) { @@ -7092,7 +7092,7 @@ int32 AuraEffect::CalculateCrowdControlAuraAmount(Unit * caster) bool AuraEffect::IsPeriodicTickCrit(Unit const * pCaster) const { Unit::AuraEffectList const& mPeriodicCritAuras= pCaster->GetAurasByType(SPELL_AURA_ABILITY_PERIODIC_CRIT); - for(Unit::AuraEffectList::const_iterator itr = mPeriodicCritAuras.begin(); itr != mPeriodicCritAuras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = mPeriodicCritAuras.begin(); itr != mPeriodicCritAuras.end(); ++itr) { if ((*itr)->isAffectedOnSpell(m_spellProto) && pCaster->isSpellCrit(m_target, m_spellProto, GetSpellSchoolMask(m_spellProto))) return true; diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index 821e208d6b7..3730107461a 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -45,7 +45,7 @@ typedef void(AuraEffect::*pAuraHandler)(bool Apply, bool Real, bool changeAmount // each setting object update field code line moved under if(Real) check is significant Trinity speedup, and less server->client data sends // each packet sending code moved under if(Real) check is _large_ Trinity speedup, and lot less server->client data sends // -// changeAmount == true at changing existing aura amount - called wit real == false +// changeAmount == true at changing existing aura amount - called wit real == false // if aura has amount dependant effect handler has to allow proceeding it // example: change speed aura, modifier aura @@ -113,7 +113,7 @@ class TRINITY_DLL_SPEC Aura bool HasEffect(uint8 effIndex) const {return bool (m_partAuras[effIndex]);} inline void HandleEffects(bool apply) { - for (uint8 i = 0; i<MAX_SPELL_EFFECTS;++i) + for (uint8 i = 0; i<MAX_SPELL_EFFECTS; ++i) if (m_partAuras[i]) m_target->HandleAuraEffect(m_partAuras[i], apply); } diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index d9aedd5fc98..1954976b824 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -327,7 +327,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) if (m_customAttr & SPELL_ATTR_CU_SHARE_DAMAGE) { uint32 count = 0; - for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) if (ihit->effectMask & (1<<effect_idx)) ++count; @@ -346,7 +346,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) if (unitTarget == m_caster) { uint8 count = 0; - for(std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) if(ihit->targetGUID != m_caster->GetGUID()) if(Player *target = ObjectAccessor::FindPlayer(ihit->targetGUID)) if(target->HasAura(m_triggeredByAuraSpell->Id)) @@ -467,7 +467,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) AuraEffect const* aura = NULL; // found req. aura for damage calculation Unit::AuraEffectList const &mPeriodic = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); - for(Unit::AuraEffectList::const_iterator i = mPeriodic.begin(); i != mPeriodic.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = mPeriodic.begin(); i != mPeriodic.end(); ++i) { // for caster applied auras only if ((*i)->GetSpellProto()->SpellFamilyName != SPELLFAMILY_WARLOCK || @@ -612,7 +612,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) // TODO: should this be put on taken but not done? if(found) damage += m_spellInfo->EffectBasePoints[1]; - + if (m_caster->GetTypeId() == TYPEID_PLAYER) { // Add Ammo and Weapon damage plus RAP * 0.1 @@ -689,7 +689,7 @@ void Spell::EffectDummy(uint32 i) case 42784: { uint32 count = 0; - for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) if(ihit->effectMask & (1<<i)) ++count; @@ -699,7 +699,7 @@ void Spell::EffectDummy(uint32 i) SpellEntry const *spellInfo = sSpellStore.LookupEntry(42784); // now deal the damage - for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) if(ihit->effectMask & (1<<i)) { if (Unit* casttarget = Unit::GetUnit((*unitTarget), ihit->targetGUID)) @@ -1252,7 +1252,7 @@ void Spell::EffectDummy(uint32 i) SearchAreaTarget(unitList, 99, PUSH_DST_CENTER, SPELL_TARGETS_ENTRY, 33114); float minDist = 99 * 99; Vehicle *target = NULL; - for(std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr) + for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr) { if(Vehicle *seat = (*itr)->GetVehicleKit()) if(!seat->GetPassenger(0)) @@ -1316,7 +1316,7 @@ void Spell::EffectDummy(uint32 i) // immediately finishes the cooldown on Frost spells const SpellCooldowns& cm = ((Player *)m_caster)->GetSpellCooldownMap(); - for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();) + for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end(); ) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); @@ -1552,7 +1552,7 @@ void Spell::EffectDummy(uint32 i) if(!pEnchant) return; - for (int s=0;s<3;s++) + for (int s=0; s<3; s++) { if(pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL) continue; @@ -1574,7 +1574,7 @@ void Spell::EffectDummy(uint32 i) //immediately finishes the cooldown on certain Rogue abilities const SpellCooldowns& cm = ((Player *)m_caster)->GetSpellCooldownMap(); - for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();) + for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end(); ) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); @@ -1602,7 +1602,7 @@ void Spell::EffectDummy(uint32 i) // immediately finishes the cooldown on your other Hunter abilities except Bestial Wrath const SpellCooldowns& cm = ((Player*)m_caster)->GetSpellCooldownMap(); - for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();) + for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end(); ) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); @@ -1716,7 +1716,7 @@ void Spell::EffectDummy(uint32 i) // Righteous Defense (step 2) (in old version 31980 dummy effect) // Clear targets for eff 1 - for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) ihit->effectMask &= ~(1<<1); // not empty (checked) @@ -1725,7 +1725,7 @@ void Spell::EffectDummy(uint32 i) // chance to be selected from list float chance = 100.0f / attackers.size(); uint32 count = 0; - for(Unit::AttackerSet::const_iterator aItr = attackers.begin(); aItr != attackers.end() && count < 3; ++aItr) + for (Unit::AttackerSet::const_iterator aItr = attackers.begin(); aItr != attackers.end() && count < 3; ++aItr) { if(!roll_chance_f(chance)) continue; @@ -1785,7 +1785,7 @@ void Spell::EffectDummy(uint32 i) if(m_caster->GetTypeId() != TYPEID_PLAYER) return; - for(uint8 j = BASE_ATTACK; j <= OFF_ATTACK; ++j) + for (uint8 j = BASE_ATTACK; j <= OFF_ATTACK; ++j) { if(Item* item = ((Player*)m_caster)->GetWeaponForAttack(WeaponAttackType(j))) { @@ -1862,7 +1862,7 @@ void Spell::EffectDummy(uint32 i) { uint32 count = 0; Unit::AuraMap const& auras = unitTarget->GetAuras(); - for(Unit::AuraMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) + for (Unit::AuraMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) { if(itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE && itr->second->GetCasterGUID() == m_caster->GetGUID()) @@ -2208,7 +2208,7 @@ void Spell::EffectTriggerSpell(uint32 effIndex) { uint32 dispelMask = GetDispellMask(DISPEL_ALL); Unit::AuraMap& Auras = unitTarget->GetAuras(); - for(Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end();) + for (Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end(); ) { // remove all harmful spells on you... SpellEntry const* spell = iter->second->GetSpellProto(); @@ -2631,7 +2631,7 @@ void Spell::SpellDamageHeal(uint32 /*i*/) Unit::AuraEffectList const& RejorRegr = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_HEAL); // find most short by duration AuraEffect *targetAura = NULL; - for(Unit::AuraEffectList::const_iterator i = RejorRegr.begin(); i != RejorRegr.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = RejorRegr.begin(); i != RejorRegr.end(); ++i) { if((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID && (*i)->GetSpellProto()->SpellFamilyFlags[0] & 0x50) @@ -2905,7 +2905,7 @@ void Spell::DoCreateItem(uint32 i, uint32 itemtype) if(BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(BattleGroundTypeId(bgType))) bg->SendRewardMarkByMail(player, newitemid, no_space); } -*/ +*/ } void Spell::EffectCreateItem(uint32 i) @@ -3032,7 +3032,7 @@ void Spell::EffectEnergize(uint32 i) // find elixirs on target uint32 elixir_mask = 0; Unit::AuraMap& Auras = unitTarget->GetAuras(); - for(Unit::AuraMap::iterator itr = Auras.begin(); itr != Auras.end(); ++itr) + for (Unit::AuraMap::iterator itr = Auras.begin(); itr != Auras.end(); ++itr) { uint32 spell_id = itr->second->GetId(); if(uint32 mask = spellmgr.GetSpellElixirMask(spell_id)) @@ -3045,7 +3045,7 @@ void Spell::EffectEnergize(uint32 i) // get all available elixirs by mask and spell level std::vector<uint32> elixirs; SpellElixirMap const& m_spellElixirs = spellmgr.GetSpellElixirMap(); - for(SpellElixirMap::const_iterator itr = m_spellElixirs.begin(); itr != m_spellElixirs.end(); ++itr) + for (SpellElixirMap::const_iterator itr = m_spellElixirs.begin(); itr != m_spellElixirs.end(); ++itr) { if (itr->second & elixir_mask) { @@ -3295,7 +3295,7 @@ void Spell::EffectSummonChangeItem(uint32 i) if( !pNewItem ) return; - for(uint8 j= PERM_ENCHANTMENT_SLOT; j<=TEMP_ENCHANTMENT_SLOT; ++j) + for (uint8 j= PERM_ENCHANTMENT_SLOT; j<=TEMP_ENCHANTMENT_SLOT; ++j) { if(m_CastItem->GetEnchantmentId(EnchantmentSlot(j))) pNewItem->SetEnchantment(EnchantmentSlot(j), m_CastItem->GetEnchantmentId(EnchantmentSlot(j)), m_CastItem->GetEnchantmentDuration(EnchantmentSlot(j)), m_CastItem->GetEnchantmentCharges(EnchantmentSlot(j))); @@ -3506,7 +3506,7 @@ void Spell::EffectSummonType(uint32 i) if (m_spellInfo->Id == 18662) // Curse of Doom amount = 1; - for(uint32 count = 0; count < amount; ++count) + for (uint32 count = 0; count < amount; ++count) { GetSummonPosition(i, pos, radius, count); @@ -3586,7 +3586,7 @@ void Spell::EffectDispel(uint32 i) uint32 dispel_type = m_spellInfo->EffectMiscValue[i]; uint32 dispelMask = GetDispellMask( DispelType(dispel_type) ); Unit::AuraMap const& auras = unitTarget->GetAuras(); - for(Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) + for (Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) { Aura *aur = itr->second; if ((1<<aur->GetSpellProto()->Dispel) & dispelMask) @@ -3907,7 +3907,7 @@ void Spell::EffectEnchantItemPrismatic(uint32 effect_idx) // support only enchantings with add socket in this slot { bool add_socket = false; - for(uint8 i = 0; i < 3; ++i) + for (uint8 i = 0; i < 3; ++i) { if(pEnchant->type[i]==ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET) { @@ -4118,7 +4118,7 @@ void Spell::EffectTameCreature(uint32 /*i*/) // caster have pet now m_caster->SetMinion(pet, true); - + pet->InitTalentForLevel(); if(m_caster->GetTypeId() == TYPEID_PLAYER) @@ -4313,7 +4313,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i) stack = aur->GetStackAmount(); } - for(uint8 j = 0; j < 3; j++) + for (uint8 j = 0; j < 3; j++) { if(m_spellInfo->Effect[j] == SPELL_EFFECT_NORMALIZED_WEAPON_DMG) { @@ -4351,7 +4351,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i) // Glyph of Devastate if (AuraEffect * aurEff = m_caster->GetAuraEffect(58388, 0)) count += aurEff->GetAmount(); - for (;count>0;count--) + for (; count>0; count--) m_caster->CastSpell(unitTarget, spellInfo, true); if (stack) spell_bonus += stack * CalculateDamage(2, unitTarget); @@ -4386,7 +4386,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i) else { Unit::AuraMap const& auras = unitTarget->GetAuras(); - for(Unit::AuraMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) + for (Unit::AuraMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) { if(itr->second->GetSpellProto()->Dispel == DISPEL_POISON) { @@ -4759,14 +4759,14 @@ void Spell::EffectScriptEffect(uint32 effIndex) Player* plr = ((Player*)m_caster); if(plr && plr->GetLastPetNumber()) { - PetType NewPetType = (plr->getClass()==CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET; + PetType NewPetType = (plr->getClass()==CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET; if (Pet* NewPet = new Pet(plr,NewPetType)) { if(NewPet->LoadPetFromDB(plr, 0, plr->GetLastPetNumber(), true)) { NewPet->SetHealth(NewPet->GetMaxHealth()); NewPet->SetPower(NewPet->getPowerType(),NewPet->GetMaxPower(NewPet->getPowerType())); - + switch (NewPet->GetEntry()) { case 11859: @@ -4872,7 +4872,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) uint32 spells[4] = { 26272, 26157, 26273, 26274 }; // check presence - for(uint8 j = 0; j < 4; ++j) + for (uint8 j = 0; j < 4; ++j) if(unitTarget->HasAuraEffect(spells[j],0)) return; @@ -5222,7 +5222,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) float x, y, z; float radius = GetSpellRadius(m_spellInfo, effIndex, true); - for(uint32 i = 0; i < 15; ++i) + for (uint32 i = 0; i < 15; ++i) { m_caster->GetRandomPoint(m_targets.m_dstPos, radius, x, y, z); m_caster->CastSpell(x, y, z, 54522, true); @@ -5292,7 +5292,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) case 58941: // Rock Shards if(unitTarget && m_originalCaster) { - for(uint32 i = 0; i < 3; ++i) + for (uint32 i = 0; i < 3; ++i) { m_originalCaster->CastSpell(unitTarget, 58689, true); m_originalCaster->CastSpell(unitTarget, 58692, true); @@ -5417,7 +5417,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) { int32 basepoints0 = damage; // Cast Absorb on totems - for(uint8 slot = SUMMON_SLOT_TOTEM; slot < MAX_TOTEM_SLOT; ++slot) + for (uint8 slot = SUMMON_SLOT_TOTEM; slot < MAX_TOTEM_SLOT; ++slot) { if(!unitTarget->m_SummonSlot[slot]) continue; @@ -5598,7 +5598,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) uint32 spellId = 0; int32 basePoint = 0; Unit::AuraMap& Auras = unitTarget->GetAuras(); - for(Unit::AuraMap::iterator i = Auras.begin(); i != Auras.end(); ++i) + for (Unit::AuraMap::iterator i = Auras.begin(); i != Auras.end(); ++i) { Aura *aura = (*i).second; if (aura->GetCasterGUID() != m_caster->GetGUID()) @@ -5684,7 +5684,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) } // all seals have aura dummy in 2 effect Unit::AuraMap & sealAuras = m_caster->GetAuras(); - for(Unit::AuraMap::iterator iter = sealAuras.begin(); iter != sealAuras.end();) + for (Unit::AuraMap::iterator iter = sealAuras.begin(); iter != sealAuras.end(); ) { if (IsSealSpell(iter->second->GetSpellProto())) { @@ -5745,7 +5745,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) const uint32 spellid = 28703; // don't overwrite an existing aura - for(uint8 i = 0; i < 5; ++i) + for (uint8 i = 0; i < 5; ++i) if(unitTarget->HasAura(spellid + i)) return; unitTarget->CastSpell(unitTarget, spellid+urand(0, 4), true); @@ -5789,7 +5789,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) case SPELLFAMILY_WARRIOR: { // Shattering Throw - if ( m_spellInfo->SpellFamilyFlags[1] & 0x1 ) + if ( m_spellInfo->SpellFamilyFlags[1] & 0x1 ) { if(!unitTarget) return; @@ -5815,12 +5815,12 @@ void Spell::EffectSanctuary(uint32 /*i*/) Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(unitTarget, unitTarget, m_caster->GetMap()->GetVisibilityDistance()); Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(unitTarget, targets, u_check); unitTarget->VisitNearbyObject(m_caster->GetMap()->GetVisibilityDistance(), searcher); - for(std::list<Unit*>::iterator iter = targets.begin(); iter != targets.end(); ++iter) + for (std::list<Unit*>::iterator iter = targets.begin(); iter != targets.end(); ++iter) { if(!(*iter)->hasUnitState(UNIT_STAT_CASTING)) continue; - for(uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++) + for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++) { if((*iter)->GetCurrentSpell(i) && (*iter)->GetCurrentSpell(i)->m_targets.getUnitTargetGUID() == unitTarget->GetGUID()) @@ -6343,7 +6343,7 @@ void Spell::EffectLeapForward(uint32 i) } int j = 0; - for(j; j<10 ;j++) + for (j; j<10 ; j++) { if(fabs(z - destz) > 6) { @@ -6573,7 +6573,7 @@ void Spell::EffectDispelMechanic(uint32 i) std::queue < std::pair < uint32, uint64 > > dispel_list; Unit::AuraMap& Auras = unitTarget->GetAuras(); - for(Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end(); iter++) + for (Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end(); iter++) { if((GetAllSpellMechanicMask(iter->second->GetSpellProto()) & (1<<(mechanic))) && GetDispelChance(iter->second->GetCaster(), iter->second->GetId())) { @@ -6581,7 +6581,7 @@ void Spell::EffectDispelMechanic(uint32 i) } } - for(;dispel_list.size();dispel_list.pop()) + for (; dispel_list.size(); dispel_list.pop()) { unitTarget->RemoveAura(dispel_list.front().first, dispel_list.front().second, AURA_REMOVE_BY_ENEMY_SPELL); } @@ -6614,7 +6614,7 @@ void Spell::EffectSummonDeadPet(uint32 /*i*/) void Spell::EffectDestroyAllTotems(uint32 /*i*/) { int32 mana = 0; - for(uint8 slot = SUMMON_SLOT_TOTEM; slot < MAX_TOTEM_SLOT; ++slot) + for (uint8 slot = SUMMON_SLOT_TOTEM; slot < MAX_TOTEM_SLOT; ++slot) { if(!m_caster->m_SummonSlot[slot]) continue; @@ -6735,7 +6735,7 @@ void Spell::EffectTransmitted(uint32 effIndex) { fx = 36.69+irand(-8,8);//random place for the bobber fy = -416.38+irand(-8,8); - fz = -19.9645;//serpentshrine water level + fz = -19.9645;//serpentshrine water level }else if ( !cMap->IsInWater(fx, fy, fz-0.5f, 0.5f)) // Hack to prevent fishing bobber from failing to land on fishing hole { // but this is not proper, we really need to ignore not materialized objects SendCastResult(SPELL_FAILED_NOT_HERE); @@ -6933,7 +6933,7 @@ void Spell::EffectStealBeneficialBuff(uint32 i) // Create dispel mask by dispel type uint32 dispelMask = GetDispellMask( DispelType(m_spellInfo->EffectMiscValue[i]) ); Unit::AuraMap const& auras = unitTarget->GetAuras(); - for(Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) + for (Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) { Aura *aur = (*itr).second; if (aur && (1<<aur->GetSpellProto()->Dispel) & dispelMask) @@ -6953,7 +6953,7 @@ void Spell::EffectStealBeneficialBuff(uint32 i) { // Random select buff for dispel std::list < Aura * > ::iterator itr = steal_list.begin(); - for (uint32 i=urand(0, list_size-1);i>0;--i) + for (uint32 i=urand(0, list_size-1); i>0; --i) itr++; success_list.push_back(*itr); steal_list.erase(itr); @@ -6966,7 +6966,7 @@ void Spell::EffectStealBeneficialBuff(uint32 i) data << uint32(m_spellInfo->Id); // dispel spell id data << uint8(0); // not used data << uint32(success_list.size()); // count - for (std::list < Aura * > ::iterator itr = success_list.begin();itr!=success_list.end();++itr) + for (std::list < Aura * > ::iterator itr = success_list.begin(); itr!=success_list.end(); ++itr) { data << uint32((*itr)->GetId()); // Spell Id data << uint8(0); // 0 - steals !=0 transfers @@ -7019,7 +7019,7 @@ void Spell::EffectActivateRune(uint32 eff_idx) if(plr->getClass() != CLASS_DEATH_KNIGHT) return; - for(uint32 j = 0; j < MAX_RUNES; ++j) + for (uint32 j = 0; j < MAX_RUNES; ++j) { if(plr->GetRuneCooldown(j) && plr->GetCurrentRune(j) == RuneType(m_spellInfo->EffectMiscValue[eff_idx])) { @@ -7105,7 +7105,7 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const * TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN; Map *map = caster->GetMap(); - for(uint32 count = 0; count < amount; ++count) + for (uint32 count = 0; count < amount; ++count) { Position pos; GetSummonPosition(i, pos, radius, count); diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index b8aa4469472..c4be996de66 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -98,7 +98,7 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) if (pUser->isInCombat()) { - for(int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) + for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) { if (SpellEntry const *spellInfo = sSpellStore.LookupEntry(proto->Spells[i].SpellId)) { @@ -135,12 +135,12 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) // send spell error if (SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid)) { - // for implicit area/coord target spells + // for implicit area/coord target spells if(!targets.getUnitTarget()) Spell::SendCastResult(_player,spellInfo,cast_count,SPELL_FAILED_NO_VALID_TARGETS); - // for explicit target spells + // for explicit target spells else - Spell::SendCastResult(_player,spellInfo,cast_count,SPELL_FAILED_BAD_TARGETS); + Spell::SendCastResult(_player,spellInfo,cast_count,SPELL_FAILED_BAD_TARGETS); } return; } @@ -523,7 +523,7 @@ void WorldSession::HandleSpellClick( WorldPacket & recv_data ) // this will get something not in world. crash Creature *unit = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid); - + if(!unit) return; @@ -536,7 +536,7 @@ void WorldSession::HandleSpellClick( WorldPacket & recv_data ) } SpellClickInfoMapBounds clickPair = objmgr.GetSpellClickInfoMapBounds(unit->GetEntry()); - for(SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr) + for (SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr) { if(itr->second.IsFitToRequirements(_player, unit)) { @@ -584,7 +584,7 @@ void WorldSession::HandleMirrrorImageDataRequest( WorldPacket & recv_data ) data << (uint8)pCreator->GetByteValue(PLAYER_BYTES_2, 0); // facialhair data << (uint32)pCreator->GetGuildId(); // unk - static const EquipmentSlots ItemSlots[] = + static const EquipmentSlots ItemSlots[] = { EQUIPMENT_SLOT_HEAD, EQUIPMENT_SLOT_SHOULDERS, @@ -600,7 +600,7 @@ void WorldSession::HandleMirrrorImageDataRequest( WorldPacket & recv_data ) EQUIPMENT_SLOT_END }; // Display items in visible slots - for (EquipmentSlots const* itr = &ItemSlots[0];*itr!=EQUIPMENT_SLOT_END;++itr) + for (EquipmentSlots const* itr = &ItemSlots[0]; *itr!=EQUIPMENT_SLOT_END; ++itr) { if (*itr == EQUIPMENT_SLOT_HEAD && pCreator->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_HELM)) data << (uint32)0; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index ef42f0d50ac..24d785853b4 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -35,7 +35,7 @@ SpellSelectTargetTypes SpellTargetType[TOTAL_SPELL_TARGETS]; SpellMgr::SpellMgr() { - for(int i = 0; i < TOTAL_SPELL_EFFECTS; ++i) + for (int i = 0; i < TOTAL_SPELL_EFFECTS; ++i) { switch(i) { @@ -98,7 +98,7 @@ SpellMgr::SpellMgr() } } - for(int i = 0; i < TOTAL_SPELL_TARGETS; ++i) + for (int i = 0; i < TOTAL_SPELL_TARGETS; ++i) { switch(i) { @@ -211,7 +211,7 @@ SpellMgr::SpellMgr() } } - for(int i = 0; i < TOTAL_SPELL_TARGETS; ++i) + for (int i = 0; i < TOTAL_SPELL_TARGETS; ++i) { switch(i) { @@ -239,7 +239,6 @@ SpellMgr::SpellMgr() } } - SpellMgr::~SpellMgr() { } @@ -449,7 +448,7 @@ AuraState GetSpellAuraState(SpellEntry const * spellInfo) if(GetSpellSchoolMask(spellInfo) & SPELL_SCHOOL_MASK_FROST) { - for (uint8 i = 0;i<MAX_SPELL_EFFECTS;++i) + for (uint8 i = 0; i<MAX_SPELL_EFFECTS; ++i) { if (spellInfo->EffectApplyAuraName[i]==SPELL_AURA_MOD_STUN || spellInfo->EffectApplyAuraName[i]==SPELL_AURA_MOD_ROOT) @@ -474,7 +473,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId) { bool food = false; bool drink = false; - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { switch(spellInfo->EffectApplyAuraName[i]) { @@ -632,7 +631,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId) break; } - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { if(spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA) { @@ -777,7 +776,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con } // Special case: effects which determine positivity of whole spell - for (uint8 i = 0;i<MAX_SPELL_EFFECTS;++i) + for (uint8 i = 0; i<MAX_SPELL_EFFECTS; ++i) { if (spellproto->EffectApplyAuraName[i] == SPELL_AURA_MOD_STEALTH) return true; @@ -855,7 +854,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con if(spellTriggeredProto) { // non-positive targets of main spell return early - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { if (!spellTriggeredProto->Effect[i]) continue; @@ -947,7 +946,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con if (!deep) { bool negative = true; - for (uint8 i=0;i<MAX_SPELL_EFFECTS;++i) + for (uint8 i=0; i<MAX_SPELL_EFFECTS; ++i) { if (i != effIndex) if (_isPositiveEffect(spellId, i, true)) @@ -1173,7 +1172,7 @@ void SpellMgr::LoadSpellTargetPositions() } bool found = false; - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { if( spellInfo->EffectImplicitTargetA[i]==TARGET_DST_DB || spellInfo->EffectImplicitTargetB[i]==TARGET_DST_DB ) { @@ -1206,14 +1205,14 @@ void SpellMgr::LoadSpellTargetPositions() } while( result->NextRow() ); // Check all spells - for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) { SpellEntry const * spellInfo = sSpellStore.LookupEntry(i); if(!spellInfo) continue; bool found = false; - for(int j = 0; j < 3; ++j) + for (int j = 0; j < 3; ++j) { switch(spellInfo->EffectImplicitTargetA[j]) { @@ -1653,7 +1652,6 @@ bool SpellMgr::canStackSpellRanks(SpellEntry const *spellInfo) return true; } - bool SpellMgr::IsProfessionOrRidingSpell(uint32 spellId) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); @@ -1705,7 +1703,7 @@ bool SpellMgr::IsSkillBonusSpell(uint32 spellId) const { SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId); - for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) + for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) { SkillLineAbilityEntry const *pAbility = _spell_idx->second; if (!pAbility || pAbility->learnOnGetSkill != ABILITY_LEARNED_ON_GET_PROFESSION_SKILL) @@ -1725,7 +1723,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 || @@ -1742,7 +1740,7 @@ SpellEntry const* SpellMgr::SelectAuraRankForPlayerLevel(SpellEntry const* spell if(!needRankSelection) return spellInfo; - for(uint32 nextSpellId = spellInfo->Id; nextSpellId != 0; nextSpellId = GetPrevSpellInChain(nextSpellId)) + for (uint32 nextSpellId = spellInfo->Id; nextSpellId != 0; nextSpellId = GetPrevSpellInChain(nextSpellId)) { SpellEntry const *nextSpellInfo = sSpellStore.LookupEntry(nextSpellId); if(!nextSpellInfo) @@ -1759,7 +1757,6 @@ SpellEntry const* SpellMgr::SelectAuraRankForPlayerLevel(SpellEntry const* spell return NULL; } - void SpellMgr::LoadSpellLearnSkills() { mSpellLearnSkills.clear(); // need for reload case @@ -1767,7 +1764,7 @@ void SpellMgr::LoadSpellLearnSkills() // search auto-learned skills and add its to map also for use in unlearn spells/talents uint32 dbc_count = 0; barGoLink bar( sSpellStore.GetNumRows() ); - for(uint32 spell = 0; spell < sSpellStore.GetNumRows(); ++spell) + for (uint32 spell = 0; spell < sSpellStore.GetNumRows(); ++spell) { bar.step(); SpellEntry const* entry = sSpellStore.LookupEntry(spell); @@ -1775,7 +1772,7 @@ void SpellMgr::LoadSpellLearnSkills() if(!entry) continue; - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { if(entry->Effect[i]==SPELL_EFFECT_SKILL) { @@ -1859,14 +1856,14 @@ void SpellMgr::LoadSpellLearnSpells() // search auto-learned spells and add its to map also for use in unlearn spells/talents uint32 dbc_count = 0; - for(uint32 spell = 0; spell < sSpellStore.GetNumRows(); ++spell) + for (uint32 spell = 0; spell < sSpellStore.GetNumRows(); ++spell) { SpellEntry const* entry = sSpellStore.LookupEntry(spell); if(!entry) continue; - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { if(entry->Effect[i]==SPELL_EFFECT_LEARN_SPELL) { @@ -1886,7 +1883,7 @@ void SpellMgr::LoadSpellLearnSpells() SpellLearnSpellMapBounds db_node_bounds = GetSpellLearnSpellMapBounds(spell); bool found = false; - for(SpellLearnSpellMap::const_iterator itr = db_node_bounds.first; itr != db_node_bounds.second; ++itr) + for (SpellLearnSpellMap::const_iterator itr = db_node_bounds.first; itr != db_node_bounds.second; ++itr) { if(itr->second.spell == dbc_node.spell) { @@ -1949,7 +1946,7 @@ void SpellMgr::LoadSpellScriptTarget() } /*bool targetfound = false; - for(int i = 0; i <3; ++i) + for (int i = 0; i <3; ++i) { if( spellProto->EffectImplicitTargetA[i]==TARGET_UNIT_NEARBY_ENTRY || spellProto->EffectImplicitTargetB[i]==TARGET_UNIT_NEARBY_ENTRY || @@ -2021,14 +2018,14 @@ void SpellMgr::LoadSpellScriptTarget() delete result; // Check all spells - for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i) { SpellEntry const * spellInfo = sSpellStore.LookupEntry(i); if(!spellInfo) continue; bool found = false; - for(int j = 0; j < 3; ++j) + for (int j = 0; j < 3; ++j) { switch(spellInfo->EffectImplicitTargetA[j]) { @@ -2186,7 +2183,7 @@ void SpellMgr::LoadPetLevelupSpellMap() if(spellSet.empty()) ++family_count; - spellSet.insert(PetLevelupSpellSet::value_type(spell->spellLevel,spell->Id)); + spellSet.insert(PetLevelupSpellSet::value_type(spell->spellLevel,spell->Id)); count++; } } @@ -2200,7 +2197,7 @@ bool LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefaultSpellsEntr { // skip empty list; bool have_spell = false; - for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) + for (int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) { if(petDefSpells.spellid[j]) { @@ -2214,12 +2211,12 @@ bool LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefaultSpellsEntr // remove duplicates with levelupSpells if any if(PetLevelupSpellSet const *levelupSpells = cInfo->family ? spellmgr.GetPetLevelupSpellList(cInfo->family) : NULL) { - for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) + for (int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) { if(!petDefSpells.spellid[j]) continue; - for(PetLevelupSpellSet::const_iterator itr = levelupSpells->begin(); itr != levelupSpells->end(); ++itr) + for (PetLevelupSpellSet::const_iterator itr = levelupSpells->begin(); itr != levelupSpells->end(); ++itr) { if (itr->second == petDefSpells.spellid[j]) { @@ -2232,7 +2229,7 @@ bool LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefaultSpellsEntr // skip empty list; have_spell = false; - for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) + for (int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) { if(petDefSpells.spellid[j]) { @@ -2251,7 +2248,7 @@ void SpellMgr::LoadPetDefaultSpells() uint32 countCreature = 0; uint32 countData = 0; - for(uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i ) + for (uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i ) { CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i); if(!cInfo) @@ -2267,7 +2264,7 @@ void SpellMgr::LoadPetDefaultSpells() int32 petSpellsId = -(int32)cInfo->PetSpellDataId; PetDefaultSpellsEntry petDefSpells; - for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) + for (int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) petDefSpells.spellid[j] = spellDataEntry->spellId[j]; if(LoadPetDefaultSpells_helper(cInfo, petDefSpells)) @@ -2278,13 +2275,13 @@ void SpellMgr::LoadPetDefaultSpells() } // different summon spells - for(uint32 i = 0; i < sSpellStore.GetNumRows(); ++i ) + for (uint32 i = 0; i < sSpellStore.GetNumRows(); ++i ) { SpellEntry const* spellEntry = sSpellStore.LookupEntry(i); if(!spellEntry) continue; - for(int k = 0; k < 3; ++k) + for (int k = 0; k < 3; ++k) { if(spellEntry->Effect[k]==SPELL_EFFECT_SUMMON || spellEntry->Effect[k]==SPELL_EFFECT_SUMMON_PET) { @@ -2303,7 +2300,7 @@ void SpellMgr::LoadPetDefaultSpells() continue; PetDefaultSpellsEntry petDefSpells; - for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) + for (int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j) petDefSpells.spellid[j] = cInfo->spells[j]; if(LoadPetDefaultSpells_helper(cInfo, petDefSpells)) @@ -2329,7 +2326,7 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg) bool need_check_reagents = false; // check effects - for(int i=0; i<3; ++i) + for (int i=0; i<3; ++i) { switch(spellInfo->Effect[i]) { @@ -2376,7 +2373,7 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg) if(need_check_reagents) { - for(int j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { if(spellInfo->Reagent[j] > 0 && !ObjectMgr::GetItemPrototype( spellInfo->Reagent[j] )) { @@ -2453,7 +2450,7 @@ void SpellMgr::LoadSpellAreas() { bool ok = true; SpellAreaMapBounds sa_bounds = GetSpellAreaMapBounds(spellArea.spellId); - for(SpellAreaMap::const_iterator itr = sa_bounds.first; itr != sa_bounds.second; ++itr) + for (SpellAreaMap::const_iterator itr = sa_bounds.first; itr != sa_bounds.second; ++itr) { if (spellArea.spellId != itr->second.spellId) continue; @@ -2539,7 +2536,7 @@ void SpellMgr::LoadSpellAreas() { bool chain = false; SpellAreaForAuraMapBounds saBound = GetSpellAreaForAuraMapBounds(spellArea.spellId); - for(SpellAreaForAuraMap::const_iterator itr = saBound.first; itr != saBound.second; ++itr) + for (SpellAreaForAuraMap::const_iterator itr = saBound.first; itr != saBound.second; ++itr) { if(itr->second->autocast && itr->second->auraSpell > 0) { @@ -2555,7 +2552,7 @@ void SpellMgr::LoadSpellAreas() } SpellAreaMapBounds saBound2 = GetSpellAreaMapBounds(spellArea.auraSpell); - for(SpellAreaMap::const_iterator itr2 = saBound2.first; itr2 != saBound2.second; ++itr2) + for (SpellAreaMap::const_iterator itr2 = saBound2.first; itr2 != saBound2.second; ++itr2) { if(itr2->second.autocast && itr2->second.auraSpell > 0) { @@ -2633,7 +2630,7 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell // Try search in next group groupEntry = sAreaGroupStore.LookupEntry(groupEntry->nextGroup); } - + if (!found) return SPELL_FAILED_INCORRECT_AREA; } @@ -2659,7 +2656,7 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell SpellAreaMapBounds saBounds = spellmgr.GetSpellAreaMapBounds(spellInfo->Id); if (saBounds.first != saBounds.second) { - for(SpellAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) + for (SpellAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) { if(itr->second.IsFitToRequirements(player,zone_id,area_id)) return SPELL_CAST_OK; @@ -3071,9 +3068,9 @@ bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *sp if(spellInfo_1->AttributesEx & SPELL_ATTR_EX_STACK_FOR_DIFF_CASTERS || spellInfo_1->AttributesEx3 & SPELL_ATTR_EX3_STACK_FOR_DIFF_CASTERS) return true; - + // check same periodic auras - for(uint32 i = 0; i < 3; ++i) + for (uint32 i = 0; i < 3; ++i) { // area auras should not stack (shaman totem) if(spellInfo_1->Effect[i] != SPELL_EFFECT_APPLY_AURA @@ -3138,7 +3135,7 @@ bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *sp spellInfo_2 = sSpellStore.LookupEntry(spellId_2); //if spells do not have the same effect or aura or miscvalue, they will stack - for(uint32 i = 0; i < 3; ++i) + for (uint32 i = 0; i < 3; ++i) if(spellInfo_1->Effect[i] != spellInfo_2->Effect[i] || spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i] || spellInfo_1->EffectMiscValue[i] != spellInfo_2->EffectMiscValue[i]) // paladin resist aura @@ -3302,7 +3299,7 @@ void SpellMgr::LoadSpellChains() mSpellChains.clear(); // need for reload case std::vector<uint32> ChainedSpells; - for (uint32 ability_id=0;ability_id<sSkillLineAbilityStore.GetNumRows();ability_id++) + for (uint32 ability_id=0; ability_id<sSkillLineAbilityStore.GetNumRows(); ability_id++) { SkillLineAbilityEntry const *AbilityInfo=sSkillLineAbilityStore.LookupEntry(ability_id); if (!AbilityInfo) @@ -3314,7 +3311,7 @@ void SpellMgr::LoadSpellChains() std::multimap<SpellRankEntry, SpellRankValue> RankMap; - for (uint32 ability_id=0;ability_id<sSkillLineAbilityStore.GetNumRows();ability_id++) + for (uint32 ability_id=0; ability_id<sSkillLineAbilityStore.GetNumRows(); ability_id++) { SkillLineAbilityEntry const *AbilityInfo=sSkillLineAbilityStore.LookupEntry(ability_id); if (!AbilityInfo) @@ -3356,7 +3353,7 @@ void SpellMgr::LoadSpellChains() entry.ManaCost=SpellInfo->manaCost; entry.CastingTimeIndex=0; entry.TalentID=0; - for (;;) + for (; ; ) { AbilityInfo=mSkillLineAbilityMap.lower_bound(spell_id)->second; value.Id=spell_id; @@ -3374,12 +3371,12 @@ void SpellMgr::LoadSpellChains() uint32 count=0; - for (std::multimap<SpellRankEntry, SpellRankValue>::iterator itr = RankMap.begin();itr!=RankMap.end();) + for (std::multimap<SpellRankEntry, SpellRankValue>::iterator itr = RankMap.begin(); itr!=RankMap.end(); ) { SpellRankEntry entry=itr->first; //trac errors in extracted data std::multimap<char const *, std::multimap<SpellRankEntry, SpellRankValue>::iterator> RankErrorMap; - for (std::multimap<SpellRankEntry, SpellRankValue>::iterator itr2 = RankMap.lower_bound(entry);itr2!=RankMap.upper_bound(entry);itr2++) + for (std::multimap<SpellRankEntry, SpellRankValue>::iterator itr2 = RankMap.lower_bound(entry); itr2!=RankMap.upper_bound(entry); itr2++) { bar.step(); RankErrorMap.insert(std::pair<char const *, std::multimap<SpellRankEntry, SpellRankValue>::iterator>(itr2->second.Rank,itr2)); @@ -3389,7 +3386,7 @@ void SpellMgr::LoadSpellChains() //if strict == true strict check is not needed if (!itr->second.strict) //check for rank duplicates, if there are any do strict check - for (std::multimap<char const *, std::multimap<SpellRankEntry, SpellRankValue>::iterator>::iterator itr2 = RankErrorMap.begin();itr2!=RankErrorMap.end();) + for (std::multimap<char const *, std::multimap<SpellRankEntry, SpellRankValue>::iterator>::iterator itr2 = RankErrorMap.begin(); itr2!=RankErrorMap.end(); ) { char const * err_entry=itr2->first; uint32 rank_count=RankErrorMap.count(itr2->first); @@ -3405,7 +3402,7 @@ void SpellMgr::LoadSpellChains() if (error) { std::list<uint32> ConflictedSpells; - for (std::multimap<SpellRankEntry, SpellRankValue>::iterator itr2 = RankMap.lower_bound(entry);itr2!=RankMap.upper_bound(entry);itr2=RankMap.lower_bound(entry)) + for (std::multimap<SpellRankEntry, SpellRankValue>::iterator itr2 = RankMap.lower_bound(entry); itr2!=RankMap.upper_bound(entry); itr2=RankMap.lower_bound(entry)) { ConflictedSpells.push_back(itr2->second.Id); if (!GetTalentSpellPos(itr2->second.Id)) @@ -3413,7 +3410,7 @@ void SpellMgr::LoadSpellChains() RankMap.erase(itr2); } SpellRankEntry nextEntry, currEntry; - for (;!ConflictedSpells.empty();ConflictedSpells.pop_front()) + for (; !ConflictedSpells.empty(); ConflictedSpells.pop_front()) { SpellEntry const *SpellInfo=sSpellStore.LookupEntry(ConflictedSpells.front()); currEntry.SkillId=entry.SkillId; @@ -3452,12 +3449,12 @@ void SpellMgr::LoadSpellChains() continue; } else - for (std::multimap<char const *, std::multimap<SpellRankEntry, SpellRankValue>::iterator>::iterator itr2 = RankErrorMap.begin();itr2!=RankErrorMap.end();) + for (std::multimap<char const *, std::multimap<SpellRankEntry, SpellRankValue>::iterator>::iterator itr2 = RankErrorMap.begin(); itr2!=RankErrorMap.end(); ) { char const * err_entry=itr2->first; uint32 rank_count=RankErrorMap.count(itr2->first); if (rank_count>1) - for (itr2 = RankErrorMap.lower_bound(err_entry);itr2!=RankErrorMap.upper_bound(err_entry);itr2++) + for (itr2 = RankErrorMap.lower_bound(err_entry); itr2!=RankErrorMap.upper_bound(err_entry); itr2++) { sLog.outDebug("There is a duplicate rank entry (%s) for spell: %u",itr2->first,itr2->second->second.Id); if (!(itr2->second->second.Id==47541 || itr2->second->second.Id==45902 || itr2->second->second.Id==7620)) @@ -3474,9 +3471,9 @@ void SpellMgr::LoadSpellChains() std::list<uint32> RankedSpells; uint32 min_spell_lvl=0; std::multimap<SpellRankEntry, SpellRankValue>::iterator min_itr; - for (;RankMap.count(entry);) + for (; RankMap.count(entry); ) { - for (std::multimap<SpellRankEntry, SpellRankValue>::iterator itr2 = RankMap.lower_bound(entry);itr2!=RankMap.upper_bound(entry);itr2++) + for (std::multimap<SpellRankEntry, SpellRankValue>::iterator itr2 = RankMap.lower_bound(entry); itr2!=RankMap.upper_bound(entry); itr2++) { SpellEntry const *SpellInfo=sSpellStore.LookupEntry(itr2->second.Id); if (SpellInfo->spellLevel<min_spell_lvl || itr2==RankMap.lower_bound(entry)) @@ -3491,7 +3488,7 @@ void SpellMgr::LoadSpellChains() //use data from talent.dbc uint16 talent_id=0; - for(std::list<uint32>::iterator itr2 = RankedSpells.begin();itr2!=RankedSpells.end();) + for (std::list<uint32>::iterator itr2 = RankedSpells.begin(); itr2!=RankedSpells.end(); ) { if (TalentSpellPos const* TalentPos=GetTalentSpellPos(*itr2)) { @@ -3505,7 +3502,7 @@ void SpellMgr::LoadSpellChains() if (talent_id) { TalentEntry const *TalentInfo = sTalentStore.LookupEntry(talent_id); - for (uint8 rank=5;rank;rank--) + for (uint8 rank=5; rank; rank--) { if (TalentInfo->RankID[rank-1]) RankedSpells.push_front(TalentInfo->RankID[rank-1]); @@ -3520,7 +3517,7 @@ void SpellMgr::LoadSpellChains() count++; uint32 spell_rank=1; - for(std::list<uint32>::iterator itr2 = RankedSpells.begin();itr2!=RankedSpells.end();spell_rank++) + for (std::list<uint32>::iterator itr2 = RankedSpells.begin(); itr2!=RankedSpells.end(); spell_rank++) { uint32 spell_id=*itr2; mSpellChains[spell_id].rank=spell_rank; @@ -3542,7 +3539,7 @@ void SpellMgr::LoadSpellChains() } //uncomment these two lines to print yourself list of spell_chains on startup - //for (UNORDERED_MAP<uint32, SpellChainNode>::iterator itr=mSpellChains.begin();itr!=mSpellChains.end();itr++) + //for (UNORDERED_MAP<uint32, SpellChainNode>::iterator itr=mSpellChains.begin(); itr!=mSpellChains.end(); itr++) //sLog.outString( "Id: %u, Rank: %d , %s, %u, %u, %u, %u",itr->first,itr->second.rank, sSpellStore.LookupEntry(itr->first)->Rank[sWorld.GetDefaultDbcLocale()], itr->second.first, itr->second.last,itr->second.next ,itr->second.prev); sLog.outString(); @@ -3555,14 +3552,14 @@ void SpellMgr::LoadSpellCustomAttr() mSpellCustomAttr.resize(GetSpellStore()->GetNumRows()); SpellEntry *spellInfo; - for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i) + for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i) { mSpellCustomAttr[i] = 0; spellInfo = (SpellEntry*)GetSpellStore()->LookupEntry(i); if(!spellInfo) continue; - for(uint32 j = 0; j < 3; ++j) + for (uint32 j = 0; j < 3; ++j) { switch(spellInfo->EffectApplyAuraName[j]) { @@ -3615,7 +3612,7 @@ void SpellMgr::LoadSpellCustomAttr() } } - for(uint32 j = 0; j < 3; ++j) + for (uint32 j = 0; j < 3; ++j) { switch(spellInfo->EffectApplyAuraName[j]) { @@ -3837,10 +3834,10 @@ void SpellMgr::LoadEnchantCustomAttr() uint32 size = sSpellItemEnchantmentStore.GetNumRows(); mEnchantCustomAttr.resize(size); - for (uint32 i = 0;i<size; ++i) + for (uint32 i = 0; i<size; ++i) mEnchantCustomAttr[i] = 0; - for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i) + for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i) { SpellEntry * spellInfo = (SpellEntry*)GetSpellStore()->LookupEntry(i); if(!spellInfo) @@ -3850,7 +3847,7 @@ void SpellMgr::LoadEnchantCustomAttr() if (!(spellInfo->AttributesEx2 & SPELL_ATTR_EX2_UNK13) || !(spellInfo->Attributes & SPELL_ATTR_NOT_SHAPESHIFT)) continue; - for(uint32 j = 0; j < 3; ++j) + for (uint32 j = 0; j < 3; ++j) { if(spellInfo->Effect[j] == SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) { @@ -3869,7 +3866,7 @@ bool SpellMgr::IsSkillTypeSpell(uint32 spellId, SkillType type) const { SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId); - for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) + for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) if (_spell_idx->second->skillId == type) return true; diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 9c7f4aca16a..da5a6affde7 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -205,7 +205,7 @@ inline float GetSpellMaxRange(uint32 id, bool positive) inline bool IsSpellHaveEffect(SpellEntry const *spellInfo, SpellEffects effect) { - for(int i= 0; i < 3; ++i) + for (int i= 0; i < 3; ++i) if(SpellEffects(spellInfo->Effect[i])==effect) return true; return false; @@ -213,7 +213,7 @@ inline bool IsSpellHaveEffect(SpellEntry const *spellInfo, SpellEffects effect) inline bool IsSpellHaveAura(SpellEntry const *spellInfo, AuraType aura) { - for(int i= 0; i < 3; ++i) + for (int i= 0; i < 3; ++i) if(AuraType(spellInfo->EffectApplyAuraName[i])==aura) return true; return false; @@ -267,7 +267,6 @@ inline bool IsPassiveSpellStackableWithRanks(SpellEntry const* spellProto) return !IsSpellHaveEffect(spellProto,SPELL_EFFECT_APPLY_AURA); } - inline bool IsDeathPersistentSpell(SpellEntry const *spellInfo) { return spellInfo->AttributesEx3 & SPELL_ATTR_EX3_DEATH_PERSISTENT; @@ -321,7 +320,7 @@ inline bool IsPositionTarget(uint32 target) inline bool IsSpellWithCasterSourceTargetsOnly(SpellEntry const* spellInfo) { - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { uint32 targetA = spellInfo->EffectImplicitTargetA[i]; if(targetA && !IsCasterSourceTarget(targetA)) @@ -699,7 +698,6 @@ typedef std::pair<SpellAreaForQuestMap::const_iterator,SpellAreaForQuestMap::con typedef std::pair<SpellAreaForAuraMap::const_iterator, SpellAreaForAuraMap::const_iterator> SpellAreaForAuraMapBounds; typedef std::pair<SpellAreaForAreaMap::const_iterator, SpellAreaForAreaMap::const_iterator> SpellAreaForAreaMapBounds; - // Spell rank chain (accessed using SpellMgr functions) struct SpellChainNode { @@ -751,7 +749,6 @@ struct PetDefaultSpellsEntry // < 0 for petspelldata id, > 0 for creature_id typedef std::map<int32, PetDefaultSpellsEntry> PetDefaultSpellsMap; - inline bool IsPrimaryProfessionSkill(uint32 skill) { SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(skill); @@ -975,7 +972,7 @@ class SpellMgr return false; // check present in same rank chain - for(; itr != mSpellChains.end(); itr = mSpellChains.find(itr->second.prev)) + for (; itr != mSpellChains.end(); itr = mSpellChains.find(itr->second.prev)) if(itr->second.prev==spell2) return true; @@ -1011,7 +1008,7 @@ class SpellMgr bool IsSpellLearnToSpell(uint32 spell_id1,uint32 spell_id2) const { SpellLearnSpellMapBounds bounds = GetSpellLearnSpellMapBounds(spell_id1); - for(SpellLearnSpellMap::const_iterator i = bounds.first; i != bounds.second; ++i) + for (SpellLearnSpellMap::const_iterator i = bounds.first; i != bounds.second; ++i) if (i->second.spell==spell_id2) return true; return false; @@ -1025,7 +1022,6 @@ class SpellMgr bool IsSkillBonusSpell(uint32 spellId) const; bool IsSkillTypeSpell(uint32 spellId, SkillType type) const; - // Spell script targets SpellScriptTargetBounds GetSpellScriptTargetBounds(uint32 spell_id) const { @@ -1128,7 +1124,7 @@ class SpellMgr inline bool IsSpellWithCasterSourceTargetsOnly(SpellEntry const* spellInfo) { - for(int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) if(uint32 target = spellInfo->EffectImplicitTargetA[i]) if(!IsCasterSourceTarget(target)) return false; diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 56bde0e5442..1f0e828699c 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -98,7 +98,7 @@ bool Player::UpdateStats(Stats stat) // Update ratings in exist SPELL_AURA_MOD_RATING_FROM_STAT and only depends from stat uint32 mask = 0; AuraEffectList const& modRatingFromStat = GetAurasByType(SPELL_AURA_MOD_RATING_FROM_STAT); - for(AuraEffectList::const_iterator i = modRatingFromStat.begin();i != modRatingFromStat.end(); ++i) + for (AuraEffectList::const_iterator i = modRatingFromStat.begin(); i != modRatingFromStat.end(); ++i) if (Stats((*i)->GetMiscBValue()) == stat) mask |= (*i)->GetMiscValue(); if (mask) @@ -116,7 +116,7 @@ void Player::ApplySpellPowerBonus(int32 amount, bool apply) // For speed just update for client ApplyModUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS, amount, apply); - for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i) + for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i) ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i, amount, apply);; } @@ -127,7 +127,7 @@ 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))); } @@ -144,7 +144,7 @@ bool Player::UpdateAllStats() UpdateAttackPowerAndDamage(true); UpdateMaxHealth(); - for(int i = POWER_MANA; i < MAX_POWERS; ++i) + for (int i = POWER_MANA; i < MAX_POWERS; ++i) UpdateMaxPower(Powers(i)); UpdateAllCritPercentages(); @@ -189,7 +189,7 @@ void Player::UpdateArmor() //add dynamic flat mods AuraEffectList const& mResbyIntellect = GetAurasByType(SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT); - for(AuraEffectList::const_iterator i = mResbyIntellect.begin();i != mResbyIntellect.end(); ++i) + for (AuraEffectList::const_iterator i = mResbyIntellect.begin(); i != mResbyIntellect.end(); ++i) { if((*i)->GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL) value += int32(GetStat(Stats((*i)->GetMiscBValue())) * (*i)->GetAmount() / 100.0f); @@ -316,7 +316,7 @@ void Player::UpdateAttackPowerAndDamage(bool ranged ) case FORM_MOONKIN: { Unit::AuraEffectList const& mDummy = GetAurasByType(SPELL_AURA_DUMMY); - for(Unit::AuraEffectList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr) { // Predatory Strikes (effect 0) if ((*itr)->GetEffIndex()==0 && (*itr)->GetSpellProto()->SpellIconID == 1563) @@ -361,18 +361,18 @@ void Player::UpdateAttackPowerAndDamage(bool ranged ) if ((getClassMask() & CLASSMASK_WAND_USERS)==0) { AuraEffectList const& mRAPbyStat = GetAurasByType(SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT); - for(AuraEffectList::const_iterator i = mRAPbyStat.begin();i != mRAPbyStat.end(); ++i) + for (AuraEffectList::const_iterator i = mRAPbyStat.begin(); i != mRAPbyStat.end(); ++i) attPowerMod += int32(GetStat(Stats((*i)->GetMiscValue())) * (*i)->GetAmount() / 100.0f); } } else { AuraEffectList const& mAPbyStat = GetAurasByType(SPELL_AURA_MOD_ATTACK_POWER_OF_STAT_PERCENT); - for(AuraEffectList::const_iterator i = mAPbyStat.begin();i != mAPbyStat.end(); ++i) + for (AuraEffectList::const_iterator i = mAPbyStat.begin(); i != mAPbyStat.end(); ++i) attPowerMod += int32(GetStat(Stats((*i)->GetMiscValue())) * (*i)->GetAmount() / 100.0f); AuraEffectList const& mAPbyArmor = GetAurasByType(SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR); - for(AuraEffectList::const_iterator iter = mAPbyArmor.begin(); iter != mAPbyArmor.end(); ++iter) + for (AuraEffectList::const_iterator iter = mAPbyArmor.begin(); iter != mAPbyArmor.end(); ++iter) // always: ((*i)->GetModifier()->m_miscvalue == 1 == SPELL_SCHOOL_MASK_NORMAL) attPowerMod += int32(GetArmor() / (*iter)->GetAmount()); } @@ -666,7 +666,7 @@ void Player::UpdateExpertise(WeaponAttackType attack) Item *weapon = GetWeaponForAttack(attack); AuraEffectList const& expAuras = GetAurasByType(SPELL_AURA_MOD_EXPERTISE); - for(AuraEffectList::const_iterator itr = expAuras.begin(); itr != expAuras.end(); ++itr) + for (AuraEffectList::const_iterator itr = expAuras.begin(); itr != expAuras.end(); ++itr) { // item neutral spell if((*itr)->GetSpellProto()->EquippedItemClass == -1) @@ -706,7 +706,7 @@ void Player::UpdateManaRegen() // Get bonus from SPELL_AURA_MOD_MANA_REGEN_FROM_STAT aura AuraEffectList const& regenAura = GetAurasByType(SPELL_AURA_MOD_MANA_REGEN_FROM_STAT); - for(AuraEffectList::const_iterator i = regenAura.begin();i != regenAura.end(); ++i) + for (AuraEffectList::const_iterator i = regenAura.begin(); i != regenAura.end(); ++i) { power_regen_mp5 += GetStat(Stats((*i)->GetMiscValue())) * (*i)->GetAmount() / 500.0f; } @@ -761,10 +761,10 @@ bool Creature::UpdateAllStats() UpdateAttackPowerAndDamage(); UpdateAttackPowerAndDamage(true); - 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; @@ -955,7 +955,7 @@ bool Guardian::UpdateAllStats() 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) diff --git a/src/game/TaxiHandler.cpp b/src/game/TaxiHandler.cpp index 45c3cbd871b..a1f0bedf329 100644 --- a/src/game/TaxiHandler.cpp +++ b/src/game/TaxiHandler.cpp @@ -174,7 +174,7 @@ void WorldSession::HandleActivateTaxiExpressOpcode ( WorldPacket & recv_data ) } std::vector<uint32> nodes; - for(uint32 i = 0; i < node_count; ++i) + for (uint32 i = 0; i < node_count; ++i) { uint32 node; recv_data >> node; diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp index 11e4f2ab61e..7b8f8ec7432 100644 --- a/src/game/ThreatManager.cpp +++ b/src/game/ThreatManager.cpp @@ -201,7 +201,7 @@ Unit* HostilReference::getSourceUnit() void ThreatContainer::clearReferences() { - for(std::list<HostilReference*>::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i) + for (std::list<HostilReference*>::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i) { (*i)->unlink(); delete (*i); @@ -214,9 +214,9 @@ void ThreatContainer::clearReferences() HostilReference* ThreatContainer::getReferenceByTarget(Unit* pVictim) { HostilReference* result = NULL; - + uint64 guid = pVictim->GetGUID(); - for(std::list<HostilReference*>::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i) + for (std::list<HostilReference*>::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i) { if((*i)->getUnitGuid() == guid) { @@ -280,7 +280,7 @@ HostilReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostilRe std::list<HostilReference*>::const_iterator lastRef = iThreatList.end(); lastRef--; - for(std::list<HostilReference*>::const_iterator iter = iThreatList.begin(); iter != iThreatList.end() && !found;) + for (std::list<HostilReference*>::const_iterator iter = iThreatList.begin(); iter != iThreatList.end() && !found; ) { currentRef = (*iter); diff --git a/src/game/TicketHandler.cpp b/src/game/TicketHandler.cpp index 2ac0c601edc..ac6675beba0 100644 --- a/src/game/TicketHandler.cpp +++ b/src/game/TicketHandler.cpp @@ -47,7 +47,7 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data ) recv_data >> ticketText; recv_data >> ticketText2; - GM_Ticket *ticket = new GM_Ticket; + GM_Ticket *ticket = new GM_Ticket; ticket->name = GetPlayer()->GetName(); ticket->guid = objmgr.GenerateGMTicketId(); ticket->playerGuid = GetPlayer()->GetGUID(); diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp index f841ac2fd9c..106efdfd5a8 100644 --- a/src/game/Totem.cpp +++ b/src/game/Totem.cpp @@ -90,7 +90,7 @@ void Totem::InitSummon() SendMessageToSet(&data, true); if(m_type == TOTEM_PASSIVE) - CastSpell(this, GetSpell(), true); + CastSpell(this, GetSpell(), true); // Some totems can have both instant effect and passive spell if (GetSpell(1)) @@ -105,7 +105,7 @@ void Totem::UnSummon() RemoveAurasDueToSpell(GetSpell()); // clear owenr's totem slot - for(int i = SUMMON_SLOT_TOTEM; i < MAX_TOTEM_SLOT; ++i) + for (int i = SUMMON_SLOT_TOTEM; i < MAX_TOTEM_SLOT; ++i) { if(m_owner->m_SummonSlot[i]==GetGUID()) { @@ -124,7 +124,7 @@ void Totem::UnSummon() pGroup = ((Player*)m_owner)->GetGroup(); if (pGroup) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); if(Target && pGroup->SameSubGroup((Player*)m_owner, Target)) diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp index b4cc62ba39a..e09e1abb812 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); @@ -151,7 +151,7 @@ void WorldSession::SendUpdateTrade() // gift creator data << (uint64) item->GetUInt64Value(ITEM_FIELD_GIFTCREATOR); data << (uint32) item->GetEnchantmentId(PERM_ENCHANTMENT_SLOT); - for(uint8 j = 0; j < 3; ++j) + for (uint8 j = 0; j < 3; ++j) data << (uint32) 0; // enchantment id (permanent/gems?) // creator data << (uint64) item->GetUInt64Value(ITEM_FIELD_CREATOR); @@ -167,7 +167,7 @@ void WorldSession::SendUpdateTrade() } else { - for(uint8 j = 0; j < 18; j++) + for (uint8 j = 0; j < 18; j++) data << uint32(0); } } @@ -179,7 +179,7 @@ void WorldSession::SendUpdateTrade() void WorldSession::moveItems(Item* myItems[], Item* hisItems[]) { - for(int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i) + for (int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i) { ItemPosCountVec traderDst; ItemPosCountVec playerDst; @@ -278,7 +278,7 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) } // not accept if some items now can't be trade (cheating) - for(int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i) + for (int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i) { if(_player->tradeItems[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; i<TRADE_SLOT_TRADED_COUNT; ++i) + for (int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i) { if(_player->tradeItems[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; i<TRADE_SLOT_TRADED_COUNT; ++i) + for (int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i) { if(myItems[i]) myItems[i]->SetInTrade(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<TRADE_SLOT_TRADED_COUNT; ++i) + for (int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i) { if(myItems[i]) { @@ -603,7 +603,7 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket) uint16 pos = (bag << 8) | slot; // prevent place single item into many trade slots using cheating and client bugs - for(int i = 0; i < TRADE_SLOT_COUNT; ++i) + for (int i = 0; i < TRADE_SLOT_COUNT; ++i) { if(_player->tradeItems[i]==pos) { diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp index 25248b7b9d2..03f6fced048 100644 --- a/src/game/Transports.cpp +++ b/src/game/Transports.cpp @@ -440,7 +440,7 @@ void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z) Map const* oldMap = GetMap(); Relocate(x, y, z); - for(PlayerSet::const_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; @@ -536,7 +536,7 @@ void Transport::Update(uint32 /*p_time*/) } */ /* - for(PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end();) + for (PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end(); ) { PlayerSet::const_iterator it2 = itr; ++itr; @@ -565,7 +565,7 @@ void Transport::UpdateForMap(Map const* targetMap) if(GetMapId()==targetMap->GetId()) { - for(Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) + for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) { if(this != itr->getSource()->GetTransport()) { @@ -584,7 +584,7 @@ void Transport::UpdateForMap(Map const* targetMap) WorldPacket out_packet; transData.BuildPacket(&out_packet); - for(Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) + for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) if(this != itr->getSource()->GetTransport()) itr->getSource()->SendDirectMessage(&out_packet); } diff --git a/src/game/Traveller.h b/src/game/Traveller.h index 279af30428a..22200c719ec 100644 --- a/src/game/Traveller.h +++ b/src/game/Traveller.h @@ -104,7 +104,6 @@ inline float Traveller<Creature>::GetMoveDestinationTo(float x, float y, float z // return sqrt((dx*dx) + (dy*dy)); } - template<> inline void Traveller<Creature>::MoveTo(float x, float y, float z, uint32 t) { diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 94a88fba710..c7ec4527fd6 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -121,7 +121,7 @@ Unit::Unit() m_addDmgOnce = 0; - for(uint8 i = 0; i < MAX_SUMMON_SLOT; ++i) + for (uint8 i = 0; i < MAX_SUMMON_SLOT; ++i) m_SummonSlot[i] = 0; m_ObjectSlot[0] = m_ObjectSlot[1] = m_ObjectSlot[2] = m_ObjectSlot[3] = 0; @@ -182,7 +182,7 @@ Unit::Unit() m_misdirectionTargetGUID = 0; // remove aurastates allowing special moves - for(uint8 i = 0; i < MAX_REACTIVE; ++i) + for (uint8 i = 0; i < MAX_REACTIVE; ++i) m_reactiveTimer[i] = 0; } @@ -516,7 +516,7 @@ void Unit::RemoveMovementImpairingAuras() RemoveAurasWithMechanic((1<<MECHANIC_SNARE)|(1<<MECHANIC_ROOT)); return; - for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();) + for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); ) { if(spellmgr.GetSpellCustomAttr(iter->second->GetId()) & SPELL_ATTR_CU_MOVEMENT_IMPAIR) RemoveAura(iter); @@ -531,7 +531,7 @@ void Unit::RemoveAurasWithInterruptFlags(uint32 flag, uint32 except) return; // interrupt auras - for (AuraList::iterator iter = m_interruptableAuras.begin(); iter != m_interruptableAuras.end();) + for (AuraList::iterator iter = m_interruptableAuras.begin(); iter != m_interruptableAuras.end(); ) { Aura * aur = *iter; ++iter; @@ -556,7 +556,7 @@ void Unit::RemoveAurasWithInterruptFlags(uint32 flag, uint32 except) void Unit::RemoveAurasWithFamily(uint32 family, uint32 familyFlag1, uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID) { - for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();) + for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); ) { if (!casterGUID || iter->second->GetCasterGUID() == casterGUID) { @@ -573,7 +573,7 @@ void Unit::RemoveAurasWithFamily(uint32 family, uint32 familyFlag1, uint32 famil void Unit::RemoveAurasWithMechanic(uint32 mechanic_mask, AuraRemoveMode removemode, uint32 except) { - for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();) + for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); ) { if (!except || iter->second->GetId() != except) { @@ -590,7 +590,7 @@ void Unit::RemoveAurasWithMechanic(uint32 mechanic_mask, AuraRemoveMode removemo void Unit::UpdateInterruptMask() { m_interruptMask = 0; - for(AuraList::const_iterator i = m_interruptableAuras.begin(); i != m_interruptableAuras.end(); ++i) + for (AuraList::const_iterator i = m_interruptableAuras.begin(); i != m_interruptableAuras.end(); ++i) m_interruptMask |= (*i)->GetSpellProto()->AuraInterruptFlags; if(Spell* spell = m_currentSpells[CURRENT_CHANNELED_SPELL]) @@ -602,7 +602,7 @@ bool Unit::HasAuraTypeWithFamilyFlags(AuraType auraType, uint32 familyName, uint { if(!HasAuraType(auraType)) return false; AuraEffectList const &auras = GetAurasByType(auraType); - for(AuraEffectList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) + for (AuraEffectList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) if(SpellEntry const *iterSpellProto = (*itr)->GetSpellProto()) if(iterSpellProto->SpellFamilyName == familyName && iterSpellProto->SpellFamilyFlags[0] & familyFlags) return true; @@ -761,7 +761,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa if (pVictim->GetTypeId() == TYPEID_PLAYER) ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_RECEIVED, damage); - else if(!pVictim->IsControlledByPlayer()) + else if(!pVictim->IsControlledByPlayer()) { //!pVictim->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_OTHER_TAGGER) if(!((Creature*)pVictim)->hasLootRecipient()) @@ -770,7 +770,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa if(IsControlledByPlayer()) ((Creature*)pVictim)->LowerPlayerDamageReq(health < damage ? health : damage); } - + if (health <= damage) { DEBUG_LOG("DealDamage: victim just died"); @@ -933,7 +933,7 @@ void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, I SpellCastTargets targets; uint32 targetMask = spellInfo->Targets; //if(targetMask & (TARGET_FLAG_UNIT|TARGET_FLAG_UNK2)) - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if(SpellTargetType[spellInfo->EffectImplicitTargetA[i]] == TARGET_TYPE_UNIT_TARGET) { @@ -1005,7 +1005,7 @@ void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* uint32 targetMask = spellInfo->Targets; //check unit target - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if(SpellTargetType[spellInfo->EffectImplicitTargetA[i]] == TARGET_TYPE_UNIT_TARGET) { @@ -1042,7 +1042,7 @@ void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* spell->m_CastItem = castItem; } - for(CustomSpellValues::const_iterator itr = value.begin(); itr != value.end(); ++itr) + for (CustomSpellValues::const_iterator itr = value.begin(); itr != value.end(); ++itr) spell->SetSpellValue(itr->first, itr->second); spell->prepare(&targets, triggeredByAura); @@ -1578,7 +1578,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) std::set<AuraEffect*> alreadyDone; uint32 removedAuras = pVictim->m_removedAurasCount; AuraEffectList const& vDamageShields = pVictim->GetAurasByType(SPELL_AURA_DAMAGE_SHIELD); - for(AuraEffectList::const_iterator i = vDamageShields.begin(), next = vDamageShields.begin(); i != vDamageShields.end(); i = next) + for (AuraEffectList::const_iterator i = vDamageShields.begin(), next = vDamageShields.begin(); i != vDamageShields.end(); i = next) { ++next; if (alreadyDone.find(*i) == alreadyDone.end()) @@ -1615,7 +1615,6 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) } } - void Unit::HandleEmoteCommand(uint32 anim_id) { WorldPacket data( SMSG_EMOTE, 4 + 8 ); @@ -1637,7 +1636,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_IGNORE_ARMOR, armor); AuraEffectList const& ResIgnoreAurasAb = GetAurasByType(SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST); - for(AuraEffectList::const_iterator j = ResIgnoreAurasAb.begin();j != ResIgnoreAurasAb.end(); ++j) + for (AuraEffectList::const_iterator j = ResIgnoreAurasAb.begin(); j != ResIgnoreAurasAb.end(); ++j) { if( (*j)->GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL && (*j)->isAffectedOnSpell(spellInfo)) @@ -1645,7 +1644,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt } AuraEffectList const& ResIgnoreAuras = GetAurasByType(SPELL_AURA_MOD_IGNORE_TARGET_RESIST); - for(AuraEffectList::const_iterator j = ResIgnoreAuras.begin();j != ResIgnoreAuras.end(); ++j) + for (AuraEffectList::const_iterator j = ResIgnoreAuras.begin(); j != ResIgnoreAuras.end(); ++j) { if( (*j)->GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL) armor= int32(float(armor) * (float(100-(*j)->GetAmount())/100.0f)); @@ -1654,7 +1653,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt if ( GetTypeId() == TYPEID_PLAYER ) { AuraEffectList const& ResIgnoreAuras = GetAurasByType(SPELL_AURA_MOD_ARMOR_PENETRATION_PCT); - for(AuraEffectList::const_iterator itr = ResIgnoreAuras.begin();itr != ResIgnoreAuras.end(); ++itr) + for (AuraEffectList::const_iterator itr = ResIgnoreAuras.begin(); itr != ResIgnoreAuras.end(); ++itr) { // item neutral spell if((*itr)->GetSpellProto()->EquippedItemClass == -1) @@ -1664,7 +1663,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt } // item dependent spell - check curent weapons - for(int i = 0; i < MAX_ATTACK; ++i) + for (int i = 0; i < MAX_ATTACK; ++i) { Item *weapon = ((Player *)this)->GetWeaponForAttack(WeaponAttackType(i)); @@ -1684,7 +1683,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt if (getLevel()<60) maxArmorPen=400+85*pVictim->getLevel(); else - maxArmorPen=400+85*pVictim->getLevel()+4.5*85*(pVictim->getLevel()-59); + maxArmorPen=400+85*pVictim->getLevel()+4.5*85*(pVictim->getLevel()-59); // Cap armor penetration to this number maxArmorPen = std::min(((armor+maxArmorPen)/3),armor); // Figure out how much armor do we ignore @@ -1694,7 +1693,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt } // Ignore enemy armor by SPELL_AURA_MOD_TARGET_ARMOR_PCT //armor *= 1.0f - GetTotalAuraModifier(SPELL_AURA_MOD_ARMOR_PENETRATION_PCT) / 100.0f; - + if (armor < 0.0f) armor = 0.0f; @@ -1753,7 +1752,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe *resist = damage; AuraEffectList const& ResIgnoreAurasAb = GetAurasByType(SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST); - for(AuraEffectList::const_iterator j = ResIgnoreAurasAb.begin();j != ResIgnoreAurasAb.end(); ++j) + for (AuraEffectList::const_iterator j = ResIgnoreAurasAb.begin(); j != ResIgnoreAurasAb.end(); ++j) { if( (*j)->GetMiscValue() & schoolMask && (*j)->isAffectedOnSpell(spellInfo)) @@ -1761,7 +1760,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe } AuraEffectList const& ResIgnoreAuras = GetAurasByType(SPELL_AURA_MOD_IGNORE_TARGET_RESIST); - for(AuraEffectList::const_iterator j = ResIgnoreAuras.begin();j != ResIgnoreAuras.end(); ++j) + for (AuraEffectList::const_iterator j = ResIgnoreAuras.begin(); j != ResIgnoreAuras.end(); ++j) { if( (*j)->GetMiscValue() & schoolMask) *resist= int32(float(*resist) * (float(100-(*j)->GetAmount())/100.0f)); @@ -1782,7 +1781,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe TriggeredSpellInfoVct triggeredSpells; // absorb without mana cost AuraEffectList const& vSchoolAbsorb = pVictim->GetAurasByType(SPELL_AURA_SCHOOL_ABSORB); - for(AuraEffectList::const_iterator i = vSchoolAbsorb.begin(); i != vSchoolAbsorb.end() && RemainingDamage > 0; ++i) + for (AuraEffectList::const_iterator i = vSchoolAbsorb.begin(); i != vSchoolAbsorb.end() && RemainingDamage > 0; ++i) { if (!((*i)->GetMiscValue() & schoolMask)) continue; @@ -1907,7 +1906,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe { case 5065: // Rank 1 case 5064: // Rank 2 - triggeredSpells.push_back(TriggeredSpellInfo(33619, pVictim, this, + triggeredSpells.push_back(TriggeredSpellInfo(33619, pVictim, this, std::min(RemainingDamage, currentAbsorb) * aurEff->GetAmount() / 100, *i)); break; default: @@ -1993,7 +1992,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe existExpired = true; } - for(TriggeredSpellInfoVct::const_iterator itr = triggeredSpells.begin(); itr != triggeredSpells.end(); ++itr) + for (TriggeredSpellInfoVct::const_iterator itr = triggeredSpells.begin(); itr != triggeredSpells.end(); ++itr) { if(itr->spell) { @@ -2010,7 +2009,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe // Remove all expired absorb auras if (existExpired) { - for(AuraEffectList::const_iterator i = vSchoolAbsorb.begin(); i != vSchoolAbsorb.end();) + for (AuraEffectList::const_iterator i = vSchoolAbsorb.begin(); i != vSchoolAbsorb.end(); ) { Aura *aura=(*i)->GetParentAura(); AuraEffect *auraeff =(*i); @@ -2027,7 +2026,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe // absorb by mana cost AuraEffectList const& vManaShield = pVictim->GetAurasByType(SPELL_AURA_MANA_SHIELD); - for(AuraEffectList::const_iterator i = vManaShield.begin(), next; i != vManaShield.end() && RemainingDamage > 0; i = next) + for (AuraEffectList::const_iterator i = vManaShield.begin(), next; i != vManaShield.end() && RemainingDamage > 0; i = next) { next = i; ++next; @@ -2066,7 +2065,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe if(pVictim != this) { AuraEffectList const& vSplitDamageFlat = pVictim->GetAurasByType(SPELL_AURA_SPLIT_DAMAGE_FLAT); - for(AuraEffectList::const_iterator i = vSplitDamageFlat.begin(), next; i != vSplitDamageFlat.end() && RemainingDamage >= 0; i = next) + for (AuraEffectList::const_iterator i = vSplitDamageFlat.begin(), next; i != vSplitDamageFlat.end() && RemainingDamage >= 0; i = next) { next = i; ++next; @@ -2087,7 +2086,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe RemainingDamage -= currentAbsorb; - uint32 splitted = currentAbsorb; uint32 splitted_absorb = 0; DealDamageMods(caster,splitted,&splitted_absorb); @@ -2099,7 +2097,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe } AuraEffectList const& vSplitDamagePct = pVictim->GetAurasByType(SPELL_AURA_SPLIT_DAMAGE_PCT); - for(AuraEffectList::const_iterator i = vSplitDamagePct.begin(), next; i != vSplitDamagePct.end() && RemainingDamage >= 0; i = next) + for (AuraEffectList::const_iterator i = vSplitDamagePct.begin(), next; i != vSplitDamagePct.end() && RemainingDamage >= 0; i = next) { next = i; ++next; @@ -2130,7 +2128,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe // TODO: School should be checked for absorbing auras or for attacks? int32 auraAbsorbMod = GetMaxPositiveAuraModifier(SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL); AuraEffectList const& AbsIgnoreAurasAb = GetAurasByType(SPELL_AURA_MOD_TARGET_ABILITY_ABSORB_SCHOOL); - for(AuraEffectList::const_iterator i = AbsIgnoreAurasAb.begin();i != AbsIgnoreAurasAb.end(); ++i) + for (AuraEffectList::const_iterator i = AbsIgnoreAurasAb.begin(); i != AbsIgnoreAurasAb.end(); ++i) { if ((*i)->GetAmount() > auraAbsorbMod && (*i)->isAffectedOnSpell(spellInfo)) @@ -2184,7 +2182,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe // Get total damage bonus from auras int32 current_dmg = 0; std::pair<AuraMap::const_iterator, AuraMap::const_iterator> range = pVictim->GetAuras().equal_range(44413); - for(AuraMap::const_iterator iter = range.first; iter != range.second; ++iter) + for (AuraMap::const_iterator iter = range.first; iter != range.second; ++iter) if (AuraEffect const * bonusEff = iter->second->GetPartAura(0)) current_dmg += bonusEff->GetAmount(); @@ -2523,7 +2521,7 @@ bool Unit::isSpellBlocked(Unit *pVictim, SpellEntry const * /*spellProto*/, Weap /* Currently not exist spells with ignore block // Ignore combat result aura (parry/dodge check on prepare) AuraList const& ignore = GetAurasByType(SPELL_AURA_IGNORE_COMBAT_RESULT); - for(AuraList::const_iterator i = ignore.begin(); i != ignore.end(); ++i) + for (AuraList::const_iterator i = ignore.begin(); i != ignore.end(); ++i) { if (!(*i)->isAffectedOnSpell(spellProto)) continue; @@ -2597,13 +2595,12 @@ bool Unit::isBlockCritical() return miss_chance; }*/ - int32 Unit::GetMechanicResistChance(const SpellEntry *spell) { if(!spell) return 0; int32 resist_mech = 0; - for(uint8 eff = 0; eff < MAX_SPELL_EFFECTS; ++eff) + for (uint8 eff = 0; eff < MAX_SPELL_EFFECTS; ++eff) { if(spell->Effect[eff] == 0) break; @@ -2623,7 +2620,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) { WeaponAttackType attType = BASE_ATTACK; - // Check damage class instead of attack type to correctly handle judgements + // Check damage class instead of attack type to correctly handle judgements // - they are meele, but can't be dodged/parried/deflected because of ranged dmg class if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED) attType = RANGED_ATTACK; @@ -2633,7 +2630,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED && !IsRangedWeaponSpell(spell)) attackerWeaponSkill = getLevel() * 5; // bonus from skills is 0.04% per skill Diff - else + else attackerWeaponSkill = int32(GetWeaponSkillValue(attType,pVictim)); int32 skillDiff = attackerWeaponSkill - int32(pVictim->GetMaxSkillValueForLevel(this)); @@ -2650,7 +2647,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) // Chance resist mechanic (select max value from every mechanic spell effect) int32 resist_mech = 0; // Get effects mechanic and chance - for(uint8 eff = 0; eff < MAX_SPELL_EFFECTS; ++eff) + for (uint8 eff = 0; eff < MAX_SPELL_EFFECTS; ++eff) { int32 effect_mech = GetEffectMechanic(spell, eff); if (effect_mech) @@ -2715,7 +2712,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) } // Ignore combat result aura AuraEffectList const& ignore = GetAurasByType(SPELL_AURA_IGNORE_COMBAT_RESULT); - for(AuraEffectList::const_iterator i = ignore.begin(); i != ignore.end(); ++i) + for (AuraEffectList::const_iterator i = ignore.begin(); i != ignore.end(); ++i) { if (!(*i)->isAffectedOnSpell(spell)) continue; @@ -2831,14 +2828,14 @@ SpellMissInfo Unit::MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell) // Chance resist mechanic (select max value from every mechanic spell effect) int32 resist_chance = pVictim->GetMechanicResistChance(spell); tmp += resist_chance; - + // Chance resist debuff tmp -= pVictim->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DEBUFF_RESISTANCE, int32(spell->Dispel)); - + // Roll chance if (rand < tmp) return SPELL_MISS_RESIST; - + // cast by caster in front of victim if (pVictim->HasInArc(M_PI,this) || pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) { @@ -2886,7 +2883,7 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool { int32 reflectchance = pVictim->GetTotalAuraModifier(SPELL_AURA_REFLECT_SPELLS); Unit::AuraEffectList const& mReflectSpellsSchool = pVictim->GetAurasByType(SPELL_AURA_REFLECT_SPELLS_SCHOOL); - for(Unit::AuraEffectList::const_iterator i = mReflectSpellsSchool.begin(); i != mReflectSpellsSchool.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = mReflectSpellsSchool.begin(); i != mReflectSpellsSchool.end(); ++i) if((*i)->GetMiscValue() & GetSpellSchoolMask(spell)) reflectchance += (*i)->GetAmount(); if (reflectchance > 0 && roll_chance_i(reflectchance)) @@ -3196,7 +3193,7 @@ void Unit::_UpdateSpells( uint32 time ) // update auras // m_AurasUpdateIterator can be updated in inderect called code at aura remove to skip next planned to update but removed auras - for (m_AurasUpdateIterator = m_Auras.begin(); m_AurasUpdateIterator != m_Auras.end();) + for (m_AurasUpdateIterator = m_Auras.begin(); m_AurasUpdateIterator != m_Auras.end(); ) { Aura* i_aura = m_AurasUpdateIterator->second; ++m_AurasUpdateIterator; // need shift to next for allow update if need into aura update @@ -3204,7 +3201,7 @@ void Unit::_UpdateSpells( uint32 time ) } // remove expired auras - for(AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end();) + for (AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end(); ) { if(i->second->IsExpired()) RemoveAura(i, AURA_REMOVE_BY_EXPIRE); @@ -3217,7 +3214,7 @@ void Unit::_UpdateSpells( uint32 time ) if(!m_gameObj.empty()) { GameObjectList::iterator itr; - for(itr = m_gameObj.begin(); itr != m_gameObj.end();) + for (itr = m_gameObj.begin(); itr != m_gameObj.end(); ) { if( !(*itr)->isSpawned() ) { @@ -3477,7 +3474,7 @@ int32 Unit::GetTotalAuraModifier(AuraType auratype) const int32 modifier = 0; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) modifier += (*i)->GetAmount(); return modifier; @@ -3488,7 +3485,7 @@ float Unit::GetTotalAuraMultiplier(AuraType auratype) const float multiplier = 1.0f; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) multiplier *= (100.0f + (*i)->GetAmount())/100.0f; return multiplier; @@ -3499,7 +3496,7 @@ int32 Unit::GetMaxPositiveAuraModifier(AuraType auratype) int32 modifier = 0; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) { if ((*i)->GetAmount() > modifier) modifier = (*i)->GetAmount(); @@ -3513,7 +3510,7 @@ int32 Unit::GetMaxNegativeAuraModifier(AuraType auratype) const int32 modifier = 0; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) if ((*i)->GetAmount() < modifier) modifier = (*i)->GetAmount(); @@ -3525,7 +3522,7 @@ int32 Unit::GetTotalAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) int32 modifier = 0; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) { if ((*i)->GetMiscValue()& misc_mask) modifier += (*i)->GetAmount(); @@ -3538,7 +3535,7 @@ float Unit::GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask float multiplier = 1.0f; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) { if ((*i)->GetMiscValue()& misc_mask) multiplier *= (100.0f + (*i)->GetAmount())/100.0f; @@ -3551,7 +3548,7 @@ int32 Unit::GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_ int32 modifier = 0; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) { if ((*i)->GetMiscValue()& misc_mask && (*i)->GetAmount() > modifier) modifier = (*i)->GetAmount(); @@ -3565,7 +3562,7 @@ int32 Unit::GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_ int32 modifier = 0; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) { if ((*i)->GetMiscValue()& misc_mask && (*i)->GetAmount() < modifier) modifier = (*i)->GetAmount(); @@ -3579,7 +3576,7 @@ int32 Unit::GetTotalAuraModifierByMiscValue(AuraType auratype, int32 misc_value) int32 modifier = 0; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) { if ((*i)->GetMiscValue()== misc_value) modifier += (*i)->GetAmount(); @@ -3592,7 +3589,7 @@ float Unit::GetTotalAuraMultiplierByMiscValue(AuraType auratype, int32 misc_valu float multiplier = 1.0f; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) { if ((*i)->GetMiscValue()== misc_value) multiplier *= (100.0f + (*i)->GetAmount())/100.0f; @@ -3605,7 +3602,7 @@ int32 Unit::GetMaxPositiveAuraModifierByMiscValue(AuraType auratype, int32 misc_ int32 modifier = 0; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) { if ((*i)->GetMiscValue()== misc_value && (*i)->GetAmount() > modifier) modifier = (*i)->GetAmount(); @@ -3619,7 +3616,7 @@ int32 Unit::GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_ int32 modifier = 0; AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) { if ((*i)->GetMiscValue()== misc_value && (*i)->GetAmount() < modifier) modifier = (*i)->GetAmount(); @@ -3699,7 +3696,7 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects) case 64821: // Fuse Armor (Razorscale) if(stackAmount == aurSpellInfo->StackAmount) CastSpell(this, 64774, true, NULL, NULL, Aur->GetCasterGUID()); - break; + break; } } @@ -3720,14 +3717,14 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects) if (Aur->IsSingleTarget()) { // caster pointer can be deleted in time aura remove, find it by guid at each iteration - for(;;) + for (; ; ) { Unit* caster = Aur->GetCaster(); assert(caster); bool restart = false; AuraList& scAuras = caster->GetSingleCastAuras(); - for(AuraList::iterator itr = scAuras.begin(); itr != scAuras.end(); ++itr) + for (AuraList::iterator itr = scAuras.begin(); itr != scAuras.end(); ++itr) { if( (*itr)->GetTarget() != Aur->GetTarget() && IsSingleTargetSpells((*itr)->GetSpellProto(),aurSpellInfo) ) @@ -3787,7 +3784,7 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur) //bool linked = spellmgr.GetSpellCustomAttr(spellId) & SPELL_ATTR_CU_LINK_AURA? true : false; bool remove = false; - for(AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end(); ++i) + for (AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end(); ++i) { if(remove) { @@ -3813,7 +3810,7 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur) bool is_triggered_by_spell = false; // prevent triggering aura of removing aura that triggered it // prevent triggered aura of removing aura that triggering it (triggered effect early some aura of parent spell - for(uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j) + for (uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j) { if (i_spellProto->EffectTriggerSpell[j] == spellProto->Id || spellProto->EffectTriggerSpell[j] == i_spellProto->Id) // I do not know what is this for @@ -3830,7 +3827,7 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur) if(sameCaster && linked) { if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(spellId + SPELL_LINK_AURA)) - for(std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) + for (std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) if(*itr>0 && *itr==i_spellId) { is_triggered_by_spell=true; @@ -3863,7 +3860,7 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur) void Unit::RemoveAura(uint32 spellId, uint64 caster ,AuraRemoveMode removeMode) { - for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);) + for (AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId); ) { if (!caster || iter->second->GetCasterGUID()==caster) { @@ -3880,7 +3877,7 @@ void Unit::RemoveAura(Aura * aur ,AuraRemoveMode mode) // no need to remove if (!aur || aur->IsRemoved()) return; - for(AuraMap::iterator iter = m_Auras.lower_bound(aur->GetId()); iter != m_Auras.upper_bound(aur->GetId());) + for (AuraMap::iterator iter = m_Auras.lower_bound(aur->GetId()); iter != m_Auras.upper_bound(aur->GetId()); ) { if (aur == iter->second) { @@ -3894,7 +3891,7 @@ void Unit::RemoveAura(Aura * aur ,AuraRemoveMode mode) void Unit::RemoveAurasDueToSpell(uint32 spellId, uint64 caster ,AuraRemoveMode removeMode) { - for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);) + for (AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId); ) { if (!caster || iter->second->GetCasterGUID()==caster) { @@ -3908,7 +3905,7 @@ void Unit::RemoveAurasDueToSpell(uint32 spellId, uint64 caster ,AuraRemoveMode r void Unit::RemoveAuraFromStack(uint32 spellId, uint64 caster ,AuraRemoveMode removeMode) { - for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);) + for (AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId); ) { if (!caster || iter->second->GetCasterGUID()==caster) { @@ -3928,7 +3925,7 @@ inline void Unit::RemoveAuraFromStack(AuraMap::iterator &iter,AuraRemoveMode rem void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit *dispeler) { - for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);) + for (AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId); ) { Aura *aur = iter->second; if (casterGUID == aur->GetCasterGUID()) @@ -3957,13 +3954,13 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit if (casterGUID == stealer->GetGUID()) return; - for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);) + for (AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId); ) { Aura * aur = iter->second; if (casterGUID == aur->GetCasterGUID()) { int32 damage[MAX_SPELL_EFFECTS]; - for (uint8 i=0;i<MAX_SPELL_EFFECTS;++i) + for (uint8 i=0; i<MAX_SPELL_EFFECTS; ++i) { if (aur->GetPartAura(i)) damage[i]=aur->GetPartAura(i)->GetAmount(); @@ -3989,7 +3986,7 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit void Unit::RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId) { - for (AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);) + for (AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId); ) { if (!castItem || iter->second->GetCastItemGUID()==castItem->GetGUID()) { @@ -4003,7 +4000,7 @@ void Unit::RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId) void Unit::RemoveAurasByType(AuraType auraType, uint64 casterGUID, Aura * except, bool negative, bool positive) { - for (AuraEffectList::const_iterator iter = m_modAuras[auraType].begin(); iter != m_modAuras[auraType].end();) + for (AuraEffectList::const_iterator iter = m_modAuras[auraType].begin(); iter != m_modAuras[auraType].end(); ) { Aura * aur = (*iter)->GetParentAura(); ++iter; @@ -4042,7 +4039,7 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase) // single target auras at other targets AuraList& scAuras = GetSingleCastAuras(); - for (AuraList::iterator iter = scAuras.begin(); iter != scAuras.end();) + for (AuraList::iterator iter = scAuras.begin(); iter != scAuras.end(); ) { Aura * aura=*iter; ++iter; @@ -4097,7 +4094,7 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode) { bool canBreak = false; // Get mask of all aurastates from remaining auras - for(AuraStateAurasMap::iterator itr = m_auraStateAuras.lower_bound(auraState); itr != m_auraStateAuras.upper_bound(auraState) && !(auraStateFound && canBreak);) + for (AuraStateAurasMap::iterator itr = m_auraStateAuras.lower_bound(auraState); itr != m_auraStateAuras.upper_bound(auraState) && !(auraStateFound && canBreak); ) { if (itr->second == Aur) { @@ -4135,7 +4132,7 @@ void Unit::RemoveAllAuras() void Unit::RemoveAllAuras(uint64 casterGUID, Aura * except /*=NULL*/, bool negative /*=true*/, bool positive /*=true*/) { - for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();) + for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); ) { if (iter->second != except && (!casterGUID || iter->second->GetCasterGUID()==casterGUID) && ((negative && !iter->second->IsPositive()) || (positive && iter->second->IsPositive()))) @@ -4149,7 +4146,7 @@ void Unit::RemoveArenaAuras(bool onleave) { // in join, remove positive buffs, on end, remove negative // used to remove positive visible auras in arenas - for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();) + for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); ) { if ( !(iter->second->GetSpellProto()->AttributesEx4 & (1<<21)) // don't remove stances, shadowform, pally/hunter auras && !iter->second->IsPassive() // don't remove passive auras @@ -4165,7 +4162,7 @@ void Unit::RemoveAllAurasOnDeath() { // used just after dieing to remove all visible auras // and disable the mods for the passive ones - for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();) + for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); ) { if (!iter->second->IsPassive() && !iter->second->IsDeathPersistent()) RemoveAura(iter, AURA_REMOVE_BY_DEATH); @@ -4203,7 +4200,7 @@ void Unit::_ApplyAllAuraMods() bool Unit::HasAuraTypeWithMiscvalue(AuraType auratype, uint32 miscvalue) const { AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) if (miscvalue == (*i)->GetMiscValue()) return true; return false; @@ -4212,13 +4209,12 @@ bool Unit::HasAuraTypeWithMiscvalue(AuraType auratype, uint32 miscvalue) const bool Unit::HasAuraTypeWithValue(AuraType auratype, uint32 value) const { AuraEffectList const& mTotalAuraList = GetAurasByType(auratype); - for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) + for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i) if (value == (*i)->GetAmount()) return true; return false; } - bool Unit::HasAuraType(AuraType auraType) const { return (!m_modAuras[auraType].empty()); @@ -4240,7 +4236,7 @@ bool Unit::HasAura(Aura * aur) const // no need to find aura if (!aur || aur->IsRemoved()) return false; - for(AuraMap::const_iterator iter = m_Auras.lower_bound(aur->GetId()); iter != m_Auras.upper_bound(aur->GetId());) + for (AuraMap::const_iterator iter = m_Auras.lower_bound(aur->GetId()); iter != m_Auras.upper_bound(aur->GetId()); ) { if (aur == iter->second) return true; @@ -4267,7 +4263,7 @@ Aura * Unit::GetAura(uint32 spellId, uint64 caster) const else { AuraMap const& auras = GetAuras(); - for(AuraMap::const_iterator itr = auras.lower_bound(spellId); itr != auras.upper_bound(spellId); ++itr) + for (AuraMap::const_iterator itr = auras.lower_bound(spellId); itr != auras.upper_bound(spellId); ++itr) if(itr->second->GetCasterGUID()==caster) return itr->second; return NULL; @@ -4284,7 +4280,7 @@ AuraEffect * Unit::GetAuraEffect(uint32 spellId, uint8 effIndex, uint64 caster) AuraEffect* Unit::GetAura(AuraType type, uint32 family, uint32 familyFlag1, uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID) { AuraEffectList const& auras = GetAurasByType(type); - for(AuraEffectList::const_iterator i = auras.begin();i != auras.end(); ++i) + for (AuraEffectList::const_iterator i = auras.begin(); i != auras.end(); ++i) { SpellEntry const *spell = (*i)->GetSpellProto(); if (spell->SpellFamilyName == family && spell->SpellFamilyFlags.HasFlag(familyFlag1, familyFlag2, familyFlag3)) @@ -4300,7 +4296,7 @@ AuraEffect* Unit::GetAura(AuraType type, uint32 family, uint32 familyFlag1, uint AuraEffect * Unit::IsScriptOverriden(SpellEntry const * spell, int32 script) const { AuraEffectList const& auras = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(AuraEffectList::const_iterator i = auras.begin();i != auras.end(); ++i) + for (AuraEffectList::const_iterator i = auras.begin(); i != auras.end(); ++i) { if ((*i)->GetMiscValue() == script) if ((*i)->isAffectedOnSpell(spell)) @@ -4319,9 +4315,9 @@ uint32 Unit::GetDiseasesByCaster(uint64 casterGUID, bool remove) }; uint32 diseases=0; - for(AuraType const* itr = &diseaseAuraTypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr) + for (AuraType const* itr = &diseaseAuraTypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr) { - for(AuraEffectList::iterator i = m_modAuras[*itr].begin();i != m_modAuras[*itr].end(); ) + for (AuraEffectList::iterator i = m_modAuras[*itr].begin(); i != m_modAuras[*itr].end(); ) { // Get auras with disease dispel type by caster if ((*i)->GetSpellProto()->Dispel == DISPEL_DISEASE @@ -4352,10 +4348,10 @@ uint32 Unit::GetDoTsByCaster(uint64 casterGUID) const }; uint32 dots=0; - for(AuraType const* itr = &diseaseAuraTypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr) + for (AuraType const* itr = &diseaseAuraTypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr) { Unit::AuraEffectList const& auras = GetAurasByType(*itr); - for(AuraEffectList::const_iterator i = auras.begin();i != auras.end(); ++i) + for (AuraEffectList::const_iterator i = auras.begin(); i != auras.end(); ++i) { // Get auras by caster if ((*i)->GetCasterGUID()==casterGUID) @@ -4374,7 +4370,7 @@ void Unit::RemoveDynObject(uint32 spellid) { if(m_dynObjGUIDs.empty()) return; - for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end();) + for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end(); ) { DynamicObject* dynObj = GetMap()->GetDynamicObject(*i); if(!dynObj) // may happen if a dynobj is removed when grid unload @@ -4404,7 +4400,7 @@ void Unit::RemoveAllDynObjects() DynamicObject * Unit::GetDynObject(uint32 spellId) { - for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end();) + for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end(); ) { DynamicObject* dynObj = GetMap()->GetDynamicObject(*i); if(!dynObj) @@ -4451,7 +4447,7 @@ void Unit::RemoveGameObject(GameObject* gameObj, bool del) gameObj->SetOwnerGUID(0); - for(uint32 i = 0; i < 4; ++i) + for (uint32 i = 0; i < 4; ++i) { if(m_ObjectSlot[i] == gameObj->GetGUID()) { @@ -4511,7 +4507,7 @@ void Unit::RemoveGameObject(uint32 spellid, bool del) void Unit::RemoveAllGameObjects() { // remove references to unit - for(GameObjectList::iterator i = m_gameObj.begin(); i != m_gameObj.end();) + for (GameObjectList::iterator i = m_gameObj.begin(); i != m_gameObj.end(); ) { (*i)->SetOwnerGUID(0); (*i)->SetRespawnTime(0); @@ -4618,7 +4614,7 @@ void Unit::SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo) data << uint64(GetGUID()); data << uint8(0); // can be 0 or 1 data << uint32(1); // target count - // for(i = 0; i < target count; ++i) + // for (i = 0; i < target count; ++i) data << uint64(target->GetGUID()); // target GUID data << uint8(missInfo); // end loop @@ -4639,7 +4635,7 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo) data << uint32(overkill < 0 ? 0 : overkill); // Overkill data << uint8(count); // Sub damage count - for(uint32 i = 0; i < count; ++i) + for (uint32 i = 0; i < count; ++i) { data << uint32(damageInfo->damageSchoolMask); // School of sub damage data << float(damageInfo->damage); // sub damage @@ -4648,13 +4644,13 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo) if(damageInfo->HitInfo & (HITINFO_ABSORB | HITINFO_ABSORB2)) { - for(uint32 i = 0; i < count; ++i) + for (uint32 i = 0; i < count; ++i) data << uint32(damageInfo->absorb); // Absorb } if(damageInfo->HitInfo & (HITINFO_RESIST | HITINFO_RESIST2)) { - for(uint32 i = 0; i < count; ++i) + for (uint32 i = 0; i < count; ++i) data << uint32(damageInfo->resist); // Resist } @@ -4679,7 +4675,7 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo) data << float(0); data << float(0); data << float(0); - for(uint8 i = 0; i < 5; ++i) + for (uint8 i = 0; i < 5; ++i) { data << float(0); data << float(0); @@ -4870,7 +4866,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger target = owner; triggered_spell_id = 50454; break; - } + } return false; } // Improved Divine Spirit @@ -5406,7 +5402,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger SpellCooldowns const SpellCDs = ((Player*)this)->GetSpellCooldowns(); // remove cooldowns on all ranks of Frost Nova - for(SpellCooldowns::const_iterator itr = SpellCDs.begin(); itr != SpellCDs.end(); itr++) + for (SpellCooldowns::const_iterator itr = SpellCDs.begin(); itr != SpellCDs.end(); itr++) { SpellEntry const* SpellCDs_entry = sSpellStore.LookupEntry(itr->first); // Frost Nova @@ -5570,7 +5566,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger { // Improved Soul Leech AuraEffectList const& SoulLeechAuras = GetAurasByType(SPELL_AURA_DUMMY); - for(Unit::AuraEffectList::const_iterator i = SoulLeechAuras.begin();i != SoulLeechAuras.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = SoulLeechAuras.begin(); i != SoulLeechAuras.end(); ++i) { if ((*i)->GetId()==54117 || (*i)->GetId()==54118) { @@ -5721,7 +5717,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger return false; int EffIndex = 0; - for(uint8 i = 0; i < MAX_SPELL_EFFECTS; i++) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; i++) { if(GoPoH->Effect[i] == SPELL_EFFECT_APPLY_AURA) { @@ -6370,7 +6366,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger case 54939: { // Lookup base amount mana restore - for (uint8 i=0; i<MAX_SPELL_EFFECTS;i++) + for (uint8 i=0; i<MAX_SPELL_EFFECTS; i++) if (procSpell->Effect[i] == SPELL_EFFECT_ENERGIZE) { int32 mana = procSpell->EffectBasePoints[i]; @@ -6521,7 +6517,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger ((Player*)this)->AddSpellCooldown(dummySpell->Id,0,time(NULL) + cooldown); // Attack Twice - for ( uint32 i = 0; i<2; ++i ) + for (uint32 i = 0; i<2; ++i ) CastCustomSpell(pVictim,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); return true; @@ -6891,7 +6887,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger { if (procSpell->SpellFamilyName == SPELLFAMILY_POTION) { - for (uint8 i=0;i<MAX_SPELL_EFFECTS;i++) + for (uint8 i=0; i<MAX_SPELL_EFFECTS; i++) { if (procSpell->Effect[i]==SPELL_EFFECT_HEAL) { @@ -7118,7 +7114,7 @@ bool Unit::HandleAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, S else runesLeft = 1; - for (uint8 i=0;i<MAX_RUNES && runesLeft;++i) + for (uint8 i=0; i<MAX_RUNES && runesLeft; ++i) { if (dummySpell->SpellIconID == 2622) { @@ -7179,7 +7175,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig basepoints0 = triggerAmount; Item* castItem = triggeredByAura->GetParentAura()->GetCastItemGUID() && GetTypeId()==TYPEID_PLAYER - ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL; + ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL; // Try handle unknown trigger spells if (sSpellStore.LookupEntry(trigger_spell_id) == NULL) @@ -7252,7 +7248,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig { // Improved Drain Soul Unit::AuraEffectList const& mAddFlatModifier = GetAurasByType(SPELL_AURA_DUMMY); - for(Unit::AuraEffectList::const_iterator i = mAddFlatModifier.begin(); i != mAddFlatModifier.end(); ++i) + for (Unit::AuraEffectList::const_iterator i = mAddFlatModifier.begin(); i != mAddFlatModifier.end(); ++i) { if ((*i)->GetMiscValue() == SPELLMOD_CHANCE_OF_SUCCESS && (*i)->GetSpellProto()->SpellIconID == 113) { @@ -7563,7 +7559,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig trigger_spell_id = 26470; break; } - // Deflection + // Deflection case 52420: { if(GetHealth()*100 / GetMaxHealth() >= 35) @@ -7692,7 +7688,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig // Glyph of Improved Scorch if (AuraEffect * aurEff = GetAuraEffect(56371,0)) { - for (int32 count = aurEff->GetAmount();count>0;count--) + for (int32 count = aurEff->GetAmount(); count>0; count--) CastSpell(pVictim, 22959, true); return true; } @@ -7745,7 +7741,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig case 53817: { // have rank dependent proc chance, ignore too often cases - // PPM = 2.5 * (rank of talent), + // PPM = 2.5 * (rank of talent), uint32 rank = spellmgr.GetSpellRank(auraSpellInfo->Id); // 5 rank -> 100% 4 rank -> 80% and etc from full rate if(!roll_chance_i(20*rank)) @@ -8385,7 +8381,7 @@ void Unit::CombatStopWithPets(bool includingCast) { CombatStop(includingCast); - for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) (*itr)->CombatStop(includingCast); } @@ -8394,11 +8390,11 @@ bool Unit::isAttackingPlayer() const if(hasUnitState(UNIT_STAT_ATTACK_PLAYER)) return true; - for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) if((*itr)->isAttackingPlayer()) return true; - for(uint8 i = 0; i < MAX_SUMMON_SLOT; ++i) + for (uint8 i = 0; i < MAX_SUMMON_SLOT; ++i) if(m_SummonSlot[i]) if(Creature *summon = GetMap()->GetCreature(m_SummonSlot[i])) if(summon->isAttackingPlayer()) @@ -8450,7 +8446,7 @@ void Unit::ModifyAuraState(AuraState flag, bool apply) if (flag != AURA_STATE_ENRAGE) // enrage aura state triggering continues auras { Unit::AuraMap& tAuras = GetAuras(); - for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end();) + for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end(); ) { SpellEntry const* spellProto = (*itr).second->GetSpellProto(); if (spellProto->CasterAuraState == flag) @@ -8468,7 +8464,7 @@ void Unit::ModifyAuraState(AuraState flag, bool apply) uint32 Unit::BuildAuraStateUpdateForTarget(Unit * target) const { uint32 auraStates = GetUInt32Value(UNIT_FIELD_AURASTATE) &~(PER_CASTER_AURA_STATE_MASK); - for(AuraStateAurasMap::const_iterator itr = m_auraStateAuras.begin(); itr != m_auraStateAuras.end();++itr) + for (AuraStateAurasMap::const_iterator itr = m_auraStateAuras.begin(); itr != m_auraStateAuras.end(); ++itr) { if ((1<<(itr->first-1)) & PER_CASTER_AURA_STATE_MASK) { @@ -8486,7 +8482,7 @@ bool Unit::HasAuraState(AuraState flag, SpellEntry const *spellProto, Unit const if(spellProto) { AuraEffectList const& stateAuras = Caster->GetAurasByType(SPELL_AURA_ABILITY_IGNORE_AURASTATE); - for(AuraEffectList::const_iterator j = stateAuras.begin();j != stateAuras.end(); ++j) + for (AuraEffectList::const_iterator j = stateAuras.begin(); j != stateAuras.end(); ++j) if((*j)->isAffectedOnSpell(spellProto)) return true; } @@ -8494,7 +8490,7 @@ bool Unit::HasAuraState(AuraState flag, SpellEntry const *spellProto, Unit const // If aura with aurastate by caster not found return false if ((1<<(flag-1)) & PER_CASTER_AURA_STATE_MASK) { - for(AuraStateAurasMap::const_iterator itr = m_auraStateAuras.lower_bound(flag); itr != m_auraStateAuras.upper_bound(flag);++itr) + for (AuraStateAurasMap::const_iterator itr = m_auraStateAuras.lower_bound(flag); itr != m_auraStateAuras.upper_bound(flag); ++itr) if (itr->second->GetCasterGUID() == Caster->GetGUID()) return true; return false; @@ -8632,7 +8628,7 @@ void Unit::SetMinion(Minion *minion, bool apply) // FIXME: hack, speed must be set only at follow if(GetTypeId() == TYPEID_PLAYER && minion->isPet()) - for(uint8 i = 0; i < MAX_MOVE_TYPE; ++i) + for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) minion->SetSpeed(UnitMoveType(i), m_speed_rate[i], true); // Ghoul pets have energy instead of mana (is anywhere better place for this code?) @@ -8680,7 +8676,7 @@ void Unit::SetMinion(Minion *minion, bool apply) if(RemoveUInt64Value(UNIT_FIELD_SUMMON, minion->GetGUID())) { //Check if there is another minion - for(ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) { // do not use this check, creature do not have charm guid //if(GetCharmGUID() == (*itr)->GetGUID()) @@ -8714,14 +8710,14 @@ void Unit::SetMinion(Minion *minion, bool apply) } } } - //else if(minion->m_Properties && minion->m_Properties->Type == SUMMON_TYPE_MINIPET) + //else if(minion->m_Properties && minion->m_Properties->Type == SUMMON_TYPE_MINIPET) // RemoveUInt64Value(UNIT_FIELD_CRITTER, minion->GetGUID()); } } void Unit::GetAllMinionsByEntry(std::list<Creature*>& Minions, uint32 entry) { - for(Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end();) + for (Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ) { Unit *unit = *itr; ++itr; @@ -8733,7 +8729,7 @@ void Unit::GetAllMinionsByEntry(std::list<Creature*>& Minions, uint32 entry) void Unit::RemoveAllMinionsByEntry(uint32 entry) { - for(Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end();) + for (Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ) { Unit *unit = *itr; ++itr; @@ -8857,7 +8853,7 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, SpellEntry const *spellInfo) return victim; Unit::AuraEffectList const& magnetAuras = victim->GetAurasByType(SPELL_AURA_SPELL_MAGNET); - for(Unit::AuraEffectList::const_iterator itr = magnetAuras.begin(); itr != magnetAuras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = magnetAuras.begin(); itr != magnetAuras.end(); ++itr) if(Unit* magnet = (*itr)->GetParentAura()->GetUnitSource()) if(magnet->isAlive()) { @@ -8869,7 +8865,7 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, SpellEntry const *spellInfo) else { AuraEffectList const& hitTriggerAuras = victim->GetAurasByType(SPELL_AURA_ADD_CASTER_HIT_TRIGGER); - for(AuraEffectList::const_iterator i = hitTriggerAuras.begin(); i != hitTriggerAuras.end(); ++i) + for (AuraEffectList::const_iterator i = hitTriggerAuras.begin(); i != hitTriggerAuras.end(); ++i) if(Unit* magnet = (*i)->GetParentAura()->GetUnitSource()) if(magnet->isAlive() && magnet->IsWithinLOSInMap(this)) if(roll_chance_i((*i)->GetAmount())) @@ -8955,7 +8951,7 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) //reserve place for players and pets because resizing vector every unit push is unefficient (vector is reallocated then) nearMembers.reserve(pGroup->GetMembersCount()*2); - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -9095,7 +9091,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 DoneTotalMod *= ((Creature*)this)->GetSpellDamageMod(((Creature*)this)->GetCreatureInfo()->rank); AuraEffectList const& mModDamagePercentDone = GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); - for(AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i) + for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i) { if( ((*i)->GetMiscValue() & GetSpellSchoolMask(spellProto)) && (*i)->GetSpellProto()->EquippedItemClass == -1 && @@ -9111,7 +9107,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 // Add flat bonus from spell damage versus DoneTotal += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS, creatureTypeMask); AuraEffectList const& mDamageDoneVersus = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE_VERSUS); - for(AuraEffectList::const_iterator i = mDamageDoneVersus.begin();i != mDamageDoneVersus.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageDoneVersus.begin(); i != mDamageDoneVersus.end(); ++i) if(creatureTypeMask & uint32((*i)->GetMiscValue())) DoneTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f; @@ -9119,7 +9115,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 Unit *owner = GetOwner(); if (!owner) owner = this; AuraEffectList const& mOverrideClassScript= owner->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(AuraEffectList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i) + for (AuraEffectList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i) { if (!(*i)->isAffectedOnSpell(spellProto)) continue; @@ -9250,7 +9246,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 if(pVictim->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED)) { AuraEffectList const& mDumyAuras = GetAurasByType(SPELL_AURA_DUMMY); - for(AuraEffectList::const_iterator i = mDumyAuras.begin(); i != mDumyAuras.end(); ++i) + for (AuraEffectList::const_iterator i = mDumyAuras.begin(); i != mDumyAuras.end(); ++i) if ((*i)->GetSpellProto()->SpellIconID == 3263) { DoneTotalMod *= float((*i)->GetAmount() + 100.f) / 100.f; @@ -9277,7 +9273,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 // Get stack of Holy Vengeance/Blood Corruption on the target added by caster uint32 stacks = 0; Unit::AuraEffectList const& auras = pVictim->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); - for(Unit::AuraEffectList::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) if(((*itr)->GetId() == 31803 || (*itr)->GetId() == 53742) && (*itr)->GetCasterGUID()==GetGUID()) { stacks = (*itr)->GetParentAura()->GetStackAmount(); @@ -9294,7 +9290,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 if(pVictim->HasAuraState(AURA_STATE_CONFLAGRATE)) { AuraEffectList const& mDumyAuras = GetAurasByType(SPELL_AURA_DUMMY); - for(AuraEffectList::const_iterator i = mDumyAuras.begin(); i != mDumyAuras.end(); ++i) + for (AuraEffectList::const_iterator i = mDumyAuras.begin(); i != mDumyAuras.end(); ++i) if ((*i)->GetSpellProto()->SpellIconID == 3173) { DoneTotalMod *= float((*i)->GetAmount() + 100.f) / 100.f; @@ -9321,7 +9317,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 // ..taken AuraEffectList const& mModDamagePercentTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); - for(AuraEffectList::const_iterator i = mModDamagePercentTaken.begin(); i != mModDamagePercentTaken.end(); ++i) + for (AuraEffectList::const_iterator i = mModDamagePercentTaken.begin(); i != mModDamagePercentTaken.end(); ++i) if( (*i)->GetMiscValue() & GetSpellSchoolMask(spellProto) ) TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f; @@ -9340,7 +9336,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 // From caster spells AuraEffectList const& mOwnerTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_FROM_CASTER); - for(AuraEffectList::const_iterator i = mOwnerTaken.begin(); i != mOwnerTaken.end(); ++i) + for (AuraEffectList::const_iterator i = mOwnerTaken.begin(); i != mOwnerTaken.end(); ++i) if( (*i)->GetCasterGUID() == GetGUID() && (*i)->isAffectedOnSpell(spellProto)) TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f; @@ -9348,7 +9344,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 if (uint32 mechanicMask = GetAllSpellMechanicMask(spellProto)) { AuraEffectList const& mDamageDoneMechanic = pVictim->GetAurasByType(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT); - for(AuraEffectList::const_iterator i = mDamageDoneMechanic.begin();i != mDamageDoneMechanic.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageDoneMechanic.begin(); i != mDamageDoneMechanic.end(); ++i) if(mechanicMask & uint32(1<<((*i)->GetMiscValue()))) TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f; } @@ -9399,7 +9395,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 if(DotDuration > 30000) DotDuration = 30000; if(!IsChanneledSpell(spellProto)) DotFactor = DotDuration / 15000.0f; int x = 0; - for(uint8 j = 0; j < MAX_SPELL_EFFECTS; j++) + for (uint8 j = 0; j < MAX_SPELL_EFFECTS; j++) { if( spellProto->Effect[j] == SPELL_EFFECT_APPLY_AURA && ( spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_DAMAGE || @@ -9423,7 +9419,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 CastingTime = GetCastingTimeForBonus( spellProto, damagetype, CastingTime ); // 50% for damage and healing spells for leech spells from damage bonus and 0% from healing - for(uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j) + for (uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j) { if( spellProto->Effect[j] == SPELL_EFFECT_HEALTH_LEECH || spellProto->Effect[j] == SPELL_EFFECT_APPLY_AURA && spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_LEECH ) @@ -9466,7 +9462,7 @@ int32 Unit::SpellBaseDamageBonus(SpellSchoolMask schoolMask) // ..done AuraEffectList const& mDamageDone = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE); - for(AuraEffectList::const_iterator i = mDamageDone.begin();i != mDamageDone.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageDone.begin(); i != mDamageDone.end(); ++i) if(((*i)->GetMiscValue() & schoolMask) != 0 && (*i)->GetSpellProto()->EquippedItemClass == -1 && // -1 == any item class (not wand then) @@ -9481,7 +9477,7 @@ int32 Unit::SpellBaseDamageBonus(SpellSchoolMask schoolMask) // Damage bonus from stats AuraEffectList const& mDamageDoneOfStatPercent = GetAurasByType(SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT); - for(AuraEffectList::const_iterator i = mDamageDoneOfStatPercent.begin();i != mDamageDoneOfStatPercent.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageDoneOfStatPercent.begin(); i != mDamageDoneOfStatPercent.end(); ++i) { if((*i)->GetMiscValue() & schoolMask) { @@ -9492,7 +9488,7 @@ int32 Unit::SpellBaseDamageBonus(SpellSchoolMask schoolMask) } // ... and attack power AuraEffectList const& mDamageDonebyAP = GetAurasByType(SPELL_AURA_MOD_SPELL_DAMAGE_OF_ATTACK_POWER); - for(AuraEffectList::const_iterator i =mDamageDonebyAP.begin();i != mDamageDonebyAP.end(); ++i) + for (AuraEffectList::const_iterator i =mDamageDonebyAP.begin(); i != mDamageDonebyAP.end(); ++i) if ((*i)->GetMiscValue() & schoolMask) DoneAdvertisedBenefit += int32(GetTotalAttackPowerValue(BASE_ATTACK) * (*i)->GetAmount() / 100.0f); @@ -9507,13 +9503,13 @@ int32 Unit::SpellBaseDamageBonusForVictim(SpellSchoolMask schoolMask, Unit *pVic int32 TakenAdvertisedBenefit = 0; // ..done (for creature type by mask) in taken AuraEffectList const& mDamageDoneCreature = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE_CREATURE); - for(AuraEffectList::const_iterator i = mDamageDoneCreature.begin();i != mDamageDoneCreature.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageDoneCreature.begin(); i != mDamageDoneCreature.end(); ++i) if(creatureTypeMask & uint32((*i)->GetMiscValue())) TakenAdvertisedBenefit += (*i)->GetAmount(); // ..taken AuraEffectList const& mDamageTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_TAKEN); - for(AuraEffectList::const_iterator i = mDamageTaken.begin();i != mDamageTaken.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageTaken.begin(); i != mDamageTaken.end(); ++i) if(((*i)->GetMiscValue() & schoolMask) != 0) TakenAdvertisedBenefit += (*i)->GetAmount(); @@ -9559,7 +9555,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM } // scripted (increase crit chance ... against ... target by x% AuraEffectList const& mOverrideClassScript = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(AuraEffectList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i) + for (AuraEffectList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i) { if (!((*i)->isAffectedOnSpell(spellProto))) continue; @@ -9773,14 +9769,14 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint // Healing done percent AuraEffectList const& mHealingDonePct = GetAurasByType(SPELL_AURA_MOD_HEALING_DONE_PERCENT); - for(AuraEffectList::const_iterator i = mHealingDonePct.begin();i != mHealingDonePct.end(); ++i) + for (AuraEffectList::const_iterator i = mHealingDonePct.begin(); i != mHealingDonePct.end(); ++i) DoneTotalMod *= (100.0f + (*i)->GetAmount()) / 100.0f; // done scripted mod (take it from owner) Unit *owner = GetOwner(); if (!owner) owner = this; AuraEffectList const& mOverrideClassScript= owner->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(AuraEffectList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i) + for (AuraEffectList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i) { if (!(*i)->isAffectedOnSpell(spellProto)) continue; @@ -9843,7 +9839,7 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint bool scripted = false; - for (uint8 i=0;i<MAX_SPELL_EFFECTS;++i) + for (uint8 i=0; i<MAX_SPELL_EFFECTS; ++i) { switch (spellProto->EffectApplyAuraName[i]) { @@ -9923,7 +9919,7 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint if(DotDuration > 30000) DotDuration = 30000; if(!IsChanneledSpell(spellProto)) DotFactor = DotDuration / 15000.0f; uint32 x = 0; - for(uint8 j = 0; j < MAX_SPELL_EFFECTS; j++) + for (uint8 j = 0; j < MAX_SPELL_EFFECTS; j++) { if( spellProto->Effect[j] == SPELL_EFFECT_APPLY_AURA && ( spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_DAMAGE || @@ -9946,7 +9942,7 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint // Distribute Damage over multiple effects, reduce by AoE CastingTime = GetCastingTimeForBonus( spellProto, damagetype, CastingTime ); // 50% for damage and healing spells for leech spells from damage bonus and 0% from healing - for(uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j) + for (uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j) { if( spellProto->Effect[j] == SPELL_EFFECT_HEALTH_LEECH || spellProto->Effect[j] == SPELL_EFFECT_APPLY_AURA && spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_LEECH ) @@ -10018,7 +10014,7 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint } AuraEffectList const& mHealingGet= pVictim->GetAurasByType(SPELL_AURA_MOD_HEALING_RECEIVED); - for(AuraEffectList::const_iterator i = mHealingGet.begin(); i != mHealingGet.end(); ++i) + for (AuraEffectList::const_iterator i = mHealingGet.begin(); i != mHealingGet.end(); ++i) if (GetGUID()==(*i)->GetCasterGUID() && (*i)->isAffectedOnSpell(spellProto) ) TakenTotalMod *= ((*i)->GetAmount() + 100.0f) / 100.0f; @@ -10032,7 +10028,7 @@ int32 Unit::SpellBaseHealingBonus(SpellSchoolMask schoolMask) int32 AdvertisedBenefit = 0; AuraEffectList const& mHealingDone = GetAurasByType(SPELL_AURA_MOD_HEALING_DONE); - for(AuraEffectList::const_iterator i = mHealingDone.begin();i != mHealingDone.end(); ++i) + for (AuraEffectList::const_iterator i = mHealingDone.begin(); i != mHealingDone.end(); ++i) if(((*i)->GetMiscValue() & schoolMask) != 0) AdvertisedBenefit += (*i)->GetAmount(); @@ -10044,7 +10040,7 @@ int32 Unit::SpellBaseHealingBonus(SpellSchoolMask schoolMask) // Healing bonus from stats AuraEffectList const& mHealingDoneOfStatPercent = GetAurasByType(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT); - for(AuraEffectList::const_iterator i = mHealingDoneOfStatPercent.begin();i != mHealingDoneOfStatPercent.end(); ++i) + for (AuraEffectList::const_iterator i = mHealingDoneOfStatPercent.begin(); i != mHealingDoneOfStatPercent.end(); ++i) { // stat used dependent from misc value (stat index) Stats usedStat = Stats((*i)->GetSpellProto()->EffectMiscValue[(*i)->GetEffIndex()]); @@ -10053,7 +10049,7 @@ int32 Unit::SpellBaseHealingBonus(SpellSchoolMask schoolMask) // ... and attack power AuraEffectList const& mHealingDonebyAP = GetAurasByType(SPELL_AURA_MOD_SPELL_HEALING_OF_ATTACK_POWER); - for(AuraEffectList::const_iterator i = mHealingDonebyAP.begin();i != mHealingDonebyAP.end(); ++i) + for (AuraEffectList::const_iterator i = mHealingDonebyAP.begin(); i != mHealingDonebyAP.end(); ++i) if ((*i)->GetMiscValue() & schoolMask) AdvertisedBenefit += int32(GetTotalAttackPowerValue(BASE_ATTACK) * (*i)->GetAmount() / 100.0f); } @@ -10064,7 +10060,7 @@ int32 Unit::SpellBaseHealingBonusForVictim(SpellSchoolMask schoolMask, Unit *pVi { int32 AdvertisedBenefit = 0; AuraEffectList const& mDamageTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_HEALING); - for(AuraEffectList::const_iterator i = mDamageTaken.begin();i != mDamageTaken.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageTaken.begin(); i != mDamageTaken.end(); ++i) if(((*i)->GetMiscValue() & schoolMask) != 0) AdvertisedBenefit += (*i)->GetAmount(); return AdvertisedBenefit; @@ -10115,14 +10111,14 @@ bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo) // Single spell immunity. SpellImmuneList const& idList = m_spellImmune[IMMUNITY_ID]; - for(SpellImmuneList::const_iterator itr = idList.begin(); itr != idList.end(); ++itr) + for (SpellImmuneList::const_iterator itr = idList.begin(); itr != idList.end(); ++itr) if(itr->type == spellInfo->Id) return true; if(spellInfo->Dispel) { SpellImmuneList const& dispelList = m_spellImmune[IMMUNITY_DISPEL]; - for(SpellImmuneList::const_iterator itr = dispelList.begin(); itr != dispelList.end(); ++itr) + for (SpellImmuneList::const_iterator itr = dispelList.begin(); itr != dispelList.end(); ++itr) if(itr->type == spellInfo->Dispel) return true; } @@ -10130,7 +10126,7 @@ bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo) if(spellInfo->Mechanic) { SpellImmuneList const& mechanicList = m_spellImmune[IMMUNITY_MECHANIC]; - for(SpellImmuneList::const_iterator itr = mechanicList.begin(); itr != mechanicList.end(); ++itr) + for (SpellImmuneList::const_iterator itr = mechanicList.begin(); itr != mechanicList.end(); ++itr) if(itr->type == spellInfo->Mechanic) return true; } @@ -10138,7 +10134,7 @@ bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo) if(spellInfo->Id != 42292 && spellInfo->Id !=59752) { SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL]; - for(SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr) + for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr) if((itr->type & GetSpellSchoolMask(spellInfo)) && !(IsPositiveSpell(itr->spellId) && IsPositiveSpell(spellInfo->Id)) && !IsDispelableBySpell(spellInfo, itr->spellId)) @@ -10170,12 +10166,12 @@ bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) con if(uint32 aura = spellInfo->EffectApplyAuraName[index]) { SpellImmuneList const& list = m_spellImmune[IMMUNITY_STATE]; - for(SpellImmuneList::const_iterator itr = list.begin(); itr != list.end(); ++itr) + for (SpellImmuneList::const_iterator itr = list.begin(); itr != list.end(); ++itr) if(itr->type == aura) return true; // Check for immune to application of harmful magical effects AuraEffectList const& immuneAuraApply = GetAurasByType(SPELL_AURA_MOD_IMMUNE_AURA_APPLY_SCHOOL); - for(AuraEffectList::const_iterator iter = immuneAuraApply.begin(); iter != immuneAuraApply.end(); ++iter) + for (AuraEffectList::const_iterator iter = immuneAuraApply.begin(); iter != immuneAuraApply.end(); ++iter) if (spellInfo->Dispel == DISPEL_MAGIC && // Magic debuff ((*iter)->GetMiscValue() & GetSpellSchoolMask(spellInfo)) && // Check school !IsPositiveEffect(spellInfo->Id, index)) // Harmful @@ -10225,7 +10221,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT // ..done (for creature type by mask) in taken AuraEffectList const& mDamageDoneCreature = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE_CREATURE); - for(AuraEffectList::const_iterator i = mDamageDoneCreature.begin();i != mDamageDoneCreature.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageDoneCreature.begin(); i != mDamageDoneCreature.end(); ++i) if(creatureTypeMask & uint32((*i)->GetMiscValue())) DoneFlatBenefit += (*i)->GetAmount(); @@ -10240,7 +10236,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT // ..done (base at attack power and creature type) AuraEffectList const& mCreatureAttackPower = GetAurasByType(SPELL_AURA_MOD_RANGED_ATTACK_POWER_VERSUS); - for(AuraEffectList::const_iterator i = mCreatureAttackPower.begin();i != mCreatureAttackPower.end(); ++i) + for (AuraEffectList::const_iterator i = mCreatureAttackPower.begin(); i != mCreatureAttackPower.end(); ++i) if(creatureTypeMask & uint32((*i)->GetMiscValue())) APbonus += (*i)->GetAmount(); } @@ -10250,7 +10246,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT // ..done (base at attack power and creature type) AuraEffectList const& mCreatureAttackPower = GetAurasByType(SPELL_AURA_MOD_MELEE_ATTACK_POWER_VERSUS); - for(AuraEffectList::const_iterator i = mCreatureAttackPower.begin();i != mCreatureAttackPower.end(); ++i) + for (AuraEffectList::const_iterator i = mCreatureAttackPower.begin(); i != mCreatureAttackPower.end(); ++i) if(creatureTypeMask & uint32((*i)->GetMiscValue())) APbonus += (*i)->GetAmount(); } @@ -10260,7 +10256,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT bool normalized = false; if(spellProto) { - for (uint8 i = 0; i<MAX_SPELL_EFFECTS;i++) + for (uint8 i = 0; i<MAX_SPELL_EFFECTS; i++) { if (spellProto->Effect[i] == SPELL_EFFECT_NORMALIZED_WEAPON_DMG) { @@ -10278,7 +10274,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT // ..taken AuraEffectList const& mDamageTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_TAKEN); - for(AuraEffectList::const_iterator i = mDamageTaken.begin();i != mDamageTaken.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageTaken.begin(); i != mDamageTaken.end(); ++i) if((*i)->GetMiscValue() & GetMeleeDamageSchoolMask()) TakenFlatBenefit += (*i)->GetAmount(); @@ -10296,13 +10292,13 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT // SPELL_AURA_MOD_OFFHAND_DAMAGE_PCT included in weapon damage AuraEffectList const& mDamageDoneVersus = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE_VERSUS); - for(AuraEffectList::const_iterator i = mDamageDoneVersus.begin();i != mDamageDoneVersus.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageDoneVersus.begin(); i != mDamageDoneVersus.end(); ++i) if(creatureTypeMask & uint32((*i)->GetMiscValue())) DoneTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f; // ..taken AuraEffectList const& mModDamagePercentTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); - for(AuraEffectList::const_iterator i = mModDamagePercentTaken.begin(); i != mModDamagePercentTaken.end(); ++i) + for (AuraEffectList::const_iterator i = mModDamagePercentTaken.begin(); i != mModDamagePercentTaken.end(); ++i) if((*i)->GetMiscValue() & GetMeleeDamageSchoolMask()) TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f; @@ -10314,7 +10310,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT if (mechanicMask) { AuraEffectList const& mDamageDoneMechanic = pVictim->GetAurasByType(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT); - for(AuraEffectList::const_iterator i = mDamageDoneMechanic.begin();i != mDamageDoneMechanic.end(); ++i) + for (AuraEffectList::const_iterator i = mDamageDoneMechanic.begin(); i != mDamageDoneMechanic.end(); ++i) if((mechanicMask & uint32(1<<((*i)->GetMiscValue()))) // Shred - "Effects which increase Bleed damage also increase Shred damage" || ((*i)->GetMiscValue() == MECHANIC_BLEED && spellProto->SpellFamilyName == SPELLFAMILY_DRUID && spellProto->SpellFamilyFlags[0] & 0x8000)) @@ -10324,7 +10320,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT // .. taken pct: dummy auras AuraEffectList const& mDummyAuras = pVictim->GetAurasByType(SPELL_AURA_DUMMY); - for(AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) + for (AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) { switch((*i)->GetSpellProto()->SpellIconID) { @@ -10345,7 +10341,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT // .. taken pct: class scripts AuraEffectList const& mclassScritAuras = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); - for(AuraEffectList::const_iterator i = mclassScritAuras.begin(); i != mclassScritAuras.end(); ++i) + for (AuraEffectList::const_iterator i = mclassScritAuras.begin(); i != mclassScritAuras.end(); ++i) { switch((*i)->GetMiscValue()) { @@ -10369,13 +10365,13 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT if(attType != RANGED_ATTACK) { AuraEffectList const& mModMeleeDamageTakenPercent = pVictim->GetAurasByType(SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN_PCT); - for(AuraEffectList::const_iterator i = mModMeleeDamageTakenPercent.begin(); i != mModMeleeDamageTakenPercent.end(); ++i) + for (AuraEffectList::const_iterator i = mModMeleeDamageTakenPercent.begin(); i != mModMeleeDamageTakenPercent.end(); ++i) TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f; } else { AuraEffectList const& mModRangedDamageTakenPercent = pVictim->GetAurasByType(SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN_PCT); - for(AuraEffectList::const_iterator i = mModRangedDamageTakenPercent.begin(); i != mModRangedDamageTakenPercent.end(); ++i) + for (AuraEffectList::const_iterator i = mModRangedDamageTakenPercent.begin(); i != mModRangedDamageTakenPercent.end(); ++i) TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f; } @@ -10436,7 +10432,7 @@ void Unit::ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType ty uint32 dispelMask = GetDispellMask(type); // Dispel all existing auras vs current dispel type AuraMap& auras = GetAuras(); - for(AuraMap::iterator itr = auras.begin(); itr != auras.end(); ) + for (AuraMap::iterator itr = auras.begin(); itr != auras.end(); ) { SpellEntry const* spell = itr->second->GetSpellProto(); if( (1<<spell->Dispel) & dispelMask ) @@ -10513,7 +10509,7 @@ void Unit::Unmount() // this prevents adding a pet to a not created map which would otherwise cause a crash // (it could probably happen when logging in after a previous crash) if(GetTypeId() == TYPEID_PLAYER) - { + { if(Pet *pPet = ((Player*)this)->GetPet()) { if(pPet->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED) && !pPet->hasUnitState(UNIT_STAT_STUNNED)) @@ -10613,7 +10609,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) } } - for(Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) { (*itr)->SetInCombatState(PvP, enemy); (*itr)->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT); @@ -10639,7 +10635,7 @@ void Unit::ClearInCombat() { if(Unit *owner = GetOwner()) { - for(uint8 i = 0; i < MAX_MOVE_TYPE; ++i) + for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) if(owner->GetSpeedRate(UnitMoveType(i)) > GetSpeedRate(UnitMoveType(i))) SetSpeed(UnitMoveType(i), owner->GetSpeedRate(UnitMoveType(i)), true); } @@ -10683,7 +10679,7 @@ bool Unit::canAttack(Unit const* target, bool force) const return false; if(m_vehicle) - if(IsOnVehicle(target) || m_vehicle->GetBase()->IsOnVehicle(target)) + if(IsOnVehicle(target) || m_vehicle->GetBase()->IsOnVehicle(target)) return false; return true; @@ -10815,13 +10811,13 @@ bool Unit::canDetectInvisibilityOf(Unit const* u) const if(m_invisibilityMask & u->m_invisibilityMask) // same group return true; AuraEffectList const& auras = u->GetAurasByType(SPELL_AURA_MOD_STALKED); // Hunter mark - for(AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) + for (AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) if((*iter)->GetCasterGUID()==GetGUID()) return true; if(uint32 mask = (m_detectInvisibilityMask & u->m_invisibilityMask)) { - for(uint32 i = 0; i < 10; ++i) + for (uint32 i = 0; i < 10; ++i) { if(((1 << i) & mask)==0) continue; @@ -10829,7 +10825,7 @@ bool Unit::canDetectInvisibilityOf(Unit const* u) const // find invisibility level uint32 invLevel = 0; Unit::AuraEffectList const& iAuras = u->GetAurasByType(SPELL_AURA_MOD_INVISIBILITY); - for(Unit::AuraEffectList::const_iterator itr = iAuras.begin(); itr != iAuras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = iAuras.begin(); itr != iAuras.end(); ++itr) if(((*itr)->GetMiscValue())==i && invLevel < (*itr)->GetAmount()) invLevel = (*itr)->GetAmount(); @@ -10842,7 +10838,7 @@ bool Unit::canDetectInvisibilityOf(Unit const* u) const else { Unit::AuraEffectList const& dAuras = GetAurasByType(SPELL_AURA_MOD_INVISIBILITY_DETECTION); - for(Unit::AuraEffectList::const_iterator itr = dAuras.begin(); itr != dAuras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = dAuras.begin(); itr != dAuras.end(); ++itr) if(((*itr)->GetMiscValue())==i && detectLevel < (*itr)->GetAmount()) detectLevel = (*itr)->GetAmount(); } @@ -10867,7 +10863,7 @@ bool Unit::canDetectStealthOf(Unit const* target, float distance) const return true; AuraEffectList const& auras = target->GetAurasByType(SPELL_AURA_MOD_STALKED); // Hunter mark - for(AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) + for (AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) if((*iter)->GetCasterGUID()==GetGUID()) return true; @@ -11358,7 +11354,7 @@ Unit* Creature::SelectVictim() target = owner->getAttackerForHelper(); if (!target) { - for(ControlList::const_iterator itr = owner->m_Controlled.begin(); itr != owner->m_Controlled.end(); ++itr) + for (ControlList::const_iterator itr = owner->m_Controlled.begin(); itr != owner->m_Controlled.end(); ++itr) { if ((*itr)->isInCombat()) { @@ -11383,7 +11379,7 @@ Unit* Creature::SelectVictim() // it in combat but attacker not make any damage and not enter to aggro radius to have record in threat list // for example at owner command to pet attack some far away creature // Note: creature not have targeted movement generator but have attacker in this case - for(AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr) + for (AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr) { if((*itr) && !canCreatureAttack(*itr) && (*itr)->GetTypeId() != TYPEID_PLAYER && !((Creature*)(*itr))->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)) @@ -11403,7 +11399,7 @@ Unit* Creature::SelectVictim() if(m_invisibilityMask) { Unit::AuraEffectList const& iAuras = GetAurasByType(SPELL_AURA_MOD_INVISIBILITY); - for(Unit::AuraEffectList::const_iterator itr = iAuras.begin(); itr != iAuras.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = iAuras.begin(); itr != iAuras.end(); ++itr) if((*itr)->GetParentAura()->IsPermanent()) { AI()->EnterEvadeMode(); @@ -11512,7 +11508,7 @@ int32 Unit::ModSpellDuration(SpellEntry const* spellProto, Unit const* target, i int32 durationMod_always = 0; int32 durationMod_not_stack = 0; - for (uint8 i = 1;i<=MECHANIC_ENRAGED;++i) + for (uint8 i = 1; i<=MECHANIC_ENRAGED; ++i) { if (!(mechanic & 1<<i)) continue; @@ -11603,7 +11599,7 @@ void Unit::ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spel DiminishingLevels Unit::GetDiminishing(DiminishingGroup group) { - for(Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i) + for (Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i) { if(i->DRGroup != group) continue; @@ -11632,7 +11628,7 @@ DiminishingLevels Unit::GetDiminishing(DiminishingGroup group) void Unit::IncrDiminishing(DiminishingGroup group) { // Checking for existing in the table - for(Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i) + for (Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i) { if(i->DRGroup != group) continue; @@ -11684,7 +11680,7 @@ void Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration,Un void Unit::ApplyDiminishingAura( DiminishingGroup group, bool apply ) { // Checking for existing in the table - for(Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i) + for (Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i) { if(i->DRGroup != group) continue; @@ -12293,7 +12289,7 @@ void Unit::DeleteCharmInfo() CharmInfo::CharmInfo(Unit* unit) : m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_petnumber(0), m_barInit(false) { - for(uint8 i = 0; i < MAX_SPELL_CHARM; ++i) + for (uint8 i = 0; i < MAX_SPELL_CHARM; ++i) m_charmspells[i].SetActionAndType(0,ACT_DISABLED); if(m_unit->GetTypeId() == TYPEID_UNIT) @@ -12315,15 +12311,15 @@ CharmInfo::~CharmInfo() void CharmInfo::InitPetActionBar() { // the first 3 SpellOrActions are attack, follow and stay - for(uint32 i = 0; i < ACTION_BAR_INDEX_PET_SPELL_START - ACTION_BAR_INDEX_START; ++i) + for (uint32 i = 0; i < ACTION_BAR_INDEX_PET_SPELL_START - ACTION_BAR_INDEX_START; ++i) SetActionBar(ACTION_BAR_INDEX_START + i,COMMAND_ATTACK - i,ACT_COMMAND); // middle 4 SpellOrActions are spells/special attacks/abilities - for(uint32 i = 0; i < ACTION_BAR_INDEX_PET_SPELL_END-ACTION_BAR_INDEX_PET_SPELL_START; ++i) + for (uint32 i = 0; i < ACTION_BAR_INDEX_PET_SPELL_END-ACTION_BAR_INDEX_PET_SPELL_START; ++i) SetActionBar(ACTION_BAR_INDEX_PET_SPELL_START + i,0,ACT_PASSIVE); // last 3 SpellOrActions are reactions - for(uint32 i = 0; i < ACTION_BAR_INDEX_END - ACTION_BAR_INDEX_PET_SPELL_END; ++i) + for (uint32 i = 0; i < ACTION_BAR_INDEX_END - ACTION_BAR_INDEX_PET_SPELL_END; ++i) SetActionBar(ACTION_BAR_INDEX_PET_SPELL_END + i,COMMAND_ATTACK - i,ACT_REACTION); } @@ -12333,7 +12329,7 @@ void CharmInfo::InitEmptyActionBar(bool withAttack) SetActionBar(ACTION_BAR_INDEX_START,COMMAND_ATTACK,ACT_COMMAND); else SetActionBar(ACTION_BAR_INDEX_START,0,ACT_PASSIVE); - for(uint32 x = ACTION_BAR_INDEX_START+1; x < ACTION_BAR_INDEX_END; ++x) + for (uint32 x = ACTION_BAR_INDEX_START+1; x < ACTION_BAR_INDEX_END; ++x) SetActionBar(x,0,ACT_PASSIVE); } @@ -12342,7 +12338,7 @@ void CharmInfo::InitPossessCreateSpells() InitEmptyActionBar(); if(m_unit->GetTypeId() == TYPEID_UNIT) { - for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i) + for (uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i) { uint32 spellId = ((Creature*)m_unit)->m_spells[i]; SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); @@ -12366,7 +12362,7 @@ void CharmInfo::InitCharmCreateSpells() InitPetActionBar(); - for(uint32 x = 0; x < MAX_SPELL_CHARM; ++x) + for (uint32 x = 0; x < MAX_SPELL_CHARM; ++x) { uint32 spellId = ((Creature*)m_unit)->m_spells[x]; SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); @@ -12396,7 +12392,7 @@ void CharmInfo::InitCharmCreateSpells() else { bool autocast = false; - for(uint32 i = 0; i < MAX_SPELL_EFFECTS && !autocast; ++i) + for (uint32 i = 0; i < MAX_SPELL_EFFECTS && !autocast; ++i) if(SpellTargetType[spellInfo->EffectImplicitTargetA[i]] == TARGET_TYPE_UNIT_TARGET) autocast = true; @@ -12420,7 +12416,7 @@ bool CharmInfo::AddSpellToActionBar(uint32 spell_id, ActiveStates newstate) uint32 first_id = spellmgr.GetFirstSpellInChain(spell_id); // new spell rank can be already listed - for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) + for (uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) { if (uint32 action = PetActionBar[i].GetAction()) { @@ -12433,7 +12429,7 @@ bool CharmInfo::AddSpellToActionBar(uint32 spell_id, ActiveStates newstate) } // or use empty slot in other case - for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) + for (uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) { if (!PetActionBar[i].GetAction() && PetActionBar[i].IsActionBarForSpell()) { @@ -12448,7 +12444,7 @@ bool CharmInfo::RemoveSpellFromActionBar(uint32 spell_id) { uint32 first_id = spellmgr.GetFirstSpellInChain(spell_id); - for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) + for (uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) { if (uint32 action = PetActionBar[i].GetAction()) { @@ -12468,7 +12464,7 @@ void CharmInfo::ToggleCreatureAutocast(uint32 spellid, bool apply) if(IsPassiveSpell(spellid)) return; - for(uint32 x = 0; x < MAX_SPELL_CHARM; ++x) + for (uint32 x = 0; x < MAX_SPELL_CHARM; ++x) if(spellid == m_charmspells[x].GetAction()) m_charmspells[x].SetType(apply ? ACT_ENABLED : ACT_DISABLED); } @@ -12493,7 +12489,7 @@ void CharmInfo::LoadPetActionBar(const std::string& data ) uint8 index; Tokens::iterator iter; - for(iter = tokens.begin(), index = ACTION_BAR_INDEX_PET_SPELL_START; index < ACTION_BAR_INDEX_PET_SPELL_END; ++iter, ++index ) + for (iter = tokens.begin(), index = ACTION_BAR_INDEX_PET_SPELL_START; index < ACTION_BAR_INDEX_PET_SPELL_END; ++iter, ++index ) { // use unsigned cast to avoid sign negative format use at long-> ActiveStates (int) conversion uint8 type = atol((*iter).c_str()); @@ -12515,13 +12511,13 @@ void CharmInfo::LoadPetActionBar(const std::string& data ) void CharmInfo::BuildActionBar( WorldPacket* data ) { - for(uint32 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) + for (uint32 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) *data << uint32(PetActionBar[i].packedData); } void CharmInfo::SetSpellAutocast( uint32 spell_id, bool state ) { - for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) + for (uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i) { if(spell_id == PetActionBar[i].GetAction() && PetActionBar[i].IsActionBarForSpell()) { @@ -12715,7 +12711,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag ProcTriggeredList procTriggered; // Fill procTriggered list - for(AuraMap::const_iterator itr = GetAuras().begin(); itr!= GetAuras().end(); ++itr) + for (AuraMap::const_iterator itr = GetAuras().begin(); itr!= GetAuras().end(); ++itr) { // Do not allow auras to proc from effect triggered by itself if (procAura && procAura->Id == itr->first) @@ -12727,7 +12723,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag if(!IsTriggeredAtSpellProcEvent(pTarget, triggerData.aura, procSpell, procFlag, procExtra, attType, isVictim, active, triggerData.spellProcEvent)) continue; - for (uint8 i=0; i<MAX_SPELL_EFFECTS;++i) + for (uint8 i=0; i<MAX_SPELL_EFFECTS; ++i) { if (AuraEffect * aurEff = itr->second->GetPartAura(i)) { @@ -12752,7 +12748,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag SetCantProc(true); // Handle effects proceed this time - for(ProcTriggeredList::const_iterator i = procTriggered.begin(); i != procTriggered.end(); ++i) + for (ProcTriggeredList::const_iterator i = procTriggered.begin(); i != procTriggered.end(); ++i) { // look for aura in auras list, it may be removed while proc event processing if (!HasAura(i->aura)) @@ -12780,7 +12776,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag } if (!handled) - for (uint8 effIndex = 0; effIndex<MAX_SPELL_EFFECTS;++effIndex) + for (uint8 effIndex = 0; effIndex<MAX_SPELL_EFFECTS; ++effIndex) { if (!(i->effMask & (1<<effIndex))) continue; @@ -13117,7 +13113,7 @@ void Unit::ClearComboPointHolders() void Unit::ClearAllReactives() { - for(uint8 i=0; i < MAX_REACTIVE; ++i) + for (uint8 i=0; i < MAX_REACTIVE; ++i) m_reactiveTimer[i] = 0; if (HasAuraState( AURA_STATE_DEFENSE)) @@ -13130,7 +13126,7 @@ void Unit::ClearAllReactives() void Unit::UpdateReactives( uint32 p_time ) { - for(uint8 i = 0; i < MAX_REACTIVE; ++i) + for (uint8 i = 0; i < MAX_REACTIVE; ++i) { ReactiveType reactive = ReactiveType(i); @@ -13178,7 +13174,7 @@ Unit* Unit::SelectNearbyTarget(float dist) const targets.remove(getVictim()); // remove not LoS targets - for(std::list<Unit *>::iterator tIter = targets.begin(); tIter != targets.end();) + for (std::list<Unit *>::iterator tIter = targets.begin(); tIter != targets.end(); ) { if(!IsWithinLOSInMap(*tIter)) { @@ -13197,7 +13193,7 @@ Unit* Unit::SelectNearbyTarget(float dist) const // select random uint32 rIdx = urand(0,targets.size()-1); std::list<Unit *>::const_iterator tcIter = targets.begin(); - for(uint32 i = 0; i < rIdx; ++i) + for (uint32 i = 0; i < rIdx; ++i) ++tcIter; return *tcIter; @@ -13254,7 +13250,7 @@ uint32 Unit::GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectT bool DirectDamage = false; bool AreaEffect = false; - for ( uint32 i=0; i<MAX_SPELL_EFFECTS;i++) + for (uint32 i=0; i<MAX_SPELL_EFFECTS; i++) { switch ( spellProto->Effect[i] ) { @@ -13311,7 +13307,7 @@ uint32 Unit::GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectT CastingTime /= 2; // -5% of total per any additional effect - for ( uint8 i=0; i<effects; ++i) + for (uint8 i=0; i<effects; ++i) { if ( CastingTime > 175 ) { @@ -13383,7 +13379,7 @@ float Unit::GetAPMultiplier(WeaponAttackType attType, bool normalized) AuraEffect* Unit::GetAuraEffect(AuraType type, SpellFamilyNames name, uint32 iconId, uint8 effIndex) const { Unit::AuraEffectList const& mDummy = GetAurasByType(type); - for(Unit::AuraEffectList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr) + for (Unit::AuraEffectList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr) { if (effIndex != (*itr)->GetEffIndex()) continue; @@ -13520,7 +13516,7 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co } // Aura added by spell can`t trigger from self (prevent drop charges/do triggers) // But except periodic and kill triggers (can triggered from self) - if(procSpell && procSpell->Id == spellProto->Id + if(procSpell && procSpell->Id == spellProto->Id && !(spellProto->procFlags&(PROC_FLAG_ON_TAKE_PERIODIC | PROC_FLAG_KILL))) return false; @@ -13721,7 +13717,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss) if(!bRewardIsAllowed) ((Creature*)pVictim)->SetLootRecipient(NULL); } - + if(bRewardIsAllowed && pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->GetLootRecipient()) player = ((Creature*)pVictim)->GetLootRecipient(); // Reward player, his pets, and group/raid members @@ -13742,7 +13738,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss) if(pVictim->GetTypeId()==TYPEID_PLAYER && pVictim->getClass()==CLASS_PRIEST) { AuraEffectList const& vDummyAuras = pVictim->GetAurasByType(SPELL_AURA_DUMMY); - for(AuraEffectList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr) + for (AuraEffectList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr) { if((*itr)->GetSpellProto()->SpellIconID==1654) { @@ -14380,7 +14376,7 @@ void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius) Group *pGroup = owner->GetGroup(); if(pGroup) { - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -14416,7 +14412,7 @@ void Unit::GetPartyMemberInDist(std::list<Unit*> &TagUnitMap, float radius) { uint8 subgroup = ((Player*)owner)->GetSubGroup(); - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -14453,7 +14449,7 @@ void Unit::GetPartyMembers(std::list<Unit*> &TagUnitMap) { uint8 subgroup = ((Player*)owner)->GetSubGroup(); - for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -14522,7 +14518,7 @@ void Unit::AddAura(uint32 spellId, Unit *target) uint8 eff_mask=0; Unit * source = this; - for(uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if(spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA || IsAreaAuraEffect(spellInfo->Effect[i])) { @@ -14666,11 +14662,11 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) if(!IsInWorld()) return; - for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) if((*itr)->GetTypeId() == TYPEID_UNIT) (*itr)->SetPhaseMask(newPhaseMask,true); - for(uint8 i = 0; i < MAX_SUMMON_SLOT; ++i) + for (uint8 i = 0; i < MAX_SUMMON_SLOT; ++i) if(m_SummonSlot[i]) if(Creature *summon = GetMap()->GetCreature(m_SummonSlot[i])) summon->SetPhaseMask(newPhaseMask,true); @@ -14818,7 +14814,7 @@ void Unit::ExitVehicle() Unit *vehicleBase = m_vehicle->GetBase(); const AuraEffectList &modAuras = vehicleBase->GetAurasByType(SPELL_AURA_CONTROL_VEHICLE); - for(AuraEffectList::const_iterator itr = modAuras.begin(); itr != modAuras.end(); ++itr) + for (AuraEffectList::const_iterator itr = modAuras.begin(); itr != modAuras.end(); ++itr) { if((*itr)->GetParentAura()->GetSourceGUID() == GetGUID()) { @@ -15019,7 +15015,6 @@ void Unit::SendThreatListUpdate() } } - void Unit::SendChangeCurrentVictimOpcode(HostilReference* pHostilReference) { if (uint32 count = getThreatManager().getThreatList().size()) @@ -15095,24 +15090,24 @@ void Unit::OutDebugInfo() const sLog.outString("In world %u, unit type mask %u", (uint32)(IsInWorld() ? 1 : 0), m_unitTypeMask); sLog.outStringInLine("Summon Slot: "); - for(uint32 i = 0; i < MAX_SUMMON_SLOT; ++i) + for (uint32 i = 0; i < MAX_SUMMON_SLOT; ++i) sLog.outStringInLine(UI64FMTD", ", m_SummonSlot[i]); sLog.outString(); sLog.outStringInLine("Controlled List: "); - for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) + for (ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) sLog.outStringInLine(UI64FMTD", ", (*itr)->GetGUID()); sLog.outString(); sLog.outStringInLine("Aura List: "); - for(AuraMap::const_iterator itr = m_Auras.begin(); itr != m_Auras.end(); ++itr) + for (AuraMap::const_iterator itr = m_Auras.begin(); itr != m_Auras.end(); ++itr) sLog.outStringInLine("%u, ", itr->first); sLog.outString(); if(IsVehicle()) { sLog.outStringInLine("Passenger List: "); - for(SeatMap::iterator itr = GetVehicleKit()->m_Seats.begin(); itr != GetVehicleKit()->m_Seats.end(); ++itr) + for (SeatMap::iterator itr = GetVehicleKit()->m_Seats.begin(); itr != GetVehicleKit()->m_Seats.end(); ++itr) if(Unit *passenger = itr->second.passenger) sLog.outStringInLine(UI64FMTD", ", passenger->GetGUID()); sLog.outString(); diff --git a/src/game/Unit.h b/src/game/Unit.h index efe615d5c17..d6f22930c61 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -36,7 +36,6 @@ #include "DBCStructure.h" #include <list> - #define WORLD_TRIGGER 12999 enum SpellInterruptFlags @@ -671,7 +670,7 @@ enum MovementFlags MOVEMENTFLAG_JUMPING |MOVEMENTFLAG_FALLING |MOVEMENTFLAG_ASCEND | MOVEMENTFLAG_SPLINE, MOVEMENTFLAG_TURNING = - MOVEMENTFLAG_LEFT | MOVEMENTFLAG_RIGHT, + MOVEMENTFLAG_LEFT | MOVEMENTFLAG_RIGHT, }; /* @@ -891,7 +890,6 @@ enum CurrentSpellTypes #define CURRENT_FIRST_NON_MELEE_SPELL 1 #define CURRENT_MAX_SPELL 4 - enum ActiveStates { ACT_PASSIVE = 0x01, // 0x01 - passive @@ -1208,7 +1206,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject float f_BaseAttackTime = GetFloatValue(UNIT_FIELD_BASEATTACKTIME+att) / m_modAttackSpeedPct[att]; return (uint32)f_BaseAttackTime; } - + void SetAttackTime(WeaponAttackType att, uint32 val) { SetFloatValue(UNIT_FIELD_BASEATTACKTIME+att,val*m_modAttackSpeedPct[att]); } void ApplyAttackTimePercentMod(WeaponAttackType att,float val, bool apply); void ApplyCastTimePercentMod(float val, bool apply); @@ -1535,8 +1533,8 @@ class TRINITY_DLL_SPEC Unit : public WorldObject void ApplyResistanceBuffModsPercentMod(SpellSchools school, bool positive, float val, bool apply) { ApplyPercentModFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply); } void InitStatBuffMods() { - for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) SetFloatValue(UNIT_FIELD_POSSTAT0+i, 0); - for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) SetFloatValue(UNIT_FIELD_NEGSTAT0+i, 0); + for (uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) SetFloatValue(UNIT_FIELD_POSSTAT0+i, 0); + for (uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) SetFloatValue(UNIT_FIELD_NEGSTAT0+i, 0); } void ApplyStatBuffMod(Stats stat, float val, bool apply) { ApplyModSignedFloatValue((val > 0 ? UNIT_FIELD_POSSTAT0+stat : UNIT_FIELD_NEGSTAT0+stat), val, apply); } void ApplyStatPercentBuffMod(Stats stat, float val, bool apply) diff --git a/src/game/UnitAI.cpp b/src/game/UnitAI.cpp index 728e6f36916..85b8ad6abba 100644 --- a/src/game/UnitAI.cpp +++ b/src/game/UnitAI.cpp @@ -126,7 +126,7 @@ Unit* UnitAI::SelectTarget(SelectAggroTarget targetType, uint32 position, float return NULL; std::list<Unit*> targetList; - for(std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) + for (std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) if(SelectTargetHelper(me, (*itr)->getTarget(), playerOnly, dist, aura)) targetList.push_back((*itr)->getTarget()); @@ -195,7 +195,7 @@ void UnitAI::SelectTargetList(std::list<Unit*> &targetList, uint32 num, SelectAg if(m_threatlist.empty()) return; - for(std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) + for (std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) if(SelectTargetHelper(me, (*itr)->getTarget(), playerOnly, dist, aura)) targetList.push_back((*itr)->getTarget()); @@ -284,7 +284,7 @@ void UnitAI::FillAISpellInfo() AISpellInfoType *AIInfo = AISpellInfo; const SpellEntry * spellInfo; - for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i, ++AIInfo) + for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i, ++AIInfo) { spellInfo = GetSpellStore()->LookupEntry(i); if(!spellInfo) @@ -304,7 +304,7 @@ void UnitAI::FillAISpellInfo() UPDATE_TARGET(AITARGET_SELF) else { - for(uint32 j = 0; j < 3; ++j) + for (uint32 j = 0; j < 3; ++j) { uint32 targetType = spellInfo->EffectImplicitTargetA[j]; @@ -341,7 +341,7 @@ void SimpleCharmedAI::UpdateAI(const uint32 /*diff*/) if(charmer->IsInEvadeMode()) { Unit::AuraEffectList const& auras = me->GetAurasByType(SPELL_AURA_MOD_CHARM); - for(Unit::AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) + for (Unit::AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) if((*iter)->GetCasterGUID() == charmer->GetGUID() && (*iter)->GetParentAura()->IsPermanent()) { charmer->Kill(me); diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp index e461d63e248..ccf51d2dc8a 100644 --- a/src/game/UpdateData.cpp +++ b/src/game/UpdateData.cpp @@ -116,7 +116,7 @@ bool UpdateData::BuildPacket(WorldPacket *packet) buf << (uint8) UPDATETYPE_OUT_OF_RANGE_OBJECTS; buf << (uint32) m_outOfRangeGUIDs.size(); - for(std::set<uint64>::const_iterator i = m_outOfRangeGUIDs.begin(); i != m_outOfRangeGUIDs.end(); ++i) + for (std::set<uint64>::const_iterator i = m_outOfRangeGUIDs.begin(); i != m_outOfRangeGUIDs.end(); ++i) { buf.appendPackGUID(*i); } diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp index 50236430bbe..01519c999a4 100644 --- a/src/game/Vehicle.cpp +++ b/src/game/Vehicle.cpp @@ -29,7 +29,7 @@ Vehicle::Vehicle(Unit *unit, VehicleEntry const *vehInfo) : me(unit), m_vehicleInfo(vehInfo), m_usableSeatNum(0) { - for(uint32 i = 0; i < 8; ++i) + for (uint32 i = 0; i < 8; ++i) { if(uint32 seatId = m_vehicleInfo->m_seatID[i]) if(VehicleSeatEntry const *veSeat = sVehicleSeatStore.LookupEntry(seatId)) @@ -37,14 +37,14 @@ Vehicle::Vehicle(Unit *unit, VehicleEntry const *vehInfo) : me(unit), m_vehicleI m_Seats.insert(std::make_pair(i, VehicleSeat(veSeat))); if(veSeat->IsUsable()) ++m_usableSeatNum; - } + } } assert(!m_Seats.empty()); } Vehicle::~Vehicle() { - for(SeatMap::const_iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) + for (SeatMap::const_iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) assert(!itr->second.passenger); } @@ -64,7 +64,7 @@ void Vehicle::Install() } else { - for(uint32 i = 0; i < MAX_SPELL_VEHICLE; ++i) + for (uint32 i = 0; i < MAX_SPELL_VEHICLE; ++i) { if(!cre->m_spells[i]) continue; @@ -121,7 +121,7 @@ void Vehicle::InstallAllAccessories() void Vehicle::Uninstall() { sLog.outDebug("Vehicle::Uninstall %u", me->GetEntry()); - for(SeatMap::iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) + for (SeatMap::iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) if(Unit *passenger = itr->second.passenger) if(passenger->HasUnitTypeMask(UNIT_MASK_ACCESSORY)) ((TempSummon*)passenger)->UnSummon(); @@ -131,7 +131,7 @@ void Vehicle::Uninstall() void Vehicle::Die() { sLog.outDebug("Vehicle::Die %u", me->GetEntry()); - for(SeatMap::iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) + for (SeatMap::iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) if(Unit *passenger = itr->second.passenger) if(passenger->HasUnitTypeMask(UNIT_MASK_ACCESSORY)) passenger->setDeathState(JUST_DIED); @@ -149,7 +149,7 @@ void Vehicle::Reset() void Vehicle::RemoveAllPassengers() { sLog.outDebug("Vehicle::RemoveAllPassengers"); - for(SeatMap::iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) + for (SeatMap::iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr) if(Unit *passenger = itr->second.passenger) { if(passenger->IsVehicle()) @@ -238,7 +238,7 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId) SeatMap::iterator seat; if(seatId < 0) // no specific seat requirement { - for(seat = m_Seats.begin(); seat != m_Seats.end(); ++seat) + for (seat = m_Seats.begin(); seat != m_Seats.end(); ++seat) if(!seat->second.passenger && seat->second.seatInfo->IsUsable()) break; @@ -312,7 +312,7 @@ void Vehicle::RemovePassenger(Unit *unit) return; SeatMap::iterator seat; - for(seat = m_Seats.begin(); seat != m_Seats.end(); ++seat) + for (seat = m_Seats.begin(); seat != m_Seats.end(); ++seat) if(seat->second.passenger == unit) break; diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp index b9fb027d9c5..e7079321206 100644 --- a/src/game/WaypointManager.cpp +++ b/src/game/WaypointManager.cpp @@ -101,7 +101,7 @@ void WaypointStore::UpdatePath(uint32 id) { if(waypoint_map.find(id)!= waypoint_map.end()) waypoint_map[id]->clear(); - + QueryResult *result; result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data WHERE id = %u ORDER BY point", id); diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index cba005a78d9..fe5d20bbc91 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -56,7 +56,7 @@ bool WaypointMovementGenerator<Creature>::GetDestination(float &x, float &y, flo { if(i_destinationHolder.HasArrived()) return false; - + i_destinationHolder.GetDestination(x, y, z); return true; } @@ -235,7 +235,7 @@ uint32 FlightPathMovementGenerator::GetPathAtMapEnd() const return i_mapIds.size(); uint32 curMapId = i_mapIds[i_currentNode]; - for(uint32 i = i_currentNode; i < i_mapIds.size(); ++i) + for (uint32 i = i_currentNode; i < i_mapIds.size(); ++i) { if(i_mapIds[i] != curMapId) return i; @@ -326,7 +326,7 @@ void FlightPathMovementGenerator::SetCurrentNodeAfterTeleport() return; uint32 map0 = i_mapIds[0]; - for(size_t i = 1; i < i_mapIds.size(); ++i) + for (size_t i = 1; i < i_mapIds.size(); ++i) { if(i_mapIds[i]!=map0) { diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp index ea336ec870e..9b17f5bd252 100644 --- a/src/game/Wintergrasp.cpp +++ b/src/game/Wintergrasp.cpp @@ -248,7 +248,7 @@ bool OPvPWintergrasp::SetupOutdoorPvP() // Load Graveyard GraveYardMap::const_iterator graveLow = objmgr.mGraveYardMap.lower_bound(ZONE_WINTERGRASP); GraveYardMap::const_iterator graveUp = objmgr.mGraveYardMap.upper_bound(ZONE_WINTERGRASP); - for (AreaPOIList::iterator itr = areaPOIs.begin(); itr != areaPOIs.end();) + for (AreaPOIList::iterator itr = areaPOIs.begin(); itr != areaPOIs.end(); ) { if ((*itr)->icon[1] == 8) { diff --git a/src/game/Wintergrasp.h b/src/game/Wintergrasp.h index 92a7b2acd9b..7db42e759e2 100644 --- a/src/game/Wintergrasp.h +++ b/src/game/Wintergrasp.h @@ -66,7 +66,6 @@ enum WintergraspRewardEvent WG_REWARD_EVENT_MAX, }; - /* Not used / Not implemented const uint16 GameEventWintergraspDefender[2] = {50, 51}; diff --git a/src/game/World.cpp b/src/game/World.cpp index 17b2529002f..81784f2c09a 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -280,7 +280,7 @@ bool World::HasRecentlyDisconnected(WorldSession* session) if (uint32 tolerance = getConfig(CONFIG_INTERVAL_DISCONNECT_TOLERANCE)) { - for (DisconnectMap::iterator i = m_disconnects.begin(); i != m_disconnects.end();) + for (DisconnectMap::iterator i = m_disconnects.begin(); i != m_disconnects.end(); ) { if (difftime(i->second, time(NULL)) < tolerance) { @@ -335,7 +335,7 @@ bool World::RemoveQueuedPlayer(WorldSession* sess) // search to remove and count skipped positions bool found = false; - for (;iter != m_QueuedPlayer.end(); ++iter, ++position) + for (; iter != m_QueuedPlayer.end(); ++iter, ++position) { if (*iter==sess) { @@ -1078,7 +1078,7 @@ void World::LoadConfigSettings(bool reload) sLog.outError("Visibility.Distance.Continents can't be greater %f",MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance); m_MaxVisibleDistanceOnContinents = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance; } - + //visibility in instances m_MaxVisibleDistanceInInstances = sConfig.GetFloatDefault("Visibility.Distance.Instances", DEFAULT_VISIBILITY_INSTANCE); if(m_MaxVisibleDistanceInInstances < 45*sWorld.getRate(RATE_CREATURE_AGGRO)) @@ -1091,7 +1091,7 @@ void World::LoadConfigSettings(bool reload) sLog.outError("Visibility.Distance.Instances can't be greater %f",MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance); m_MaxVisibleDistanceInInstances = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance; } - + //visibility in BG/Arenas m_MaxVisibleDistanceInBGArenas = sConfig.GetFloatDefault("Visibility.Distance.BGArenas", DEFAULT_VISIBILITY_BGARENAS); if(m_MaxVisibleDistanceInBGArenas < 45*sWorld.getRate(RATE_CREATURE_AGGRO)) @@ -1151,7 +1151,6 @@ void World::LoadConfigSettings(bool reload) sLog.outString("WORLD: VMap data directory is: %svmaps",m_dataPath.c_str()); sLog.outString("WORLD: VMap config keys are: vmap.enableLOS, vmap.enableHeight, vmap.ignoreMapIds, vmap.ignoreSpellIds"); - m_configs[CONFIG_MAX_WHO] = sConfig.GetIntDefault("MaxWhoListReturns", 49); m_configs[CONFIG_PET_LOS] = sConfig.GetBoolDefault("vmap.petLOS", false); m_configs[CONFIG_BG_START_MUSIC] = sConfig.GetBoolDefault("MusicInBattleground", false); @@ -1171,7 +1170,7 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED] = sConfig.GetBoolDefault("OutdoorPvP.Wintergrasp.Enabled", true); m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.StartTime", 30); - m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.BattleTime", 30); + m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.BattleTime", 30); m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.Interval", 150); m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_CUSTOM_HONOR] = sConfig.GetBoolDefault("OutdoorPvP.Wintergrasp.CustomHonorRewards", false); m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_WIN_BATTLE] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorBattleWin", 3000); @@ -1930,11 +1929,9 @@ void World::Update(uint32 diff) sBattleGroundMgr.Update(diff); RecordTimeDiff("UpdateBattleGroundMgr"); - sOutdoorPvPMgr.Update(diff); RecordTimeDiff("UpdateOutdoorPvPMgr"); - // execute callbacks from sql queries that were queued recently UpdateResultQueue(); RecordTimeDiff("UpdateResultQueue"); diff --git a/src/game/World.h b/src/game/World.h index 5e64e74661e..a5de315ad7a 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -254,7 +254,7 @@ enum WorldConfigs CONFIG_MIN_LOG_UPDATE, CONFIG_CHECK_DB, CONFIG_ENABLE_SINFO_LOGIN, - CONFIG_PET_LOS, + CONFIG_PET_LOS, CONFIG_NUMTHREADS, CONFIG_OFFHAND_CHECK_AT_SPELL_UNLEARN, CONFIG_CHATLOG_CHANNEL, @@ -588,7 +588,7 @@ class World static float GetMaxVisibleDistanceInInstances() { return m_MaxVisibleDistanceInInstances; } static float GetMaxVisibleDistanceInBGArenas() { return m_MaxVisibleDistanceInBGArenas; } static float GetMaxVisibleDistanceForObject() { return m_MaxVisibleDistanceForObject; } - + static float GetMaxVisibleDistanceInFlight() { return m_MaxVisibleDistanceInFlight; } static float GetVisibleUnitGreyDistance() { return m_VisibleUnitGreyDistance; } static float GetVisibleObjectGreyDistance() { return m_VisibleObjectGreyDistance; } @@ -676,7 +676,7 @@ class World static float m_MaxVisibleDistanceInInstances; static float m_MaxVisibleDistanceInBGArenas; static float m_MaxVisibleDistanceForObject; - + static float m_MaxVisibleDistanceInFlight; static float m_VisibleUnitGreyDistance; static float m_VisibleObjectGreyDistance; diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index f5515bf78c1..83144d2644f 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -162,7 +162,7 @@ void WorldSession::LogUnprocessedTail(WorldPacket *packet) LookupOpcodeName(packet->GetOpcode()), packet->GetOpcode(), packet->rpos(),packet->wpos()); - + packet->print_storage(); } @@ -321,7 +321,7 @@ void WorldSession::LogoutPlayer(bool Save) // build set of player who attack _player or who have pet attacking of _player std::set<Player*> aset; - for(Unit::AttackerSet::const_iterator itr = _player->getAttackers().begin(); itr != _player->getAttackers().end(); ++itr) + for (Unit::AttackerSet::const_iterator itr = _player->getAttackers().begin(); itr != _player->getAttackers().end(); ++itr) { Unit* owner = (*itr)->GetOwner(); // including player controlled case if(owner) @@ -340,7 +340,7 @@ void WorldSession::LogoutPlayer(bool Save) _player->RepopAtGraveyard(); // give honor to all attackers from set like group case - for(std::set<Player*>::const_iterator itr = aset.begin(); itr != aset.end(); ++itr) + for (std::set<Player*>::const_iterator itr = aset.begin(); itr != aset.end(); ++itr) (*itr)->RewardHonor(_player,aset.size()); // give bg rewards and update counters like kill by first from attackers @@ -405,7 +405,7 @@ void WorldSession::LogoutPlayer(bool Save) if(Save) { uint32 eslot; - for(int j = BUYBACK_SLOT_START; j < BUYBACK_SLOT_END; ++j) + for (int j = BUYBACK_SLOT_START; j < BUYBACK_SLOT_END; ++j) { eslot = j - BUYBACK_SLOT_START; _player->SetUInt64Value(PLAYER_FIELD_VENDORBUYBACK_SLOT_1 + (eslot * 2), 0); @@ -658,14 +658,14 @@ void WorldSession::SendAccountDataTimes() WorldPacket data( 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(m_accountData[i].Time); // also unix time SendPacket(&data); } void WorldSession::LoadTutorialsData() { - for ( int aX = 0 ; aX < 8 ; ++aX ) + for (int aX = 0 ; aX < 8 ; ++aX ) m_Tutorials[ aX ] = 0; QueryResult *result = CharacterDatabase.PQuery("SELECT tut0,tut1,tut2,tut3,tut4,tut5,tut6,tut7 FROM character_tutorial WHERE account = '%u'", GetAccountId()); @@ -690,7 +690,7 @@ void WorldSession::LoadTutorialsData() void WorldSession::SendTutorialsData() { WorldPacket data(SMSG_TUTORIAL_FLAGS, 4*8); - for(uint32 i = 0; i < 8; ++i) + for (uint32 i = 0; i < 8; ++i) data << m_Tutorials[i]; SendPacket(&data); } @@ -794,7 +794,7 @@ void WorldSession::ReadAddonsInfo(WorldPacket &data) uint32 addonsCount; addonInfo >> addonsCount; // addons count - for(uint32 i = 0; i < addonsCount; ++i) + for (uint32 i = 0; i < addonsCount; ++i) { std::string addonName; uint8 enabled; @@ -847,7 +847,7 @@ void WorldSession::SendAddonsInfo() WorldPacket data(SMSG_ADDON_INFO, 4); - for(AddonsList::iterator itr = m_addonsList.begin(); itr != m_addonsList.end(); ++itr) + for (AddonsList::iterator itr = m_addonsList.begin(); itr != m_addonsList.end(); ++itr) { uint8 state = 2; // 2 is sent here data << uint8(state); @@ -877,7 +877,7 @@ void WorldSession::SendAddonsInfo() uint32 count = 0; data << uint32(count); - /*for(uint32 i = 0; i < count; ++i) + /*for (uint32 i = 0; i < count; ++i) { uint32 string (16 bytes) @@ -895,4 +895,4 @@ void WorldSession::SetPlayer( Player *plr ) // set m_GUID that can be used while player loggined and later until m_playerRecentlyLogout not reset if(_player) m_GUIDLow = _player->GetGUIDLow(); -}
\ No newline at end of file +} diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp index 1b63ec01421..c45e6b943d6 100644 --- a/src/game/WorldSocket.cpp +++ b/src/game/WorldSocket.cpp @@ -965,10 +965,9 @@ int WorldSocket::iSendPacket (const WorldPacket& pct) errno = ENOBUFS; return -1; } - - + m_Crypt.EncryptSend ( header.header, header.getHeaderLength()); - + if (m_OutBuffer->copy ((char*) header.header, header.getHeaderLength()) == -1) ACE_ASSERT (false); diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp index cc08962efa5..2a34041c43f 100644 --- a/src/game/WorldSocketMgr.cpp +++ b/src/game/WorldSocketMgr.cpp @@ -171,7 +171,7 @@ class ReactorRunnable : protected ACE_Task_Base AddNewSockets (); - for (i = m_Sockets.begin (); i != m_Sockets.end ();) + for (i = m_Sockets.begin (); i != m_Sockets.end (); ) { if ((*i)->Update () == -1) { |