Custom step height: Fix implementation

paramat · paramat · commit 5e04f1a3357a · 2017-05-08T05:59:19.000+01:00
Recent commit 45ab62d 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.
diff --git 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));
+	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);

Original file line number	Diff line number	Diff line change
`@@ -344,13 +344,11 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,`
`344`	`344`	`}`
`345`	`345`	`}`
`346`	`346`
`347`		`- float player_stepheight = (m_cao == 0) ? 0.0 :`
`348`		`- (touching_ground ?`
`349`		`- (m_cao->getStepheight() * BS) :`
`350`		`- (m_cao->getStepheight() -0.4 * BS));`
	`347`	`+ float player_stepheight = (m_cao == 0) ? 0.0f :`
	`348`	`+ ((touching_ground) ? m_cao->getStepheight() : (0.2f * BS));`
`351`	`349`
`352`	`350`	`#ifdef __ANDROID__`
`353`		`- player_stepheight += (0.6 * BS);`
	`351`	`+ player_stepheight += (0.6f * BS);`
`354`	`352`	`#endif`
`355`	`353`
`356`	`354`	`v3f accel_f = v3f(0,0,0);`