Make ClientInterface::statenames consistent with the state enum again

[minetest.git] / src / nodemetadata.cpp

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index bd54d225688d1c99755d3db07c7b38ca5e9a9bf0..2a9131be0b014c55a2cad19695f12bb414886f36 100644 (file)
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -45,10 +45,11 @@ void NodeMetadata::serialize(std::ostream &os) const
 {
        int num_vars = m_stringvars.size();
        writeU32(os, num_vars);
-       for(std::map<std::string, std::string>::const_iterator
-                       i = m_stringvars.begin(); i != m_stringvars.end(); i++){
-               os<<serializeString(i->first);
-               os<<serializeLongString(i->second);
+       for (StringMap::const_iterator
+                       it = m_stringvars.begin();
+                       it != m_stringvars.end(); ++it) {
+               os << serializeString(it->first);
+               os << serializeLongString(it->second);
        }
 
        m_inventory->serialize(os);
@@ -95,7 +96,7 @@ void NodeMetadataList::serialize(std::ostream &os) const
 
        for(std::map<v3s16, NodeMetadata*>::const_iterator
                        i = m_data.begin();
-                       i != m_data.end(); i++)
+                       i != m_data.end(); ++i)
        {
                v3s16 p = i->first;
                NodeMetadata *data = i->second;
@@ -203,11 +204,10 @@ void NodeMetadataList::clear()
 std::string NodeMetadata::getString(const std::string &name,
        unsigned short recursion) const
 {
-       std::map<std::string, std::string>::const_iterator it;
-       it = m_stringvars.find(name);
-       if (it == m_stringvars.end()) {
+       StringMap::const_iterator it = m_stringvars.find(name);
+       if (it == m_stringvars.end())
                return "";
-       }
+
        return resolveString(it->second, recursion);
 }