summaryrefslogtreecommitdiff
path: root/src/content_cao.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2013-07-22 18:54:30 +0200
committerPilzAdam <pilzadam@minetest.net>2013-07-30 19:48:02 +0200
commit251e3e01c7350d94ea8dec0857e834d1ed84ac3f (patch)
tree4278247af930c66a1012e71d2ed5d65fea137347 /src/content_cao.cpp
parentff7c380d0eabf96a8677dfa3a94f0d18191572cf (diff)
downloadminetest-251e3e01c7350d94ea8dec0857e834d1ed84ac3f.tar.gz
minetest-251e3e01c7350d94ea8dec0857e834d1ed84ac3f.tar.bz2
minetest-251e3e01c7350d94ea8dec0857e834d1ed84ac3f.zip
Add support for setting stepheight for entities
Diffstat (limited to 'src/content_cao.cpp')
-rw-r--r--src/content_cao.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 925855288..bbee0bc83 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1150,12 +1150,11 @@ public:
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