Make getters of the Settings class const

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

diff --git a/src/collision.h b/src/collision.h
index 331ff8f9d6c869113cd4c0f2cfa71fa08658737b..32086aae3c49ca8fe223ebc28a46e162e5cd0300 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -25,10 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class Map;
 class IGameDef;
+class Environment;
+class ActiveObject;
 
 enum CollisionType
 {
-       COLLISION_NODE
+       COLLISION_NODE,
+       COLLISION_OBJECT,
 };
 
 struct CollisionInfo
@@ -65,10 +68,12 @@ struct collisionMoveResult
 };
 
 // Moves using a single iteration; speed should not exceed pos_max_d/dtime
-collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef,
+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);
+               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