diff options
| author | sapier <Sapier at GMX dot net> | 2013-07-22 18:54:30 +0200 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-07-30 19:48:02 +0200 |
| commit | 251e3e01c7350d94ea8dec0857e834d1ed84ac3f (patch) | |
| tree | 4278247af930c66a1012e71d2ed5d65fea137347 /src/content_sao.cpp | |
| parent | ff7c380d0eabf96a8677dfa3a94f0d18191572cf (diff) | |
| download | minetest-251e3e01c7350d94ea8dec0857e834d1ed84ac3f.tar.gz minetest-251e3e01c7350d94ea8dec0857e834d1ed84ac3f.tar.bz2 minetest-251e3e01c7350d94ea8dec0857e834d1ed84ac3f.zip | |
Add support for setting stepheight for entities
Diffstat (limited to 'src/content_sao.cpp')
| -rw-r--r-- | src/content_sao.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 6b3593ec7..90c4fa69c 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -505,14 +505,14 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) box.MaxEdge *= BS; collisionMoveResult moveresult; f32 pos_max_d = BS*0.25; // Distance per iteration - f32 stepheight = 0; // Maximum climbable step height v3f p_pos = m_base_position; v3f p_velocity = m_velocity; v3f p_acceleration = m_acceleration; moveresult = collisionMoveSimple(m_env,m_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 m_base_position = p_pos; m_velocity = p_velocity; |