X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnameidmapping.cpp;h=05cfae0691722f3c86023a59f3328606a1db08bd;hb=285ba74723695c4b51192dac0e1e17c5d8f880db;hp=78e4a0a56e2df4d1c212304a45d59bb3680b479d;hpb=a98baef5e4fedca36c8c8755ad7c8233469f6a3f;p=minetest.git

diff --git a/src/nameidmapping.cpp b/src/nameidmapping.cpp
index 78e4a0a56..05cfae069 100644
--- a/src/nameidmapping.cpp
+++ b/src/nameidmapping.cpp
@@ -25,10 +25,9 @@ void NameIdMapping::serialize(std::ostream &os) const
 {
 	writeU8(os, 0); // version
 	writeU16(os, m_id_to_name.size());
-	for (IdToNameMap::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);
 	}
 }
 
@@ -42,7 +41,7 @@ void NameIdMapping::deSerialize(std::istream &is)
 	m_name_to_id.clear();
 	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;
 	}