Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

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

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 37aef7afe88beaafab0da029c94368bccfd12a49..b587f7bbb3942dc3cc32a485a8e3dac73747bea3 100644 (file)
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -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));
+       // TODO: this shouldn't be hardcoded but transmitted from server
+       float player_stepheight = (touching_ground) ? (BS * 0.6f) : (BS * 0.2f);
 
 #ifdef __ANDROID__
-       player_stepheight += (0.6 * BS);
+       player_stepheight += (0.6f * BS);
 #endif
 
        v3f accel_f = v3f(0,0,0);