Prefer prefix ++/-- on non-primitive types

Postfix ++/-- might cause the creation of a tmp instance
that might be optimized out. Mights are bad. Prefix doesn't
have this problem.

world/Adventure.cpp

@@ -74,7 +74,7 @@ void Adventure::RemovePlayer(std::string character_name)
 			players.erase(iter);
 			return;
 		}
-		iter++;
+		++iter;
 	}
 }
 
@@ -87,7 +87,7 @@ bool Adventure::PlayerExists(std::string character_name)
 		{
 			return true;
 		}
-		iter++;
+		++iter;
 	}
 	return false;
 }
@@ -214,7 +214,7 @@ void Adventure::SetStatus(AdventureStatus new_status)
 	while(iter != players.end())
 	{
 		adventure_manager.GetAdventureData((*iter).c_str());
-		iter++;
+		++iter;
 	}
 }
 
@@ -233,7 +233,7 @@ void Adventure::SendAdventureMessage(uint32 type, const char *msg)
 			strcpy(sms->to, (*iter).c_str());
 			zoneserver_list.SendPacket(current->zone(), current->instance(), pack);
 		}
-		iter++;
+		++iter;
 	}
 	delete pack;
 }
@@ -360,7 +360,7 @@ void Adventure::Finished(AdventureWinStatus ws)
 			adventure_manager.AddFinishedEvent(afe);
 			database.UpdateAdventureStatsEntry(database.GetCharacterID((*iter).c_str()), GetTemplate()->theme, (ws != AWS_Lose) ? true : false);
 		}
-		iter++;
+		++iter;
 	}
 	adventure_manager.GetAdventureData(this);
 }
@@ -411,7 +411,7 @@ void Adventure::MoveCorpsesToGraveyard()
 			LogFile->write(EQEMuLog::Error, "Error in AdventureManager:::MoveCorpsesToGraveyard: %s (%s)", query, errbuf);
 			safe_delete_array(query);
 		}
-		iter++;
+		++iter;
 	}
 
 	iter = dbid_list.begin();
@@ -433,8 +433,8 @@ void Adventure::MoveCorpsesToGraveyard()
 
 		zoneserver_list.SendPacket(spc->zone_id, 0, pack);
 		delete pack;
-		iter++;
-		c_iter++;
+		++iter;
+		++c_iter;
 	}
 }
 

world/AdventureManager.cpp

@@ -48,7 +48,7 @@ void AdventureManager::Process()
 				delete adv;
 				continue;
 			}
-			iter++;
+			++iter;
 		}
 	}
 
@@ -118,7 +118,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 				}
 			}
 		}
-		iter++;
+		++iter;
 	}
 
 	/**
@@ -171,7 +171,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 			ea_iter = eligible_adventures.erase(ea_iter);
 			continue;
 		}
-		ea_iter++;
+		++ea_iter;
 	}
 
 	/**
@@ -281,9 +281,9 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 				ea_iter = eligible_adventures.erase(ea_iter);
 				continue;
 			}
-			ea_iter++;
+			++ea_iter;
 		}
-		ez_iter++;
+		++ez_iter;
 	}
 
 	std::list<AdventureZoneIn>::iterator ezi_iter = excluded_zone_ins.begin();
@@ -297,9 +297,9 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 				ea_iter = eligible_adventures.erase(ea_iter);
 				continue;
 			}
-			ea_iter++;
+			++ea_iter;
 		}
-		ezi_iter++;
+		++ezi_iter;
 	}
 
 	/**
@@ -319,7 +319,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 			ea_iter = eligible_adventures.erase(ea_iter);
 			continue;
 		}
-		ea_iter++;
+		++ea_iter;
 	}
 
 	if(eligible_adventures.size() > 0)
@@ -328,7 +328,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 		int c_index = MakeRandomInt(0, (eligible_adventures.size()-1));
 		for(int i = 0; i < c_index; ++i)
 		{
-			ea_iter++;
+			++ea_iter;
 		}
 		ServerPacket *pack = new ServerPacket(ServerOP_AdventureRequestAccept, sizeof(ServerAdventureRequestAccept_Struct) + (sar->member_count * 64));
 		ServerAdventureRequestAccept_Struct *sra = (ServerAdventureRequestAccept_Struct*)pack->pBuffer;
@@ -457,7 +457,7 @@ void AdventureManager::GetAdventureData(Adventure *adv)
 	while(iter != player_list.end())
 	{
 		GetAdventureData((*iter).c_str());
-		iter++;
+		++iter;
 	}
 }
 
@@ -537,7 +537,7 @@ bool AdventureManager::IsInExcludedZoneList(std::list<AdventureZones> excluded_z
 		{
 			return true;
 		}
-		iter++;
+		++iter;
 	}
 	return false;
 }
@@ -551,7 +551,7 @@ bool AdventureManager::IsInExcludedZoneInList(std::list<AdventureZoneIn> exclude
 		{
 			return true;
 		}
-		iter++;
+		++iter;
 	}
 	return false;
 }
@@ -587,7 +587,7 @@ Adventure **AdventureManager::GetFinishedAdventures(const char *player, int &cou
 				count++;
 			}
 		}
-		iter++;
+		++iter;
 	}
 	return ret;
 }
@@ -601,7 +601,7 @@ Adventure *AdventureManager::GetActiveAdventure(const char *player)
 		{
 			return (*iter);
 		}
-		iter++;
+		++iter;
 	}
 	return nullptr;
 }
@@ -621,7 +621,7 @@ AdventureTemplate *AdventureManager::GetAdventureTemplate(int theme, int id)
 		{
 			return (*l_iter);
 		}
-		l_iter++;
+		++l_iter;
 	}
 	return nullptr;
 }
@@ -788,7 +788,7 @@ void AdventureManager::PlayerClickedDoor(const char *player, int zone_id, int do
 				return;
 			}
 		}
-		iter++;
+		++iter;
 	}
 
 	ClientListEntry *pc = client_list.FindCharacter(player);
@@ -855,7 +855,7 @@ void AdventureManager::IncrementCount(uint16 instance_id)
 			current = (*iter);
 			break;
 		}
-		iter++;
+		++iter;
 	}
 
 	if(current)
@@ -877,7 +877,7 @@ void AdventureManager::IncrementCount(uint16 instance_id)
 				strcpy(ac->player, (*siter).c_str());
 				zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 			}
-			siter++;
+			++siter;
 		}
 
 		delete pack;
@@ -895,7 +895,7 @@ void AdventureManager::IncrementAssassinationCount(uint16 instance_id)
 			current = (*iter);
 			break;
 		}
-		iter++;
+		++iter;
 	}
 
 	if(current)
@@ -916,7 +916,7 @@ void AdventureManager::GetZoneData(uint16 instance_id)
 			current = (*iter);
 			break;
 		}
-		iter++;
+		++iter;
 	}
 
 	if(current)
@@ -1302,7 +1302,7 @@ void AdventureManager::DoLeaderboardRequestWins(const char* player)
 			al->entries[i].failure = li.losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_wins.end())
@@ -1318,7 +1318,7 @@ void AdventureManager::DoLeaderboardRequestWins(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1369,7 +1369,7 @@ void AdventureManager::DoLeaderboardRequestPercentage(const char* player)
 			al->entries[i].failure = li.losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_percentage.end())
@@ -1385,7 +1385,7 @@ void AdventureManager::DoLeaderboardRequestPercentage(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1436,7 +1436,7 @@ void AdventureManager::DoLeaderboardRequestWinsGuk(const char* player)
 			al->entries[i].failure = li.guk_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_wins_guk.end())
@@ -1452,7 +1452,7 @@ void AdventureManager::DoLeaderboardRequestWinsGuk(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1503,7 +1503,7 @@ void AdventureManager::DoLeaderboardRequestPercentageGuk(const char* player)
 			al->entries[i].failure = li.guk_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_percentage_guk.end())
@@ -1519,7 +1519,7 @@ void AdventureManager::DoLeaderboardRequestPercentageGuk(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1570,7 +1570,7 @@ void AdventureManager::DoLeaderboardRequestWinsMir(const char* player)
 			al->entries[i].failure = li.mir_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_wins_mir.end())
@@ -1586,7 +1586,7 @@ void AdventureManager::DoLeaderboardRequestWinsMir(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1637,7 +1637,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMir(const char* player)
 			al->entries[i].failure = li.mir_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_percentage_mir.end())
@@ -1653,7 +1653,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMir(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1704,7 +1704,7 @@ void AdventureManager::DoLeaderboardRequestWinsMmc(const char* player)
 			al->entries[i].failure = li.mmc_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_wins_mmc.end())
@@ -1720,7 +1720,7 @@ void AdventureManager::DoLeaderboardRequestWinsMmc(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1771,7 +1771,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMmc(const char* player)
 			al->entries[i].failure = li.mmc_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_percentage_mmc.end())
@@ -1787,7 +1787,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMmc(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1838,7 +1838,7 @@ void AdventureManager::DoLeaderboardRequestWinsRuj(const char* player)
 			al->entries[i].failure = li.ruj_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_wins_ruj.end())
@@ -1854,7 +1854,7 @@ void AdventureManager::DoLeaderboardRequestWinsRuj(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1905,7 +1905,7 @@ void AdventureManager::DoLeaderboardRequestPercentageRuj(const char* player)
 			al->entries[i].failure = li.ruj_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_percentage_ruj.end())
@@ -1921,7 +1921,7 @@ void AdventureManager::DoLeaderboardRequestPercentageRuj(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -1972,7 +1972,7 @@ void AdventureManager::DoLeaderboardRequestWinsTak(const char* player)
 			al->entries[i].failure = li.tak_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_wins_ruj.end())
@@ -1988,7 +1988,7 @@ void AdventureManager::DoLeaderboardRequestWinsTak(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -2039,7 +2039,7 @@ void AdventureManager::DoLeaderboardRequestPercentageTak(const char* player)
 			al->entries[i].failure = li.tak_losses;
 			strcpy(al->entries[i].name, li.name.c_str());
 			i++;
-			iter++;
+			++iter;
 		}
 
 		if(place == -1 && iter != leaderboard_info_percentage_tak.end())
@@ -2055,7 +2055,7 @@ void AdventureManager::DoLeaderboardRequestPercentageTak(const char* player)
 					break;
 				}
 				i++;
-				iter++;
+				++iter;
 			}
 		}
 
@@ -2093,7 +2093,7 @@ bool AdventureManager::PopFinishedEvent(const char *name, AdventureFinishEvent &
 			Save();
 			return true;
 		}
-		iter++;
+		++iter;
 	}
 	return false;
 }

world/EQLConfig.cpp

@@ -99,7 +99,7 @@ void EQLConfig::GetZones(std::vector<LauncherZone> &result) {
 	std::map<std::string, LauncherZone>::iterator cur, end;
 	cur = m_zones.begin();
 	end = m_zones.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		result.push_back(cur->second);
 	}
 }
@@ -112,7 +112,7 @@ std::vector<std::string> EQLConfig::ListZones() {
 		std::map<std::string, LauncherZone>::iterator cur, end;
 		cur = m_zones.begin();
 		end = m_zones.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			res.push_back(cur->first);
 		}
 	} else {

world/EQW.cpp

@@ -120,7 +120,7 @@ std::vector<std::string> EQW::ListBootedZones() {
 	std::vector<uint32>::iterator cur, end;
 	cur = zones.begin();
 	end = zones.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		res.push_back(itoa(*cur));
 	}
 
@@ -170,7 +170,7 @@ std::vector<std::string> EQW::ListPlayers(Const_char *zone_name) {
 	std::vector<ClientListEntry *>::iterator cur, end;
 	cur = list.begin();
 	end = list.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		res.push_back((*cur)->name());
 	}
 	return(res);

world/LauncherLink.cpp

@@ -58,7 +58,7 @@ bool LauncherLink::Process() {
 		std::map<std::string, ZoneState>::iterator cur, end;
 		cur = m_states.begin();
 		end = m_states.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			if(!cur->second.up) {
 				StartZone(cur->first.c_str());
 			}

world/LauncherList.cpp

@@ -32,28 +32,28 @@ LauncherList::~LauncherList() {
 	std::vector<LauncherLink *>::iterator cur, end;
 	cur = m_pendingLaunchers.begin();
 	end = m_pendingLaunchers.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		delete *cur;
 	}
 
 	std::map<std::string, EQLConfig *>::iterator curc, endc;
 	curc = m_configs.begin();
 	endc = m_configs.end();
-	for(; curc != endc; curc++) {
+	for(; curc != endc; ++curc) {
 		delete curc->second;
 	}
 
 	std::map<std::string, LauncherLink *>::iterator curl, endl;
 	curl = m_launchers.begin();
 	endl = m_launchers.end();
-	for(; curl != endl; curl++) {
+	for(; curl != endl; ++curl) {
 		delete curl->second;
 	}
 }
 
 void LauncherList::Process() {
 	//process pending launchers..
-	std::vector<LauncherLink *>::iterator cur, end;
+	std::vector<LauncherLink *>::iterator cur;
 	cur = m_pendingLaunchers.begin();
 	while(cur != m_pendingLaunchers.end()) {
 		LauncherLink *l = *cur;
@@ -79,12 +79,12 @@ void LauncherList::Process() {
 			//put the launcher in the list.
 			m_launchers[name] = l;
 		} else {
-			cur++;
+			++cur;
 		}
 	}
 
 	//process active launchers.
-	std::map<std::string, LauncherLink *>::iterator curl, tmp;
+	std::map<std::string, LauncherLink *>::iterator curl;
 	curl = m_launchers.begin();
 	while(curl != m_launchers.end()) {
 		LauncherLink *l = curl->second;
@@ -92,12 +92,10 @@ void LauncherList::Process() {
 		if(!l->Process()) {
 			//launcher has died before it identified itself.
 			_log(WORLD__LAUNCH, "Removing launcher %s (%d)", l->GetName(), l->GetID());
-			tmp = curl;
-			curl++;
-			m_launchers.erase(tmp);
+			curl = m_launchers.erase(curl);
 			delete l;
 		} else {
-			curl++;
+			++curl;
 		}
 	}
 }
@@ -124,7 +122,7 @@ LauncherLink *LauncherList::FindByZone(const char *short_name) {
 	std::map<std::string, LauncherLink *>::iterator cur, end;
 	cur = m_launchers.begin();
 	end = m_launchers.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(cur->second->ContainsZone(short_name))
 			return(cur->second);
 	}
@@ -146,7 +144,7 @@ void LauncherList::GetLauncherNameList(std::vector<std::string> &res) {
 	std::map<std::string, EQLConfig *>::iterator cur, end;
 	cur = m_configs.begin();
 	end = m_configs.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		res.push_back(cur->first);
 	}
 }
@@ -159,7 +157,7 @@ void LauncherList::LoadList() {
 	std::vector<std::string>::iterator cur, end;
 	cur = launchers.begin();
 	end = launchers.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		m_configs[*cur] = new EQLConfig(cur->c_str());
 	}
 }