ToolDefManager serialization

[oweals/minetest.git] / src / mapblock.h

diff --git a/src/mapblock.h b/src/mapblock.h
index 741c306eb9968c58c0a3052ce9b0e3a8122f8774..e7fd932b8e2395e7613a53a8f91bdc98fd69fefd 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -29,9 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "exceptions.h"
 #include "serialization.h"
 #include "constants.h"
-#include "mapblockobject.h"
 #include "voxel.h"
-#include "nodemetadata.h"
 #include "staticobject.h"
 #include "mapblock_nodemod.h"
 #ifndef SERVER
@@ -39,6 +37,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #endif
 
 class Map;
+class NodeMetadataList;
+class IGameDef;
 
 #define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff
 
@@ -119,7 +119,7 @@ public:
 class MapBlock /*: public NodeContainer*/
 {
 public:
-       MapBlock(Map *parent, v3s16 pos, bool dummy=false);
+       MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy=false);
        ~MapBlock();
        
        /*virtual u16 nodeContainerId() const
@@ -225,8 +225,10 @@ public:
 
        void setLightingExpired(bool expired)
        {
-               m_lighting_expired = expired;
-               raiseModified(MOD_STATE_WRITE_NEEDED);
+               if(expired != m_lighting_expired){
+                       m_lighting_expired = expired;
+                       raiseModified(MOD_STATE_WRITE_NEEDED);
+               }
        }
        bool getLightingExpired()
        {
@@ -239,8 +241,10 @@ public:
        }
        void setGenerated(bool b)
        {
-               raiseModified(MOD_STATE_WRITE_NEEDED);
-               m_generated = b;
+               if(b != m_generated){
+                       raiseModified(MOD_STATE_WRITE_NEEDED);
+                       m_generated = b;
+               }
        }
 
        bool isValid()
@@ -388,12 +392,13 @@ public:
                                getNodeParentNoEx(p + face_dir),
                                face_dir);
        }*/
-       u8 getFaceLight2(u32 daynight_ratio, v3s16 p, v3s16 face_dir)
+       u8 getFaceLight2(u32 daynight_ratio, v3s16 p, v3s16 face_dir,
+                       INodeDefManager *nodemgr)
        {
                return getFaceLight(daynight_ratio,
                                getNodeParentNoEx(p),
                                getNodeParentNoEx(p + face_dir),
-                               face_dir);
+                               face_dir, nodemgr);
        }
        
 #ifndef SERVER // Only on client
@@ -419,68 +424,6 @@ public:
        // Copies data from VoxelManipulator getPosRelative()
        void copyFrom(VoxelManipulator &dst);
 
-       /*
-               MapBlockObject stuff
-               DEPRECATED
-       */
-       
-       /*void serializeObjects(std::ostream &os, u8 version)
-       {
-               m_objects.serialize(os, version);
-       }*/
-       // If smgr!=NULL, new objects are added to the scene
-       void updateObjects(std::istream &is, u8 version,
-                       scene::ISceneManager *smgr, u32 daynight_ratio)
-       {
-               m_objects.update(is, version, smgr, daynight_ratio);
-
-               raiseModified(MOD_STATE_WRITE_NEEDED);
-       }
-       void clearObjects()
-       {
-               m_objects.clear();
-
-               raiseModified(MOD_STATE_WRITE_NEEDED);
-       }
-       void addObject(MapBlockObject *object)
-                       throw(ContainerFullException, AlreadyExistsException)
-       {
-               m_objects.add(object);
-
-               raiseModified(MOD_STATE_WRITE_NEEDED);
-       }
-       void removeObject(s16 id)
-       {
-               m_objects.remove(id);
-
-               raiseModified(MOD_STATE_WRITE_NEEDED);
-       }
-       MapBlockObject * getObject(s16 id)
-       {
-               return m_objects.get(id);
-       }
-       JMutexAutoLock * getObjectLock()
-       {
-               return m_objects.getLock();
-       }
-
-       /*
-               Moves objects, deletes objects and spawns new objects
-       */
-       void stepObjects(float dtime, bool server, u32 daynight_ratio);
-
-       // origin is relative to block
-       void getObjects(v3f origin, f32 max_d,
-                       core::array<DistanceSortedObject> &dest)
-       {
-               m_objects.getObjects(origin, max_d, dest);
-       }
-
-       s32 getObjectCount()
-       {
-               return m_objects.getCount();
-       }
-
 #ifndef SERVER // Only on client
        /*
                Methods for setting temporary modifications to nodes for
@@ -634,7 +577,7 @@ public:
        JMutex mesh_mutex;
 #endif
        
-       NodeMetadataList m_node_metadata;
+       NodeMetadataList *m_node_metadata;
        StaticObjectList m_static_objects;
        
 private:
@@ -646,6 +589,8 @@ private:
        Map *m_parent;
        // Position in blocks on parent
        v3s16 m_pos;
+
+       IGameDef *m_gamedef;
        
        /*
                If NULL, block is a dummy block.
@@ -684,9 +629,6 @@ private:
 
        bool m_generated;
        
-       // DEPRECATED
-       MapBlockObjectList m_objects;
-
 #ifndef SERVER // Only on client
        /*
                Set to true if the mesh has been ordered to be updated