Fix modstore/favourites hang by adding asynchronous lua job support

[dragonfireclient.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 15725f00e73ac6d725d46eb520195c15ea4d8137..a6480c569fb706ed77aeff56b83e68fcb73c21b2 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -33,8 +33,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "modifiedstate.h"
 #include "util/container.h"
 #include "nodetimer.h"
-#include "database.h"
 
+class Database;
 class ClientMap;
 class MapSector;
 class ServerMapSector;
@@ -403,6 +403,9 @@ class ServerMap : public Map
 
        */
        MapBlock * emergeBlock(v3s16 p, bool create_blank=true);
+       
+       // Carries out any initialization necessary before block is sent
+       void prepareBlock(MapBlock *block);
 
        // Helper for placing objects on ground level
        s16 findGroundLevel(v2s16 p2d);
@@ -477,8 +480,8 @@ class ServerMap : public Map
        // Parameters fed to the Mapgen
        MapgenParams *m_mgparams;
 
-       virtual s16 getHeat(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
-       virtual s16 getHumidity(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
+       virtual s16 updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
+       virtual s16 updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
 
 private:
        // Seed used for all kinds of randomness in generation