From 64be231fe6dcffa63330e96e58680974f4079bcb Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Fri, 9 Jan 2015 03:05:13 -0500 Subject: [PATCH] clang-modernize -use-auto convert for world/adventure_manager.cpp --- world/adventure_manager.cpp | 157 +++++++++++++++++++----------------- 1 file changed, 82 insertions(+), 75 deletions(-) diff --git a/world/adventure_manager.cpp b/world/adventure_manager.cpp index 53d5fb191..db4b768d8 100644 --- a/world/adventure_manager.cpp +++ b/world/adventure_manager.cpp @@ -38,7 +38,7 @@ void AdventureManager::Process() { if(process_timer->Check()) { - std::list::iterator iter = adventure_list.begin(); + auto iter = adventure_list.begin(); while(iter != adventure_list.end()) { if(!(*iter)->Process()) @@ -76,10 +76,10 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) /** * This block checks to see if we actually have any adventures for the requested theme. */ - std::map >::iterator adv_list_iter = adventure_entries.find(sar->template_id); + auto adv_list_iter = adventure_entries.find(sar->template_id); if(adv_list_iter == adventure_entries.end()) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureRequestDeny, sizeof(ServerAdventureRequestDeny_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureRequestDeny, sizeof(ServerAdventureRequestDeny_Struct)); ServerAdventureRequestDeny_Struct *deny = (ServerAdventureRequestDeny_Struct*)pack->pBuffer; strcpy(deny->leader, sar->leader); strcpy(deny->reason, "There are currently no adventures set for this theme."); @@ -94,7 +94,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) * Active being in progress, finished adventures that are still waiting to expire do not count * Though they will count against you for which new adventure you can get. */ - std::list::iterator iter = adventure_list.begin(); + auto iter = adventure_list.begin(); while(iter != adventure_list.end()) { Adventure* current = (*iter); @@ -104,7 +104,8 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) { if(current->PlayerExists((data + sizeof(ServerAdventureRequest_Struct) + (64 * i)))) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureRequestDeny, sizeof(ServerAdventureRequestDeny_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureRequestDeny, + sizeof(ServerAdventureRequestDeny_Struct)); ServerAdventureRequestDeny_Struct *deny = (ServerAdventureRequestDeny_Struct*)pack->pBuffer; strcpy(deny->leader, sar->leader); @@ -158,7 +159,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) * Remove zones from eligible zones based on their difficulty and type. * ie only use difficult zones for difficult, collect for collect, etc. */ - std::list::iterator ea_iter = eligible_adventures.begin(); + auto ea_iter = eligible_adventures.begin(); while(ea_iter != eligible_adventures.end()) { if((*ea_iter)->is_hard != ((sar->risk == 2) ? true : false)) @@ -240,7 +241,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) if(valid_count == 0) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureRequestDeny, sizeof(ServerAdventureRequestDeny_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureRequestDeny, sizeof(ServerAdventureRequestDeny_Struct)); ServerAdventureRequestDeny_Struct *deny = (ServerAdventureRequestDeny_Struct*)pack->pBuffer; strcpy(deny->leader, sar->leader); strcpy(deny->reason, "The number of found players for this adventure was zero."); @@ -254,7 +255,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) if(max_level - min_level > RuleI(Adventure, MaxLevelRange)) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureRequestDeny, sizeof(ServerAdventureRequestDeny_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureRequestDeny, sizeof(ServerAdventureRequestDeny_Struct)); ServerAdventureRequestDeny_Struct *deny = (ServerAdventureRequestDeny_Struct*)pack->pBuffer; strcpy(deny->leader, sar->leader); @@ -271,10 +272,10 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) /** * Remove the zones from our eligible zones based on the exclusion above */ - std::list::iterator ez_iter = excluded_zones.begin(); + auto ez_iter = excluded_zones.begin(); while(ez_iter != excluded_zones.end()) { - std::list::iterator ea_iter = eligible_adventures.begin(); + auto ea_iter = eligible_adventures.begin(); while(ea_iter != eligible_adventures.end()) { if((*ez_iter).zone.compare((*ea_iter)->zone) == 0 && (*ez_iter).version == (*ea_iter)->zone_version) @@ -287,10 +288,10 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) ++ez_iter; } - std::list::iterator ezi_iter = excluded_zone_ins.begin(); + auto ezi_iter = excluded_zone_ins.begin(); while(ezi_iter != excluded_zone_ins.end()) { - std::list::iterator ea_iter = eligible_adventures.begin(); + auto ea_iter = eligible_adventures.begin(); while(ea_iter != eligible_adventures.end()) { if((*ezi_iter).zone_id == (*ea_iter)->zone_in_zone_id && (*ezi_iter).door_id == (*ea_iter)->zone_in_object_id) @@ -331,7 +332,8 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) { ++ea_iter; } - ServerPacket *pack = new ServerPacket(ServerOP_AdventureRequestAccept, sizeof(ServerAdventureRequestAccept_Struct) + (sar->member_count * 64)); + auto pack = new ServerPacket(ServerOP_AdventureRequestAccept, + sizeof(ServerAdventureRequestAccept_Struct) + (sar->member_count * 64)); ServerAdventureRequestAccept_Struct *sra = (ServerAdventureRequestAccept_Struct*)pack->pBuffer; strcpy(sra->leader, sar->leader); strcpy(sra->text, (*ea_iter)->text); @@ -346,7 +348,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) } else { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureRequestDeny, sizeof(ServerAdventureRequestDeny_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureRequestDeny, sizeof(ServerAdventureRequestDeny_Struct)); ServerAdventureRequestDeny_Struct *deny = (ServerAdventureRequestDeny_Struct*)pack->pBuffer; strcpy(deny->leader, sar->leader); strcpy(deny->reason, "The number of adventures returned was zero."); @@ -369,7 +371,7 @@ void AdventureManager::TryAdventureCreate(const char *data) AdventureTemplate *adv_template = GetAdventureTemplate(src->theme, src->id); if(!adv_template) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureCreateDeny, 64); + auto pack = new ServerPacket(ServerOP_AdventureCreateDeny, 64); strcpy((char*)pack->pBuffer, src->leader); pack->Deflate(); zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack); @@ -377,10 +379,10 @@ void AdventureManager::TryAdventureCreate(const char *data) return; } - Adventure *adv = new Adventure(adv_template); + auto adv = new Adventure(adv_template); if(!adv->CreateInstance()) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureCreateDeny, 64); + auto pack = new ServerPacket(ServerOP_AdventureCreateDeny, 64); strcpy((char*)pack->pBuffer, src->leader); pack->Deflate(); zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack); @@ -394,7 +396,7 @@ void AdventureManager::TryAdventureCreate(const char *data) Adventure *a = GetActiveAdventure((data + sizeof(ServerAdventureRequestCreate_Struct) + (64 * i))); if(a) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureCreateDeny, 64); + auto pack = new ServerPacket(ServerOP_AdventureCreateDeny, 64); strcpy((char*)pack->pBuffer, src->leader); pack->Deflate(); zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack); @@ -415,8 +417,9 @@ void AdventureManager::TryAdventureCreate(const char *data) { int f_count = 0; Adventure** finished_adventures = GetFinishedAdventures((data + sizeof(ServerAdventureRequestCreate_Struct) + (64 * i)), f_count); - ServerPacket *pack = new ServerPacket(ServerOP_AdventureData, sizeof(ServerSendAdventureData_Struct) - + (sizeof(ServerFinishedAdventures_Struct) * f_count)); + auto pack = new ServerPacket(ServerOP_AdventureData, + sizeof(ServerSendAdventureData_Struct) + + (sizeof(ServerFinishedAdventures_Struct) * f_count)); ServerSendAdventureData_Struct *sca = (ServerSendAdventureData_Struct*)pack->pBuffer; strcpy(sca->player, (data + sizeof(ServerAdventureRequestCreate_Struct) + (64 * i))); @@ -454,7 +457,7 @@ void AdventureManager::TryAdventureCreate(const char *data) void AdventureManager::GetAdventureData(Adventure *adv) { std::list player_list = adv->GetPlayers(); - std::list::iterator iter = player_list.begin(); + auto iter = player_list.begin(); while(iter != player_list.end()) { GetAdventureData((*iter).c_str()); @@ -470,8 +473,9 @@ void AdventureManager::GetAdventureData(const char *name) int f_count = 0; Adventure** finished_adventures = GetFinishedAdventures(name, f_count); Adventure *current = GetActiveAdventure(name); - ServerPacket *pack = new ServerPacket(ServerOP_AdventureData, sizeof(ServerSendAdventureData_Struct) - + (sizeof(ServerFinishedAdventures_Struct) * f_count)); + auto pack = + new ServerPacket(ServerOP_AdventureData, sizeof(ServerSendAdventureData_Struct) + + (sizeof(ServerFinishedAdventures_Struct) * f_count)); ServerSendAdventureData_Struct *sca = (ServerSendAdventureData_Struct*)pack->pBuffer; if(current) @@ -500,7 +504,7 @@ void AdventureManager::GetAdventureData(const char *name) if(f_count == 0) { delete pack; - ServerPacket *pack = new ServerPacket(ServerOP_AdventureDataClear, 64); + auto pack = new ServerPacket(ServerOP_AdventureDataClear, 64); strcpy((char*)pack->pBuffer, name); pack->Deflate(); zoneserver_list.SendPacket(player->zone(), player->instance(), pack); @@ -531,7 +535,7 @@ void AdventureManager::GetAdventureData(const char *name) bool AdventureManager::IsInExcludedZoneList(std::list excluded_zones, std::string zone_name, int version) { - std::list::iterator iter = excluded_zones.begin(); + auto iter = excluded_zones.begin(); while(iter != excluded_zones.end()) { if(((*iter).zone.compare(zone_name) == 0) && ((*iter).version == version)) @@ -545,7 +549,7 @@ bool AdventureManager::IsInExcludedZoneList(std::list excluded_z bool AdventureManager::IsInExcludedZoneInList(std::list excluded_zone_ins, int zone_id, int door_object) { - std::list::iterator iter = excluded_zone_ins.begin(); + auto iter = excluded_zone_ins.begin(); while(iter != excluded_zone_ins.end()) { if(((*iter).zone_id == zone_id) && ((*iter).door_id == door_object)) @@ -562,7 +566,7 @@ Adventure **AdventureManager::GetFinishedAdventures(const char *player, int &cou Adventure **ret = nullptr; count = 0; - std::list::iterator iter = adventure_list.begin(); + auto iter = adventure_list.begin(); while(iter != adventure_list.end()) { if((*iter)->PlayerExists(player)) @@ -571,7 +575,7 @@ Adventure **AdventureManager::GetFinishedAdventures(const char *player, int &cou { if(ret) { - Adventure **t = new Adventure*[count + 1]; + auto t = new Adventure *[count + 1]; for(int i = 0; i < count; i++) { t[i] = ret[i]; @@ -595,7 +599,7 @@ Adventure **AdventureManager::GetFinishedAdventures(const char *player, int &cou Adventure *AdventureManager::GetActiveAdventure(const char *player) { - std::list::iterator iter = adventure_list.begin(); + auto iter = adventure_list.begin(); while(iter != adventure_list.end()) { if((*iter)->PlayerExists(player) && (*iter)->IsActive()) @@ -609,13 +613,13 @@ Adventure *AdventureManager::GetActiveAdventure(const char *player) AdventureTemplate *AdventureManager::GetAdventureTemplate(int theme, int id) { - std::map >::iterator iter = adventure_entries.find(theme); + auto iter = adventure_entries.find(theme); if(iter == adventure_entries.end()) { return nullptr; } - std::list::iterator l_iter = (*iter).second.begin(); + auto l_iter = (*iter).second.begin(); while(l_iter != (*iter).second.end()) { if((*l_iter)->id == id) @@ -629,7 +633,7 @@ AdventureTemplate *AdventureManager::GetAdventureTemplate(int theme, int id) AdventureTemplate *AdventureManager::GetAdventureTemplate(int id) { - std::map::iterator iter = adventure_templates.find(id); + auto iter = adventure_templates.find(id); if(iter == adventure_templates.end()) { return nullptr; @@ -653,7 +657,7 @@ bool AdventureManager::LoadAdventureTemplates() } for (auto row = results.begin(); row != results.end(); ++row) { - AdventureTemplate *aTemplate = new AdventureTemplate; + auto aTemplate = new AdventureTemplate; aTemplate->id = atoi(row[0]); strcpy(aTemplate->zone, row[1]); aTemplate->zone_version = atoi(row[2]); @@ -728,7 +732,7 @@ bool AdventureManager::LoadAdventureEntries() void AdventureManager::PlayerClickedDoor(const char *player, int zone_id, int door_id) { - std::list::iterator iter = adventure_list.begin(); + auto iter = adventure_list.begin(); while(iter != adventure_list.end()) { const AdventureTemplate *t = (*iter)->GetTemplate(); @@ -739,7 +743,9 @@ void AdventureManager::PlayerClickedDoor(const char *player, int zone_id, int do ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureClickDoorReply, sizeof(ServerPlayerClickedAdventureDoorReply_Struct)); + auto pack = + new ServerPacket(ServerOP_AdventureClickDoorReply, + sizeof(ServerPlayerClickedAdventureDoorReply_Struct)); ServerPlayerClickedAdventureDoorReply_Struct *sr = (ServerPlayerClickedAdventureDoorReply_Struct*)pack->pBuffer; strcpy(sr->player, player); sr->zone_id = database.GetZoneID(t->zone); @@ -766,7 +772,7 @@ void AdventureManager::PlayerClickedDoor(const char *player, int zone_id, int do ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureClickDoorError, 64); + auto pack = new ServerPacket(ServerOP_AdventureClickDoorError, 64); strcpy((char*)pack->pBuffer, player); pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); @@ -784,7 +790,7 @@ void AdventureManager::LeaveAdventure(const char *name) { if(pc->instance() != 0 && pc->instance() == current->GetInstanceID()) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaveDeny, 64); + auto pack = new ServerPacket(ServerOP_AdventureLeaveDeny, 64); strcpy((char*)pack->pBuffer, name); pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); @@ -798,7 +804,7 @@ void AdventureManager::LeaveAdventure(const char *name) } current->RemovePlayer(name); - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaveReply, 64); + auto pack = new ServerPacket(ServerOP_AdventureLeaveReply, 64); strcpy((char*)pack->pBuffer, name); pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); @@ -807,7 +813,7 @@ void AdventureManager::LeaveAdventure(const char *name) } else { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaveReply, 64); + auto pack = new ServerPacket(ServerOP_AdventureLeaveReply, 64); strcpy((char*)pack->pBuffer, name); pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); @@ -818,7 +824,7 @@ void AdventureManager::LeaveAdventure(const char *name) void AdventureManager::IncrementCount(uint16 instance_id) { - std::list::iterator iter = adventure_list.begin(); + auto iter = adventure_list.begin(); Adventure *current = nullptr; while(iter != adventure_list.end()) { @@ -834,8 +840,8 @@ void AdventureManager::IncrementCount(uint16 instance_id) { current->IncrementCount(); std::list slist = current->GetPlayers(); - std::list::iterator siter = slist.begin(); - ServerPacket *pack = new ServerPacket(ServerOP_AdventureCountUpdate, sizeof(ServerAdventureCountUpdate_Struct)); + auto siter = slist.begin(); + auto pack = new ServerPacket(ServerOP_AdventureCountUpdate, sizeof(ServerAdventureCountUpdate_Struct)); ServerAdventureCountUpdate_Struct *ac = (ServerAdventureCountUpdate_Struct*)pack->pBuffer; ac->count = current->GetCount(); ac->total = current->GetTemplate()->type_count; @@ -858,7 +864,7 @@ void AdventureManager::IncrementCount(uint16 instance_id) void AdventureManager::IncrementAssassinationCount(uint16 instance_id) { - std::list::iterator iter = adventure_list.begin(); + auto iter = adventure_list.begin(); Adventure *current = nullptr; while(iter != adventure_list.end()) { @@ -879,7 +885,7 @@ void AdventureManager::IncrementAssassinationCount(uint16 instance_id) void AdventureManager::GetZoneData(uint16 instance_id) { - std::list::iterator iter = adventure_list.begin(); + auto iter = adventure_list.begin(); Adventure *current = nullptr; while(iter != adventure_list.end()) { @@ -893,7 +899,7 @@ void AdventureManager::GetZoneData(uint16 instance_id) if(current) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureZoneData, sizeof(ServerZoneAdventureDataReply_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureZoneData, sizeof(ServerZoneAdventureDataReply_Struct)); ServerZoneAdventureDataReply_Struct *zd = (ServerZoneAdventureDataReply_Struct*)pack->pBuffer; const AdventureTemplate* temp = current->GetTemplate(); @@ -1241,7 +1247,7 @@ void AdventureManager::DoLeaderboardRequestWins(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1249,7 +1255,7 @@ void AdventureManager::DoLeaderboardRequestWins(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_wins.begin(); + auto iter = leaderboard_info_wins.begin(); while(i < 100 && iter != leaderboard_info_wins.end()) { LeaderboardInfo li = (*iter); @@ -1308,7 +1314,7 @@ void AdventureManager::DoLeaderboardRequestPercentage(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1316,7 +1322,7 @@ void AdventureManager::DoLeaderboardRequestPercentage(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_percentage.begin(); + auto iter = leaderboard_info_percentage.begin(); while(i < 100 && iter != leaderboard_info_percentage.end()) { LeaderboardInfo li = (*iter); @@ -1375,7 +1381,7 @@ void AdventureManager::DoLeaderboardRequestWinsGuk(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1383,7 +1389,7 @@ void AdventureManager::DoLeaderboardRequestWinsGuk(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_wins_guk.begin(); + auto iter = leaderboard_info_wins_guk.begin(); while(i < 100 && iter != leaderboard_info_wins_guk.end()) { LeaderboardInfo li = (*iter); @@ -1442,7 +1448,7 @@ void AdventureManager::DoLeaderboardRequestPercentageGuk(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1450,7 +1456,7 @@ void AdventureManager::DoLeaderboardRequestPercentageGuk(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_percentage_guk.begin(); + auto iter = leaderboard_info_percentage_guk.begin(); while(i < 100 && iter != leaderboard_info_percentage_guk.end()) { LeaderboardInfo li = (*iter); @@ -1509,7 +1515,7 @@ void AdventureManager::DoLeaderboardRequestWinsMir(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1517,7 +1523,7 @@ void AdventureManager::DoLeaderboardRequestWinsMir(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_wins_mir.begin(); + auto iter = leaderboard_info_wins_mir.begin(); while(i < 100 && iter != leaderboard_info_wins_mir.end()) { LeaderboardInfo li = (*iter); @@ -1576,7 +1582,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMir(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1584,7 +1590,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMir(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_percentage_mir.begin(); + auto iter = leaderboard_info_percentage_mir.begin(); while(i < 100 && iter != leaderboard_info_percentage_mir.end()) { LeaderboardInfo li = (*iter); @@ -1643,7 +1649,7 @@ void AdventureManager::DoLeaderboardRequestWinsMmc(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1651,7 +1657,7 @@ void AdventureManager::DoLeaderboardRequestWinsMmc(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_wins_mmc.begin(); + auto iter = leaderboard_info_wins_mmc.begin(); while(i < 100 && iter != leaderboard_info_wins_mmc.end()) { LeaderboardInfo li = (*iter); @@ -1710,7 +1716,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMmc(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1718,7 +1724,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMmc(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_percentage_mmc.begin(); + auto iter = leaderboard_info_percentage_mmc.begin(); while(i < 100 && iter != leaderboard_info_percentage_mmc.end()) { LeaderboardInfo li = (*iter); @@ -1777,7 +1783,7 @@ void AdventureManager::DoLeaderboardRequestWinsRuj(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1785,7 +1791,7 @@ void AdventureManager::DoLeaderboardRequestWinsRuj(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_wins_ruj.begin(); + auto iter = leaderboard_info_wins_ruj.begin(); while(i < 100 && iter != leaderboard_info_wins_ruj.end()) { LeaderboardInfo li = (*iter); @@ -1844,7 +1850,7 @@ void AdventureManager::DoLeaderboardRequestPercentageRuj(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1852,7 +1858,7 @@ void AdventureManager::DoLeaderboardRequestPercentageRuj(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_percentage_ruj.begin(); + auto iter = leaderboard_info_percentage_ruj.begin(); while(i < 100 && iter != leaderboard_info_percentage_ruj.end()) { LeaderboardInfo li = (*iter); @@ -1911,7 +1917,7 @@ void AdventureManager::DoLeaderboardRequestWinsTak(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1919,7 +1925,7 @@ void AdventureManager::DoLeaderboardRequestWinsTak(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_wins_ruj.begin(); + auto iter = leaderboard_info_wins_ruj.begin(); while(i < 100 && iter != leaderboard_info_wins_ruj.end()) { LeaderboardInfo li = (*iter); @@ -1978,7 +1984,7 @@ void AdventureManager::DoLeaderboardRequestPercentageTak(const char* player) ClientListEntry *pc = client_list.FindCharacter(player); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureLeaderboard, 64 + sizeof(AdventureLeaderboard_Struct)); AdventureLeaderboard_Struct *al = (AdventureLeaderboard_Struct*)(pack->pBuffer + 64); strcpy((char*)pack->pBuffer, player); @@ -1986,7 +1992,7 @@ void AdventureManager::DoLeaderboardRequestPercentageTak(const char* player) int our_successes = 0; int our_failures = 0; int i = 0; - std::list::iterator iter = leaderboard_info_percentage_tak.begin(); + auto iter = leaderboard_info_percentage_tak.begin(); while(i < 100 && iter != leaderboard_info_percentage_tak.end()) { LeaderboardInfo li = (*iter); @@ -2042,7 +2048,7 @@ void AdventureManager::DoLeaderboardRequestPercentageTak(const char* player) bool AdventureManager::PopFinishedEvent(const char *name, AdventureFinishEvent &fe) { - std::list::iterator iter = finished_list.begin(); + auto iter = finished_list.begin(); while(iter != finished_list.end()) { if((*iter).name.compare(name) == 0) @@ -2065,7 +2071,7 @@ void AdventureManager::SendAdventureFinish(AdventureFinishEvent fe) ClientListEntry *pc = client_list.FindCharacter(fe.name.c_str()); if(pc) { - ServerPacket *pack = new ServerPacket(ServerOP_AdventureFinish, sizeof(ServerAdventureFinish_Struct)); + auto pack = new ServerPacket(ServerOP_AdventureFinish, sizeof(ServerAdventureFinish_Struct)); ServerAdventureFinish_Struct *af = (ServerAdventureFinish_Struct*)pack->pBuffer; strcpy(af->player, fe.name.c_str()); af->theme = fe.theme; @@ -2088,7 +2094,7 @@ void AdventureManager::Save() ss.write((const char*)&number_of_elements, sizeof(int)); char null_term = 0; - std::list::iterator a_iter = adventure_list.begin(); + auto a_iter = adventure_list.begin(); while(a_iter != adventure_list.end()) { int cur = (*a_iter)->GetCount(); @@ -2113,7 +2119,7 @@ void AdventureManager::Save() cur = players.size(); ss.write((const char*)&cur, sizeof(int)); - std::list::iterator s_iter = players.begin(); + auto s_iter = players.begin(); while(s_iter != players.end()) { ss.write((const char*)(*s_iter).c_str(), (*s_iter).size()); @@ -2126,7 +2132,7 @@ void AdventureManager::Save() number_of_elements = finished_list.size(); ss.write((const char*)&number_of_elements, sizeof(int)); - std::list::iterator f_iter = finished_list.begin(); + auto f_iter = finished_list.begin(); while(f_iter != finished_list.end()) { ss.write((const char*)&(*f_iter).win, sizeof(bool)); @@ -2198,7 +2204,8 @@ void AdventureManager::Load() AdventureTemplate *t = GetAdventureTemplate(template_id); if(t) { - Adventure *adv = new Adventure(t, count, a_count, (AdventureStatus)status, instance_id, rem_time); + auto adv = + new Adventure(t, count, a_count, (AdventureStatus)status, instance_id, rem_time); for(int j = 0; j < num_players; ++j) { adv->AddPlayer((const char*)ptr, false);