Print --videomodes response to standard output, too

[dragonfireclient.git] / src / nodetimer.cpp

diff --git a/src/nodetimer.cpp b/src/nodetimer.cpp
index a5b48a5afa07a44af744915f95bb29182ba227a4..35094054691da236e30e0369af5046f9a3f1407d 100644 (file)
--- a/src/nodetimer.cpp
+++ b/src/nodetimer.cpp
@@ -45,9 +45,9 @@ void NodeTimer::deSerialize(std::istream &is)
 
 void NodeTimerList::serialize(std::ostream &os, u8 map_format_version) const
 {
-       if(map_format_version == 24){
+       if (map_format_version == 24) {
                // Version 0 is a placeholder for "nothing to see here; go away."
-               if(m_data.empty()){
+               if (m_data.empty()) {
                        writeU8(os, 0); // version
                        return;
                }
@@ -55,18 +55,18 @@ void NodeTimerList::serialize(std::ostream &os, u8 map_format_version) const
                writeU16(os, m_data.size());
        }
 
-       if(map_format_version >= 25){
-               writeU8(os, 2+4+4);
+       if (map_format_version >= 25) {
+               writeU8(os, 2 + 4 + 4); // length of the data for a single timer
                writeU16(os, m_data.size());
        }
 
-       for(std::map<v3s16, NodeTimer>::const_iterator
+       for (std::map<v3s16, NodeTimer>::const_iterator
                        i = m_data.begin();
-                       i != m_data.end(); ++i){
+                       i != m_data.end(); ++i) {
                v3s16 p = i->first;
                NodeTimer t = i->second;
 
-               u16 p16 = p.Z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + p.Y*MAP_BLOCKSIZE + p.X;
+               u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X;
                writeU16(os, p16);
                t.serialize(os);
        }
@@ -75,7 +75,7 @@ void NodeTimerList::serialize(std::ostream &os, u8 map_format_version) const
 void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 {
        m_data.clear();
-       
+
        if(map_format_version == 24){
                u8 timer_version = readU8(is);
                if(timer_version == 0)
@@ -108,7 +108,7 @@ void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 
                if(t.timeout <= 0)
                {
-                       infostream<<"WARNING: NodeTimerList::deSerialize(): "
+                       warningstream<<"NodeTimerList::deSerialize(): "
                                        <<"invalid data at position"
                                        <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
                                        <<std::endl;
@@ -117,7 +117,7 @@ void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 
                if(m_data.find(p) != m_data.end())
                {
-                       infostream<<"WARNING: NodeTimerList::deSerialize(): "
+                       warningstream<<"NodeTimerList::deSerialize(): "
                                        <<"already set data at position"
                                        <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
                                        <<std::endl;