Spawn level: Add 'get_spawn_level(x, z)' API

[oweals/minetest.git] / src / clientmap.h

diff --git a/src/clientmap.h b/src/clientmap.h
index 8d272077145bc6b209cee658f00393aba68ca4ab..8402bb00d5d88e43fa56f99c7e8c394788a49a15 100644 (file)
--- a/src/clientmap.h
+++ b/src/clientmap.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLIENTMAP_HEADER
-#define CLIENTMAP_HEADER
+#pragma once
 
 #include "irrlichttypes_extrabloated.h"
 #include "map.h"
@@ -36,12 +35,6 @@ struct MapDrawControl
        u32 wanted_max_blocks = 0;
        // show a wire frame for debugging
        bool show_wireframe = false;
-       // Number of blocks rendered is written here by the renderer
-       u32 blocks_drawn = 0;
-       // Number of blocks that would have been drawn in wanted_range
-       u32 blocks_would_have_drawn = 0;
-       // Distance to the farthest block drawn
-       float farthest_drawn = 0;
 };
 
 class Client;
@@ -59,12 +52,10 @@ public:
        ClientMap(
                        Client *client,
                        MapDrawControl &control,
-                       scene::ISceneNode* parent,
-                       scene::ISceneManager* mgr,
                        s32 id
        );
 
-       ~ClientMap();
+       virtual ~ClientMap() = default;
 
        s32 mapType() const
        {
@@ -76,7 +67,7 @@ public:
                ISceneNode::drop();
        }
 
-       void updateCamera(v3f pos, v3f dir, f32 fov, v3s16 offset)
+       void updateCamera(const v3f &pos, const v3f &dir, f32 fov, const v3s16 &offset)
        {
                m_camera_position = pos;
                m_camera_direction = dir;
@@ -111,7 +102,7 @@ public:
 
        void getBlocksInViewRange(v3s16 cam_pos_nodes,
                v3s16 *p_blocks_min, v3s16 *p_blocks_max);
-       void updateDrawList(video::IVideoDriver* driver);
+       void updateDrawList();
        void renderMap(video::IVideoDriver* driver, s32 pass);
 
        int getBackgroundBrightness(float max_d, u32 daylight_factor,
@@ -132,7 +123,7 @@ private:
 
        MapDrawControl &m_control;
 
-       v3f m_camera_position;
+       v3f m_camera_position = v3f(0,0,0);
        v3f m_camera_direction = v3f(0,0,1);
        f32 m_camera_fov = M_PI;
        v3s16 m_camera_offset;
@@ -145,6 +136,3 @@ private:
        bool m_cache_bilinear_filter;
        bool m_cache_anistropic_filter;
 };
-
-#endif
-