X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flocalplayer.h;h=dc59c4179a09dd1a28ad3e818482f1464213d33f;hb=b9343a7da4b02f48ed298c5d352f4fbcda585822;hp=8e4378dfa157f5ffc3e49e2f95806e4b95e45282;hpb=4c40e0775ca564296a56f72ff3adce50ba925b0c;p=minetest.git

diff --git a/src/localplayer.h b/src/localplayer.h
index 8e4378dfa..dc59c4179 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include "environment.h"
 #include "constants.h"
+#include "settings.h"
 #include <list>
 
 class Client;
@@ -60,7 +61,6 @@ class LocalPlayer : public Player
 	u8 liquid_viscosity = 0;
 	bool is_climbing = false;
 	bool swimming_vertical = false;
-	bool is_slipping = false;
 
 	float physics_override_speed = 1.0f;
 	float physics_override_jump = 1.0f;
@@ -142,8 +142,8 @@ class LocalPlayer : public Player
 
 	void setCollisionbox(const aabb3f &box) { m_collisionbox = box; }
 
-	bool getCanZoom() const { return m_can_zoom; }
-	void setCanZoom(bool can_zoom) { m_can_zoom = can_zoom; }
+	float getZoomFOV() const { return m_zoom_fov; }
+	void setZoomFOV(float zoom_fov) { m_zoom_fov = zoom_fov; }
 
 private:
 	void accelerateHorizontal(const v3f &target_speed, const f32 max_increase);
@@ -181,8 +181,8 @@ class LocalPlayer : public Player
 	bool camera_barely_in_ceiling = false;
 	aabb3f m_collisionbox = aabb3f(-BS * 0.30f, 0.0f, -BS * 0.30f, BS * 0.30f,
 			BS * 1.75f, BS * 0.30f);
-	bool m_can_zoom = true;
 	float m_eye_height = 1.625f;
+	float m_zoom_fov = 0.0f;
 
 	GenericCAO *m_cao = nullptr;
 	Client *m_client;