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.

common/EQNetwork.cpp

@@ -229,25 +229,18 @@ void EQStreamServer::Process() {
 	}
 
 	std::map <std::string, EQStream*>::iterator connection;
-	for (connection = connection_list.begin( ); connection != connection_list.end( );)
-	{
-		if(!connection->second)
-		{
-			std::map <std::string, EQStream*>::iterator tmp=connection;
-			connection++;
-			connection_list.erase(tmp);
+	for (connection = connection_list.begin(); connection != connection_list.end();) {
+		if (!connection->second) {
+			connection = connection_list.erase(connection);
 			continue;
 		}
 		EQStream* eqs_data = connection->second;
 		if (eqs_data->IsFree() && (!eqs_data->CheckNetActive())) {
-			std::map <std::string, EQStream*>::iterator tmp=connection;
-			connection++;
 			safe_delete(eqs_data);
-			connection_list.erase(tmp);
-		}
-		else if(!eqs_data->RunLoop) {
+			connection = connection_list.erase(connection);
+		} else if (!eqs_data->RunLoop) {
 			eqs_data->Process(sock);
-			connection++;
+			++connection;
 		}
 	}
 }

common/EQStream.cpp

@@ -747,7 +747,7 @@ void EQStream::Write(int eq_fd)
 					// Copy it first as it will still live until it is acked
 					p=(*sitr)->Copy();
 					_log(NET__NET_COMBINE, _L "Starting combined packet with seq packet %d of len %d" __L, seq_send, p->size);
-					sitr++;
+					++sitr;
 					NextSequencedSend++;
 				} else if (!p->combine(*sitr)) {
 					// Trying to combine this packet with the base didn't work (too big maybe)
@@ -765,7 +765,7 @@ void EQStream::Write(int eq_fd)
 				} else {
 					// Combine worked
 					_log(NET__NET_COMBINE, _L "Combined seq packet %d of len %d, yeilding %d combined." __L, seq_send, (*sitr)->size, p->size);
-					sitr++;
+					++sitr;
 					NextSequencedSend++;
 				}
 			} else {
@@ -774,7 +774,7 @@ void EQStream::Write(int eq_fd)
 					// Copy it first as it will still live until it is acked
 					p=(*sitr)->Copy();
 					_log(NET__NET_COMBINE, _L "Starting combined packet with seq packet %d of len %d" __L, seq_send, p->size);
-					sitr++;
+					++sitr;
 					NextSequencedSend++;
 				} else if (!p->combine(*sitr)) {
 					// Trying to combine this packet with the base didn't work (too big maybe)
@@ -792,7 +792,7 @@ void EQStream::Write(int eq_fd)
 				} else {
 					// Combine worked
 					_log(NET__NET_COMBINE, _L "Combined seq packet %d of len %d, yeilding %d combined." __L, seq_send, (*sitr)->size, p->size);
-					sitr++;
+					++sitr;
 					NextSequencedSend++;
 				}
 			}
@@ -1047,7 +1047,7 @@ EQApplicationPacket *p=nullptr;
 	MInboundQueue.lock();
 	if (!InboundQueue.empty()) {
 		std::vector<EQRawApplicationPacket *>::iterator itr;
-		for(itr=InboundQueue.begin();itr!=InboundQueue.end();itr++) {
+		for(itr=InboundQueue.begin();itr!=InboundQueue.end();++itr) {
 			p=*itr;
 			delete p;
 		}
@@ -1094,7 +1094,7 @@ EQProtocolPacket *p=nullptr;
 	}
 	if(!SequencedQueue.empty()) {
 		std::deque<EQProtocolPacket *>::iterator itr;
-		for(itr=SequencedQueue.begin();itr!=SequencedQueue.end();itr++) {
+		for(itr=SequencedQueue.begin();itr!=SequencedQueue.end();++itr) {
 			p=*itr;
 			delete p;
 		}
@@ -1119,7 +1119,7 @@ EQProtocolPacket *p=nullptr;
 
 	if(!PacketQueue.empty()) {
 		std::map<unsigned short,EQProtocolPacket *>::iterator itr;
-		for(itr=PacketQueue.begin();itr!=PacketQueue.end();itr++) {
+		for(itr=PacketQueue.begin();itr!=PacketQueue.end();++itr) {
 			p=itr->second;
 			delete p;
 		}

common/Item.cpp

@@ -101,7 +101,7 @@ ItemInstQueue::~ItemInstQueue() {
 	iter_queue cur,end;
 	cur = m_list.begin();
 	end = m_list.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ItemInst *tmp = * cur;
 		safe_delete(tmp);
 	}
@@ -113,7 +113,7 @@ Inventory::~Inventory() {
 
 	cur = m_worn.begin();
 	end = m_worn.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ItemInst *tmp = cur->second;
 		safe_delete(tmp);
 	}
@@ -121,7 +121,7 @@ Inventory::~Inventory() {
 
 	cur = m_inv.begin();
 	end = m_inv.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ItemInst *tmp = cur->second;
 		safe_delete(tmp);
 	}
@@ -129,7 +129,7 @@ Inventory::~Inventory() {
 
 	cur = m_bank.begin();
 	end = m_bank.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ItemInst *tmp = cur->second;
 		safe_delete(tmp);
 	}
@@ -137,7 +137,7 @@ Inventory::~Inventory() {
 
 	cur = m_shbank.begin();
 	end = m_shbank.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ItemInst *tmp = cur->second;
 		safe_delete(tmp);
 	}
@@ -145,7 +145,7 @@ Inventory::~Inventory() {
 
 	cur = m_trade.begin();
 	end = m_trade.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ItemInst *tmp = cur->second;
 		safe_delete(tmp);
 	}
@@ -166,7 +166,7 @@ ItemInst::ItemInst(const ItemInst& copy)
 	m_merchantcount=copy.m_merchantcount;
 	// Copy container contents
 	iter_contents it;
-	for (it=copy.m_contents.begin(); it!=copy.m_contents.end(); it++) {
+	for (it=copy.m_contents.begin(); it!=copy.m_contents.end(); ++it) {
 		ItemInst* inst_old = it->second;
 		ItemInst* inst_new = nullptr;
 
@@ -179,7 +179,7 @@ ItemInst::ItemInst(const ItemInst& copy)
 		}
 	}
 	std::map<std::string, std::string>::const_iterator iter;
-	for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); iter++) {
+	for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); ++iter) {
 		m_custom_data[iter->first] = iter->second;
 	}
 	m_SerialNumber = copy.m_SerialNumber;
@@ -428,7 +428,7 @@ void ItemInst::Clear()
 	iter_contents cur, end;
 	cur = m_contents.begin();
 	end = m_contents.end();
-	for (; cur != end; cur++) {
+	for (; cur != end; ++cur) {
 		ItemInst* inst = cur->second;
 		safe_delete(inst);
 	}
@@ -446,7 +446,7 @@ void ItemInst::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent)
 		ItemInst* inst = cur->second;
 		const Item_Struct* item = inst->GetItem();
 		del = cur;
-		cur++;
+		++cur;
 
 		switch(is_nodrop) {
 		case byFlagSet:
@@ -611,7 +611,7 @@ std::string ItemInst::GetCustomDataString() const {
 		ret_val += iter->first;
 		ret_val += "^";
 		ret_val += iter->second;
-		iter++;
+		++iter;
 
 		if(ret_val.length() > 0) {
 			ret_val += "^";
@@ -1231,11 +1231,11 @@ int16 Inventory::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, boo
 void Inventory::dumpBagContents(ItemInst *inst, iter_inst *it) {
 	iter_contents itb;
 
-	if (!inst || !inst->IsType(ItemClassContainer)) 
+	if (!inst || !inst->IsType(ItemClassContainer))
 		return;
 
 	// Go through bag, if bag
-	for (itb=inst->_begin(); itb!=inst->_end(); itb++) {
+	for (itb=inst->_begin(); itb!=inst->_end(); ++itb) {
 		ItemInst* baginst = itb->second;
 		if(!baginst || !baginst->GetItem())
 			continue;
@@ -1308,7 +1308,7 @@ void Inventory::dumpItemCollection(const std::map<int16, ItemInst*> &collection)
 	iter_contents itb;
 	ItemInst* inst = nullptr;
 	
-	for (it=collection.begin(); it!=collection.end(); it++) {
+	for (it=collection.begin(); it!=collection.end(); ++it) {
 		inst = it->second;
 		if(!inst || !inst->GetItem())
 			continue;
@@ -1430,7 +1430,7 @@ int16 Inventory::_HasItem(std::map<int16, ItemInst*>& bucket, uint32 item_id, ui
 	uint8 quantity_found = 0;
 
 	// Check item: After failed checks, check bag contents (if bag)
-	for (it=bucket.begin(); it!=bucket.end(); it++) {
+	for (it=bucket.begin(); it!=bucket.end(); ++it) {
 		inst = it->second;
 		if (inst) {
 			if (inst->GetID() == item_id) {
@@ -1447,7 +1447,7 @@ int16 Inventory::_HasItem(std::map<int16, ItemInst*>& bucket, uint32 item_id, ui
 		// Go through bag, if bag
 		if (inst && inst->IsType(ItemClassContainer)) {
 
-			for (itb=inst->_begin(); itb!=inst->_end(); itb++) {
+			for (itb=inst->_begin(); itb!=inst->_end(); ++itb) {
 				ItemInst* baginst = itb->second;
 				if (baginst->GetID() == item_id) {
 					quantity_found += (baginst->GetCharges()<=0) ? 1 : baginst->GetCharges();
@@ -1474,7 +1474,7 @@ int16 Inventory::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity)
 	uint8 quantity_found = 0;
 
 	// Read-only iteration of queue
-	for (it=iqueue.begin(); it!=iqueue.end(); it++) {
+	for (it=iqueue.begin(); it!=iqueue.end(); ++it) {
 		ItemInst* inst = *it;
 		if (inst)
 		{
@@ -1491,7 +1491,7 @@ int16 Inventory::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity)
 		// Go through bag, if bag
 		if (inst && inst->IsType(ItemClassContainer)) {
 
-			for (itb=inst->_begin(); itb!=inst->_end(); itb++) {
+			for (itb=inst->_begin(); itb!=inst->_end(); ++itb) {
 				ItemInst* baginst = itb->second;
 				if (baginst->GetID() == item_id) {
 					quantity_found += (baginst->GetCharges()<=0) ? 1 : baginst->GetCharges();
@@ -1520,7 +1520,7 @@ int16 Inventory::_HasItemByUse(std::map<int16, ItemInst*>& bucket, uint8 use, ui
 	uint8 quantity_found = 0;
 
 	// Check item: After failed checks, check bag contents (if bag)
-	for (it=bucket.begin(); it!=bucket.end(); it++) {
+	for (it=bucket.begin(); it!=bucket.end(); ++it) {
 		inst = it->second;
 		if (inst && inst->IsType(ItemClassCommon) && inst->GetItem()->ItemType == use) {
 			quantity_found += (inst->GetCharges()<=0) ? 1 : inst->GetCharges();
@@ -1554,7 +1554,7 @@ int16 Inventory::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity)
 	uint8 quantity_found = 0;
 
 	// Read-only iteration of queue
-	for (it=iqueue.begin(); it!=iqueue.end(); it++) {
+	for (it=iqueue.begin(); it!=iqueue.end(); ++it) {
 		ItemInst* inst = *it;
 		if (inst && inst->IsType(ItemClassCommon) && inst->GetItem()->ItemType == use) {
 			quantity_found += (inst->GetCharges()<=0) ? 1 : inst->GetCharges();
@@ -1565,7 +1565,7 @@ int16 Inventory::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity)
 		// Go through bag, if bag
 		if (inst && inst->IsType(ItemClassContainer)) {
 
-			for (itb=inst->_begin(); itb!=inst->_end(); itb++) {
+			for (itb=inst->_begin(); itb!=inst->_end(); ++itb) {
 				ItemInst* baginst = itb->second;
 				if (baginst && baginst->IsType(ItemClassCommon) && baginst->GetItem()->ItemType == use) {
 					quantity_found += (baginst->GetCharges()<=0) ? 1 : baginst->GetCharges();
@@ -1587,7 +1587,7 @@ int16 Inventory::_HasItemByLoreGroup(std::map<int16, ItemInst*>& bucket, uint32
 	ItemInst* inst = nullptr;
 
 	// Check item: After failed checks, check bag contents (if bag)
-	for (it=bucket.begin(); it!=bucket.end(); it++) {
+	for (it=bucket.begin(); it!=bucket.end(); ++it) {
 		inst = it->second;
 		if (inst) {
 			if (inst->GetItem()->LoreGroup == loregroup)
@@ -1603,7 +1603,7 @@ int16 Inventory::_HasItemByLoreGroup(std::map<int16, ItemInst*>& bucket, uint32
 		// Go through bag, if bag
 		if (inst && inst->IsType(ItemClassContainer)) {
 
-			for (itb=inst->_begin(); itb!=inst->_end(); itb++) {
+			for (itb=inst->_begin(); itb!=inst->_end(); ++itb) {
 				ItemInst* baginst = itb->second;
 				if (baginst && baginst->IsType(ItemClassCommon)&& baginst->GetItem()->LoreGroup == loregroup)
 					return Inventory::CalcSlotId(it->first, itb->first);
@@ -1629,7 +1629,7 @@ int16 Inventory::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup)
 	iter_contents itb;
 
 	// Read-only iteration of queue
-	for (it=iqueue.begin(); it!=iqueue.end(); it++) {
+	for (it=iqueue.begin(); it!=iqueue.end(); ++it) {
 		ItemInst* inst = *it;
 		if (inst)
 		{
@@ -1646,7 +1646,7 @@ int16 Inventory::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup)
 		// Go through bag, if bag
 		if (inst && inst->IsType(ItemClassContainer)) {
 
-			for (itb=inst->_begin(); itb!=inst->_end(); itb++) {
+			for (itb=inst->_begin(); itb!=inst->_end(); ++itb) {
 				ItemInst* baginst = itb->second;
 				if (baginst && baginst->IsType(ItemClassCommon)&& baginst->GetItem()->LoreGroup == loregroup)
 					return Inventory::CalcSlotId(SLOT_CURSOR, itb->first);

common/TCPServer.h

@@ -65,7 +65,7 @@ public:
 		vitr cur, end;
 		cur = m_list.begin();
 		end = m_list.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			delete *cur;
 		}
 	}
@@ -98,7 +98,7 @@ protected:
 			} else {
 				if (!data->Process())
 					data->Disconnect();
-				cur++;
+				++cur;
 			}
 		}
 	}

common/guild_base.cpp

@@ -1113,7 +1113,7 @@ uint8 *BaseGuildManager::MakeGuildList(const char *head_name, uint32 &length) co
 	std::map<uint32, GuildInfo *>::const_iterator cur, end;
 	cur = m_guilds.begin();
 	end = m_guilds.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		pos = 64 + (64 * cur->first);
 		strn0cpy((char *) buffer + pos, cur->second->name.c_str(), 64);
 	}
@@ -1218,7 +1218,7 @@ uint32 BaseGuildManager::FindGuildByLeader(uint32 leader) const {
 	std::map<uint32, GuildInfo *>::const_iterator cur, end;
 	cur = m_guilds.begin();
 	end = m_guilds.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(cur->second->leader_char_id == leader)
 			return(cur->first);
 	}
@@ -1297,7 +1297,7 @@ void BaseGuildManager::ClearGuilds() {
 	std::map<uint32, GuildInfo *>::iterator cur, end;
 	cur = m_guilds.begin();
 	end = m_guilds.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		delete cur->second;
 	}
 	m_guilds.clear();

common/ptimer.cpp

@@ -294,7 +294,7 @@ PTimerList::~PTimerList() {
 	while(s != _list.end()) {
 		if(s->second != nullptr)
 			delete s->second;
-		s++;
+		++s;
 	}
 }
 
@@ -305,7 +305,7 @@ bool PTimerList::Load(Database *db) {
 	while(s != _list.end()) {
 		if(s->second != nullptr)
 			delete s->second;
-		s++;
+		++s;
 	}
 	_list.clear();
 
@@ -373,7 +373,7 @@ bool PTimerList::Store(Database *db) {
 			if(!s->second->Store(db))
 				res = false;
 		}
-		s++;
+		++s;
 	}
 	return(res);
 }
@@ -474,7 +474,7 @@ void PTimerList::ToVector(std::vector< std::pair<pTimerType, PersistentTimer *>
 			p.second = s->second;
 			out.push_back(p);
 		}
-		s++;
+		++s;
 	}
 }
 

common/shareddb.cpp

@@ -150,7 +150,7 @@ bool ret=true;
 	char* query = 0;
 	// Delete cursor items
 	if ((ret = RunQuery(query, MakeAnyLenString(&query, "DELETE FROM inventory WHERE charid=%i AND ( (slotid >=8000 and slotid<=8999) or slotid=30 or (slotid>=331 and slotid<=340))", char_id), errbuf))) {
-		for(it=start,i=8000;it!=end;it++,i++) {
+		for(it=start,i=8000;it!=end;++it,i++) {
 			ItemInst *inst=*it;
 			if (!(ret=SaveInventory(char_id,inst,(i==8000) ? 30 : i)))
 				break;

common/timeoutmgr.cpp

@@ -39,7 +39,7 @@ void TimeoutManager::CheckTimeouts() {
 	std::vector<Timeoutable *>::iterator cur,end;
 	cur = members.begin();
 	end = members.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		Timeoutable *it = *cur;
 		if(it->next_check.Check()) {
 #ifdef TIMEOUT_DEBUG
@@ -69,7 +69,7 @@ void TimeoutManager::DeleteMember(Timeoutable *who) {
 	std::vector<Timeoutable *>::iterator cur,end;
 	cur = members.begin();
 	end = members.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(*cur == who) {
 			members.erase(cur);
 			return;

eqlaunch/eqlaunch.cpp

@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) {
 		*/
 		zone = zones.begin();
 		zend = zones.end();
-		for(; zone != zend; zone++) {
+		for(; zone != zend; ++zone) {
 			if(!zone->second->Process())
 				to_remove.insert(zone->first);
 		}
@@ -159,7 +159,7 @@ int main(int argc, char *argv[]) {
 	//try to be semi-nice about this... without waiting too long
 	zone = zones.begin();
 	zend = zones.end();
-	for(; zone != zend; zone++) {
+	for(; zone != zend; ++zone) {
 		zone->second->Stop();
 	}
 	Sleep(1);
@@ -169,7 +169,7 @@ int main(int argc, char *argv[]) {
 	launch->Process();
 	//kill anybody left
 	launch->TerminateAll(true);
-	for(; zone != zend; zone++) {
+	for(; zone != zend; ++zone) {
 		delete zone->second;
 	}
 

eqlaunch/worldserver.cpp

@@ -49,7 +49,7 @@ void WorldServer::OnConnected() {
 	std::map<std::string, ZoneLaunch *>::iterator cur, end;
 	cur = m_zones.begin();
 	end = m_zones.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		cur->second->SendStatus();
 	}
 }

loginserver/ClientManager.cpp

@@ -131,7 +131,7 @@ void ClientManager::Process()
 		}
 		else
 		{
-			iter++;
+			++iter;
 		}
 	}
 }
@@ -150,7 +150,7 @@ void ClientManager::ProcessDisconnect()
 		}
 		else
 		{
-			iter++;
+			++iter;
 		}
 	}
 }
@@ -161,7 +161,7 @@ void ClientManager::UpdateServerList()
 	while(iter != clients.end())
 	{
 		(*iter)->SendServerListPacket();
-		iter++;
+		++iter;
 	}
 }
 
@@ -178,7 +178,7 @@ void ClientManager::RemoveExistingClient(unsigned int account_id)
 		}
 		else
 		{
-			iter++;
+			++iter;
 		}
 	}
 }
@@ -195,7 +195,7 @@ Client *ClientManager::GetClient(unsigned int account_id)
 			cur = (*iter);
 			count++;
 		}
-		iter++;
+		++iter;
 	}
 
 	if(count > 1)

loginserver/Config.cpp

@@ -68,7 +68,7 @@ void Config::Parse(const char *file_name)
 			{
 				title.clear();
 				bool first = true;
-				iter++;
+				++iter;
 				if(iter == tokens.end())
 				{
 					server_log->Log(log_error, "Config::Parse(), EOF before title done parsing.");
@@ -89,9 +89,9 @@ void Config::Parse(const char *file_name)
 					}
 
 					title += (*iter);
-					iter++;
+					++iter;
 				}
-				iter++;
+				++iter;
 			}
 
 			if(mode == 0)
@@ -127,7 +127,7 @@ void Config::Parse(const char *file_name)
 					vars[title] = var_map;
 				}
 			}
-			iter++;
+			++iter;
 		}
 		fclose(input);
 	}

loginserver/ServerManager.cpp

@@ -87,7 +87,7 @@ void ServerManager::Process()
 		}
 		else
 		{
-			iter++;
+			++iter;
 		}
 	}
 }
@@ -109,7 +109,7 @@ void ServerManager::ProcessDisconnect()
 		}
 		else
 		{
-			iter++;
+			++iter;
 		}
 	}
 }
@@ -123,7 +123,7 @@ WorldServer* ServerManager::GetServerByAddress(unsigned int address)
 		{
 			return (*iter);
 		}
-		iter++;
+		++iter;
 	}
 
 	return nullptr;
@@ -142,7 +142,7 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c)
 	{
 		if((*iter)->IsAuthorized() == false)
 		{
-			iter++;
+			++iter;
 			continue;
 		}
 
@@ -163,7 +163,7 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c)
 		}
 
 		server_count++;
-		iter++;
+		++iter;
 	}
 
 	EQApplicationPacket *outapp = new EQApplicationPacket(OP_ServerListResponse, packet_size);
@@ -186,7 +186,7 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c)
 	{
 		if((*iter)->IsAuthorized() == false)
 		{
-			iter++;
+			++iter;
 			continue;
 		}
 
@@ -260,7 +260,7 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c)
 		*(uint32*)data_ptr = (*iter)->GetPlayersOnline();
 		data_ptr += 4;
 
-		iter++;
+		++iter;
 	}
 
 	return outapp;
@@ -287,7 +287,7 @@ void ServerManager::SendUserToWorldRequest(unsigned int server_id, unsigned int
 			}
 			delete outapp;
 		}
-		iter++;
+		++iter;
 	}
 
 	if(!found && server.options.IsTraceOn())
@@ -303,7 +303,7 @@ bool ServerManager::ServerExists(string l_name, string s_name, WorldServer *igno
 	{
 		if((*iter) == ignore)
 		{
-			iter++;
+			++iter;
 			continue;
 		}
 
@@ -312,7 +312,7 @@ bool ServerManager::ServerExists(string l_name, string s_name, WorldServer *igno
 			return true;
 		}
 
-		iter++;
+		++iter;
 	}
 	return false;
 }
@@ -324,7 +324,7 @@ void ServerManager::DestroyServerByName(string l_name, string s_name, WorldServe
 	{
 		if((*iter) == ignore)
 		{
-			iter++;
+			++iter;
 		}
 
 		if((*iter)->GetLongName().compare(l_name) == 0 && (*iter)->GetShortName().compare(s_name) == 0)
@@ -339,7 +339,7 @@ void ServerManager::DestroyServerByName(string l_name, string s_name, WorldServe
 			iter = world_servers.erase(iter);
 		}
 
-		iter++;
+		++iter;
 	}
 }
 

ucs/chatchannel.cpp

@@ -314,7 +314,7 @@ void ChatChannel::SendOPList(Client *c) {
 
 	std::list<std::string>::iterator Iterator;
 
-	for(Iterator = Moderators.begin(); Iterator != Moderators.end(); Iterator++)
+	for(Iterator = Moderators.begin(); Iterator != Moderators.end(); ++Iterator)
 		c->GeneralChannelMessage((*Iterator));
 
 }
@@ -580,7 +580,7 @@ void ChatChannel::RemoveInvitee(std::string Invitee) {
 
 	std::list<std::string>::iterator Iterator;
 
-	for(Iterator = Invitees.begin(); Iterator != Invitees.end(); Iterator++) {
+	for(Iterator = Invitees.begin(); Iterator != Invitees.end(); ++Iterator) {
 
 		if((*Iterator) == Invitee) {
 
@@ -597,7 +597,7 @@ bool ChatChannel::IsInvitee(std::string Invitee) {
 
 	std::list<std::string>::iterator Iterator;
 
-	for(Iterator = Invitees.begin(); Iterator != Invitees.end(); Iterator++) {
+	for(Iterator = Invitees.begin(); Iterator != Invitees.end(); ++Iterator) {
 
 		if((*Iterator) == Invitee)
 			return true;
@@ -621,7 +621,7 @@ void ChatChannel::RemoveModerator(std::string Moderator) {
 
 	std::list<std::string>::iterator Iterator;
 
-	for(Iterator = Moderators.begin(); Iterator != Moderators.end(); Iterator++) {
+	for(Iterator = Moderators.begin(); Iterator != Moderators.end(); ++Iterator) {
 
 		if((*Iterator) == Moderator) {
 
@@ -638,7 +638,7 @@ bool ChatChannel::IsModerator(std::string Moderator) {
 
 	std::list<std::string>::iterator Iterator;
 
-	for(Iterator = Moderators.begin(); Iterator != Moderators.end(); Iterator++) {
+	for(Iterator = Moderators.begin(); Iterator != Moderators.end(); ++Iterator) {
 
 		if((*Iterator) == Moderator)
 			return true;
@@ -662,7 +662,7 @@ void ChatChannel::RemoveVoice(std::string inVoiced) {
 
 	std::list<std::string>::iterator Iterator;
 
-	for(Iterator = Voiced.begin(); Iterator != Voiced.end(); Iterator++) {
+	for(Iterator = Voiced.begin(); Iterator != Voiced.end(); ++Iterator) {
 
 		if((*Iterator) == inVoiced) {
 
@@ -679,7 +679,7 @@ bool ChatChannel::HasVoice(std::string inVoiced) {
 
 	std::list<std::string>::iterator Iterator;
 
-	for(Iterator = Voiced.begin(); Iterator != Voiced.end(); Iterator++) {
+	for(Iterator = Voiced.begin(); Iterator != Voiced.end(); ++Iterator) {
 
 		if((*Iterator) == inVoiced)
 			return true;

ucs/clientlist.cpp

@@ -190,11 +190,11 @@ std::vector<std::string> ParseRecipients(std::string RecipientString) {
 
 		(*Iterator) = Secret + (*Iterator);
 
-		Iterator++;
+		++Iterator;
 
 	}
 
-	for(Iterator = RecipientList.begin(); Iterator != RecipientList.end(); Iterator++) {
+	for(Iterator = RecipientList.begin(); Iterator != RecipientList.end(); ++Iterator) {
 
 		if((*Iterator).length() > 0) {
 
@@ -554,7 +554,7 @@ void Clientlist::CheckForStaleConnections(Client *c) {
 
 	std::list<Client*>::iterator Iterator;
 
-	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); Iterator++) {
+	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); ++Iterator) {
 
 		if(((*Iterator) != c) && ((c->GetName() == (*Iterator)->GetName())
 				&& (c->GetConnectionType() == (*Iterator)->GetConnectionType()))) {
@@ -596,7 +596,7 @@ void Clientlist::Process() {
 
 	std::list<Client*>::iterator Iterator;
 
-	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); Iterator++) {
+	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); ++Iterator) {
 
 		(*Iterator)->AccountUpdate();
 		if((*Iterator)->ClientStream->CheckClosed()) {
@@ -893,7 +893,7 @@ void Clientlist::CloseAllConnections() {
 
 	std::list<Client*>::iterator Iterator;
 
-	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); Iterator++) {
+	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); ++Iterator) {
 
 		_log(UCS__TRACE, "Removing client %s", (*Iterator)->GetName().c_str());
 
@@ -953,7 +953,7 @@ Client *Clientlist::FindCharacter(std::string CharacterName) {
 
 	std::list<Client*>::iterator Iterator;
 
-	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); Iterator++) {
+	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); ++Iterator) {
 
 		if((*Iterator)->GetName() == CharacterName)
 			return ((*Iterator));
@@ -2243,7 +2243,7 @@ Client *Clientlist::IsCharacterOnline(std::string CharacterName) {
 	//
 	std::list<Client*>::iterator Iterator;
 
-	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); Iterator++) {
+	for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); ++Iterator) {
 
 		if(!(*Iterator)->IsMailConnection())
 			continue;
@@ -2352,7 +2352,7 @@ void Client::SendFriends() {
 
 		safe_delete(outapp);
 
-		Iterator++;
+		++Iterator;
 	}
 
 	Iterator = Ignorees.begin();
@@ -2375,7 +2375,7 @@ void Client::SendFriends() {
 
 		safe_delete(outapp);
 
-		Iterator++;
+		++Iterator;
 	}
 }
 

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());
 	}
 }

zone/AA.cpp

@@ -1103,7 +1103,7 @@ void Client::SendAATimers() {
 	PTimerList::iterator c,e;
 	c = p_timers.begin();
 	e = p_timers.end();
-	for(; c != e; c++) {
+	for(; c != e; ++c) {
 		PersistentTimer *cur = c->second;
 		if(cur->GetType() < pTimerAAStart || cur->GetType() > pTimerAAEnd)
 			continue;	//not an AA timer
@@ -1510,7 +1510,7 @@ void Client::ResetAA(){
 		aa[i]->value = 0;
 	}
 	std::map<uint32,uint8>::iterator itr;
-	for(itr=aa_points.begin();itr!=aa_points.end();itr++)
+	for(itr=aa_points.begin();itr!=aa_points.end();++itr)
 		aa_points[itr->first] = 0;
 
 		for(int i = 0; i < _maxLeaderAA; ++i)

zone/MobAI.cpp

@@ -935,25 +935,25 @@ void Client::AI_Process()
 	{
 		if(AIfeignremember_timer->Check()) {
 			std::set<uint32>::iterator RememberedCharID, tmp;
-			RememberedCharID=feign_memory_list.begin();
+			RememberedCharID = feign_memory_list.begin();
 			bool got_one = false;
-			while(RememberedCharID != feign_memory_list.end()) {
+			while (RememberedCharID != feign_memory_list.end()) {
 				Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID);
-				if(remember_client == nullptr) {
+				if (remember_client == nullptr) {
 					//they are gone now...
 					tmp = RememberedCharID;
-					RememberedCharID++;
+					++RememberedCharID;
 					feign_memory_list.erase(tmp);
 				} else if (!remember_client->GetFeigned()) {
 					AddToHateList(remember_client->CastToMob(),1);
 					tmp = RememberedCharID;
-					RememberedCharID++;
+					++RememberedCharID;
 					feign_memory_list.erase(tmp);
 					got_one = true;
 					break;
 				} else {
 					//they are still feigned, carry on...
-					RememberedCharID++;
+					++RememberedCharID;
 				}
 			}
 		}
@@ -1406,25 +1406,25 @@ void Mob::AI_Process() {
 			// Improved Feign Death Memory
 			// check to see if any of our previous feigned targets have gotten up.
 			std::set<uint32>::iterator RememberedCharID, tmp;
-			RememberedCharID=feign_memory_list.begin();
+			RememberedCharID = feign_memory_list.begin();
 			bool got_one = false;
-			while(RememberedCharID != feign_memory_list.end()) {
+			while (RememberedCharID != feign_memory_list.end()) {
 				Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID);
-				if(remember_client == nullptr) {
+				if (remember_client == nullptr) {
 					//they are gone now...
 					tmp = RememberedCharID;
-					RememberedCharID++;
+					++RememberedCharID;
 					feign_memory_list.erase(tmp);
 				} else if (!remember_client->GetFeigned()) {
 					AddToHateList(remember_client->CastToMob(),1);
 					tmp = RememberedCharID;
-					RememberedCharID++;
+					++RememberedCharID;
 					feign_memory_list.erase(tmp);
 					got_one = true;
 					break;
 				} else {
 					//they are still feigned, carry on...
-					RememberedCharID++;
+					++RememberedCharID;
 				}
 			}
 		}
@@ -2406,7 +2406,7 @@ void NPC::RemoveSpellFromNPCList(int16 spell_id)
 			iter = AIspells.erase(iter);
 			continue;
 		}
-		iter++;
+		++iter;
 	}
 }
 

zone/QuestParserCollection.cpp

@@ -50,7 +50,7 @@ void QuestParserCollection::AddVar(std::string name, std::string val) {
 	std::list<QuestInterface*>::iterator iter = _load_precedence.begin();
 	while(iter != _load_precedence.end()) {
 		(*iter)->AddVar(name, val);
-		iter++;
+		++iter;
 	}
 }
 
@@ -58,7 +58,7 @@ void QuestParserCollection::Init() {
 	std::list<QuestInterface*>::iterator iter = _load_precedence.begin();
 	while(iter != _load_precedence.end()) {
 		(*iter)->Init();
-		iter++;
+		++iter;
 	}
 }
 
@@ -78,7 +78,7 @@ void QuestParserCollection::ReloadQuests(bool reset_timers) {
 	std::list<QuestInterface*>::iterator iter = _load_precedence.begin();
 	while(iter != _load_precedence.end()) {
 		(*iter)->ReloadQuests();
-		iter++;
+		++iter;
 	}
 }
 
@@ -469,7 +469,7 @@ QuestInterface *QuestParserCollection::GetQIByNPCQuest(uint32 npcid, std::string
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//second look for /quests/zone/npcname.ext (precedence)
@@ -503,7 +503,7 @@ QuestInterface *QuestParserCollection::GetQIByNPCQuest(uint32 npcid, std::string
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//third look for /quests/global/npcid.ext (precedence)
@@ -524,7 +524,7 @@ QuestInterface *QuestParserCollection::GetQIByNPCQuest(uint32 npcid, std::string
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//fourth look for /quests/global/npcname.ext (precedence)
@@ -545,7 +545,7 @@ QuestInterface *QuestParserCollection::GetQIByNPCQuest(uint32 npcid, std::string
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//fifth look for /quests/zone/default.ext (precedence)
@@ -566,7 +566,7 @@ QuestInterface *QuestParserCollection::GetQIByNPCQuest(uint32 npcid, std::string
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//last look for /quests/global/default.ext (precedence)
@@ -587,7 +587,7 @@ QuestInterface *QuestParserCollection::GetQIByNPCQuest(uint32 npcid, std::string
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	return nullptr;
@@ -620,8 +620,8 @@ QuestInterface *QuestParserCollection::GetQIByPlayerQuest(std::string &filename)
 			return (*iter);
 		}
 
-		iter++;
-	}	
+		++iter;
+	}
 
 	//second look for /quests/zone/player.ext (precedence)
 	filename = "quests/";
@@ -642,7 +642,7 @@ QuestInterface *QuestParserCollection::GetQIByPlayerQuest(std::string &filename)
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//third look for /quests/global/player.ext (precedence)
@@ -663,7 +663,7 @@ QuestInterface *QuestParserCollection::GetQIByPlayerQuest(std::string &filename)
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	return nullptr;
@@ -691,7 +691,7 @@ QuestInterface *QuestParserCollection::GetQIByGlobalNPCQuest(std::string &filena
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	return nullptr;
@@ -719,7 +719,7 @@ QuestInterface *QuestParserCollection::GetQIByGlobalPlayerQuest(std::string &fil
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	return nullptr;
@@ -747,7 +747,7 @@ QuestInterface *QuestParserCollection::GetQIBySpellQuest(uint32 spell_id, std::s
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//second look for /quests/global/spells/spell_id.ext (precedence)
@@ -769,7 +769,7 @@ QuestInterface *QuestParserCollection::GetQIBySpellQuest(uint32 spell_id, std::s
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//third look for /quests/zone/spells/default.ext (precedence)
@@ -790,7 +790,7 @@ QuestInterface *QuestParserCollection::GetQIBySpellQuest(uint32 spell_id, std::s
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//last look for /quests/global/spells/default.ext (precedence)
@@ -811,7 +811,7 @@ QuestInterface *QuestParserCollection::GetQIBySpellQuest(uint32 spell_id, std::s
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	return nullptr;
@@ -839,7 +839,7 @@ QuestInterface *QuestParserCollection::GetQIByItemQuest(std::string item_script,
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 	
 	//second look for /quests/global/items/item_script.ext (precedence)
@@ -861,7 +861,7 @@ QuestInterface *QuestParserCollection::GetQIByItemQuest(std::string item_script,
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//third look for /quests/zone/items/default.ext (precedence)
@@ -882,7 +882,7 @@ QuestInterface *QuestParserCollection::GetQIByItemQuest(std::string item_script,
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	//last look for /quests/global/items/default.ext (precedence)
@@ -903,7 +903,7 @@ QuestInterface *QuestParserCollection::GetQIByItemQuest(std::string item_script,
 			return (*iter);
 		}
 
-		iter++;
+		++iter;
 	}
 
 	return nullptr;

zone/aggro.cpp

@@ -189,7 +189,7 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 			cur = faction_list.begin();
 			end = faction_list.end();
 			bool res = false;
-			for(; cur != end; cur++) {
+			for(; cur != end; ++cur) {
 				struct NPCFaction* fac = *cur;
 				if ((int32)fac->factionID == mob_primary) {
 					if (fac->npc_value > 0) {

zone/bot.cpp

@@ -4774,7 +4774,7 @@ void Bot::LoadAndSpawnAllZonedBots(Client* botOwner) {
 				std::list<uint32> ActiveBots = Bot::GetGroupedBotsByGroupId(botOwner->GetGroup()->GetID(), &errorMessage);
 
 				if(errorMessage.empty() && !ActiveBots.empty()) {
-					for(std::list<uint32>::iterator itr = ActiveBots.begin(); itr != ActiveBots.end(); itr++) {
+					for(std::list<uint32>::iterator itr = ActiveBots.begin(); itr != ActiveBots.end(); ++itr) {
 						Bot* activeBot = Bot::LoadBot(*itr, &errorMessage);
 
 						if(!errorMessage.empty()) {
@@ -8812,7 +8812,7 @@ void Bot::BotOrderCampAll(Client* c) {
 	if(c) {
 		std::list<Bot*> BotList = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID());
 
-		for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); botListItr++) {
+		for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); ++botListItr) {
 			(*botListItr)->Camp();
 		}
 	}
@@ -11196,7 +11196,7 @@ Bot* Bot::GetBotByBotClientOwnerAndBotName(Client* c, std::string botName) {
 		std::list<Bot*> BotList = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID());
 
 		if(!BotList.empty()) {
-			for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); botListItr++) {
+			for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); ++botListItr) {
 				if(std::string((*botListItr)->GetCleanName()) == botName) {
 					Result = (*botListItr);
 					break;
@@ -11255,7 +11255,7 @@ void Bot::ProcessClientZoneChange(Client* botOwner) {
 	if(botOwner) {
 		std::list<Bot*> BotList = entity_list.GetBotsByBotOwnerCharacterID(botOwner->CharacterID());
 
-		for(std::list<Bot*>::iterator itr = BotList.begin(); itr != BotList.end(); itr++) {
+		for(std::list<Bot*>::iterator itr = BotList.begin(); itr != BotList.end(); ++itr) {
 			Bot* tempBot = *itr;
 
 			if(tempBot) {
@@ -11960,7 +11960,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 		}
 
 		if(!AvailableBots.empty()) {
-			for(std::list<BotsAvailableList>::iterator TempAvailableBotsList = AvailableBots.begin(); TempAvailableBotsList != AvailableBots.end(); TempAvailableBotsList++) {
+			for(std::list<BotsAvailableList>::iterator TempAvailableBotsList = AvailableBots.begin(); TempAvailableBotsList != AvailableBots.end(); ++TempAvailableBotsList) {
 				if(!listAll && TempAvailableBotsList->BotClass != iClass)
 					continue;
 
@@ -12004,7 +12004,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 			std::list<Bot*> spawnedBots = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID());
 
 			if(!spawnedBots.empty()) {
-				for(std::list<Bot*>::iterator botsListItr = spawnedBots.begin(); botsListItr != spawnedBots.end(); botsListItr++) {
+				for(std::list<Bot*>::iterator botsListItr = spawnedBots.begin(); botsListItr != spawnedBots.end(); ++botsListItr) {
 					Bot* tempBot = *botsListItr;
 					if(tempBot) {
 						if(tempBot->GetClass() != WARRIOR && tempBot->GetClass() != MONK && tempBot->GetClass() != BARD && tempBot->GetClass() != BERSERKER && tempBot->GetClass() != ROGUE)
@@ -14719,7 +14719,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 		}
 
 		if(!botGroupList.empty()) {
-			for(std::list<BotGroupList>::iterator botGroupListItr = botGroupList.begin(); botGroupListItr != botGroupList.end(); botGroupListItr++) {
+			for(std::list<BotGroupList>::iterator botGroupListItr = botGroupList.begin(); botGroupListItr != botGroupList.end(); ++botGroupListItr) {
 				c->Message(0, "Bot Group Name: %s -- Bot Group Leader: %s", botGroupListItr->BotGroupName.c_str(), botGroupListItr->BotGroupLeaderName.c_str());
 			}
 		}
@@ -14859,7 +14859,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 		}
 
 		std::list<BotGroup>::iterator botGroupItr = botGroup.begin();
-		for(botGroupItr; botGroupItr != botGroup.end(); botGroupItr++) {
+		for(botGroupItr; botGroupItr != botGroup.end(); ++botGroupItr) {
 			// Don't try to re-spawn the botgroup's leader.
 			if(botGroupItr->BotID == botGroupLeader->GetBotID()) { continue; }
 
@@ -15195,7 +15195,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 				std::list<Bot*> spawnedBots = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID());
 
 				if(!spawnedBots.empty()) {
-					for(std::list<Bot*>::iterator botsListItr = spawnedBots.begin(); botsListItr != spawnedBots.end(); botsListItr++) {
+					for(std::list<Bot*>::iterator botsListItr = spawnedBots.begin(); botsListItr != spawnedBots.end(); ++botsListItr) {
 						Bot* tempBot = *botsListItr;
 						if(tempBot) {
 							tempBot->SetGroupMessagesOn(groupMessages);
@@ -15545,7 +15545,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 						return;
 					}
 
-					Mob* target;
+					Mob* target = nullptr;
 					std::string targetName = std::string(sep->arg[4]);
 
 					if(!targetName.empty())
@@ -15635,7 +15635,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 				if(!strcasecmp(sep->arg[3], "all")) {
 					std::list<Bot*> BotList = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID());
 
-					for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); botListItr++) {
+					for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); ++botListItr) {
 						Bot* leaderBot = *botListItr;
 						if(leaderBot->GetInHealRotation() && leaderBot->GetHealRotationLeader() == leaderBot) {
 							//start all heal rotations
@@ -15644,7 +15644,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 
 							rotationMemberList = GetBotsInHealRotation(leaderBot);
 
-							for(std::list<Bot*>::iterator rotationMemberItr = rotationMemberList.begin(); rotationMemberItr != rotationMemberList.end(); rotationMemberItr++) {
+							for(std::list<Bot*>::iterator rotationMemberItr = rotationMemberList.begin(); rotationMemberItr != rotationMemberList.end(); ++rotationMemberItr) {
 								Bot* tempBot = *rotationMemberItr;
 
 								if(tempBot) {
@@ -15681,7 +15681,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 
 						botList = GetBotsInHealRotation(leaderBot);
 
-						for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) {
+						for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); ++botListItr) {
 							Bot* tempBot = *botListItr;
 
 							if(tempBot) {
@@ -15712,7 +15712,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 				if(!strcasecmp(sep->arg[3], "all")) {
 					std::list<Bot*> BotList = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID());
 
-					for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); botListItr++) {
+					for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); ++botListItr) {
 						Bot* leaderBot = *botListItr;
 						if(leaderBot->GetInHealRotation() && leaderBot->GetHealRotationLeader() == leaderBot) {
 							//start all heal rotations
@@ -15720,7 +15720,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 
 							rotationMemberList = GetBotsInHealRotation(leaderBot);
 
-							for(std::list<Bot*>::iterator rotationMemberItr = rotationMemberList.begin(); rotationMemberItr != rotationMemberList.end(); rotationMemberItr++) {
+							for(std::list<Bot*>::iterator rotationMemberItr = rotationMemberList.begin(); rotationMemberItr != rotationMemberList.end(); ++rotationMemberItr) {
 								Bot* tempBot = *rotationMemberItr;
 
 								if(tempBot) {
@@ -15753,7 +15753,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 
 						botList = GetBotsInHealRotation(leaderBot);
 
-						for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) {
+						for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); ++botListItr) {
 							Bot* tempBot = *botListItr;
 
 							if(tempBot && tempBot->GetBotOwnerCharacterID() == c->CharacterID()) {
@@ -15785,7 +15785,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 				if(!strcasecmp(sep->arg[3], "all")) {
 					std::list<Bot*> BotList = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID());
 
-					for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); botListItr++) {
+					for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); ++botListItr) {
 						Bot* tempBot = *botListItr;
 						if(tempBot->GetInHealRotation() && tempBot->GetHealRotationLeader() == tempBot) {
 							//list leaders and number of bots per rotation
@@ -15816,7 +15816,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 						c->Message(0, "Bot Heal Rotation- Leader: %s", leaderBot->GetCleanName());
 						c->Message(0, "Bot Heal Rotation- Timer: %1.1f", ((float)leaderBot->GetHealRotationTimer()/1000.0f));
 
-						for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) {
+						for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); ++botListItr) {
 							Bot* tempBot = *botListItr;
 
 							if(tempBot && tempBot->GetBotOwnerCharacterID() == c->CharacterID()) {
@@ -15874,7 +15874,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 
 					botList = GetBotsInHealRotation(leaderBot);
 
-					for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) {
+					for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); ++botListItr) {
 						Bot* tempBot = *botListItr;
 
 						if(tempBot && tempBot->GetBotOwnerCharacterID() == c->CharacterID())
@@ -15922,7 +15922,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
 
 					botList = GetBotsInHealRotation(leaderBot);
 
-					for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) {
+					for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); ++botListItr) {
 						Bot* tempBot = *botListItr;
 
 						if(tempBot && tempBot->GetBotOwnerCharacterID() == c->CharacterID())
@@ -16238,7 +16238,7 @@ Bot* EntityList::GetBotByBotID(uint32 botID) {
 	Bot* Result = 0;
 
 	if(botID > 0) {
-		for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); botListItr++) {
+		for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); ++botListItr) {
 			Bot* tempBot = *botListItr;
 
 			if(tempBot && tempBot->GetBotID() == botID) {
@@ -16255,7 +16255,7 @@ Bot* EntityList::GetBotByBotName(std::string botName) {
 	Bot* Result = 0;
 
 	if(!botName.empty()) {
-		for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); botListItr++) {
+		for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); ++botListItr) {
 			Bot* tempBot = *botListItr;
 
 			if(tempBot && std::string(tempBot->GetName()) == botName) {
@@ -16303,7 +16303,7 @@ std::list<Bot*> EntityList::GetBotsByBotOwnerCharacterID(uint32 botOwnerCharacte
 	std::list<Bot*> Result;
 
 	if(botOwnerCharacterID > 0) {
-		for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); botListItr++) {
+		for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); ++botListItr) {
 			Bot* tempBot = *botListItr;
 
 			if(tempBot && tempBot->GetBotOwnerCharacterID() == botOwnerCharacterID)
@@ -16366,7 +16366,7 @@ bool EntityList::RemoveBot(uint16 entityID) {
 	bool Result = false;
 
 	if(entityID > 0) {
-		for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); botListItr++)
+		for(std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); ++botListItr)
 		{
 			Bot* tempBot = *botListItr;
 
@@ -16920,7 +16920,7 @@ bool Bot::AddHealRotationMember( Bot* healer ) {
 
 				std::list<Bot*> botList = GetBotsInHealRotation(this);
 
-				for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) {
+				for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); ++botListItr) {
 					Bot* tempBot = *botListItr;
 
 					if(tempBot)
@@ -16968,7 +16968,7 @@ bool Bot::RemoveHealRotationMember( Bot* healer ) {
 		//update rotation data
 		std::list<Bot*> botList = GetBotsInHealRotation(leader);
 
-		for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) {
+		for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); ++botListItr) {
 			Bot* tempBot = *botListItr;
 
 			if(tempBot) {
@@ -17043,7 +17043,7 @@ bool Bot::AddHealRotationTarget( Mob* target ) {
 
 				_healRotationTargets[i] = target->GetID();
 
-				for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) {
+				for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); ++botListItr) {
 					Bot* tempBot = *botListItr;
 
 					if(tempBot && tempBot != this) {
@@ -17081,7 +17081,7 @@ bool Bot::RemoveHealRotationTarget( Mob* target ) {
 				index = i;
 				removed = true;
 
-				for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) {
+				for(std::list<Bot*>::iterator botListItr = botList.begin(); botListItr != botList.end(); ++botListItr) {
 					Bot* tempBot = *botListItr;
 
 					if(tempBot)
@@ -17220,7 +17220,7 @@ void Bot::BotHealRotationsClear(Client* c) {
 	if(c) {
 		std::list<Bot*> BotList = entity_list.GetBotsByBotOwnerCharacterID(c->CharacterID());
 
-		for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); botListItr++) {
+		for(std::list<Bot*>::iterator botListItr = BotList.begin(); botListItr != BotList.end(); ++botListItr) {
 			Bot* tempBot = *botListItr;
 			if(tempBot->GetInHealRotation()) {
 				//clear all heal rotation data for bots in a heal rotation

zone/botspellsai.cpp

@@ -301,7 +301,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) {
 			if (tar->DontBuffMeBefore() < Timer::GetCurrentTime()) {
 				std::list<BotSpell> buffSpellList = GetBotSpellsBySpellType(this, SpellType_Buff);
 
-				for(std::list<BotSpell>::iterator itr = buffSpellList.begin(); itr != buffSpellList.end(); itr++) {
+				for(std::list<BotSpell>::iterator itr = buffSpellList.begin(); itr != buffSpellList.end(); ++itr) {
 					BotSpell selectedBotSpell = *itr;
 
 					if(selectedBotSpell.SpellId == 0)
@@ -560,7 +560,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) {
 
 				std::list<BotSpell> inCombatBuffList = GetBotSpellsBySpellType(this, SpellType_InCombatBuff);
 
-				for(std::list<BotSpell>::iterator itr = inCombatBuffList.begin(); itr != inCombatBuffList.end(); itr++) {
+				for(std::list<BotSpell>::iterator itr = inCombatBuffList.begin(); itr != inCombatBuffList.end(); ++itr) {
 					BotSpell selectedBotSpell = *itr;
 
 					if(selectedBotSpell.SpellId == 0)
@@ -588,7 +588,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) {
 				if (tar->DontBuffMeBefore() < Timer::GetCurrentTime()) {
 					std::list<BotSpell> inCombatBuffList = GetBotSpellsBySpellType(this, SpellType_InCombatBuff);
 
-					for(std::list<BotSpell>::iterator itr = inCombatBuffList.begin(); itr != inCombatBuffList.end(); itr++) {
+					for(std::list<BotSpell>::iterator itr = inCombatBuffList.begin(); itr != inCombatBuffList.end(); ++itr) {
 						BotSpell selectedBotSpell = *itr;
 
 						if(selectedBotSpell.SpellId == 0)
@@ -727,7 +727,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) {
 				const int maxDotSelect = 5;
 				int dotSelectCounter = 0;
 
-				for(std::list<BotSpell>::iterator itr = dotList.begin(); itr != dotList.end(); itr++) {
+				for(std::list<BotSpell>::iterator itr = dotList.begin(); itr != dotList.end(); ++itr) {
 					BotSpell selectedBotSpell = *itr;
 
 					if(selectedBotSpell.SpellId == 0)
@@ -1450,7 +1450,7 @@ BotSpell Bot::GetBestBotSpellForFastHeal(Bot *botCaster) {
 	if(botCaster) {
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_CurrentHP);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsFastHealSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				result.SpellId = botSpellListItr->SpellId;
@@ -1476,7 +1476,7 @@ BotSpell Bot::GetBestBotSpellForHealOverTime(Bot* botCaster) {
 		std::list<BotSpell> botHoTSpellList = GetBotSpellsForSpellEffect(botCaster, SE_HealOverTime);
 		std::vector<AISpells_Struct> botSpellList = botCaster->GetBotSpells();
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botHoTSpellList.begin(); botSpellListItr != botHoTSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botHoTSpellList.begin(); botSpellListItr != botHoTSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsHealOverTimeSpell(botSpellListItr->SpellId)) {
 
@@ -1542,7 +1542,7 @@ BotSpell Bot::GetBestBotSpellForRegularSingleTargetHeal(Bot* botCaster) {
 	if(botCaster) {
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_CurrentHP);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsRegularSingleTargetHealSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				result.SpellId = botSpellListItr->SpellId;
@@ -1567,7 +1567,7 @@ BotSpell Bot::GetFirstBotSpellForSingleTargetHeal(Bot* botCaster) {
 	if(botCaster) {
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_CurrentHP);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if((IsRegularSingleTargetHealSpell(botSpellListItr->SpellId) || IsFastHealSpell(botSpellListItr->SpellId)) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				result.SpellId = botSpellListItr->SpellId;
@@ -1592,7 +1592,7 @@ BotSpell Bot::GetBestBotSpellForGroupHeal(Bot* botCaster) {
 	if(botCaster) {
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_CurrentHP);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsRegularGroupHealSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				result.SpellId = botSpellListItr->SpellId;
@@ -1618,7 +1618,7 @@ BotSpell Bot::GetBestBotSpellForGroupHealOverTime(Bot* botCaster) {
 		std::list<BotSpell> botHoTSpellList = GetBotSpellsForSpellEffect(botCaster, SE_HealOverTime);
 		std::vector<AISpells_Struct> botSpellList = botCaster->GetBotSpells();
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botHoTSpellList.begin(); botSpellListItr != botHoTSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botHoTSpellList.begin(); botSpellListItr != botHoTSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsGroupHealOverTimeSpell(botSpellListItr->SpellId)) {
 
@@ -1654,7 +1654,7 @@ BotSpell Bot::GetBestBotSpellForGroupCompleteHeal(Bot* botCaster) {
 	if(botCaster) {
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_CompleteHeal);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsGroupCompleteHealSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				result.SpellId = botSpellListItr->SpellId;
@@ -1679,7 +1679,7 @@ BotSpell Bot::GetBestBotSpellForMez(Bot* botCaster) {
 	if(botCaster) {
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_Mez);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsMezSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				result.SpellId = botSpellListItr->SpellId;
@@ -1704,7 +1704,7 @@ BotSpell Bot::GetBestBotSpellForMagicBasedSlow(Bot* botCaster) {
 	if(botCaster) {
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_AttackSpeed);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsSlowSpell(botSpellListItr->SpellId) && spells[botSpellListItr->SpellId].resisttype == RESIST_MAGIC && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				result.SpellId = botSpellListItr->SpellId;
@@ -1729,7 +1729,7 @@ BotSpell Bot::GetBestBotSpellForDiseaseBasedSlow(Bot* botCaster) {
 	if(botCaster) {
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_AttackSpeed);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsSlowSpell(botSpellListItr->SpellId) && spells[botSpellListItr->SpellId].resisttype == RESIST_DISEASE && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				result.SpellId = botSpellListItr->SpellId;
@@ -1752,7 +1752,7 @@ Mob* Bot::GetFirstIncomingMobToMez(Bot* botCaster, BotSpell botSpell) {
 		std::list<NPC*> npc_list;
 		entity_list.GetNPCList(npc_list);
 
-		for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); itr++) {
+		for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); ++itr) {
 			NPC* npc = *itr;
 
 			if(npc->DistNoRootNoZ(*botCaster) <= botCaster->GetActSpellRange(botSpell.SpellId, spells[botSpell.SpellId].range)) {
@@ -1792,7 +1792,7 @@ BotSpell Bot::GetBestBotMagicianPetSpell(Bot *botCaster) {
 
 		std::string petType = GetBotMagicianPetType(botCaster);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsSummonPetSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				if(!strncmp(spells[botSpellListItr->SpellId].teleport_zone, petType.c_str(), petType.length())) {
@@ -1901,7 +1901,7 @@ BotSpell Bot::GetBestBotSpellForNukeByTargetType(Bot* botCaster, SpellTargetType
 	if(botCaster) {
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffectAndTargetType(botCaster, SE_CurrentHP, targetType);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsPureNukeSpell(botSpellListItr->SpellId) && IsDamageSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) {
 				result.SpellId = botSpellListItr->SpellId;
@@ -1928,7 +1928,7 @@ BotSpell Bot::GetBestBotSpellForStunByTargetType(Bot* botCaster, SpellTargetType
 	{
 		std::list<BotSpell> botSpellList = GetBotSpellsForSpellEffectAndTargetType(botCaster, SE_Stun, targetType);
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++)
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr)
 		{
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsStunSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex))
@@ -1967,7 +1967,7 @@ BotSpell Bot::GetBestBotWizardNukeSpellByTargetResists(Bot* botCaster, Mob* targ
 		firstWizardMagicNukeSpellFound.SpellIndex = 0;
 		firstWizardMagicNukeSpellFound.ManaCost = 0;
 
-		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) {
+		for(std::list<BotSpell>::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); ++botSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			bool spellSelected = false;
 
@@ -2139,7 +2139,7 @@ BotSpell Bot::GetBestBotSpellForCure(Bot* botCaster, Mob *tar) {
 
 		//Check for group cure first
 		if(countNeedsCured > 2) {
-			for(std::list<BotSpell>::iterator itr = cureList.begin(); itr != cureList.end(); itr++) {
+			for(std::list<BotSpell>::iterator itr = cureList.begin(); itr != cureList.end(); ++itr) {
 				BotSpell selectedBotSpell = *itr;
 
 				if(IsGroupSpell(itr->SpellId) && CheckSpellRecastTimers(botCaster, itr->SpellIndex)) {
@@ -2176,7 +2176,7 @@ BotSpell Bot::GetBestBotSpellForCure(Bot* botCaster, Mob *tar) {
 
 		//no group cure for target- try to find single target spell
 		if(!spellSelected) {
-			for(std::list<BotSpell>::iterator itr = cureList.begin(); itr != cureList.end(); itr++) {
+			for(std::list<BotSpell>::iterator itr = cureList.begin(); itr != cureList.end(); ++itr) {
 				BotSpell selectedBotSpell = *itr;
 
 				if(CheckSpellRecastTimers(botCaster, itr->SpellIndex)) {

zone/client.cpp

@@ -4748,7 +4748,7 @@ void Client::ShowSkillsWindow()
 		Skills[SkillName[i]] = (SkillUseTypes)i;
 
 	// print out all available skills
-	for(it = Skills.begin(); it != Skills.end(); it++) {
+	for(it = Skills.begin(); it != Skills.end(); ++it) {
 		if(GetSkill(it->second) > 0 || MaxSkill(it->second) > 0) {
 			WindowText += it->first;
 			// line up the values
@@ -5142,7 +5142,7 @@ void Client::SendRewards()
 				{
 					break;
 				}
-				iter++;
+				++iter;
 			}
 
 			if(iter != zone->VeteranRewards.end())
@@ -5232,7 +5232,7 @@ bool Client::TryReward(uint32 claim_id)
 		{
 			break;
 		}
-		iter++;
+		++iter;
 	}
 
 	if(iter == zone->VeteranRewards.end())
@@ -6606,7 +6606,7 @@ void Client::SendStatsWindow(Client* client, bool use_window)
 
 	for(std::map <uint32, int32>::iterator iter = item_faction_bonuses.begin();
 		iter != item_faction_bonuses.end();
-		iter++)
+		++iter)
 	{
 		memset(&faction_buf, 0, sizeof(faction_buf));
 
@@ -6728,7 +6728,7 @@ void Client::SendAltCurrencies() {
 				altc->entries[i].stack_size = 1000;
 			}
 			i++;
-			iter++;
+			++iter;
 		}
 
 		FastQueuePacket(&outapp);
@@ -6776,7 +6776,7 @@ void Client::SendAlternateCurrencyValues()
 	std::list<AltCurrencyDefinition_Struct>::iterator iter = zone->AlternateCurrencies.begin();
 	while(iter != zone->AlternateCurrencies.end()) {
 		SendAlternateCurrencyValue((*iter).id, false);
-		iter++;
+		++iter;
 	}
 }
 
@@ -7215,7 +7215,7 @@ void Client::SendMercPersonalInfo()
 						mdus->MercData[i].Stances[stanceindex].StanceIndex = stanceindex;
 						mdus->MercData[i].Stances[stanceindex].Stance = (iter->StanceID);
 						stanceindex++;
-						iter++;
+						++iter;
 					}
 				}
 
@@ -7281,7 +7281,7 @@ void Client::SendMercPersonalInfo()
 						mml->Mercs[i].Stances[stanceindex].StanceIndex = stanceindex;
 						mml->Mercs[i].Stances[stanceindex].Stance = (iter->StanceID);
 						stanceindex++;
-						iter++;
+						++iter;
 					}
 				}
 				FastQueuePacket(&outapp);
@@ -7898,7 +7898,7 @@ bool Client::RemoveRespawnOption(std::string option_name)
 		opt = &(*itr);
 		if (opt->name.compare(option_name) == 0)
 		{
-			respawn_options.erase(itr); 
+			itr = respawn_options.erase(itr);
 			had = true;
 			//could be more with the same name, so keep going...
 		}

zone/client_logs.cpp

@@ -38,7 +38,7 @@ void ClientLogs::subscribe(EQEMuLog::LogIDs id, Client *c) {
 	std::vector<Client *>::iterator cur,end;
 	cur = entries[id].begin();
 	end = entries[id].end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(*cur == c) {
 	printf("%s was allready subscribed to %d\n", c->GetName(), id);
 			return;
@@ -58,7 +58,7 @@ void ClientLogs::unsubscribe(EQEMuLog::LogIDs id, Client *c) {
 	std::vector<Client *>::iterator cur,end;
 	cur = entries[id].begin();
 	end = entries[id].end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(*cur == c) {
 			entries[id].erase(cur);
 			return;
@@ -97,7 +97,7 @@ void ClientLogs::msg(EQEMuLog::LogIDs id, const char *buf) {
 	std::vector<Client *>::iterator cur,end;
 	cur = entries[id].begin();
 	end = entries[id].end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(!(*cur)->InZone())
 			continue;
 		(*cur)->Message(CLIENT_LOG_CHANNEL, buf);

zone/client_packet.cpp

@@ -2215,7 +2215,7 @@ void Client::Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app)
 	const Item_Struct *item = 0;
 	std::list<MerchantList> merlist = zone->merchanttable[merchantid];
 	std::list<MerchantList>::const_iterator itr;
-	for(itr = merlist.begin();itr != merlist.end() && count<255;itr++){
+	for(itr = merlist.begin();itr != merlist.end() && count<255;++itr){
 		const MerchantList &ml = *itr;
 		if(GetLevel() < ml.level_required) {
 			continue;
@@ -2311,7 +2311,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 	std::list<MerchantList> merlist = zone->merchanttable[merchantid];
 	std::list<MerchantList>::const_iterator itr;
 
-	for(itr = merlist.begin();itr != merlist.end();itr++){
+	for(itr = merlist.begin();itr != merlist.end();++itr){
 		MerchantList ml = *itr;
 		if(GetLevel() < ml.level_required) {
 			continue;
@@ -5505,7 +5505,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 	uint32 item_id = 0;
 	std::list<MerchantList> merlist = zone->merchanttable[merchantid];
 	std::list<MerchantList>::const_iterator itr;
-	for(itr = merlist.begin();itr != merlist.end();itr++){
+	for(itr = merlist.begin();itr != merlist.end();++itr){
 		MerchantList ml = *itr;
 		if(GetLevel() < ml.level_required) {
 			continue;
@@ -5527,7 +5527,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 		std::list<TempMerchantList> tmp_merlist = zone->tmpmerchanttable[tmp->GetNPCTypeID()];
 		std::list<TempMerchantList>::const_iterator tmp_itr;
 		TempMerchantList ml;
-		for(tmp_itr = tmp_merlist.begin();tmp_itr != tmp_merlist.end();tmp_itr++){
+		for(tmp_itr = tmp_merlist.begin();tmp_itr != tmp_merlist.end();++tmp_itr){
 			ml = *tmp_itr;
 			if(mp->itemslot == ml.slot){
 				item_id = ml.item;
@@ -9220,7 +9220,7 @@ bool Client::FinishConnState2(DBAsyncWork* dbaw) {
 
 		// Send stuff on the cursor which isnt sent in bulk
 		iter_queue it;
-		for (it=m_inv.cursor_begin();it!=m_inv.cursor_end();it++) {
+		for (it=m_inv.cursor_begin();it!=m_inv.cursor_end();++it) {
 			// First item cursor is sent in bulk inventory packet
 			if (it==m_inv.cursor_begin())
 				continue;
@@ -12544,7 +12544,7 @@ void Client::Handle_OP_AltCurrencyMerchantRequest(const EQApplicationPacket *app
 				found = true;
 				break;
 			}
-			altc_iter++;
+			++altc_iter;
 		}
 
 		if(!found) {
@@ -12560,7 +12560,7 @@ void Client::Handle_OP_AltCurrencyMerchantRequest(const EQApplicationPacket *app
 
 		std::list<MerchantList> merlist = zone->merchanttable[merchant_id];
 		std::list<MerchantList>::const_iterator itr;
-		for(itr = merlist.begin(); itr != merlist.end() && count < 255; itr++){
+		for(itr = merlist.begin(); itr != merlist.end() && count < 255; ++itr){
 			const MerchantList &ml = *itr;
 			if(GetLevel() < ml.level_required) {
 				continue;
@@ -12627,7 +12627,7 @@ void Client::Handle_OP_AltCurrencySellSelection(const EQApplicationPacket *app)
 		bool found = false;
 		std::list<MerchantList> merlist = zone->merchanttable[merchant_id];
 		std::list<MerchantList>::const_iterator itr;
-		for(itr = merlist.begin(); itr != merlist.end(); itr++) {
+		for(itr = merlist.begin(); itr != merlist.end(); ++itr) {
 			MerchantList ml = *itr;
 			if(GetLevel() < ml.level_required) {
 				continue;
@@ -12689,7 +12689,7 @@ void Client::Handle_OP_AltCurrencyPurchase(const EQApplicationPacket *app) {
 		bool found = false;
 		std::list<MerchantList> merlist = zone->merchanttable[merchant_id];
 		std::list<MerchantList>::const_iterator itr;
-		for(itr = merlist.begin(); itr != merlist.end(); itr++) {
+		for(itr = merlist.begin(); itr != merlist.end(); ++itr) {
 			MerchantList ml = *itr;
 			if(GetLevel() < ml.level_required) {
 				continue;
@@ -12751,7 +12751,7 @@ void Client::Handle_OP_AltCurrencyReclaim(const EQApplicationPacket *app) {
 		if((*iter).id == reclaim->currency_id) {
 			item_id = (*iter).item_id;
 		}
-		iter++;
+		++iter;
 	}
 
 	if(item_id == 0) {
@@ -12806,7 +12806,7 @@ void Client::Handle_OP_AltCurrencySell(const EQApplicationPacket *app) {
 		bool found = false;
 		std::list<MerchantList> merlist = zone->merchanttable[merchant_id];
 		std::list<MerchantList>::const_iterator itr;
-		for(itr = merlist.begin(); itr != merlist.end(); itr++) {
+		for(itr = merlist.begin(); itr != merlist.end(); ++itr) {
 			MerchantList ml = *itr;
 			if(GetLevel() < ml.level_required) {
 				continue;
@@ -13498,10 +13498,10 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 		int i = 0;
 		int StanceCount = 0;
 
-		for(std::list<MercData>::iterator mercListItr = mercDataList.begin(); mercListItr != mercDataList.end(); mercListItr++)
+		for(std::list<MercData>::iterator mercListItr = mercDataList.begin(); mercListItr != mercDataList.end(); ++mercListItr)
 		{
 			std::list<MercStanceInfo>::iterator siter = zone->merc_stance_list[mercListItr->MercTemplateID].begin();
-			for(siter = zone->merc_stance_list[mercListItr->MercTemplateID].begin(); siter != zone->merc_stance_list[mercListItr->MercTemplateID].end(); siter++)
+			for(siter = zone->merc_stance_list[mercListItr->MercTemplateID].begin(); siter != zone->merc_stance_list[mercListItr->MercTemplateID].end(); ++siter)
 			{
 				StanceCount++;
 			}
@@ -13513,7 +13513,7 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 		mml->MercTypeCount = mercTypeCount;
 		if(mercTypeCount > 0)
 		{
-			for(std::list<MercType>::iterator mercTypeListItr = mercTypeList.begin(); mercTypeListItr != mercTypeList.end(); mercTypeListItr++) {
+			for(std::list<MercType>::iterator mercTypeListItr = mercTypeList.begin(); mercTypeListItr != mercTypeList.end(); ++mercTypeListItr) {
 			mml->MercGrades[i] = mercTypeListItr->Type;	// DBStringID for Type
 			i++;
 			}
@@ -13523,7 +13523,7 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 		if(mercCount > 0)
 		{
 			i = 0;
-			for(std::list<MercData>::iterator mercListIter = mercDataList.begin(); mercListIter != mercDataList.end(); mercListIter++)
+			for(std::list<MercData>::iterator mercListIter = mercDataList.begin(); mercListIter != mercDataList.end(); ++mercListIter)
 			{
 				mml->Mercs[i].MercID = mercListIter->MercTemplateID;
 				mml->Mercs[i].MercType = mercListIter->MercType;
@@ -13540,7 +13540,7 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 				mml->Mercs[i].MercUnk02 = 1;
 				int mercStanceCount = 0;
 				std::list<MercStanceInfo>::iterator iter = zone->merc_stance_list[mercListIter->MercTemplateID].begin();
-				for(iter = zone->merc_stance_list[mercListIter->MercTemplateID].begin(); iter != zone->merc_stance_list[mercListIter->MercTemplateID].end(); iter++)
+				for(iter = zone->merc_stance_list[mercListIter->MercTemplateID].begin(); iter != zone->merc_stance_list[mercListIter->MercTemplateID].end(); ++iter)
 				{
 				mercStanceCount++;
 				}
@@ -13557,7 +13557,7 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 						mml->Mercs[i].Stances[stanceindex].StanceIndex = stanceindex;
 						mml->Mercs[i].Stances[stanceindex].Stance = (iter2->StanceID);
 						stanceindex++;
-						iter2++;
+						++iter2;
 					}
 				}
 				i++;
@@ -13692,7 +13692,7 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app)
 			std::list<MercStanceInfo>::iterator iter = mercStanceList.begin();
 			while(iter != mercStanceList.end()) {
 				numStances++;
-				iter++;
+				++iter;
 			}
 
 			MercTemplate* mercTemplate = zone->GetMercTemplate(GetMerc()->GetMercTemplateID());

zone/client_process.cpp

@@ -904,7 +904,7 @@ void Client::BulkSendInventoryItems() {
 
 	EQApplicationPacket* outapp = new EQApplicationPacket(OP_CharInventory, size);
 	uchar* ptr = outapp->pBuffer;
-	for(itr = ser_items.begin(); itr != ser_items.end(); itr++){
+	for(itr = ser_items.begin(); itr != ser_items.end(); ++itr){
 		int length = itr->second.length();
 		if(length > 5) {
 			memcpy(ptr, itr->second.c_str(), length);
@@ -978,7 +978,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
 
 	uint32 i=1;
 	uint8 handychance = 0;
-	for(itr = merlist.begin();itr != merlist.end() && i<numItemSlots;itr++){
+	for (itr = merlist.begin(); itr != merlist.end() && i < numItemSlots; ++itr) {
 		MerchantList ml = *itr;
 		if(GetLevel() < ml.level_required) {
 			continue;
@@ -1027,7 +1027,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
 	}
 	std::list<TempMerchantList> origtmp_merlist = zone->tmpmerchanttable[npcid];
 	tmp_merlist.clear();
-	for(tmp_itr = origtmp_merlist.begin();tmp_itr != origtmp_merlist.end() && i<numItemSlots;tmp_itr++){
+	for(tmp_itr = origtmp_merlist.begin();tmp_itr != origtmp_merlist.end() && i<numItemSlots;++tmp_itr){
 		TempMerchantList ml = *tmp_itr;
 		item=database.GetItem(ml.item);
 		ml.slot=i;

zone/command.cpp

@@ -461,7 +461,7 @@ int command_init(void) {
 	std::map<std::string,uint8> command_settings;
 	std::map<std::string,uint8>::iterator itr;
 	database.GetCommandSettings(command_settings);
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if ((itr=command_settings.find(cur->first))!=command_settings.end())
 		{
 			cur->second->access = itr->second;
@@ -526,7 +526,7 @@ int command_add(const char *command_string, const char *desc, int access, CmdFun
 	std::map<std::string, CommandRecord *>::iterator cur,end,del;
 	cur = commandlist.begin();
 	end = commandlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(cur->second->function == function) {
 			int r;
 			for(r = 1; r < CMDALIASES; r++) {
@@ -782,7 +782,7 @@ void command_help(Client *c, const Seperator *sep)
 	cur = commandlist.begin();
 	end = commandlist.end();
 
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(sep->arg[1][0]) {
 			if(cur->first.find(sep->arg[1]) == std::string::npos) {
 				continue;
@@ -2961,7 +2961,7 @@ void command_peekinv(Client *c, const Seperator *sep)
 			}
 		}
 		else {
-			for(it=client->GetInv().cursor_begin();it!=client->GetInv().cursor_end();it++,i++) {
+			for(it=client->GetInv().cursor_begin();it!=client->GetInv().cursor_end();++it,i++) {
 				const ItemInst* inst = *it;
 				item = (inst) ? inst->GetItem() : nullptr;
 				if (c->GetClientVersion() >= EQClientSoF)
@@ -8299,7 +8299,7 @@ void command_rules(Client *c, const Seperator *sep) {
 		std::map<int, std::string>::iterator cur, end;
 		cur = sets.begin();
 		end = sets.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			c->Message(0, "(%d) %s", cur->first, cur->second.c_str());
 		}
 	} else if(!strcasecmp(sep->arg[1], "reload")) {
@@ -8398,7 +8398,7 @@ void command_rules(Client *c, const Seperator *sep) {
 			std::vector<const char *>::iterator cur, end;
 			cur = rule_list.begin();
 			end = rule_list.end();
-			for(; cur != end; cur++) {
+			for(; cur != end; ++cur) {
 				c->Message(0, " %s", *cur);
 			}
 		} else if(sep->argnum == 2) {
@@ -8414,7 +8414,7 @@ void command_rules(Client *c, const Seperator *sep) {
 			std::vector<const char *>::iterator cur, end;
 			cur = rule_list.begin();
 			end = rule_list.end();
-			for(; cur != end; cur++) {
+			for(; cur != end; ++cur) {
 				c->Message(0, " %s", *cur);
 			}
 		} else {
@@ -8437,7 +8437,7 @@ void command_rules(Client *c, const Seperator *sep) {
 			std::vector<const char *>::iterator cur, end;
 			cur = rule_list.begin();
 			end = rule_list.end();
-			for(std::string tmp_value; cur != end; cur++) {
+			for(std::string tmp_value; cur != end; ++cur) {
 				if (RuleManager::Instance()->GetRule(*cur, tmp_value))
 					c->Message(0, " %s - %s", *cur, tmp_value.c_str());
 			}

zone/corpse.cpp

@@ -389,7 +389,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp)
 			// this was mainly for client profile state reflection..should match db player inventory entries now.
 
 			iter_queue it;
-			for(it=client->GetInv().cursor_begin(),i=8001; it!=client->GetInv().cursor_end(); it++,i++) {
+			for(it=client->GetInv().cursor_begin(),i=8001; it!=client->GetInv().cursor_end(); ++it,i++) {
 				item = *it;
 				if((item && (!client->IsBecomeNPC())) || (item && client->IsBecomeNPC() && !item->GetItem()->NoRent))
 				{
@@ -413,7 +413,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp)
 					ss << " OR ";
 				}
 				ss << "slotid=" << (*iter);
-				iter++;
+				++iter;
 			}
 			ss << ")";
 			database.RunQuery(ss.str().c_str(), ss.str().length());
@@ -519,7 +519,7 @@ Corpse::~Corpse() {
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* item = *cur;
 		safe_delete(item);
 	}
@@ -598,7 +598,7 @@ bool Corpse::Save() {
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* item = *cur;
 		memcpy((char*) &dbpc->items[x++], (char*) item, sizeof(player_lootitem::ServerLootItem_Struct));
 	}
@@ -675,7 +675,7 @@ ServerLootItem_Struct* Corpse::GetItem(uint16 lootslot, ServerLootItem_Struct**
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if((*cur)->lootslot == lootslot)
 		{
 			sitem = *cur;
@@ -689,7 +689,7 @@ ServerLootItem_Struct* Corpse::GetItem(uint16 lootslot, ServerLootItem_Struct**
 
 		cur = itemlist.begin();
 		end = itemlist.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			sitem2 = *cur;
 			if(sitem2->equipSlot >= bagstart && sitem2->equipSlot < bagstart + 10)
 			{
@@ -705,7 +705,7 @@ uint32 Corpse::GetWornItem(int16 equipSlot) const {
 	ItemList::const_iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* item = *cur;
 		if (item->equipSlot == equipSlot)
 		{
@@ -725,7 +725,7 @@ void Corpse::RemoveItem(uint16 lootslot)
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* sitem = *cur;
 		if (sitem->lootslot == lootslot)
 		{
@@ -742,7 +742,7 @@ void Corpse::RemoveItem(ServerLootItem_Struct* item_data)
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* sitem = *cur;
 		if (sitem == item_data)
 		{
@@ -1006,7 +1006,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 		else if(client->GetClientVersion() == EQClientTitanium) { corpselootlimit = 31; }
 		else { corpselootlimit = 30; }
 
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			ServerLootItem_Struct* item_data = *cur;
 			item_data->lootslot = 0xFFFF;
 
@@ -1046,7 +1046,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 
 				cur = itemlist.begin();
 				end = itemlist.end();
-				for(; cur != end; cur++) {
+				for(; cur != end; ++cur) {
 					ServerLootItem_Struct* item_data = *cur;
 					item = database.GetItem(item_data->item_id);
 					LogFile->write(EQEMuLog::Debug, "Corpse Looting: %s was not sent to client loot window (corpse_dbid: %i, charname: %s(%s))", item->Name, GetDBID(), client->GetName(), client->GetGM() ? "GM" : "Owner");
@@ -1337,7 +1337,7 @@ void Corpse::QueryLoot(Client* to) {
 	else if (to->GetClientVersion() == EQClientTitanium) { corpselootlimit = 31; }
 	else { corpselootlimit = 30; }
 
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* sitem = *cur;
 
 		if (IsPlayerCorpse()) {
@@ -1403,7 +1403,7 @@ bool Corpse::Summon(Client* client, bool spell, bool CheckDistance)
 		{
 			bool consented = false;
 			std::list<std::string>::iterator itr;
-			for(itr = client->consent_list.begin(); itr != client->consent_list.end(); itr++)
+			for(itr = client->consent_list.begin(); itr != client->consent_list.end(); ++itr)
 			{
 				if(strcmp(this->GetOwnerName(), itr->c_str()) == 0)
 				{

zone/embperl.h

@@ -131,7 +131,7 @@ public:
 		hv_clear(hv);
 
 		// Iterate through key-value pairs, storing them in hash
-		for (it = vals.begin(); it != vals.end(); it++)
+		for (it = vals.begin(); it != vals.end(); ++it)
 		{
 			int keylen = static_cast<int>(it->first.length());
 

zone/entity.cpp

@@ -348,7 +348,7 @@ void EntityList::CheckGroupList (const char *fname, const int fline)
 {
 	std::list<Group *>::iterator it;
 
-	for (it = group_list.begin(); it != group_list.end(); it++)
+	for (it = group_list.begin(); it != group_list.end(); ++it)
 	{
 		if (*it == nullptr)
 		{
@@ -394,7 +394,7 @@ void EntityList::QueueToGroupsForNPCHealthAA(Mob* sender, const EQApplicationPac
 	while(iterator != group_list.end())
 	{
 		(*iterator)->QueueHPPacketsForNPCHealthAA(sender, app);
-		iterator++;
+		++iterator;
 	}
 }
 
@@ -410,7 +410,7 @@ void EntityList::RaidProcess() {
 	{
 		count++;
 		(*iterator)->Process();
-		iterator++;
+		++iterator;
 	}
 	if(count == 0)
 		net.raid_timer.Disable();//No groups in list, disable until one is added
@@ -1938,7 +1938,7 @@ Group* EntityList::GetGroupByMob(Mob* mob)
 		if ((*iterator)->IsGroupMember(mob)) {
 			return *iterator;
 		}
-		iterator++;
+		++iterator;
 	}
 #if EQDEBUG >= 5
 	CheckGroupList (__FILE__, __LINE__);
@@ -1956,7 +1956,7 @@ Group* EntityList::GetGroupByLeaderName(const char* leader){
 		if (!strcmp((*iterator)->GetLeaderName(), leader)) {
 			return *iterator;
 		}
-		iterator++;
+		++iterator;
 	}
 #if EQDEBUG >= 5
 	CheckGroupList (__FILE__, __LINE__);
@@ -1973,7 +1973,7 @@ Group* EntityList::GetGroupByID(uint32 group_id){
 		if ((*iterator)->GetID() == group_id) {
 			return *iterator;
 		}
-		iterator++;
+		++iterator;
 	}
 #if EQDEBUG >= 5
 	CheckGroupList (__FILE__, __LINE__);
@@ -1991,7 +1991,7 @@ Group* EntityList::GetGroupByClient(Client* client)
 		if ((*iterator)->IsGroupMember(client->CastToMob())) {
 			return *iterator;
 		}
-		iterator++;
+		++iterator;
 	}
 #if EQDEBUG >= 5
 	CheckGroupList (__FILE__, __LINE__);
@@ -2011,7 +2011,7 @@ Raid* EntityList::GetRaidByLeaderName(const char *leader){
 				return *iterator;
 	}
 }
-		iterator++;
+		++iterator;
 	}
 	return 0;
 }
@@ -2025,7 +2025,7 @@ Raid* EntityList::GetRaidByID(uint32 id){
 		if ((*iterator)->GetID() == id) {
 			return *iterator;
 		}
-		iterator++;
+		++iterator;
 	}
 	return 0;
 }
@@ -2045,7 +2045,7 @@ Raid* EntityList::GetRaidByClient(Client* client)
 					return *iterator;
 			}
 		}
-		iterator++;
+		++iterator;
 	}
 	return 0;
 }
@@ -2065,7 +2065,7 @@ Raid* EntityList::GetRaidByMob(Mob* mob) {
 					return *iterator;
 			}*/
 		}
-		iterator++;
+		++iterator;
 	}
 	return 0;
 }
@@ -2507,7 +2507,7 @@ bool EntityList::RemoveGroup(uint32 delete_id){
 #endif
 			return true;
 		}
-		iterator++;
+		++iterator;
 	}
 #if EQDEBUG >= 5
 	CheckGroupList (__FILE__, __LINE__);
@@ -2526,7 +2526,7 @@ bool EntityList::RemoveRaid(uint32 delete_id){
 			raid_list.remove (*iterator);
 			return true;
 		}
-		iterator++;
+		++iterator;
 	}
 	return false;
 }
@@ -3821,7 +3821,7 @@ bool EntityList::LimitCheckType(uint32 npc_type, int count) {
 	cur = npc_limit_list.begin();
 	end = npc_limit_list.end();
 
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(cur->second.npc_type == npc_type) {
 			count--;
 			if(count == 0) {
@@ -3842,7 +3842,7 @@ bool EntityList::LimitCheckGroup(uint32 spawngroup_id, int count) {
 	cur = npc_limit_list.begin();
 	end = npc_limit_list.end();
 
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(cur->second.spawngroup_id == spawngroup_id) {
 			count--;
 			if(count == 0) {
@@ -3864,7 +3864,7 @@ bool EntityList::LimitCheckBoth(uint32 npc_type, uint32 spawngroup_id, int group
 	cur = npc_limit_list.begin();
 	end = npc_limit_list.end();
 
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(cur->second.npc_type == npc_type) {
 			type_count--;
 			if(type_count == 0) {

zone/guild_mgr.cpp

@@ -177,7 +177,7 @@ uint8 *ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char *prefix_na
 	end = members.end();
 	uint32 name_len = 0;
 	uint32 note_len = 0;
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ci = *cur;
 		name_len += ci->char_name.length();
 		note_len += ci->public_note.length();
@@ -205,7 +205,7 @@ uint8 *ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char *prefix_na
 
 	cur = members.begin();
 	end = members.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ci = *cur;
 
 		//the order we set things here must match the struct
@@ -247,7 +247,7 @@ void ZoneGuildManager::ListGuilds(Client *c) const {
 	cur = m_guilds.begin();
 	end = m_guilds.end();
 	int r = 0;
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		leadername[0] = '\0';
 		database.GetCharName(cur->second->leader_char_id, leadername);
 		if (leadername[0] == '\0')

zone/merc.cpp

@@ -2236,7 +2236,7 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) {
 
 					std::list<MercSpell> buffSpellList = GetMercSpellsBySpellType(this, SpellType_Buff);
 
-					for(std::list<MercSpell>::iterator itr = buffSpellList.begin(); itr != buffSpellList.end(); itr++) {
+					for(std::list<MercSpell>::iterator itr = buffSpellList.begin(); itr != buffSpellList.end(); ++itr) {
 						MercSpell selectedMercSpell = *itr;
 
 						if(!((spells[selectedMercSpell.spellid].targettype == ST_Target || spells[selectedMercSpell.spellid].targettype == ST_Pet ||
@@ -2396,7 +2396,7 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) {
 					std::list<MercSpell> buffSpellList = GetMercSpellsBySpellType(this, SpellType_InCombatBuff);
 					Mob* tar = this;
 
-					for(std::list<MercSpell>::iterator itr = buffSpellList.begin(); itr != buffSpellList.end(); itr++) {
+					for(std::list<MercSpell>::iterator itr = buffSpellList.begin(); itr != buffSpellList.end(); ++itr) {
 						MercSpell selectedMercSpell = *itr;
 
 						if(!(spells[selectedMercSpell.spellid].targettype == ST_Self)) {
@@ -2541,7 +2541,7 @@ void Merc::CheckHateList() {
 					std::list<NPC*> npc_list;
 					entity_list.GetNPCList(npc_list);
 
-					for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); itr++) {
+					for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); ++itr) {
 						NPC* npc = *itr;
 						float dist = npc->DistNoRootNoZ(*this);
 						int radius = RuleI(Mercs, AggroRadius);
@@ -2594,7 +2594,7 @@ bool Merc::CheckAENuke(Merc* caster, Mob* tar, uint16 spell_id, uint8 &numTarget
 	std::list<NPC*> npc_list;
 	entity_list.GetNPCList(npc_list);
 
-	for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); itr++) {
+	for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); ++itr) {
 		NPC* npc = *itr;
 
 		if(npc->DistNoRootNoZ(*tar) <= spells[spell_id].aoerange * spells[spell_id].aoerange) {
@@ -3311,7 +3311,7 @@ MercSpell Merc::GetBestMercSpellForVeryFastHeal(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CurrentHP);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsVeryFastHealSpell(mercSpellListItr->spellid)
 				&& CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -3343,7 +3343,7 @@ MercSpell Merc::GetBestMercSpellForFastHeal(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CurrentHP);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsFastHealSpell(mercSpellListItr->spellid)
 				&& CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -3375,7 +3375,7 @@ MercSpell Merc::GetBestMercSpellForHealOverTime(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercHoTSpellList = GetMercSpellsForSpellEffect(caster, SE_HealOverTime);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercHoTSpellList.begin(); mercSpellListItr != mercHoTSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercHoTSpellList.begin(); mercSpellListItr != mercHoTSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsHealOverTimeSpell(mercSpellListItr->spellid)) {
 
@@ -3415,7 +3415,7 @@ MercSpell Merc::GetBestMercSpellForPercentageHeal(Merc* caster) {
 	if(caster && caster->AI_HasSpells()) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CurrentHP);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsCompleteHealSpell(mercSpellListItr->spellid)
 				&& CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -3447,7 +3447,7 @@ MercSpell Merc::GetBestMercSpellForRegularSingleTargetHeal(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CurrentHP);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsRegularSingleTargetHealSpell(mercSpellListItr->spellid)
 				&& CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -3479,7 +3479,7 @@ MercSpell Merc::GetFirstMercSpellForSingleTargetHeal(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CurrentHP);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if((IsRegularSingleTargetHealSpell(mercSpellListItr->spellid)
 				|| IsFastHealSpell(mercSpellListItr->spellid))
@@ -3512,7 +3512,7 @@ MercSpell Merc::GetBestMercSpellForGroupHeal(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CurrentHP);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsRegularGroupHealSpell(mercSpellListItr->spellid)
 				&& CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -3544,7 +3544,7 @@ MercSpell Merc::GetBestMercSpellForGroupHealOverTime(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercHoTSpellList = GetMercSpellsForSpellEffect(caster, SE_HealOverTime);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercHoTSpellList.begin(); mercSpellListItr != mercHoTSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercHoTSpellList.begin(); mercSpellListItr != mercHoTSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsGroupHealOverTimeSpell(mercSpellListItr->spellid)) {
 
@@ -3584,7 +3584,7 @@ MercSpell Merc::GetBestMercSpellForGroupCompleteHeal(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CompleteHeal);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsGroupCompleteHealSpell(mercSpellListItr->spellid)
 				&& CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -3616,7 +3616,7 @@ MercSpell Merc::GetBestMercSpellForAETaunt(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_Taunt);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if((spells[mercSpellListItr->spellid].targettype == ST_AECaster
 				|| spells[mercSpellListItr->spellid].targettype == ST_AETarget
@@ -3650,7 +3650,7 @@ MercSpell Merc::GetBestMercSpellForTaunt(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_Taunt);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if((spells[mercSpellListItr->spellid].targettype == ST_Target)
 				&& CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -3682,7 +3682,7 @@ MercSpell Merc::GetBestMercSpellForHate(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_Calm);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
 				result.spellid = mercSpellListItr->spellid;
@@ -3738,7 +3738,7 @@ MercSpell Merc::GetBestMercSpellForCure(Merc* caster, Mob *tar) {
 
 		//Check for group cure first
 		if(countNeedsCured > 2) {
-			for(std::list<MercSpell>::iterator itr = cureList.begin(); itr != cureList.end(); itr++) {
+			for(std::list<MercSpell>::iterator itr = cureList.begin(); itr != cureList.end(); ++itr) {
 				MercSpell selectedMercSpell = *itr;
 
 				if(IsGroupSpell(itr->spellid) && CheckSpellRecastTimers(caster, itr->spellid)) {
@@ -3778,7 +3778,7 @@ MercSpell Merc::GetBestMercSpellForCure(Merc* caster, Mob *tar) {
 
 		//no group cure for target- try to find single target spell
 		if(!spellSelected) {
-			for(std::list<MercSpell>::iterator itr = cureList.begin(); itr != cureList.end(); itr++) {
+			for(std::list<MercSpell>::iterator itr = cureList.begin(); itr != cureList.end(); ++itr) {
 				MercSpell selectedMercSpell = *itr;
 
 				if(CheckSpellRecastTimers(caster, itr->spellid)) {
@@ -3834,7 +3834,7 @@ MercSpell Merc::GetBestMercSpellForStun(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsForSpellEffect(caster, SE_Stun);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
 				result.spellid = mercSpellListItr->spellid;
@@ -3929,7 +3929,7 @@ MercSpell Merc::GetBestMercSpellForTargetedAENuke(Merc* caster, Mob* tar) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsBySpellType(caster, SpellType_Nuke);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsAENukeSpell(mercSpellListItr->spellid) && !IsAERainNukeSpell(mercSpellListItr->spellid)
 				&& !IsPBAENukeSpell(mercSpellListItr->spellid) && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -3980,7 +3980,7 @@ MercSpell Merc::GetBestMercSpellForPBAENuke(Merc* caster, Mob* tar) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsBySpellType(caster, SpellType_Nuke);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsPBAENukeSpell(mercSpellListItr->spellid) && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
 				uint8 numTargets = 0;
@@ -4030,7 +4030,7 @@ MercSpell Merc::GetBestMercSpellForAERainNuke(Merc* caster, Mob* tar) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsBySpellType(caster, SpellType_Nuke);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsAERainNukeSpell(mercSpellListItr->spellid) && MakeRandomInt(1, 100) <= castChance && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
 				uint8 numTargets = 0;
@@ -4068,7 +4068,7 @@ MercSpell Merc::GetBestMercSpellForNuke(Merc* caster) {
 	if(caster) {
 		std::list<MercSpell> mercSpellList = GetMercSpellsBySpellType(caster, SpellType_Nuke);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 			if(IsPureNukeSpell(mercSpellListItr->spellid) && !IsAENukeSpell(mercSpellListItr->spellid)
 					&& MakeRandomInt(1, 100) <= castChance && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -4111,7 +4111,7 @@ MercSpell Merc::GetBestMercSpellForNukeByTargetResists(Merc* caster, Mob* target
 
 		std::list<MercSpell> mercSpellList = GetMercSpellsBySpellType(caster, SpellType_Nuke);
 
-		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) {
+		for(std::list<MercSpell>::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); ++mercSpellListItr) {
 			// Assuming all the spells have been loaded into this list by level and in descending order
 
 			if(IsPureNukeSpell(mercSpellListItr->spellid) && !IsAENukeSpell(mercSpellListItr->spellid) && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) {
@@ -4350,7 +4350,7 @@ bool Merc::CheckAETaunt() {
 		std::list<NPC*> npc_list;
 		entity_list.GetNPCList(npc_list);
 
-		for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); itr++) {
+		for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); ++itr) {
 			NPC* npc = *itr;
 			float dist = npc->DistNoRootNoZ(*this);
 			int range = GetActSpellRange(mercSpell.spellid, spells[mercSpell.spellid].range);
@@ -4436,7 +4436,7 @@ bool Merc::CheckConfidence() {
 	std::list<NPC*> npc_list;
 	entity_list.GetNPCList(npc_list);
 
-	for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); itr++) {
+	for(std::list<NPC*>::iterator itr = npc_list.begin(); itr != npc_list.end(); ++itr) {
 		NPC* mob = *itr;
 		float ConRating = 1.0;
 		int CurrentCon = 0;
@@ -4920,7 +4920,7 @@ bool Merc::LoadMercSpells() {
 	int16 attack_proc_spell = -1;
 	int8 proc_chance = 0;
 
-	for (std::list<MercSpellEntry>::iterator mercSpellEntryItr = spellList.begin(); mercSpellEntryItr != spellList.end(); mercSpellEntryItr++) {
+	for (std::list<MercSpellEntry>::iterator mercSpellEntryItr = spellList.begin(); mercSpellEntryItr != spellList.end(); ++mercSpellEntryItr) {
 		if (proficiency_id == mercSpellEntryItr->proficiencyid && GetLevel() >= mercSpellEntryItr->minlevel && GetLevel() <= mercSpellEntryItr->maxlevel && mercSpellEntryItr->spellid > 0) {
 			MercSpell mercSpell;
 
@@ -5932,7 +5932,7 @@ int NPC::GetNumMercTypes(uint32 clientVersion)
 	int count = 0;
 	std::list<MercType> mercTypeList = GetMercTypesList();
 
-	for(std::list<MercType>::iterator mercTypeListItr = mercTypeList.begin(); mercTypeListItr != mercTypeList.end(); mercTypeListItr++) {
+	for(std::list<MercType>::iterator mercTypeListItr = mercTypeList.begin(); mercTypeListItr != mercTypeList.end(); ++mercTypeListItr) {
 		if(mercTypeListItr->ClientVersion <= clientVersion)
 			count++;
 	}
@@ -5945,7 +5945,7 @@ int NPC::GetNumMercs(uint32 clientVersion)
 	int count = 0;
 	std::list<MercData> mercDataList = GetMercsList();
 
-	for(std::list<MercData>::iterator mercListItr = mercDataList.begin(); mercListItr != mercDataList.end(); mercListItr++) {
+	for(std::list<MercData>::iterator mercListItr = mercDataList.begin(); mercListItr != mercDataList.end(); ++mercListItr) {
 		if(mercListItr->ClientVersion <= clientVersion)
 			count++;
 	}
@@ -5957,7 +5957,7 @@ std::list<MercType> NPC::GetMercTypesList(uint32 clientVersion) {
 	std::list<MercType> result;
 
 	if(GetNumMercTypes() > 0) {
-		for(std::list<MercType>::iterator mercTypeListItr = mercTypeList.begin(); mercTypeListItr != mercTypeList.end(); mercTypeListItr++) {
+		for(std::list<MercType>::iterator mercTypeListItr = mercTypeList.begin(); mercTypeListItr != mercTypeList.end(); ++mercTypeListItr) {
 			if(mercTypeListItr->ClientVersion <= clientVersion) {
 				MercType mercType;
 				mercType.Type = mercTypeListItr->Type;
@@ -5974,7 +5974,7 @@ std::list<MercData> NPC::GetMercsList(uint32 clientVersion) {
 	std::list<MercData> result;
 
 	if(GetNumMercs() > 0) {
-		for(std::list<MercData>::iterator mercListItr = mercDataList.begin(); mercListItr != mercDataList.end(); mercListItr++) {
+		for(std::list<MercData>::iterator mercListItr = mercDataList.begin(); mercListItr != mercDataList.end(); ++mercListItr) {
 			if(mercListItr->ClientVersion <= clientVersion) {
 				MercTemplate *merc_template = zone->GetMercTemplate(mercListItr->MercTemplateID);
 

zone/mob.cpp

@@ -4767,7 +4767,7 @@ int32 Mob::GetItemFactionBonus(uint32 pFactionID) {
 
 void Mob::ClearItemFactionBonuses() {
 	std::map <uint32, int32> :: iterator itr;
-	for(itr = item_faction_bonuses.begin(); itr != item_faction_bonuses.end(); itr++)
+	for(itr = item_faction_bonuses.begin(); itr != item_faction_bonuses.end(); ++itr)
 	{
 		item_faction_bonuses.erase(itr->first);
 	}

zone/npc.cpp

@@ -280,12 +280,8 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float
 			trap_list = trap_ent_iter->second;
 			if(trap_list.size() > 0)
 			{
-				uint16 count = MakeRandomInt(0, (trap_list.size()-1));
 				std::list<LDoNTrapTemplate*>::iterator trap_list_iter = trap_list.begin();
-				for(int x = 0; x < count; ++x)
-				{
-					trap_list_iter++;
-				}
+				std::advance(trap_list_iter, MakeRandomInt(0, trap_list.size() - 1));
 				LDoNTrapTemplate* tt = (*trap_list_iter);
 				if(tt)
 				{
@@ -374,7 +370,7 @@ NPC::~NPC()
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* item = *cur;
 		safe_delete(item);
 	}
@@ -385,7 +381,7 @@ NPC::~NPC()
 	std::list<struct NPCFaction*>::iterator cur,end;
 	cur = faction_list.begin();
 	end = faction_list.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		struct NPCFaction* fac = *cur;
 		safe_delete(fac);
 	}
@@ -424,7 +420,7 @@ ServerLootItem_Struct* NPC::GetItem(int slot_id) {
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* item = *cur;
 		if (item->equipSlot == slot_id) {
 			return item;
@@ -437,7 +433,7 @@ void NPC::RemoveItem(uint32 item_id, uint16 quantity, uint16 slot) {
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* item = *cur;
 		if (item->item_id == item_id && slot <= 0 && quantity <= 0) {
 			itemlist.erase(cur);
@@ -477,7 +473,7 @@ void NPC::CheckMinMaxLevel(Mob *them)
 			cur = itemlist.erase(cur);
 			continue;
 		}
-		cur++;
+		++cur;
 	}
 
 }
@@ -486,7 +482,7 @@ void NPC::ClearItemList() {
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		ServerLootItem_Struct* item = *cur;
 		safe_delete(item);
 	}
@@ -500,7 +496,7 @@ void NPC::QueryLoot(Client* to) {
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
 	end = itemlist.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		const Item_Struct* item = database.GetItem((*cur)->item_id);
 		if (item)
 			if (to->GetClientVersion() >= EQClientRoF)
@@ -1286,7 +1282,7 @@ void NPC::PickPocket(Client* thief) {
 		ItemList::iterator cur,end;
 		cur = itemlist.begin();
 		end = itemlist.end();
-		for(; cur != end && x < 49; cur++) {
+		for(; cur != end && x < 49; ++cur) {
 			ServerLootItem_Struct* citem = *cur;
 			const Item_Struct* item = database.GetItem(citem->item_id);
 			if (item)
@@ -2351,7 +2347,7 @@ FACTION_VALUE NPC::CheckNPCFactionAlly(int32 other_faction) {
 	std::list<struct NPCFaction*>::iterator cur,end;
 	cur = faction_list.begin();
 	end = faction_list.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		struct NPCFaction* fac = *cur;
 		if ((int32)fac->factionID == other_faction) {
 			if (fac->npc_value > 0)

zone/pathing.cpp

@@ -1324,12 +1324,12 @@ void Client::SendPathPacket(std::vector<FindPerson_Point> &points) {
 	cur = points.begin();
 	end = points.end();
 	unsigned int r;
-	for(r = 0; cur != end; cur++, r++) {
+	for(r = 0; cur != end; ++cur, r++) {
 		fpr->path[r] = *cur;
 
 	}
 	//put the last element into the destination field
-	cur--;
+	--cur;
 	fpr->path[r] = *cur;
 	fpr->dest = *cur;
 

zone/spawn2.cpp

@@ -566,7 +566,7 @@ void SpawnConditionManager::Process() {
 		std::vector<SpawnEvent>::iterator cur,end;
 		cur = spawn_events.begin();
 		end = spawn_events.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			SpawnEvent &cevent = *cur;
 
 			if(!cevent.enabled)
@@ -827,7 +827,7 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in
 	cur = spawn_events.begin();
 	end = spawn_events.end();
 	bool ran;
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		SpawnEvent &cevent = *cur;
 
 		if(!cevent.enabled)
@@ -875,7 +875,7 @@ void SpawnConditionManager::FindNearestEvent() {
 	cur = spawn_events.begin();
 	end = spawn_events.end();
 	int next_id = -1;
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		SpawnEvent &cevent = *cur;
 
 		if(!cevent.enabled)
@@ -983,7 +983,7 @@ void SpawnConditionManager::ReloadEvent(uint32 event_id) {
 	std::vector<SpawnEvent>::iterator cur,end;
 	cur = spawn_events.begin();
 	end = spawn_events.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		SpawnEvent &cevent = *cur;
 
 		if(cevent.id == event_id) {
@@ -1026,7 +1026,7 @@ void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool rese
 	std::vector<SpawnEvent>::iterator cur,end;
 	cur = spawn_events.begin();
 	end = spawn_events.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		SpawnEvent &cevent = *cur;
 
 		if(cevent.id == event_id) {

zone/spawngroup.cpp

@@ -64,7 +64,7 @@ uint32 SpawnGroup::GetNPCType() {
 	std::list<SpawnEntry*> possible;
 	cur = list_.begin();
 	end = list_.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		SpawnEntry *se = *cur;
 
 		//check limits on this spawn group and npc type
@@ -83,7 +83,7 @@ uint32 SpawnGroup::GetNPCType() {
 
 	cur = possible.begin();
 	end = possible.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		SpawnEntry *se = *cur;
 		if (roll < se->chance) {
 			npcType = se->NPCType;
@@ -104,7 +104,7 @@ SpawnGroup::~SpawnGroup() {
 	std::list<SpawnEntry*>::iterator cur,end;
 	cur = list_.begin();
 	end = list_.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		SpawnEntry* tmp = *cur;
 		safe_delete(tmp);
 	}
@@ -115,7 +115,7 @@ SpawnGroupList::~SpawnGroupList() {
 	std::map<uint32, SpawnGroup*>::iterator cur,end;
 	cur = groups.begin();
 	end = groups.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		SpawnGroup* tmp = cur->second;
 		safe_delete(tmp);
 	}

zone/spells.cpp

@@ -2058,7 +2058,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16
 							SpellOnTarget(spell_id, (*iter), false, true, resist_adjust);
 					}
 				}
-				iter++;
+				++iter;
 			}
 			break;
 		}
@@ -2940,7 +2940,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
 		std::vector<int>::iterator cur, end;
 		cur = overwrite_slots.begin();
 		end = overwrite_slots.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			// strip spell
 			BuffFadeBySlot(*cur, false);
 

zone/tasks.cpp

@@ -829,7 +829,7 @@ void ClientTaskState::EnableTask(int CharID, int TaskCount, int *TaskList) {
 			// Our list of enabled tasks is sorted, so we can quit if we find a taskid higher than
 			// the one we are looking for.
 			if((*Iterator) > TaskList[i]) break;
-			Iterator++;
+			++Iterator;
 		}
 		if(AddTask) {
 			EnabledTasks.insert(Iterator, TaskList[i]);
@@ -890,7 +890,7 @@ void ClientTaskState::DisableTask(int CharID, int TaskCount, int *TaskList) {
 				break;
 			}
 			if((*Iterator) > TaskList[i]) break;
-			Iterator++;
+			++Iterator;
 		}
 		if(RemoveTask) {
 			EnabledTasks.erase(Iterator);
@@ -947,7 +947,7 @@ bool ClientTaskState::IsTaskEnabled(int TaskID) {
 	while(Iterator != EnabledTasks.end()) {
 		if((*Iterator) == TaskID) return true;
 		if((*Iterator) > TaskID) break;
-		Iterator++;
+		++Iterator;
 	}
 
 	return false;
@@ -1021,7 +1021,7 @@ int TaskManager::FirstTaskInSet(int TaskSetID) {
 	while(Iterator != TaskSets[TaskSetID].end()) {
 		if((*Iterator) > 0)
 			return (*Iterator);
-		Iterator++;
+		++Iterator;
 	}
 
 	return 0;
@@ -1087,7 +1087,7 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i
 					(IsTaskRepeatable((*Iterator)) || !state->IsTaskCompleted((*Iterator))))
 					TaskList[TaskListIndex++] = (*Iterator);
 
-				Iterator++;
+				++Iterator;
 			}
 			if(TaskListIndex > 0)
 			{
@@ -1497,7 +1497,7 @@ bool ClientTaskState::UnlockActivities(int CharID, int TaskIndex) {
 						ErasedElements++;
 					}
 					else
-						Iterator++;
+						++Iterator;
 				}
 				_log(TASKS__UPDATE, "Erased Element count is %i", ErasedElements);
 				if(ErasedElements) {
@@ -1570,7 +1570,7 @@ bool ClientTaskState::UnlockActivities(int CharID, int TaskIndex) {
 						ErasedElements++;
 					}
 					else
-						Iterator++;
+						++Iterator;
 				}
 				_log(TASKS__UPDATE, "Erased Element count is %i", ErasedElements);
 				if(ErasedElements) {

zone/titles.cpp

@@ -165,7 +165,7 @@ std::string TitleManager::GetSuffix(int TitleID)
 		if((*Iterator).TitleID == TitleID)
 			return (*Iterator).Suffix;
 
-		Iterator++;
+		++Iterator;
 	}
 
 	return "";

zone/tradeskills.cpp

@@ -1082,7 +1082,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 			}
 			if(RuleB(TaskSystem, EnableTaskSystem))
 				UpdateTasksForItem(ActivityTradeSkill, itr->first, itr->second);
-			itr++;
+			++itr;
 		}
 		return(true);
 	} else {
@@ -1103,7 +1103,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 		while(itr != spec->onfail.end()) {
 			//should we check these arguments?
 			SummonItem(itr->first, itr->second);
-			itr++;
+			++itr;
 		}
 
 		// Rolls on each item, is possible to return everything
@@ -1116,7 +1116,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 				for(sc = 0; sc < itr->second; sc++)
 					if(MakeRandomInt(0,99) < SalvageChance)
 						SummonItem(itr->first, 1);
-				itr++;
+				++itr;
 			}
 		}
 

zone/tribute.cpp

@@ -308,7 +308,7 @@ void Client::SendTributes() {
 	cur = tribute_list.begin();
 	end = tribute_list.end();
 
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(cur->second.is_guild)
 			continue;	//skip guild tributes here
 		int len = cur->second.name.length();
@@ -342,7 +342,7 @@ void Client::SendGuildTributes() {
 	cur = tribute_list.begin();
 	end = tribute_list.end();
 
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		if(!cur->second.is_guild)
 			continue;	//skip guild tributes here
 		int len = cur->second.name.length();

zone/waypoints.cpp

@@ -73,7 +73,7 @@ void NPC::DisplayWaypointInfo(Client *c) {
 	std::vector<wplist>::iterator cur, end;
 	cur = Waypoints.begin();
 	end = Waypoints.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		c->Message(0,"Waypoint %d: (%.2f,%.2f,%.2f,%.2f) pause %d",
 				cur->index,
 				cur->x,
@@ -272,12 +272,8 @@ void NPC::CalculateNewWaypoint()
 		std::list<wplist>::iterator iter = closest.begin();
 		if(closest.size() != 0)
 		{
-			int idx = MakeRandomInt(0, closest.size() - 1);
 			iter = closest.begin();
-			for(int i = 0; i < idx; ++i)
-			{
-				iter++;
-			}
+			std::advance(iter, MakeRandomInt(0, closest.size() - 1));
 			cur_wp = (*iter).index;
 		}
 
@@ -335,7 +331,7 @@ void NPC::CalculateNewWaypoint()
 		{
 			if(CheckLosFN((*iter).x, (*iter).y, (*iter).z, GetSize()))
 			{
-				iter++;
+				++iter;
 			}
 			else
 			{
@@ -345,12 +341,8 @@ void NPC::CalculateNewWaypoint()
 
 		if(closest.size() != 0)
 		{
-			int idx = MakeRandomInt(0, closest.size() - 1);
 			iter = closest.begin();
-			for(int i = 0; i < idx; ++i)
-			{
-				iter++;
-			}
+			std::advance(iter, MakeRandomInt(0, closest.size() - 1));
 			cur_wp = (*iter).index;
 		}
 		break;
@@ -406,7 +398,7 @@ void NPC::GetClosestWaypoint(std::list<wplist> &wp_list, int count, float m_x, f
 	for(int i = 0; i < count; ++i)
 	{
 		wp_list.push_back(Waypoints[(*iter).index]);
-		iter++;
+		++iter;
 	}
 }
 

zone/zone.cpp

@@ -341,7 +341,7 @@ int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charg
 	std::list<MerchantList> merlist = merchanttable[merchantid];
 	std::list<MerchantList>::const_iterator itr;
 	uint32 i = 1;
-	for(itr = merlist.begin();itr != merlist.end();itr++){
+	for (itr = merlist.begin(); itr != merlist.end(); ++itr) {
 		MerchantList ml = *itr;
 		if(ml.item == item)
 			return 0;
@@ -357,7 +357,7 @@ int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charg
 	TempMerchantList ml;
 	while(freeslot == 0 && !update_charges){
 		freeslot = i;
-		for(tmp_itr = tmp_merlist.begin();tmp_itr != tmp_merlist.end();tmp_itr++){
+		for (tmp_itr = tmp_merlist.begin(); tmp_itr != tmp_merlist.end(); ++tmp_itr) {
 			ml = *tmp_itr;
 			if(ml.item == item){
 				update_charges = true;
@@ -373,7 +373,7 @@ int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charg
 	if(update_charges){
 		tmp_merlist.clear();
 		std::list<TempMerchantList> oldtmp_merlist = tmpmerchanttable[npcid];
-		for(tmp_itr = oldtmp_merlist.begin();tmp_itr != oldtmp_merlist.end();tmp_itr++){
+		for (tmp_itr = oldtmp_merlist.begin(); tmp_itr != oldtmp_merlist.end(); ++tmp_itr) {
 			TempMerchantList ml2 = *tmp_itr;
 			if(ml2.item != item)
 				tmp_merlist.push_back(ml2);
@@ -419,7 +419,7 @@ uint32 Zone::GetTempMerchantQuantity(uint32 NPCID, uint32 Slot) {
 	std::list<TempMerchantList> TmpMerchantList = tmpmerchanttable[NPCID];
 	std::list<TempMerchantList>::const_iterator Iterator;
 
-	for(Iterator = TmpMerchantList.begin(); Iterator != TmpMerchantList.end(); Iterator++)
+	for (Iterator = TmpMerchantList.begin(); Iterator != TmpMerchantList.end(); ++Iterator)
 		if((*Iterator).slot == Slot)
 			return (*Iterator).charges;
 
@@ -527,7 +527,7 @@ void Zone::LoadMerchantData_result(MYSQL_RES* result) {
 				found = true;
 				break;
 			}
-			iter++;
+			++iter;
 		}
 
 		if(found) {
@@ -617,7 +617,7 @@ void Zone::LoadMercTemplates(){
 				tempMercTemplate.Stances[i] = 0;
 			}
 
-			for(std::list<MercStanceInfo>::iterator mercStanceListItr = merc_stances.begin(); mercStanceListItr != merc_stances.end(); mercStanceListItr++) {
+			for (std::list<MercStanceInfo>::iterator mercStanceListItr = merc_stances.begin(); mercStanceListItr != merc_stances.end(); ++mercStanceListItr) {
 				if(mercStanceListItr->ClassID == tempMercTemplate.ClassID && mercStanceListItr->ProficiencyID == tempMercTemplate.ProficiencyID) {
 					zone->merc_stance_list[tempMercTemplate.MercTemplateID].push_back((*mercStanceListItr));
 					tempMercTemplate.Stances[stanceIndex] = mercStanceListItr->StanceID;

zone/zonedb.cpp

@@ -3193,7 +3193,7 @@ bool ZoneDatabase::GetFactionIdsForNPC(uint32 nfl_id, std::list<struct NPCFactio
 		std::list<struct NPCFaction*>::iterator cur,end;
 		cur = faction_list->begin();
 		end = faction_list->end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			struct NPCFaction* tmp = *cur;
 			safe_delete(tmp);
 		}
@@ -3212,7 +3212,7 @@ bool ZoneDatabase::GetFactionIdsForNPC(uint32 nfl_id, std::list<struct NPCFactio
 	std::list<struct NPCFaction*>::iterator cur,end;
 	cur = faction_list->begin();
 	end = faction_list->end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		struct NPCFaction* tmp = *cur;
 		safe_delete(tmp);
 	}

zone/zoning.cpp

@@ -793,7 +793,7 @@ void Client::SendZoneFlagInfo(Client *to) const {
 
 	to->Message(0, "Flags for %s:", GetName());
 
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		uint32 zoneid = *cur;
 
 		const char *short_name = database.GetZoneName(zoneid);