fix to the previous commit

[dragonfireclient.git] / src / mapblock.h

diff --git a/src/mapblock.h b/src/mapblock.h
index 1894269bd978b9e9478a20a7bbb783985f8a8043..30e9e38f81e9cc9285995a51012ec4304e51d70e 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapblockobject.h"
 #include "voxel.h"
 #include "nodemetadata.h"
+#include "staticobject.h"
 
 
 // Named by looking towards z+
@@ -156,21 +157,47 @@ class NodeContainer
        virtual MapNode getNode(v3s16 p) = 0;
        virtual void setNode(v3s16 p, MapNode & n) = 0;
        virtual u16 nodeContainerId() const = 0;
+
+       MapNode getNodeNoEx(v3s16 p)
+       {
+               try{
+                       return getNode(p);
+               }
+               catch(InvalidPositionException &e){
+                       return MapNode(CONTENT_IGNORE);
+               }
+       }
 };
 
 /*
-       Plain functions in mapblock.cpp
+       Mesh making stuff
 */
 
+class MapBlock;
+
+#ifndef SERVER
+
+struct MeshMakeData
+{
+       u32 m_daynight_ratio;
+       NodeModMap m_temp_mods;
+       VoxelManipulator m_vmanip;
+       v3s16 m_blockpos;
+       
+       /*
+               Copy central data directly from block, and other data from
+               parent of block.
+       */
+       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(
-               u32 daynight_ratio,
-               NodeModMap &temp_mods,
-               VoxelManipulator &vmanip,
-               v3s16 blockpos_nodes);
-
 /*
        MapBlock itself
 */
@@ -185,7 +212,7 @@ class MapBlock : public NodeContainer
        {
                return NODECONTAINER_ID_MAPBLOCK;
        }
-
+       
        NodeContainer * getParent()
        {
                return m_parent;
@@ -655,14 +682,14 @@ class MapBlock : public NodeContainer
 #endif
        
        NodeMetadataList m_node_metadata;
+       StaticObjectList m_static_objects;
        
 private:
        /*
                Private member variables
        */
 
-       // Parent container (practically the Map)
-       // Not a MapSector, it is just a structural element.
+       // NOTE: Lots of things rely on this being the Map
        NodeContainer *m_parent;
        // Position in blocks on parent
        v3s16 m_pos;
@@ -702,10 +729,11 @@ class MapBlock : public NodeContainer
        // Whether day and night lighting differs
        bool m_day_night_differs;
        
+       // TODO: Remove this
        MapBlockObjectList m_objects;
 
        // Object spawning stuff
-       float m_spawn_timer;
+       //float m_spawn_timer;
 
 #ifndef SERVER // Only on client
        /*