From 8cae65978611476d0da215acf61819a905c68267 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Fri, 14 Jun 2013 12:04:46 +0000 Subject: Add an option to disable object <-> object collision for Lua entities --- src/collision.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/collision.h') diff --git a/src/collision.h b/src/collision.h index 77bf1f15d..32086aae3 100644 --- a/src/collision.h +++ b/src/collision.h @@ -71,7 +71,9 @@ struct collisionMoveResult collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef, f32 pos_max_d, const aabb3f &box_0, f32 stepheight, f32 dtime, - v3f &pos_f, v3f &speed_f, v3f &accel_f,ActiveObject* self=0); + v3f &pos_f, v3f &speed_f, + v3f &accel_f,ActiveObject* self=0, + bool collideWithObjects=true); #if 0 // This doesn't seem to work and isn't used -- cgit v1.2.3