Modernize client code (#6250)

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

diff --git a/src/localplayer.h b/src/localplayer.h
index 9f7e921286eb6a850b22078830f75e3ca9da633c..ffaa83f33667e1f7a8785e755f53a39e027cf3e4 100644 (file)
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -29,6 +29,7 @@ class Client;
 class Environment;
 class GenericCAO;
 class ClientActiveObject;
+class ClientEnvironment;
 class IGameDef;
 
 enum LocalPlayerAnimations
@@ -78,7 +79,7 @@ public:
        void old_move(f32 dtime, Environment *env, f32 pos_max_d,
                        std::vector<CollisionInfo> *collision_info);
 
-       void applyControl(float dtime);
+       void applyControl(float dtime, Environment *env);
 
        v3s16 getStandingNodePos();
        v3s16 getFootstepNodePos();
@@ -143,7 +144,7 @@ public:
        void setCollisionbox(const aabb3f &box) { m_collisionbox = box; }
 
 private:
-       void accelerateHorizontal(const v3f &target_speed, const f32 max_increase);
+       void accelerateHorizontal(const v3f &target_speed, f32 max_increase, bool slippery);
        void accelerateVertical(const v3f &target_speed, const f32 max_increase);
        bool updateSneakNode(Map *map, const v3f &position, const v3f &sneak_max);