GameDef compiles

[minetest.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 411a7ae514d9f11c36fee3815a3c3b4744d63c61..3def571b8189a5c3c65127032ba20f53d9fbf689 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -41,6 +41,7 @@ class ServerMapSector;
 class ClientMapSector;
 class MapBlock;
 class NodeMetadata;
+class IGameDef;
 
 namespace mapgen{
        struct BlockMakeData;
@@ -109,7 +110,7 @@ class Map /*: public NodeContainer*/
 {
 public:
 
-       Map(std::ostream &dout);
+       Map(std::ostream &dout, IGameDef *gamedef);
        virtual ~Map();
 
        /*virtual u16 nodeContainerId() const
@@ -157,6 +158,10 @@ class Map /*: public NodeContainer*/
        // Returns NULL if not found
        MapBlock * getBlockNoCreateNoEx(v3s16 p);
        
+       /* Server overrides */
+       virtual MapBlock * emergeBlock(v3s16 p, bool allow_generate=true)
+       { return getBlockNoCreateNoEx(p); }
+
        // Returns InvalidPositionException if not found
        bool isNodeUnderground(v3s16 p);
        
@@ -205,7 +210,7 @@ class Map /*: public NodeContainer*/
                These handle lighting but not faces.
        */
        void addNodeAndUpdate(v3s16 p, MapNode n,
-                       core::map<v3s16, MapBlock*> &modified_blocks);
+                       core::map<v3s16, MapBlock*> &modified_blocks, std::string &player_name);
        void removeNodeAndUpdate(v3s16 p,
                        core::map<v3s16, MapBlock*> &modified_blocks);
 
@@ -285,7 +290,9 @@ class Map /*: public NodeContainer*/
        
 protected:
 
-       std::ostream &m_dout;
+       std::ostream &m_dout; // A bit deprecated, could be removed
+
+       IGameDef *m_gamedef;
 
        core::map<MapEventReceiver*, bool> m_event_receivers;
        
@@ -311,7 +318,7 @@ class ServerMap : public Map
        /*
                savedir: directory to which map data should be saved
        */
-       ServerMap(std::string savedir);
+       ServerMap(std::string savedir, IGameDef *gamedef);
        ~ServerMap();
 
        s32 mapType() const
@@ -378,7 +385,8 @@ class ServerMap : public Map
        // Verify we can read/write to the database
        void verifyDatabase();
        // Get an integer suitable for a block
-       static int getBlockAsInteger(const v3s16 pos);
+       static sqlite3_int64 getBlockAsInteger(const v3s16 pos);
+       static v3s16 getIntegerAsBlock(sqlite3_int64 i);
 
        // Returns true if the database file does not exist
        bool loadFromFolders();
@@ -390,6 +398,8 @@ class ServerMap : public Map
        void save(bool only_changed);
        //void loadAll();
        
+       void listAllLoadableBlocks(core::list<v3s16> &dst);
+       
        // Saves map seed and possibly other stuff
        void saveMapMeta();
        void loadMapMeta();
@@ -428,9 +438,9 @@ class ServerMap : public Map
        u64 getSeed(){ return m_seed; }
 
 private:
-       // Seed used for all kinds of randomness
+       // Seed used for all kinds of randomness in generation
        u64 m_seed;
-
+       
        std::string m_savedir;
        bool m_map_saving_enabled;
 
@@ -454,6 +464,7 @@ class ServerMap : public Map
        sqlite3 *m_database;
        sqlite3_stmt *m_database_read;
        sqlite3_stmt *m_database_write;
+       sqlite3_stmt *m_database_list;
 };
 
 /*
@@ -488,6 +499,7 @@ struct MapDrawControl
 };
 
 class Client;
+class ITextureSource;
 
 /*
        ClientMap
@@ -500,6 +512,7 @@ class ClientMap : public Map, public scene::ISceneNode
 public:
        ClientMap(
                        Client *client,
+                       IGameDef *gamedef,
                        MapDrawControl &control,
                        scene::ISceneNode* parent,
                        scene::ISceneManager* mgr,
@@ -518,11 +531,12 @@ class ClientMap : public Map, public scene::ISceneNode
                ISceneNode::drop();
        }
 
-       void updateCamera(v3f pos, v3f dir)
+       void updateCamera(v3f pos, v3f dir, f32 fov)
        {
                JMutexAutoLock lock(m_camera_mutex);
                m_camera_position = pos;
                m_camera_direction = dir;
+               m_camera_fov = fov;
        }
 
        /*
@@ -552,6 +566,8 @@ class ClientMap : public Map, public scene::ISceneNode
 
        void renderMap(video::IVideoDriver* driver, s32 pass);
 
+       void renderPostFx();
+
        /*
                Methods for setting temporary modifications to nodes for
                drawing.
@@ -572,7 +588,7 @@ class ClientMap : public Map, public scene::ISceneNode
        
        /*
                Update the faces of the given block and blocks on the
-               leading edge.
+               leading edge, without threading. Rarely used.
        */
        void updateMeshes(v3s16 blockpos, u32 daynight_ratio);
        
@@ -601,6 +617,7 @@ class ClientMap : public Map, public scene::ISceneNode
 
        v3f m_camera_position;
        v3f m_camera_direction;
+       f32 m_camera_fov;
        JMutex m_camera_mutex;
        
        core::map<v2s16, bool> m_last_drawn_sectors;