projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make getters of the Settings class const
[oweals/minetest.git]
/
src
/
collision.h
diff --git
a/src/collision.h
b/src/collision.h
index 38cc3efb39c00149772f1b077ad7aabe28b18b02..32086aae3c49ca8fe223ebc28a46e162e5cd0300 100644
(file)
--- a/
src/collision.h
+++ b/
src/collision.h
@@
-25,10
+25,13
@@
with this program; if not, write to the Free Software Foundation, Inc.,
class Map;
class IGameDef;
class Map;
class IGameDef;
+class Environment;
+class ActiveObject;
enum CollisionType
{
enum CollisionType
{
- COLLISION_NODE
+ COLLISION_NODE,
+ COLLISION_OBJECT,
};
struct CollisionInfo
};
struct CollisionInfo
@@
-65,10
+68,12
@@
struct collisionMoveResult
};
// Moves using a single iteration; speed should not exceed pos_max_d/dtime
};
// 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,
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
#if 0
// This doesn't seem to work and isn't used