Add support for setting stepheight for entities

2013-07-22 18:54:30 +02:00
parent ff7c380d0e
commit 251e3e01c7
7 changed files with 12 additions and 5 deletions
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1150,12 +1150,11 @@ class GenericCAO : public ClientActiveObject
 				box.MaxEdge *= BS;
 				collisionMoveResult moveresult;
 				f32 pos_max_d = BS*0.125; // Distance per iteration
-				f32 stepheight = 0;
 				v3f p_pos = m_position;
 				v3f p_velocity = m_velocity;
 				v3f p_acceleration = m_acceleration;
 				moveresult = collisionMoveSimple(env,env->getGameDef(),
-						pos_max_d, box, stepheight, dtime,
+						pos_max_d, box, m_prop.stepheight, dtime,
 						p_pos, p_velocity, p_acceleration,
 						this, m_prop.collideWithObjects);
 				// Apply results