Remove ClientMap::m_camera_mutex

[minetest.git] / src / camera.h

diff --git a/src/camera.h b/src/camera.h
index a0de13d2a5105084eb613684c7e35d77c1b01336..006f4b3cebadf1a74f9e682d2e1ed74b9bd54198 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "inventory.h"
 #include "mesh.h"
-#include "tile.h"
+#include "client/tile.h"
 #include "util/numeric.h"
 #include <ICameraSceneNode.h>
 
@@ -110,7 +110,7 @@ class Camera
        }
 
        // Checks if the constructor was able to create the scene nodes
-       bool successfullyCreated(std::wstring& error_message);
+       bool successfullyCreated(std::string &error_message);
 
        // Step the camera: updates the viewing range and view bobbing.
        void step(f32 dtime);
@@ -159,7 +159,6 @@ class Camera
 
        scene::ISceneManager* m_wieldmgr;
        WieldMeshSceneNode* m_wieldnode;
-       scene::ILightSceneNode* m_wieldlightnode;
 
        // draw control
        MapDrawControl& m_draw_control;
@@ -212,8 +211,6 @@ class Camera
 
        f32 m_cache_fall_bobbing_amount;
        f32 m_cache_view_bobbing_amount;
-       f32 m_cache_viewing_range_min;
-       f32 m_cache_viewing_range_max;
        f32 m_cache_wanted_fps;
        f32 m_cache_fov;
        bool m_cache_view_bobbing;