Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / camera.h

diff --git a/src/client/camera.h b/src/client/camera.h
index 30fac52899a0d8bdd60cfe3acf68e1dcdaad0d67..ecd71f1e72d2cee62f6956d84b0cc4d2690cd675 100644 (file)
--- a/src/client/camera.h
+++ b/src/client/camera.h
@@ -162,16 +162,11 @@ class Camera
        // Notify about new server-sent FOV and initialize smooth FOV transition
        void notifyFovChange();
 
-       // Checks if the constructor was able to create the scene nodes
-       bool successfullyCreated(std::string &error_message);
-
        // Step the camera: updates the viewing range and view bobbing.
        void step(f32 dtime);
 
        // Update the camera from the local player's position.
-       // busytime is used to adjust the viewing range.
-       void update(LocalPlayer* player, f32 frametime, f32 busytime,
-                       f32 tool_reload_ratio);
+       void update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio);
 
        // Update render distance
        void updateViewingRange();
@@ -245,6 +240,8 @@ class Camera
        // Camera offset
        v3s16 m_camera_offset;
 
+       bool m_stepheight_smooth_active = false;
+
        // Server-sent FOV variables
        bool m_server_sent_fov = false;
        f32 m_curr_fov_degrees, m_old_fov_degrees, m_target_fov_degrees;