X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcollision.h;h=32086aae3c49ca8fe223ebc28a46e162e5cd0300;hb=b97c9c65777b0389f4cc9a6e3257506f29761e03;hp=77bf1f15d05ea32661197feb531af6233e50e836;hpb=6e4fdf37baaeaf1048210e5519822ebd68dd413b;p=oweals%2Fminetest.git 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