aboutsummaryrefslogtreecommitdiff
path: root/src/content_cao.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2013-04-09 23:16:13 +0200
committersapier <Sapier at GMX dot net>2013-04-09 23:16:13 +0200
commit6e4fdf37baaeaf1048210e5519822ebd68dd413b (patch)
treec3ed76bc45da980437f64689bd4c3b66d5c96fdc /src/content_cao.cpp
parent7d002b60ff3d672d141e0de65702c8af5b60f83a (diff)
downloadhax-minetest-server-6e4fdf37baaeaf1048210e5519822ebd68dd413b.tar.gz
hax-minetest-server-6e4fdf37baaeaf1048210e5519822ebd68dd413b.zip
fix objects colliding with its own collision boxes
Diffstat (limited to 'src/content_cao.cpp')
-rw-r--r--src/content_cao.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 9738dc34c..f79d0d6f6 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1152,7 +1152,7 @@ public:
v3f p_acceleration = m_acceleration;
moveresult = collisionMoveSimple(env,env->getGameDef(),
pos_max_d, box, stepheight, dtime,
- p_pos, p_velocity, p_acceleration);
+ p_pos, p_velocity, p_acceleration,this);
// Apply results
m_position = p_pos;
m_velocity = p_velocity;