Autojump: Disable in fly mode, support continuous forward (#8200)

Correctly disable in fly mode (issue #8199)
Also autojump in continuous forward mode (issue #8201)
This commit is contained in:
SmallJoker 2019-02-09 21:44:04 +01:00 committed by luk3yx
parent 4a58af58a7
commit ac96505a73

View File

@ -662,6 +662,12 @@ void LocalPlayer::applyControl(float dtime, ClientEnvironment *env)
speedH += v3f(1,0,0) *
(control.sidew_move_joystick_axis / 32767.f);
}
if (m_autojump) {
// release autojump after a given time
m_autojump_time -= dtime;
if (m_autojump_time <= 0.0f)
m_autojump = false;
}
if(control.jump)
{
if (free_move) {
@ -1153,14 +1159,8 @@ void LocalPlayer::handleAutojump(f32 dtime, Environment *env,
if (!g_settings->getBool("autojump"))
return;
if (m_autojump) {
// release autojump after a given time
m_autojump_time -= dtime;
if (m_autojump_time <= 0.0f)
m_autojump = false;
if (m_autojump)
return;
}
bool control_forward = control.up ||
(!control.up && !control.down &&