X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnameidmapping.cpp;h=05cfae0691722f3c86023a59f3328606a1db08bd;hb=c7aa92aaed27ad8e10af7463b154b5b580c86da5;hp=ed59ddd16848b7c0a7db53d198c797562b14752a;hpb=34b7a147dcf9831f3b4d81599c473ba01ff5da00;p=dragonfireclient.git

diff --git a/src/nameidmapping.cpp b/src/nameidmapping.cpp
index ed59ddd16..05cfae069 100644
--- a/src/nameidmapping.cpp
+++ b/src/nameidmapping.cpp
@@ -25,27 +25,24 @@ void NameIdMapping::serialize(std::ostream &os) const
 {
 	writeU8(os, 0); // version
 	writeU16(os, m_id_to_name.size());
-	for(std::map<u16, std::string>::const_iterator
-			i = m_id_to_name.begin();
-			i != m_id_to_name.end(); ++i){
-		writeU16(os, i->first);
-		os<<serializeString(i->second);
+	for (const auto &i : m_id_to_name) {
+		writeU16(os, i.first);
+		os << serializeString16(i.second);
 	}
 }
 
 void NameIdMapping::deSerialize(std::istream &is)
 {
 	int version = readU8(is);
-	if(version != 0)
+	if (version != 0)
 		throw SerializationError("unsupported NameIdMapping version");
 	u32 count = readU16(is);
 	m_id_to_name.clear();
 	m_name_to_id.clear();
-	for(u32 i=0; i<count; i++){
+	for (u32 i = 0; i < count; i++) {
 		u16 id = readU16(is);
-		std::string name = deSerializeString(is);
+		std::string name = deSerializeString16(is);
 		m_id_to_name[id] = name;
 		m_name_to_id[name] = id;
 	}
 }
-