CMake stuff works now on linux and windows... and should be possible to make to work...

[dragonfireclient.git] / src / mapblock.h

diff --git a/src/mapblock.h b/src/mapblock.h
index b5126b8225560c4984dc2b8d3583925ea82a61e6..743dad9276fdd647f6bf82ea10bce6b0f7b9a462 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -281,6 +281,7 @@ class MapBlock : public NodeContainer
        }
        
 #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);
@@ -309,7 +310,8 @@ class MapBlock : public NodeContainer
        // Updates all DAYNIGHT_CACHE_COUNT meshes
        void updateMeshes(s32 first_i=0);*/
 #endif // !SERVER
-
+       
+       // See comments in mapblock.cpp
        bool propagateSunlight(core::map<v3s16, bool> & light_sources);
        
        // Copies data to VoxelManipulator to getPosRelative()
@@ -325,9 +327,9 @@ class MapBlock : public NodeContainer
        }
        // If smgr!=NULL, new objects are added to the scene
        void updateObjects(std::istream &is, u8 version,
-                       scene::ISceneManager *smgr)
+                       scene::ISceneManager *smgr, u32 daynight_ratio)
        {
-               m_objects.update(is, version, smgr);
+               m_objects.update(is, version, smgr, daynight_ratio);
 
                setChangedFlag();
        }
@@ -358,12 +360,11 @@ class MapBlock : public NodeContainer
        {
                return m_objects.getLock();
        }
-       void stepObjects(float dtime, bool server)
-       {
-               m_objects.step(dtime, server);
 
-               setChangedFlag();
-       }
+       /*
+               Moves objects, deletes objects and spawns new objects
+       */
+       void stepObjects(float dtime, bool server, u32 daynight_ratio);
 
        /*void wrapObject(MapBlockObject *object)
        {
@@ -399,15 +400,30 @@ class MapBlock : public NodeContainer
                                <<", mod.type="<<mod.type
                                <<", mod.param="<<mod.param
                                <<std::endl;*/
+               JMutexAutoLock lock(m_temp_mods_mutex);
                m_temp_mods[p] = mod;
        }
+       // Returns true if there was one
+       bool getTempMod(v3s16 p, struct NodeMod *mod)
+       {
+               JMutexAutoLock lock(m_temp_mods_mutex);
+               core::map<v3s16, NodeMod>::Node *n;
+               n = m_temp_mods.find(p);
+               if(n == NULL)
+                       return false;
+               if(mod)
+                       *mod = n->getValue();
+               return true;
+       }
        void clearTempMod(v3s16 p)
        {
+               JMutexAutoLock lock(m_temp_mods_mutex);
                if(m_temp_mods.find(p))
                        m_temp_mods.remove(p);
        }
        void clearTempMods()
        {
+               JMutexAutoLock lock(m_temp_mods_mutex);
                m_temp_mods.clear();
        }
 #endif
@@ -427,6 +443,20 @@ class MapBlock : public NodeContainer
                return m_day_night_differs;
        }
 
+       /*
+               Miscellaneous stuff
+       */
+       
+       /*
+               Tries to measure ground level.
+               Return value:
+                       -1 = only air
+                       -2 = only ground
+                       -3 = random fail
+                       0...MAP_BLOCKSIZE-1 = ground level
+       */
+       s16 getGroundLevel(v2s16 p2d);
+
        /*
                Serialization
        */
@@ -454,6 +484,8 @@ class MapBlock : public NodeContainer
 
        MapNode & getNodeRef(s16 x, s16 y, s16 z)
        {
+               if(data == NULL)
+                       throw InvalidPositionException();
                if(x < 0 || x >= MAP_BLOCKSIZE) throw InvalidPositionException();
                if(y < 0 || y >= MAP_BLOCKSIZE) throw InvalidPositionException();
                if(z < 0 || z >= MAP_BLOCKSIZE) throw InvalidPositionException();
@@ -491,6 +523,9 @@ class MapBlock : public NodeContainer
        bool m_day_night_differs;
        
        MapBlockObjectList m_objects;
+
+       // Object spawning stuff
+       float m_spawn_timer;
        
 #ifndef SERVER
        bool m_mesh_expired;
@@ -498,6 +533,7 @@ class MapBlock : public NodeContainer
        // Temporary modifications to nodes
        // These are only used when drawing
        core::map<v3s16, NodeMod> m_temp_mods;
+       JMutex m_temp_mods_mutex;
 #endif
 };