"or" -> "||" in content_mapblock.cpp

[dragonfireclient.git] / src / camera.h

diff --git a/src/camera.h b/src/camera.h
index 56c99d1014881a8ed1498d74ac7320ab196b039a..168863c3ec618af56693576c339c5af6de858d93 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -105,14 +105,12 @@ class Camera
 
        // Update the camera from the local player's position.
        // frametime is used to adjust the viewing range.
-       void update(LocalPlayer* player, f32 frametime, v2u32 screensize);
+       void update(LocalPlayer* player, f32 frametime, v2u32 screensize,
+                       f32 tool_reload_ratio);
 
        // Render distance feedback loop
        void updateViewingRange(f32 frametime_in);
 
-       // Update settings from g_settings
-       void updateSettings();
-
        // Start digging animation
        // Pass 0 for left click, 1 for right click
        void setDigging(s32 button);
@@ -139,11 +137,6 @@ class Camera
        // draw control
        MapDrawControl& m_draw_control;
 
-       // viewing_range_min_nodes setting
-       f32 m_viewing_range_min;
-       // viewing_range_max_nodes setting
-       f32 m_viewing_range_max;
-
        // Absolute camera position
        v3f m_camera_position;
        // Absolute camera direction
@@ -155,7 +148,6 @@ class Camera
        f32 m_fov_y;
 
        // Stuff for viewing range calculations
-       f32 m_wanted_frametime;
        f32 m_added_frametime;
        s16 m_added_frames;
        f32 m_range_old;