aboutsummaryrefslogtreecommitdiff
path: root/src/collision.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/collision.h')
-rw-r--r--src/collision.h3
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