Fix how address is logged when a wrong password is supplied

[dragonfireclient.git] / src / nodetimer.cpp

diff --git a/src/nodetimer.cpp b/src/nodetimer.cpp
index b20bcf5788921129351f684558f7ffef8d8268e1..1feefa203a5981549e1009702d0843cab14e493d 100644 (file)
--- a/src/nodetimer.cpp
+++ b/src/nodetimer.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-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
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "nodetimer.h"
 #include "log.h"
+#include "serialization.h"
 #include "util/serialize.h"
 #include "constants.h" // MAP_BLOCKSIZE
 
@@ -42,41 +43,52 @@ void NodeTimer::deSerialize(std::istream &is)
        NodeTimerList
 */
 
-void NodeTimerList::serialize(std::ostream &os) const
+void NodeTimerList::serialize(std::ostream &os, u8 map_format_version) const
 {
-       /*
-               Version 0 is a placeholder for "nothing to see here; go away."
-       */
-
-       if(m_data.size() == 0){
-               writeU8(os, 0); // version
-               return;
+       if (map_format_version == 24) {
+               // Version 0 is a placeholder for "nothing to see here; go away."
+               if (m_data.empty()) {
+                       writeU8(os, 0); // version
+                       return;
+               }
+               writeU8(os, 1); // version
+               writeU16(os, m_data.size());
        }
 
-       writeU8(os, 1); // version
-       writeU16(os, m_data.size());
+       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);
        }
 }
 
-void NodeTimerList::deSerialize(std::istream &is)
+void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version)
 {
        m_data.clear();
 
-       u8 version = readU8(is);
-       if(version == 0)
-               return;
-       if(version != 1)
-               throw SerializationError("unsupported NodeTimerList version");
+       if(map_format_version == 24){
+               u8 timer_version = readU8(is);
+               if(timer_version == 0)
+                       return;
+               if(timer_version != 1)
+                       throw SerializationError("unsupported NodeTimerList version");
+       }
+
+       if(map_format_version >= 25){
+               u8 timer_data_len = readU8(is);
+               if(timer_data_len != 2+4+4)
+                       throw SerializationError("unsupported NodeTimer data length");
+       }
 
        u16 count = readU16(is);
 
@@ -84,12 +96,12 @@ void NodeTimerList::deSerialize(std::istream &is)
        {
                u16 p16 = readU16(is);
 
-               v3s16 p(0,0,0);
-               p.Z += p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE;
-               p16 -= p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE;
-               p.Y += p16 / MAP_BLOCKSIZE;
-               p16 -= p.Y * MAP_BLOCKSIZE;
-               p.X += p16;
+               v3s16 p;
+               p.Z = p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE;
+               p16 &= MAP_BLOCKSIZE * MAP_BLOCKSIZE - 1;
+               p.Y = p16 / MAP_BLOCKSIZE;
+               p16 &= MAP_BLOCKSIZE - 1;
+               p.X = p16;
 
                NodeTimer t;
                t.deSerialize(is);
@@ -122,7 +134,7 @@ std::map<v3s16, NodeTimer> NodeTimerList::step(float dtime)
        // Increment timers
        for(std::map<v3s16, NodeTimer>::iterator
                        i = m_data.begin();
-                       i != m_data.end(); i++){
+                       i != m_data.end(); ++i){
                v3s16 p = i->first;
                NodeTimer t = i->second;
                t.elapsed += dtime;
@@ -134,7 +146,7 @@ std::map<v3s16, NodeTimer> NodeTimerList::step(float dtime)
        // Delete elapsed timers
        for(std::map<v3s16, NodeTimer>::const_iterator
                        i = elapsed_timers.begin();
-                       i != elapsed_timers.end(); i++){
+                       i != elapsed_timers.end(); ++i){
                v3s16 p = i->first;
                m_data.erase(p);
        }