Implement urlencode and urldecode

[dragonfireclient.git] / src / mapblock.h

diff --git a/src/mapblock.h b/src/mapblock.h
index 0168411157b30ee691c7094fe3916e8f2ddff4f8..501ab75dafb944132801aa8f256fa05f3c75c34f 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -20,19 +20,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPBLOCK_HEADER
 #define MAPBLOCK_HEADER
 
-#include <jmutex.h>
-#include <jmutexautolock.h>
-#include <exception>
 #include <set>
 #include "debug.h"
-#include "irrlichttypes.h"
 #include "irr_v3d.h"
-#include "irr_aabb3d.h"
 #include "mapnode.h"
 #include "exceptions.h"
-#include "serialization.h"
 #include "constants.h"
-#include "voxel.h"
 #include "staticobject.h"
 #include "nodemetadata.h"
 #include "nodetimer.h"
@@ -43,6 +36,7 @@ class Map;
 class NodeMetadataList;
 class IGameDef;
 class MapBlockMesh;
+class VoxelManipulator;
 
 #define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff
 
@@ -479,6 +473,9 @@ class MapBlock /*: public NodeContainer*/
        // unknown blocks from id-name mapping to wndef
        void deSerialize(std::istream &is, u8 version, bool disk);
 
+       void serializeNetworkSpecific(std::ostream &os, u16 net_proto_version);
+       void deSerializeNetworkSpecific(std::istream &is);
+
 private:
        /*
                Private methods
@@ -511,7 +508,6 @@ class MapBlock /*: public NodeContainer*/
 
 #ifndef SERVER // Only on client
        MapBlockMesh *mesh;
-       //JMutex mesh_mutex;
 #endif
        
        NodeMetadataList m_node_metadata;
@@ -519,9 +515,9 @@ class MapBlock /*: public NodeContainer*/
        StaticObjectList m_static_objects;
        
        s16 heat;
-       u32 heat_time;
        s16 humidity;
-       u32 humidity_time;
+       u32 heat_last_update;
+       u32 humidity_last_update;
 
 private:
        /*