lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Correctly disable in fly mode (issue #8199)
Also autojump in continuous forward mode (issue #8201)
master
SmallJoker 2019-02-09 21:44:04 +01:00 committed by GitHub
parent 705b454026
commit 6d6a813614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/client/localplayer.cpp
View File

@ -611,6 +611,12 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
speedH += v3f(1,0,0) * speedH += v3f(1,0,0) *
(control.sidew_move_joystick_axis / 32767.f); (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(control.jump)
{ {
if (free_move) { if (free_move) {
@ -1102,15 +1108,10 @@ void LocalPlayer::handleAutojump(f32 dtime, Environment *env,
if (!player_settings.autojump) if (!player_settings.autojump)
return; return;
if (m_autojump) { if (m_autojump)
// release autojump after a given time
m_autojump_time -= dtime;
if (m_autojump_time <= 0.0f)
m_autojump = false;
return; return;
}
bool control_forward = control.up || bool control_forward = control.up || player_settings.continuous_forward ||
(!control.up && !control.down && (!control.up && !control.down &&
control.forw_move_joystick_axis < -0.05); control.forw_move_joystick_axis < -0.05);
bool could_autojump = bool could_autojump =