minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Custom step height: Fix implementation 

Recent commit 45ab62d6a3 had a coding error that
made climbing out of water difficult due to an incorrect value of the step height
when not 'touching ground'.
It also incorrectly multiplied the custom stepheight by BS, resulting in being
able to step-up 2 nodes if set to the default of 0.6, or even 0.3.
Also the implementation was wrong because it customised the step height when
not 'touching ground', this step height is for a slight rise when catching the
edge of a node during a jump, and should always remain at 0.2 * BS.
This commit is contained in:
paramat 2017-05-08 01:27:11 +01:00
parent 3342dcc4bc
commit 5e04f1a335
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/localplayer.cpp
View File

@ -344,13 +344,11 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
}
}
float player_stepheight = (m_cao == 0) ? 0.0 :
(touching_ground ?
(m_cao->getStepheight() * BS) :
(m_cao->getStepheight() -0.4 * BS));
float player_stepheight = (m_cao == 0) ? 0.0f :
((touching_ground) ? m_cao->getStepheight() : (0.2f * BS));
#ifdef __ANDROID__
player_stepheight += (0.6 * BS);
player_stepheight += (0.6f * BS);
#endif
v3f accel_f = v3f(0,0,0);