Translated using Weblate (Japanese)

[oweals/minetest.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index 77bf1f15d05ea32661197feb531af6233e50e836..fc4187eda89bc76659b53a9908a33643c1bcd8bb 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -71,16 +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);
-
-#if 0
-// This doesn't seem to work and isn't used
-// Moves using as many iterations as needed
-collisionMoveResult collisionMovePrecise(Map *map, IGameDef *gamedef,
-               f32 pos_max_d, const aabb3f &box_0,
-               f32 stepheight, f32 dtime,
-               v3f &pos_f, v3f &speed_f, v3f &accel_f);
-#endif
+               v3f &pos_f, v3f &speed_f,
+               v3f &accel_f,ActiveObject* self=0,
+               bool collideWithObjects=true);
 
 // Helper function:
 // Checks for collision of a moving aabbox with a static aabbox