ToolDefManager serialization

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

diff --git a/src/mapblock.h b/src/mapblock.h
index 693bc51905f499af37a938efe80926b34f9bed4d..e7fd932b8e2395e7613a53a8f91bdc98fd69fefd 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -29,15 +29,16 @@ 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
        #include "mapblock_mesh.h"
 #endif
 
+class Map;
+class NodeMetadataList;
+class IGameDef;
 
 #define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff
 
@@ -81,6 +82,7 @@ enum ModifiedState
        BLOCKGEN_FULLY_GENERATED=6
 };*/
 
+#if 0
 enum
 {
        NODECONTAINER_ID_MAPBLOCK,
@@ -108,23 +110,24 @@ public:
                }
        }
 };
+#endif
 
 /*
        MapBlock itself
 */
 
-class MapBlock : public NodeContainer
+class MapBlock /*: public NodeContainer*/
 {
 public:
-       MapBlock(NodeContainer *parent, v3s16 pos, bool dummy=false);
+       MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy=false);
        ~MapBlock();
        
-       virtual u16 nodeContainerId() const
+       /*virtual u16 nodeContainerId() const
        {
                return NODECONTAINER_ID_MAPBLOCK;
-       }
+       }*/
        
-       NodeContainer * getParent()
+       Map * getParent()
        {
                return m_parent;
        }
@@ -222,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()
        {
@@ -236,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()
@@ -385,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
@@ -416,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
@@ -631,7 +577,7 @@ public:
        JMutex mesh_mutex;
 #endif
        
-       NodeMetadataList m_node_metadata;
+       NodeMetadataList *m_node_metadata;
        StaticObjectList m_static_objects;
        
 private:
@@ -640,9 +586,11 @@ private:
        */
 
        // NOTE: Lots of things rely on this being the Map
-       NodeContainer *m_parent;
+       Map *m_parent;
        // Position in blocks on parent
        v3s16 m_pos;
+
+       IGameDef *m_gamedef;
        
        /*
                If NULL, block is a dummy block.
@@ -681,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
@@ -740,5 +685,10 @@ inline s16 getNodeBlockY(s16 y)
        return getContainerPos(y, MAP_BLOCKSIZE);
 }
 
+/*
+       Get a quick string to describe what a block actually contains
+*/
+std::string analyze_block(MapBlock *block);
+
 #endif