diff options
| author | Weblate <42@minetest.ru> | 2013-04-18 20:00:16 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-04-18 20:00:16 +0200 |
| commit | 9e6376bd95ba9309365b39b878ab2f499776437a (patch) | |
| tree | a354a250daedf036cc36e33d3d1ebb9fafc4ac27 /src/collision.h | |
| parent | e385af7cc01d156164b85d10b00a7047a5372e66 (diff) | |
| parent | e60eb32050a44d344795e4a1515a56038bb97e02 (diff) | |
| download | minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.gz minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.bz2 minetest-9e6376bd95ba9309365b39b878ab2f499776437a.zip | |
Merge remote branch 'origin/master'
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 |