Fix typo in lua_api.txt

[dragonfireclient.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index bccadcec52a8e0847dc3165c4f5ec8a41180aa98..b70b18acc0ff80c9d4b85668705d780d9fe951d3 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -20,9 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAP_HEADER
 #define MAP_HEADER
 
-#include <jmutex.h>
-#include <jmutexautolock.h>
-#include <jthread.h>
 #include <iostream>
 #include <sstream>
 #include <set>
@@ -33,15 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapnode.h"
 #include "constants.h"
 #include "voxel.h"
-#include "mapgen.h" //for BlockMakeData and EmergeManager
 #include "modifiedstate.h"
 #include "util/container.h"
 #include "nodetimer.h"
 
-extern "C" {
-       #include "sqlite3.h"
-}
-
+class Database;
 class ClientMap;
 class MapSector;
 class ServerMapSector;
@@ -50,7 +43,9 @@ class NodeMetadata;
 class IGameDef;
 class IRollbackReportSink;
 class EmergeManager;
+class ServerEnvironment;
 struct BlockMakeData;
+struct MapgenParams;
 
 
 /*
@@ -336,6 +331,9 @@ class Map /*: public NodeContainer*/
        void transforming_liquid_add(v3s16 p);
        s32 transforming_liquid_size();
 
+       virtual s16 getHeat(v3s16 p);
+       virtual s16 getHumidity(v3s16 p);
+
 protected:
        friend class LuaVoxelManip;
 
@@ -424,13 +422,8 @@ class ServerMap : public Map
        /*
                Database functions
        */
-       // Create the database structure
-       void createDatabase();
        // Verify we can read/write to the database
        void verifyDatabase();
-       // Get an integer suitable for a block
-       static sqlite3_int64 getBlockAsInteger(const v3s16 pos);
-       static v3s16 getIntegerAsBlock(sqlite3_int64 i);
 
        // Returns true if the database file does not exist
        bool loadFromFolders();
@@ -483,6 +476,10 @@ class ServerMap : public Map
 
        // Parameters fed to the Mapgen
        MapgenParams *m_mgparams;
+
+       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
        u64 m_seed;
@@ -506,14 +503,7 @@ class ServerMap : public Map
                This is reset to false when written on disk.
        */
        bool m_map_metadata_changed;
-
-       /*
-               SQLite database and statements
-       */
-       sqlite3 *m_database;
-       sqlite3_stmt *m_database_read;
-       sqlite3_stmt *m_database_write;
-       sqlite3_stmt *m_database_list;
+       Database *dbase;
 };
 
 #define VMANIP_BLOCK_DATA_INEXIST     1