Initially add small and tight logging facility

[minetest.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 411a7ae514d9f11c36fee3815a3c3b4744d63c61..b58ba047be1a0aace8b92162ec6bb35f239f5d4f 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -205,7 +205,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);
 
@@ -378,7 +378,7 @@ 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);
 
        // Returns true if the database file does not exist
        bool loadFromFolders();
@@ -518,11 +518,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 +553,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.
@@ -601,6 +604,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;