Make autoforward simulate the 'up' key (#8249)

[oweals/minetest.git] / src / client / localplayer.cpp

diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
index c627cc6d9a0053d6d04c696829e74db6ae25e75f..dabeee6fedf2a326a55c833acef411096be1f924 100644 (file)
--- a/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@ -496,7 +496,6 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
        bool pitch_move = (free_move || in_liquid) && player_settings.pitch_move;
        // When aux1_descends is enabled the fast key is used to go down, so fast isn't possible
        bool fast_climb = fast_move && control.aux1 && !player_settings.aux1_descends;
-       bool continuous_forward = player_settings.continuous_forward;
        bool always_fly_fast = player_settings.always_fly_fast;
 
        // Whether superspeed mode is used or not
@@ -583,16 +582,8 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
                }
        }
 
-       if (continuous_forward)
-               speedH += v3f(0,0,1);
-
        if (control.up) {
-               if (continuous_forward) {
-                       if (fast_move)
-                               superspeed = true;
-               } else {
-                       speedH += v3f(0,0,1);
-               }
+               speedH += v3f(0,0,1);
        }
        if (control.down) {
                speedH -= v3f(0,0,1);
@@ -689,7 +680,7 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
                incH = incV = movement_acceleration_default * BS * dtime;
 
        float slip_factor = 1.0f;
-       if (!free_move)
+       if (!free_move && !in_liquid && !in_liquid_stable)
                slip_factor = getSlipFactor(env, speedH);
 
        // Don't sink when swimming in pitch mode
@@ -1111,7 +1102,7 @@ void LocalPlayer::handleAutojump(f32 dtime, Environment *env,
        if (m_autojump)
                return;
 
-       bool control_forward = control.up || player_settings.continuous_forward ||
+       bool control_forward = control.up ||
                        (!control.up && !control.down &&
                        control.forw_move_joystick_axis < -0.05);
        bool could_autojump =