diff options
| author | sapier <Sapier at GMX dot net> | 2013-01-12 17:59:19 +0000 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-03-28 00:09:24 +0100 |
| commit | 8800896824d609c754eee38d3720a112f4216e57 (patch) | |
| tree | 31e0be737fa3883acb1559ab5e6ada7e35ba20fb /src/collision.h | |
| parent | 880d9e53c39af1a7ca8b9ee5a9146708dabd5315 (diff) | |
| download | minetest-8800896824d609c754eee38d3720a112f4216e57.tar.gz minetest-8800896824d609c754eee38d3720a112f4216e57.tar.bz2 minetest-8800896824d609c754eee38d3720a112f4216e57.zip | |
Closed add object <-> object collision handling
Diffstat (limited to 'src/collision.h')
| -rw-r--r-- | src/collision.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/collision.h b/src/collision.h index 38cc3efb3..117818456 100644 --- a/src/collision.h +++ b/src/collision.h @@ -25,10 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc., class Map; class IGameDef; +class Environment; enum CollisionType { - COLLISION_NODE + COLLISION_NODE, + COLLISION_OBJECT, }; struct CollisionInfo @@ -65,7 +67,7 @@ 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); |