Merge pull request #503 from RealBadAngel/master

[minetest.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 5a489e64f813cd2b3febf5d688f92ef0b0e23944..770afdb37eab0aa27e7051a4cefc6a944e391dcc 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -108,8 +108,8 @@ class Player
                m_speed = speed;
        }
        
-       // Y direction is ignored
-       void accelerate(v3f target_speed, f32 max_increase);
+       void accelerateHorizontal(v3f target_speed, f32 max_increase);
+       void accelerateVertical(v3f target_speed, f32 max_increase);
 
        v3f getPosition()
        {
@@ -196,19 +196,37 @@ class Player
 
        bool touching_ground;
        // This oscillates so that the player jumps a bit above the surface
-       bool in_water;
+       bool in_liquid;
        // This is more stable and defines the maximum speed of the player
-       bool in_water_stable;
+       bool in_liquid_stable;
+       // Gets the viscosity of water to calculate friction
+       u8 liquid_viscosity;
        bool is_climbing;
-       bool swimming_up;
+       bool swimming_vertical;
        bool camera_barely_in_ceiling;
        
        u8 light;
 
        Inventory inventory;
 
+       f32 movement_acceleration_default;
+       f32 movement_acceleration_air;
+       f32 movement_acceleration_fast;
+       f32 movement_speed_walk;
+       f32 movement_speed_crouch;
+       f32 movement_speed_fast;
+       f32 movement_speed_climb;
+       f32 movement_speed_jump;
+       f32 movement_liquid_fluidity;
+       f32 movement_liquid_fluidity_smooth;
+       f32 movement_liquid_sink;
+       f32 movement_gravity;
+
        u16 hp;
 
+       float hurt_tilt_timer;
+       float hurt_tilt_strength;
+
        u16 peer_id;
        
        std::string inventory_formspec;