Merge pull request #59 from PrairieAstronomer/readme_irrlicht_change

[dragonfireclient.git] / src / nameidmapping.cpp

diff --git a/src/nameidmapping.cpp b/src/nameidmapping.cpp
index 7857ffda1065e0fd86e0afba9dd0d5889f767bb5..05cfae0691722f3c86023a59f3328606a1db08bd 100644 (file)
--- a/src/nameidmapping.cpp
+++ b/src/nameidmapping.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -18,33 +18,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "nameidmapping.h"
-#include "utility.h"
+#include "exceptions.h"
+#include "util/serialize.h"
 
 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;
        }
 }
-