diff options
author | Spp <none@none> | 2010-04-07 19:14:10 +0200 |
---|---|---|
committer | Spp <none@none> | 2010-04-07 19:14:10 +0200 |
commit | d19e12708001fbef2308be0e8cb5375a2ac7af48 (patch) | |
tree | 09fc8f67a6197802e0512950f0b0a3438a9834e8 /src/game/AchievementMgr.cpp | |
parent | 2e127f7a30706dc1d40c65de22ff02851732da24 (diff) |
Code style (game + scripts only):
"if(" --> "if ("
--HG--
branch : trunk
Diffstat (limited to 'src/game/AchievementMgr.cpp')
-rw-r--r-- | src/game/AchievementMgr.cpp | 318 |
1 files changed, 159 insertions, 159 deletions
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 29ef589bf24..dd2ad673d54 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -75,7 +75,7 @@ namespace Trinity bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) { - if(dataType >= MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE) + if (dataType >= MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE) { sLog.outErrorDb( "Table `achievement_criteria_data` for criteria (Entry: %u) have wrong data type (%u), ignore.", criteria->ID,dataType); return false; @@ -229,7 +229,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) } return true; case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_DRUNK: - if(drunk.state >= MAX_DRUNKEN) + if (drunk.state >= MAX_DRUNKEN) { sLog.outErrorDb( "Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_S_DRUNK (%u) have unknown drunken state in value1 (%u), ignore.", criteria->ID, criteria->requiredType,dataType,drunk.state); @@ -274,9 +274,9 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_PLAYER_CLASS_RACE: if (!target || target->GetTypeId() != TYPEID_PLAYER) return false; - if(classRace.class_id && classRace.class_id != target->ToPlayer()->getClass()) + if (classRace.class_id && classRace.class_id != target->ToPlayer()->getClass()) return false; - if(classRace.race_id && classRace.race_id != target->ToPlayer()->getRace()) + if (classRace.race_id && classRace.race_id != target->ToPlayer()->getRace()) return false; return true; case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_PLAYER_LESS_HEALTH: @@ -325,7 +325,7 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un case ACHIEVEMENT_CRITERIA_DATA_TYPE_BG_LOSS_TEAM_SCORE: { BattleGround* bg = source->GetBattleGround(); - if(!bg) + if (!bg) return false; return bg->IsTeamScoreInRange(source->GetTeam()==ALLIANCE ? HORDE : ALLIANCE,bg_loss_team_score.min_score,bg_loss_team_score.max_score); } @@ -363,7 +363,7 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un bool AchievementCriteriaDataSet::Meets(Player const* source, Unit const* target, uint32 miscvalue /*= 0*/) const { for (Storage::const_iterator itr = storage.begin(); itr != storage.end(); ++itr) - if(!itr->Meets(criteria_id, source, target, miscvalue)) + if (!itr->Meets(criteria_id, source, target, miscvalue)) return false; return true; @@ -404,7 +404,7 @@ void AchievementMgr::Reset() void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1, uint32 miscvalue2) { - if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0) + if ((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0) sLog.outDetail("AchievementMgr::ResetAchievementCriteria(%u, %u, %u)", type, miscvalue1, miscvalue2); if (!sWorld.getConfig(CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS) && m_player->GetSession()->GetSecurity() > SEC_PLAYER) @@ -452,18 +452,18 @@ void AchievementMgr::DeleteFromDB(uint32 lowguid) void AchievementMgr::SaveToDB() { - if(!m_completedAchievements.empty()) + if (!m_completedAchievements.empty()) { bool need_execute = false; std::ostringstream ssdel; std::ostringstream ssins; for (CompletedAchievementMap::iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter) { - if(!iter->second.changed) + if (!iter->second.changed) continue; /// first new/changed record prefix - if(!need_execute) + if (!need_execute) { ssdel << "DELETE FROM character_achievement WHERE guid = " << GetPlayer()->GetGUIDLow() << " AND achievement IN ("; ssins << "INSERT INTO character_achievement (guid, achievement, date) VALUES "; @@ -484,17 +484,17 @@ void AchievementMgr::SaveToDB() iter->second.changed = false; } - if(need_execute) + if (need_execute) ssdel << ")"; - if(need_execute) + if (need_execute) { CharacterDatabase.Execute( ssdel.str().c_str() ); CharacterDatabase.Execute( ssins.str().c_str() ); } } - if(!m_criteriaProgress.empty()) + if (!m_criteriaProgress.empty()) { /// prepare deleting and insert bool need_execute_del = false; @@ -503,13 +503,13 @@ void AchievementMgr::SaveToDB() std::ostringstream ssins; for (CriteriaProgressMap::iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter) { - if(!iter->second.changed) + if (!iter->second.changed) continue; // deleted data (including 0 progress state) { /// first new/changed record prefix (for any counter value) - if(!need_execute_del) + if (!need_execute_del) { ssdel << "DELETE FROM character_achievement_progress WHERE guid = " << GetPlayer()->GetGUIDLow() << " AND criteria IN ("; need_execute_del = true; @@ -523,10 +523,10 @@ void AchievementMgr::SaveToDB() } // store data only for real progress - if(iter->second.counter != 0) + if (iter->second.counter != 0) { /// first new/changed record prefix - if(!need_execute_ins) + if (!need_execute_ins) { ssins << "INSERT INTO character_achievement_progress (guid, criteria, counter, date) VALUES "; need_execute_ins = true; @@ -543,14 +543,14 @@ void AchievementMgr::SaveToDB() iter->second.changed = false; } - if(need_execute_del) // DELETE ... IN (.... _)_ + if (need_execute_del) // DELETE ... IN (.... _)_ ssdel << ")"; - if(need_execute_del || need_execute_ins) + if (need_execute_del || need_execute_ins) { - if(need_execute_del) + if (need_execute_del) CharacterDatabase.Execute( ssdel.str().c_str() ); - if(need_execute_ins) + if (need_execute_ins) CharacterDatabase.Execute( ssins.str().c_str() ); } } @@ -558,7 +558,7 @@ void AchievementMgr::SaveToDB() void AchievementMgr::LoadFromDB(QueryResult_AutoPtr achievementResult, QueryResult_AutoPtr criteriaResult) { - if(achievementResult) + if (achievementResult) { do { @@ -567,7 +567,7 @@ void AchievementMgr::LoadFromDB(QueryResult_AutoPtr achievementResult, QueryResu uint32 achievement_id = fields[0].GetUInt32(); // don't must happen: cleanup at server startup in achievementmgr.LoadCompletedAchievements() - if(!sAchievementStore.LookupEntry(achievement_id)) + if (!sAchievementStore.LookupEntry(achievement_id)) continue; CompletedAchievementData& ca = m_completedAchievements[achievement_id]; @@ -576,7 +576,7 @@ void AchievementMgr::LoadFromDB(QueryResult_AutoPtr achievementResult, QueryResu } while (achievementResult->NextRow()); } - if(criteriaResult) + if (criteriaResult) { do { @@ -609,22 +609,22 @@ void AchievementMgr::LoadFromDB(QueryResult_AutoPtr achievementResult, QueryResu void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement) { - if(GetPlayer()->GetSession()->PlayerLoading()) + if (GetPlayer()->GetSession()->PlayerLoading()) return; #ifdef TRINITY_DEBUG - if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0) + if ((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0) sLog.outDebug("AchievementMgr::SendAchievementEarned(%u)", achievement->ID); #endif - if(Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId())) + if (Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId())) { Trinity::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED,achievement->ID); Trinity::LocalizedPacketDo<Trinity::AchievementChatBuilder> say_do(say_builder); guild->BroadcastWorker(say_do,GetPlayer()); } - if(achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_KILL|ACHIEVEMENT_FLAG_REALM_FIRST_REACH)) + if (achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_KILL|ACHIEVEMENT_FLAG_REALM_FIRST_REACH)) { // broadcast realm first reached WorldPacket data(SMSG_SERVER_FIRST_ACHIEVEMENT, strlen(GetPlayer()->GetName())+1+8+4+4); @@ -701,7 +701,7 @@ static const uint32 achievIdForDangeon[][4] = */ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1, uint32 miscvalue2, Unit *unit, uint32 time) { - if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0) + if ((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0) sLog.outDetail("AchievementMgr::UpdateAchievementCriteria(%u, %u, %u, %u)", type, miscvalue1, miscvalue2, time); if (!sWorld.getConfig(CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS) && m_player->GetSession()->GetSecurity() > SEC_PLAYER) @@ -739,7 +739,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_FLIGHT_PATHS_TAKEN: case ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); break; @@ -753,7 +753,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED: case ACHIEVEMENT_CRITERIA_TYPE_TOTAL_HEALING_RECEIVED: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; SetCriteriaProgress(achievementCriteria, miscvalue1, PROGRESS_ACCUMULATE); break; @@ -765,7 +765,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEAL_CASTED: case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALING_RECEIVED: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; SetCriteriaProgress(achievementCriteria, miscvalue1, PROGRESS_HIGHEST); break; @@ -800,14 +800,14 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui { if (bg->GetTypeID() != BATTLEGROUND_AB) continue; - if(!((BattleGroundAB*)bg)->IsTeamScores500Disadvantage(GetPlayer()->GetTeam())) + if (!((BattleGroundAB*)bg)->IsTeamScores500Disadvantage(GetPlayer()->GetTeam())) continue; break; } case 156: // AB, win while controlling all 5 flags (all nodes) case 784: // EY, win while holding 4 bases (all nodes) { - if(!bg->IsAllNodesConrolledByTeam(GetPlayer()->GetTeam())) + if (!bg->IsAllNodesConrolledByTeam(GetPlayer()->GetTeam())) continue; break; } @@ -823,14 +823,14 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE: { // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; - if(achievementCriteria->kill_creature.creatureID != miscvalue1) + if (achievementCriteria->kill_creature.creatureID != miscvalue1) continue; // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria); - if(!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(),unit)) continue; SetCriteriaProgress(achievementCriteria, miscvalue2, PROGRESS_ACCUMULATE); @@ -841,27 +841,27 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui break; case ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL: // update at loading or specific skill update - if(miscvalue1 && miscvalue1 != achievementCriteria->reach_skill_level.skillID) + if (miscvalue1 && miscvalue1 != achievementCriteria->reach_skill_level.skillID) continue; - if(uint32 skillvalue = GetPlayer()->GetBaseSkillValue(achievementCriteria->reach_skill_level.skillID)) + if (uint32 skillvalue = GetPlayer()->GetBaseSkillValue(achievementCriteria->reach_skill_level.skillID)) SetCriteriaProgress(achievementCriteria, skillvalue); break; case ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL: // update at loading or specific skill update - if(miscvalue1 && miscvalue1 != achievementCriteria->learn_skill_level.skillID) + if (miscvalue1 && miscvalue1 != achievementCriteria->learn_skill_level.skillID) continue; - if(uint32 maxSkillvalue = GetPlayer()->GetPureMaxSkillValue(achievementCriteria->learn_skill_level.skillID)) + if (uint32 maxSkillvalue = GetPlayer()->GetPureMaxSkillValue(achievementCriteria->learn_skill_level.skillID)) SetCriteriaProgress(achievementCriteria, maxSkillvalue); break; case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_ACHIEVEMENT: - if(m_completedAchievements.find(achievementCriteria->complete_achievement.linkedAchievement) != m_completedAchievements.end()) + if (m_completedAchievements.find(achievementCriteria->complete_achievement.linkedAchievement) != m_completedAchievements.end()) SetCriteriaProgress(achievementCriteria, 1); break; case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT: { uint32 counter =0; for (QuestStatusMap::const_iterator itr = GetPlayer()->getQuestStatusMap().begin(); itr!=GetPlayer()->getQuestStatusMap().end(); itr++) - if(itr->second.m_rewarded) + if (itr->second.m_rewarded) counter++; SetCriteriaProgress(achievementCriteria, counter); break; @@ -869,14 +869,14 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE: { // speedup for non-login case - if(miscvalue1 && miscvalue1 != achievementCriteria->complete_quests_in_zone.zoneID) + if (miscvalue1 && miscvalue1 != achievementCriteria->complete_quests_in_zone.zoneID) continue; uint32 counter =0; 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 && quest->GetZoneOrSort() >= 0 && uint32(quest->GetZoneOrSort()) == achievementCriteria->complete_quests_in_zone.zoneID) + if (itr->second.m_rewarded && quest && quest->GetZoneOrSort() >= 0 && uint32(quest->GetZoneOrSort()) == achievementCriteria->complete_quests_in_zone.zoneID) counter++; } SetCriteriaProgress(achievementCriteria, counter); @@ -884,39 +884,39 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui } case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; - if(GetPlayer()->GetMapId() != achievementCriteria->complete_battleground.mapID) + if (GetPlayer()->GetMapId() != achievementCriteria->complete_battleground.mapID) continue; SetCriteriaProgress(achievementCriteria, miscvalue1, PROGRESS_ACCUMULATE); break; case ACHIEVEMENT_CRITERIA_TYPE_DEATH_AT_MAP: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; - if(GetPlayer()->GetMapId() != achievementCriteria->death_at_map.mapID) + if (GetPlayer()->GetMapId() != achievementCriteria->death_at_map.mapID) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); break; case ACHIEVEMENT_CRITERIA_TYPE_DEATH: { // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) 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) { - if(achievIdByArenaSlot[j] == achievement->ID) + if (achievIdByArenaSlot[j] == achievement->ID) { BattleGround* bg = GetPlayer()->GetBattleGround(); - if(!bg || !bg->isArena() || ArenaTeam::GetSlotByType(bg->GetArenaType()) != j) + if (!bg || !bg->isArena() || ArenaTeam::GetSlotByType(bg->GetArenaType()) != j) notfit = true; break; } } - if(notfit) + if (notfit) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); @@ -925,35 +925,35 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_DEATH_IN_DUNGEON: { // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; Map const* map = GetPlayer()->IsInWorld() ? GetPlayer()->GetMap() : MapManager::Instance().FindMap(GetPlayer()->GetMapId(), GetPlayer()->GetInstanceId()); - if(!map || !map->IsDungeon()) + if (!map || !map->IsDungeon()) continue; // search case bool found = false; for (int j = 0; achievIdForDangeon[j][0]; ++j) { - if(achievIdForDangeon[j][0] == achievement->ID) + if (achievIdForDangeon[j][0] == achievement->ID) { - if(map->IsRaid()) + if (map->IsRaid()) { // if raid accepted (ignore difficulty) - if(!achievIdForDangeon[j][2]) + if (!achievIdForDangeon[j][2]) break; // for } - else if(GetPlayer()->GetDungeonDifficulty()==DUNGEON_DIFFICULTY_NORMAL) + else if (GetPlayer()->GetDungeonDifficulty()==DUNGEON_DIFFICULTY_NORMAL) { // dungeon in normal mode accepted - if(!achievIdForDangeon[j][1]) + if (!achievIdForDangeon[j][1]) break; // for } else { // dungeon in heroic mode accepted - if(!achievIdForDangeon[j][3]) + if (!achievIdForDangeon[j][3]) break; // for } @@ -961,11 +961,11 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui break; // for } } - if(!found) + if (!found) continue; //FIXME: work only for instances where max==min for players - if(((InstanceMap*)map)->GetMaxPlayers() != achievementCriteria->death_in_dungeon.manLimit) + if (((InstanceMap*)map)->GetMaxPlayers() != achievementCriteria->death_in_dungeon.manLimit) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); break; @@ -973,19 +973,19 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui } case ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_CREATURE: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; - if(miscvalue1 != achievementCriteria->killed_by_creature.creatureEntry) + if (miscvalue1 != achievementCriteria->killed_by_creature.creatureEntry) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); break; case ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_PLAYER: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; // if team check required: must kill by opposition faction - if(achievement->ID==318 && miscvalue2==GetPlayer()->GetTeam()) + if (achievement->ID==318 && miscvalue2==GetPlayer()->GetTeam()) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); @@ -993,12 +993,12 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_FALL_WITHOUT_DYING: { // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria); - if(!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(),unit)) continue; // miscvalue1 is the ingame fallheight*100 as stored in dbc @@ -1007,9 +1007,9 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui } case ACHIEVEMENT_CRITERIA_TYPE_DEATHS_FROM: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; - if(miscvalue2 != achievementCriteria->death_from.type) + if (miscvalue2 != achievementCriteria->death_from.type) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); break; @@ -1024,7 +1024,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui else { // login case. - if(!GetPlayer()->GetQuestRewardStatus(achievementCriteria->complete_quest.questID)) + if (!GetPlayer()->GetQuestRewardStatus(achievementCriteria->complete_quest.questID)) continue; } @@ -1040,7 +1040,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui { // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria); - if(!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(),unit)) continue; break; } @@ -1059,10 +1059,10 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria); - if(!data) + if (!data) continue; - if(!data->Meets(GetPlayer(),unit)) + if (!data->Meets(GetPlayer(),unit)) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); @@ -1076,20 +1076,20 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria); - if(!data) + if (!data) continue; - if(!data->Meets(GetPlayer(),unit)) + if (!data->Meets(GetPlayer(),unit)) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); break; } case ACHIEVEMENT_CRITERIA_TYPE_LEARN_SPELL: - if(miscvalue1 && miscvalue1!=achievementCriteria->learn_spell.spellID) + if (miscvalue1 && miscvalue1!=achievementCriteria->learn_spell.spellID) continue; - if(GetPlayer()->HasSpell(achievementCriteria->learn_spell.spellID)) + if (GetPlayer()->HasSpell(achievementCriteria->learn_spell.spellID)) SetCriteriaProgress(achievementCriteria, 1); break; case ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE: @@ -1102,11 +1102,11 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui continue; // zone specific - if(achievementCriteria->loot_type.lootTypeCount==1) + if (achievementCriteria->loot_type.lootTypeCount==1) { // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria); - if(!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(),unit)) continue; } @@ -1115,7 +1115,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui } case ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM: // speedup for non-login case - if(miscvalue1 && achievementCriteria->own_item.itemID != miscvalue1) + if (miscvalue1 && achievementCriteria->own_item.itemID != miscvalue1) continue; SetCriteriaProgress(achievementCriteria, GetPlayer()->GetItemCount(achievementCriteria->own_item.itemID, true)); break; @@ -1125,11 +1125,11 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui continue; // additional requirements - if(achievementCriteria->win_rated_arena.flag==ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE) + if (achievementCriteria->win_rated_arena.flag==ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE) { // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria); - if(!data || !data->Meets(GetPlayer(),unit,miscvalue1)) + if (!data || !data->Meets(GetPlayer(),unit,miscvalue1)) { // reset the progress as we have a win without the requirement. SetCriteriaProgress(achievementCriteria, 0); @@ -1141,48 +1141,48 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui break; case ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM: // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case - if(!miscvalue1) + if (!miscvalue1) continue; - if(achievementCriteria->use_item.itemID != miscvalue1) + if (achievementCriteria->use_item.itemID != miscvalue1) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); break; case ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM: // You _have_ to loot that item, just owning it when logging in does _not_ count! - if(!miscvalue1) + if (!miscvalue1) continue; - if(miscvalue1 != achievementCriteria->own_item.itemID) + if (miscvalue1 != achievementCriteria->own_item.itemID) continue; SetCriteriaProgress(achievementCriteria, miscvalue2, PROGRESS_ACCUMULATE); break; case ACHIEVEMENT_CRITERIA_TYPE_EXPLORE_AREA: { WorldMapOverlayEntry const* worldOverlayEntry = sWorldMapOverlayStore.LookupEntry(achievementCriteria->explore_area.areaReference); - if(!worldOverlayEntry) + if (!worldOverlayEntry) break; bool matchFound = false; for (int j = 0; j < MAX_WORLD_MAP_OVERLAY_AREA_IDX; ++j) { uint32 area_id = worldOverlayEntry->areatableID[j]; - if(!area_id) // array have 0 only in empty tail + if (!area_id) // array have 0 only in empty tail break; int32 exploreFlag = GetAreaFlagByAreaID(area_id); - if(exploreFlag < 0) + if (exploreFlag < 0) continue; uint32 playerIndexOffset = uint32(exploreFlag) / 32; uint32 mask = 1<< (uint32(exploreFlag) % 32); - if(GetPlayer()->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + playerIndexOffset) & mask) + if (GetPlayer()->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + playerIndexOffset) & mask) { matchFound = true; break; } } - if(matchFound) + if (matchFound) SetCriteriaProgress(achievementCriteria, 1); break; } @@ -1208,7 +1208,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_VISIT_BARBER_SHOP: { // skip for login case - if(!miscvalue1) + if (!miscvalue1) continue; SetCriteriaProgress(achievementCriteria, 1); break; @@ -1257,15 +1257,15 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE: { // miscvalue1 = emote - if(!miscvalue1) + if (!miscvalue1) continue; - if(miscvalue1 != achievementCriteria->do_emote.emoteID) + if (miscvalue1 != achievementCriteria->do_emote.emoteID) continue; - if(achievementCriteria->do_emote.count) + if (achievementCriteria->do_emote.count) { // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria); - if(!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(),unit)) continue; } @@ -1280,11 +1280,11 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui if (achievementCriteria->healing_done.flag == ACHIEVEMENT_CRITERIA_CONDITION_MAP) { - if(GetPlayer()->GetMapId() != achievementCriteria->healing_done.mapid) + if (GetPlayer()->GetMapId() != achievementCriteria->healing_done.mapid) continue; // map specific case (BG in fact) expected player targeted damage/heal - if(!unit || unit->GetTypeId() != TYPEID_PLAYER) + if (!unit || unit->GetTypeId() != TYPEID_PLAYER) continue; } @@ -1330,7 +1330,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spellIter->first); for (SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter) { - if(skillIter->second->skillId == achievementCriteria->learn_skillline_spell.skillLine) + if (skillIter->second->skillId == achievementCriteria->learn_skillline_spell.skillLine) spellCount++; } } @@ -1444,7 +1444,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui case ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS: break; // Not implemented yet :( } - if(IsCompletedCriteria(achievementCriteria,achievement)) + if (IsCompletedCriteria(achievementCriteria,achievement)) CompletedCriteriaFor(achievement); // check again the completeness for SUMM and REQ COUNT achievements, @@ -1455,10 +1455,10 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui CompletedAchievement(achievement); } - if(AchievementEntryList const* achRefList = achievementmgr.GetAchievementByReferencedId(achievement->ID)) + if (AchievementEntryList const* achRefList = achievementmgr.GetAchievementByReferencedId(achievement->ID)) { for (AchievementEntryList::const_iterator itr = achRefList->begin(); itr != achRefList->end(); ++itr) - if(IsCompletedAchievement(*itr)) + if (IsCompletedAchievement(*itr)) CompletedAchievement(*itr); } } @@ -1470,18 +1470,18 @@ static const uint32 achievIdByRace[MAX_RACES] = { 0, 1408, 1410, 1407, 1409, bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achievementCriteria, AchievementEntry const* achievement) { // counter can never complete - if(achievement->flags & ACHIEVEMENT_FLAG_COUNTER) + if (achievement->flags & ACHIEVEMENT_FLAG_COUNTER) return false; - if(achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_REACH | ACHIEVEMENT_FLAG_REALM_FIRST_KILL)) + if (achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_REACH | ACHIEVEMENT_FLAG_REALM_FIRST_KILL)) { // someone on this realm has already completed that achievement - if(achievementmgr.IsRealmCompleted(achievement)) + if (achievementmgr.IsRealmCompleted(achievement)) return false; } CriteriaProgressMap::const_iterator itr = m_criteriaProgress.find(achievementCriteria->ID); - if(itr == m_criteriaProgress.end()) + if (itr == m_criteriaProgress.end()) return false; CriteriaProgress const* progress = &itr->second; @@ -1496,12 +1496,12 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve { // skip wrong class achievements for (int i = 1; i < MAX_CLASSES; ++i) - if(achievIdByClass[i] == achievement->ID && i != GetPlayer()->getClass()) + if (achievIdByClass[i] == achievement->ID && i != GetPlayer()->getClass()) return false; // skip wrong race achievements for (int i = 1; i < MAX_RACES; ++i) - if(achievIdByRace[i] == achievement->ID && i != GetPlayer()->getRace()) + if (achievIdByRace[i] == achievement->ID && i != GetPlayer()->getRace()) return false; // appropriate class/race or not class/race specific @@ -1620,7 +1620,7 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve void AchievementMgr::CompletedCriteriaFor(AchievementEntry const* achievement) { // counter can never complete - if(achievement->flags & ACHIEVEMENT_FLAG_COUNTER) + if (achievement->flags & ACHIEVEMENT_FLAG_COUNTER) return; // already completed and stored @@ -1634,7 +1634,7 @@ void AchievementMgr::CompletedCriteriaFor(AchievementEntry const* achievement) bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry) { // counter can never complete - if(entry->flags & ACHIEVEMENT_FLAG_COUNTER) + if (entry->flags & ACHIEVEMENT_FLAG_COUNTER) return false; // for achievement with referenced achievement criterias get from referenced and counter from self @@ -1642,7 +1642,7 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry) uint32 achievmentForTestCount = entry->count; AchievementCriteriaEntryList const* cList = achievementmgr.GetAchievementCriteriaByAchievement(achievmentForTestId); - if(!cList) + if (!cList) return false; uint32 count = 0; @@ -1655,7 +1655,7 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry) AchievementCriteriaEntry const* criteria = *itr; CriteriaProgressMap::const_iterator itrProgress = m_criteriaProgress.find(criteria->ID); - if(itrProgress == m_criteriaProgress.end()) + if (itrProgress == m_criteriaProgress.end()) continue; CriteriaProgress const* progress = &itrProgress->second; @@ -1677,18 +1677,18 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry) bool completed = IsCompletedCriteria(criteria,entry); // found an uncompleted criteria, but DONT return false yet - there might be a completed criteria with ACHIEVEMENT_CRITERIA_COMPLETE_FLAG_ALL - if(completed) + if (completed) ++count; else completed_all = false; // completed as have req. count of completed criterias - if(achievmentForTestCount > 0 && achievmentForTestCount <= count) + if (achievmentForTestCount > 0 && achievmentForTestCount <= count) return true; } // all criterias completed requirement - if(completed_all && achievmentForTestCount==0) + if (completed_all && achievmentForTestCount==0) return true; return false; @@ -1696,17 +1696,17 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry) void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, uint32 changeValue, ProgressType ptype) { - if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0) + if ((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0) sLog.outDetail("AchievementMgr::SetCriteriaProgress(%u, %u) for (GUID:%u)", entry->ID, changeValue, m_player->GetGUIDLow()); CriteriaProgress *progress = NULL; CriteriaProgressMap::iterator iter = m_criteriaProgress.find(entry->ID); - if(iter == m_criteriaProgress.end()) + if (iter == m_criteriaProgress.end()) { // not create record for 0 counter - if(changeValue == 0) + if (changeValue == 0) return; progress = &m_criteriaProgress[entry->ID]; @@ -1736,7 +1736,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, } // not update (not mark as changed) if counter will have same value - if(progress->counter == newValue) + if (progress->counter == newValue) return; progress->counter = newValue; @@ -1744,10 +1744,10 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, progress->changed = true; - if(entry->timeLimit) + if (entry->timeLimit) { time_t now = time(NULL); - if(time_t(progress->date + entry->timeLimit) < now) + if (time_t(progress->date + entry->timeLimit) < now) progress->counter = 1; // also it seems illogical, the timeframe will be extended at every criteria update @@ -1760,10 +1760,10 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) { sLog.outDetail("AchievementMgr::CompletedAchievement(%u)", achievement->ID); - if(!sWorld.getConfig(CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS) && m_player->GetSession()->GetSecurity() > SEC_PLAYER) + if (!sWorld.getConfig(CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS) && m_player->GetSession()->GetSecurity() > SEC_PLAYER) return; - if(achievement->flags & ACHIEVEMENT_FLAG_COUNTER || HasAchieved(achievement)) + if (achievement->flags & ACHIEVEMENT_FLAG_COUNTER || HasAchieved(achievement)) return; SendAchievementEarned(achievement); @@ -1773,7 +1773,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) // don't insert for ACHIEVEMENT_FLAG_REALM_FIRST_KILL since otherwise only the first group member would reach that achievement // TODO: where do set this instead? - if(!(achievement->flags & ACHIEVEMENT_FLAG_REALM_FIRST_KILL)) + if (!(achievement->flags & ACHIEVEMENT_FLAG_REALM_FIRST_KILL)) achievementmgr.SetRealmCompleted(achievement); UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_ACHIEVEMENT); @@ -1782,18 +1782,18 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) AchievementReward const* reward = achievementmgr.GetAchievementReward(achievement); // no rewards - if(!reward) + if (!reward) return; // titles - if(uint32 titleId = reward->titleId[GetPlayer()->GetTeam() == HORDE ? 0 : 1]) + if (uint32 titleId = reward->titleId[GetPlayer()->GetTeam() == HORDE ? 0 : 1]) { - if(CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId)) + if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId)) GetPlayer()->SetTitle(titleEntry); } // mail - if(reward->sender) + if (reward->sender) { Item* item = reward->itemId ? Item::CreateItem(reward->itemId,1,GetPlayer ()) : NULL; @@ -1804,7 +1804,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) std::string text = reward->text; if ( loc_idx >= 0 ) { - if(AchievementRewardLocale const* loc = achievementmgr.GetAchievementRewardLocale(achievement)) + if (AchievementRewardLocale const* loc = achievementmgr.GetAchievementRewardLocale(achievement)) { if (loc->subject.size() > size_t(loc_idx) && !loc->subject[loc_idx].empty()) subject = loc->subject[loc_idx]; @@ -1817,7 +1817,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) MailDraft draft(subject, itemTextId); - if(item) + if (item) { // save new item before send item->SaveToDB(); // save for prevent lost at next mail load, if send fail then item will deleted @@ -1837,7 +1837,7 @@ void AchievementMgr::SendAllAchievementData() bool send = false; WorldPacket data(SMSG_ALL_ACHIEVEMENT_DATA); - if( size < 0x8000 ) + if ( size < 0x8000 ) data.resize( size ); else data.resize( 0x7fff ); @@ -1853,7 +1853,7 @@ void AchievementMgr::SendAllAchievementData() data.clear(); send = false; - if( !cAchievements ) + if ( !cAchievements ) { for (; iter != m_completedAchievements.end() && !send; ++iter) { @@ -1862,7 +1862,7 @@ void AchievementMgr::SendAllAchievementData() send = data.size() > 0x7f00; } - if( iter == m_completedAchievements.end() ) + if ( iter == m_completedAchievements.end() ) cAchievements = true; } @@ -1879,7 +1879,7 @@ void AchievementMgr::SendAllAchievementData() send = data.size() > 0x7f00; } - if( iter2 == m_criteriaProgress.end() ) + if ( iter2 == m_criteriaProgress.end() ) cProgress = true; data << int32(-1); @@ -1935,7 +1935,7 @@ AchievementCriteriaEntryList const& AchievementGlobalMgr::GetAchievementCriteria void AchievementGlobalMgr::LoadAchievementCriteriaList() { - if(sAchievementCriteriaStore.GetNumRows()==0) + if (sAchievementCriteriaStore.GetNumRows()==0) { barGoLink bar(1); bar.step(); @@ -1951,7 +1951,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList() bar.step(); AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(entryId); - if(!criteria) + if (!criteria) continue; m_AchievementCriteriasByType[criteria->requiredType].push_back(criteria); @@ -1964,7 +1964,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList() void AchievementGlobalMgr::LoadAchievementReferenceList() { - if(sAchievementStore.GetNumRows()==0) + if (sAchievementStore.GetNumRows()==0) { barGoLink bar(1); bar.step(); @@ -1981,7 +1981,7 @@ void AchievementGlobalMgr::LoadAchievementReferenceList() bar.step(); AchievementEntry const* achievement = sAchievementStore.LookupEntry(entryId); - if(!achievement || !achievement->refAchievement) + if (!achievement || !achievement->refAchievement) continue; m_AchievementListByReferencedId[achievement->refAchievement].push_back(achievement); @@ -1998,7 +1998,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() QueryResult_AutoPtr result = WorldDatabase.Query("SELECT criteria_id, type, value1, value2 FROM achievement_criteria_data"); - if(!result) + if (!result) { barGoLink bar(1); bar.step(); @@ -2051,13 +2051,13 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() for (uint32 entryId = 0; entryId < sAchievementCriteriaStore.GetNumRows(); ++entryId) { AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(entryId); - if(!criteria) + if (!criteria) continue; switch(criteria->requiredType) { case ACHIEVEMENT_CRITERIA_TYPE_WIN_BG: - if(!criteria->win_bg.additionalRequirement1_type) + if (!criteria->win_bg.additionalRequirement1_type) continue; break; case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE: @@ -2065,7 +2065,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST: { AchievementEntry const* achievement = sAchievementStore.LookupEntry(criteria->referredAchievement); - if(!achievement) + if (!achievement) continue; // exist many achievements with this criteria, use at this moment hardcoded check to skil simple case @@ -2087,30 +2087,30 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL: // any cases break; case ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA: // need skip generic cases - if(criteria->win_rated_arena.flag!=ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE) + if (criteria->win_rated_arena.flag!=ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE) continue; break; case ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM: // any cases break; case ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE: // need skip generic cases - if(criteria->do_emote.count==0) + if (criteria->do_emote.count==0) continue; break; case ACHIEVEMENT_CRITERIA_TYPE_WIN_DUEL: // skip statistics - if(criteria->win_duel.duelCount==0) + if (criteria->win_duel.duelCount==0) continue; break; case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2: // any cases break; case ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE: // need skip generic cases - if(criteria->loot_type.lootTypeCount!=1) + if (criteria->loot_type.lootTypeCount!=1) continue; break; default: // type not use DB data, ignore continue; } - if(!GetCriteriaDataSet(criteria)) + if (!GetCriteriaDataSet(criteria)) sLog.outErrorDb( "Table `achievement_criteria_data` not have expected data for criteria (Entry: %u Type: %u) for achievement %u.", criteria->ID, criteria->requiredType, criteria->referredAchievement); } @@ -2122,7 +2122,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements() { QueryResult_AutoPtr result = CharacterDatabase.Query("SELECT achievement FROM character_achievement GROUP BY achievement"); - if(!result) + if (!result) { barGoLink bar(1); bar.step(); @@ -2139,7 +2139,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements() Field *fields = result->Fetch(); uint32 achievement_id = fields[0].GetUInt32(); - if(!sAchievementStore.LookupEntry(achievement_id)) + if (!sAchievementStore.LookupEntry(achievement_id)) { // we will remove not existed achievement for all characters sLog.outError("Not existed achievement %u data removed from table `character_achievement`.",achievement_id); @@ -2161,7 +2161,7 @@ void AchievementGlobalMgr::LoadRewards() // 0 1 2 3 4 5 6 QueryResult_AutoPtr result = WorldDatabase.Query("SELECT entry, title_A, title_H, item, sender, subject, text FROM achievement_reward"); - if(!result) + if (!result) { barGoLink bar(1); @@ -2292,7 +2292,7 @@ void AchievementGlobalMgr::LoadRewardLocales() uint32 entry = fields[0].GetUInt32(); - if(m_achievementRewards.find(entry)==m_achievementRewards.end()) + if (m_achievementRewards.find(entry)==m_achievementRewards.end()) { sLog.outErrorDb( "Table `locales_achievement_reward` (Entry: %u) has locale strings for not existed achievement reward .", entry); continue; @@ -2303,24 +2303,24 @@ void AchievementGlobalMgr::LoadRewardLocales() for (int i = 1; i < MAX_LOCALE; ++i) { std::string str = fields[1+2*(i-1)].GetCppString(); - if(!str.empty()) + if (!str.empty()) { int idx = objmgr.GetOrNewIndexForLocale(LocaleConstant(i)); - if(idx >= 0) + if (idx >= 0) { - if(data.subject.size() <= size_t(idx)) + if (data.subject.size() <= size_t(idx)) data.subject.resize(idx+1); data.subject[idx] = str; } } str = fields[1+2*(i-1)+1].GetCppString(); - if(!str.empty()) + if (!str.empty()) { int idx = objmgr.GetOrNewIndexForLocale(LocaleConstant(i)); - if(idx >= 0) + if (idx >= 0) { - if(data.text.size() <= size_t(idx)) + if (data.text.size() <= size_t(idx)) data.text.resize(idx+1); data.text[idx] = str; |