diff options
| author | sapier <Sapier at GMX dot net> | 2013-04-09 23:16:13 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2013-04-09 23:16:13 +0200 |
| commit | 6e4fdf37baaeaf1048210e5519822ebd68dd413b (patch) | |
| tree | c3ed76bc45da980437f64689bd4c3b66d5c96fdc /src/collision.h | |
| parent | 7d002b60ff3d672d141e0de65702c8af5b60f83a (diff) | |
| download | minetest-6e4fdf37baaeaf1048210e5519822ebd68dd413b.tar.gz minetest-6e4fdf37baaeaf1048210e5519822ebd68dd413b.tar.bz2 minetest-6e4fdf37baaeaf1048210e5519822ebd68dd413b.zip | |
fix objects colliding with its own collision boxes
Diffstat (limited to 'src/collision.h')
| -rw-r--r-- | src/collision.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/collision.h b/src/collision.h index 117818456..77bf1f15d 100644 --- a/src/collision.h +++ b/src/collision.h @@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class Map; class IGameDef; class Environment; +class ActiveObject; enum CollisionType { @@ -70,7 +71,7 @@ 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); + v3f &pos_f, v3f &speed_f, v3f &accel_f,ActiveObject* self=0); #if 0 // This doesn't seem to work and isn't used |