diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-14 21:41:30 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:42 +0200 |
| commit | c6fd2986d4261cf742d3bc21e8c12be59ab89f95 (patch) | |
| tree | ef6ce8210f7f017bce42a024b75a44e73b5ab139 /src/collision.h | |
| parent | abceeee92f99b84ebb79968269835a4f509bfb90 (diff) | |
| download | minetest-c6fd2986d4261cf742d3bc21e8c12be59ab89f95.tar.gz minetest-c6fd2986d4261cf742d3bc21e8c12be59ab89f95.tar.bz2 minetest-c6fd2986d4261cf742d3bc21e8c12be59ab89f95.zip | |
GameDef compiles
Diffstat (limited to 'src/collision.h')
| -rw-r--r-- | src/collision.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/collision.h b/src/collision.h index 6d167bb7b..3354ea09a 100644 --- a/src/collision.h +++ b/src/collision.h @@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.h" class Map; +class IGameDef; struct collisionMoveResult { @@ -34,13 +35,13 @@ struct collisionMoveResult }; // Moves using a single iteration; speed should not exceed pos_max_d/dtime -collisionMoveResult collisionMoveSimple(Map *map, f32 pos_max_d, - const core::aabbox3d<f32> &box_0, +collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef, + f32 pos_max_d, const core::aabbox3d<f32> &box_0, f32 dtime, v3f &pos_f, v3f &speed_f); // Moves using as many iterations as needed -collisionMoveResult collisionMovePrecise(Map *map, f32 pos_max_d, - const core::aabbox3d<f32> &box_0, +collisionMoveResult collisionMovePrecise(Map *map, IGameDef *gamedef, + f32 pos_max_d, const core::aabbox3d<f32> &box_0, f32 dtime, v3f &pos_f, v3f &speed_f); enum CollisionType |