fix gettext compile issues under win32

[dragonfireclient.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 2f8bfaebabc4cb19bba80af6964982de61b47ef5..a6480c569fb706ed77aeff56b83e68fcb73c21b2 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -34,10 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/container.h"
 #include "nodetimer.h"
 
-extern "C" {
-       #include "sqlite3.h"
-}
-
+class Database;
 class ClientMap;
 class MapSector;
 class ServerMapSector;
@@ -406,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);
@@ -425,13 +425,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();
@@ -485,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
@@ -511,14 +506,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