Document zoom_fov in settingtypes.txt and minetest.conf.example

[dragonfireclient.git] / src / nameidmapping.cpp

diff --git a/src/nameidmapping.cpp b/src/nameidmapping.cpp
index 7857ffda1065e0fd86e0afba9dd0d5889f767bb5..2af8beffffa6c4ebaa3aec770c795c611655879c 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,15 +18,16 @@ 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
+       for(UNORDERED_MAP<u16, std::string>::const_iterator
                        i = m_id_to_name.begin();
-                       i != m_id_to_name.end(); i++){
+                       i != m_id_to_name.end(); ++i){
                writeU16(os, i->first);
                os<<serializeString(i->second);
        }