diff options
| author | PilzAdam <pilzadam@minetest.net> | 2013-06-14 12:04:46 +0000 |
|---|---|---|
| committer | RealBadAngel <mk@realbadangel.pl> | 2013-07-20 20:43:11 +0200 |
| commit | 8cae65978611476d0da215acf61819a905c68267 (patch) | |
| tree | 2fec7ef03de8946149c8d118b49ca472e0d048a6 /src/collision.h | |
| parent | 413f0d0353d49d7baed32540d73cbec99e35658a (diff) | |
| download | minetest-8cae65978611476d0da215acf61819a905c68267.tar.gz minetest-8cae65978611476d0da215acf61819a905c68267.tar.bz2 minetest-8cae65978611476d0da215acf61819a905c68267.zip | |
Add an option to disable object <-> object collision for Lua entities
Diffstat (limited to 'src/collision.h')
| -rw-r--r-- | src/collision.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |