hopefully fixed the privilege problems

[minetest.git] / src / mapblock.h

diff --git a/src/mapblock.h b/src/mapblock.h
index 87abf6a86d2e6477566ac92ac231b66be2e5deba..1eb97353cc74129e600904fbabced36a53640c5b 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -32,7 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapblockobject.h"
 #include "voxel.h"
 #include "nodemetadata.h"
+#include "staticobject.h"
 
+#define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff
 
 // Named by looking towards z+
 enum{
@@ -174,6 +176,8 @@ class NodeContainer
 
 class MapBlock;
 
+#ifndef SERVER
+
 struct MeshMakeData
 {
        u32 m_daynight_ratio;
@@ -188,11 +192,13 @@ struct MeshMakeData
        void fill(u32 daynight_ratio, MapBlock *block);
 };
 
+scene::SMesh* makeMapBlockMesh(MeshMakeData *data);
+
+#endif
+
 u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2,
                v3s16 face_dir);
 
-scene::SMesh* makeMapBlockMesh(MeshMakeData *data);
-
 /*
        MapBlock itself
 */
@@ -239,24 +245,28 @@ class MapBlock : public NodeContainer
                reallocate();
        }
        
-       bool getChangedFlag()
+       /*
+               This is called internally or externally after the block is
+               modified, so that the block is saved and possibly not deleted from
+               memory.
+       */
+       void setChangedFlag()
        {
-               return changed;
+               changed = true;
        }
        void resetChangedFlag()
        {
                changed = false;
        }
-       void setChangedFlag()
+       bool getChangedFlag()
        {
-               changed = true;
+               return changed;
        }
 
        bool getIsUnderground()
        {
                return is_underground;
        }
-
        void setIsUnderground(bool a_is_underground)
        {
                is_underground = a_is_underground;
@@ -354,6 +364,15 @@ class MapBlock : public NodeContainer
                return getNode(p.X, p.Y, p.Z);
        }
        
+       MapNode getNodeNoEx(v3s16 p)
+       {
+               try{
+                       return getNode(p.X, p.Y, p.Z);
+               }catch(InvalidPositionException &e){
+                       return MapNode(CONTENT_IGNORE);
+               }
+       }
+       
        void setNode(s16 x, s16 y, s16 z, MapNode & n)
        {
                if(data == NULL)
@@ -439,47 +458,19 @@ class MapBlock : public NodeContainer
                                face_dir);
        }
        
-#ifndef SERVER
-       // light = 0...255
-       /*static void makeFastFace(TileSpec tile, u8 light, v3f p,
-                       v3s16 dir, v3f scale, v3f posRelative_f,
-                       core::array<FastFace> &dest);*/
-       
-       /*TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 face_dir,
-                       NodeModMap &temp_mods);*/
-       /*u8 getNodeContent(v3s16 p, MapNode mn,
-                       NodeModMap &temp_mods);*/
-
-       /*
-               Generates the FastFaces of a node row. This has a
-               ridiculous amount of parameters because that way they
-               can be precalculated by the caller.
+#ifndef SERVER // Only on client
 
-               translate_dir: unit vector with only one of x, y or z
-               face_dir: unit vector with only one of x, y or z
-       */
-       /*void updateFastFaceRow(
-                       u32 daynight_ratio,
-                       v3f posRelative_f,
-                       v3s16 startpos,
-                       u16 length,
-                       v3s16 translate_dir,
-                       v3f translate_dir_f,
-                       v3s16 face_dir,
-                       v3f face_dir_f,
-                       core::array<FastFace> &dest,
-                       NodeModMap &temp_mods);*/
-       
+#if 1
        /*
                Thread-safely updates the whole mesh of the mapblock.
+               NOTE: Prefer generating the mesh separately and then using
+               replaceMesh().
        */
-#if 1
        void updateMesh(u32 daynight_ratio);
 #endif
-
+       // Replace the mesh with a new one
        void replaceMesh(scene::SMesh *mesh_new);
-       
-#endif // !SERVER
+#endif
        
        // See comments in mapblock.cpp
        bool propagateSunlight(core::map<v3s16, bool> & light_sources,
@@ -493,6 +484,7 @@ class MapBlock : public NodeContainer
 
        /*
                MapBlockObject stuff
+               DEPRECATED
        */
        
        void serializeObjects(std::ostream &os, u8 version)
@@ -540,13 +532,6 @@ class MapBlock : public NodeContainer
        */
        void stepObjects(float dtime, bool server, u32 daynight_ratio);
 
-       /*void wrapObject(MapBlockObject *object)
-       {
-               m_objects.wrapObject(object);
-
-               setChangedFlag();
-       }*/
-
        // origin is relative to block
        void getObjects(v3f origin, f32 max_d,
                        core::array<DistanceSortedObject> &dest)
@@ -559,7 +544,7 @@ class MapBlock : public NodeContainer
                return m_objects.getCount();
        }
 
-#ifndef SERVER
+#ifndef SERVER // Only on client
        /*
                Methods for setting temporary modifications to nodes for
                drawing
@@ -634,14 +619,30 @@ class MapBlock : public NodeContainer
        */
        s16 getGroundLevel(v2s16 p2d);
 
+       /*
+               Timestamp (see m_timestamp)
+               NOTE: BLOCK_TIMESTAMP_UNDEFINED=0xffffffff means there is no timestamp.
+       */
+       void setTimestamp(u32 time)
+       {
+               m_timestamp = time;
+               setChangedFlag();
+       }
+       u32 getTimestamp()
+       {
+               return m_timestamp;
+       }
+
        /*
                Serialization
        */
        
-       // Doesn't write version by itself
+       // These don't write or read version by itself
        void serialize(std::ostream &os, u8 version);
-
        void deSerialize(std::istream &is, u8 version);
+       // Used after the basic ones when writing on disk (serverside)
+       void serializeDiskExtra(std::ostream &os, u8 version);
+       void deSerializeDiskExtra(std::istream &is, u8 version);
 
 private:
        /*
@@ -671,12 +672,13 @@ class MapBlock : public NodeContainer
                Public member variables
        */
 
-#ifndef SERVER
+#ifndef SERVER // Only on client
        scene::SMesh *mesh;
        JMutex mesh_mutex;
 #endif
        
        NodeMetadataList m_node_metadata;
+       StaticObjectList m_static_objects;
        
 private:
        /*
@@ -723,11 +725,9 @@ class MapBlock : public NodeContainer
        // Whether day and night lighting differs
        bool m_day_night_differs;
        
+       // DEPRECATED
        MapBlockObjectList m_objects;
 
-       // Object spawning stuff
-       float m_spawn_timer;
-
 #ifndef SERVER // Only on client
        /*
                Set to true if the mesh has been ordered to be updated
@@ -741,6 +741,12 @@ class MapBlock : public NodeContainer
        NodeModMap m_temp_mods;
        JMutex m_temp_mods_mutex;
 #endif
+       
+       /*
+               When block is removed from active blocks, this is set to gametime.
+               Value BLOCK_TIMESTAMP_UNDEFINED=0xffffffff means there is no timestamp.
+       */
+       u32 m_timestamp;
 };
 
 inline bool blockpos_over_limit(v3s16 p)