diff --git a/source/src/physics.cpp b/source/src/physics.cpp index 750b74e2..a28c6ebb 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -184,7 +184,7 @@ bool objcollide(physent *d, const vec &objpos, float objrad, float objheight) // // drop & rise are supplied by the physics below to indicate gravity/push for current mini-timestep static int cornersurface = 0; -bool collide(physent *d, bool spawn = false, float drop = 0, float rise = 0) +bool collide(physent *d, bool spawn, float drop, float rise) { cornersurface = 0; const float fx1 = d->o.x-d->radius; // figure out integer cube rectangle this entity covers in map diff --git a/source/src/protos.h b/source/src/protos.h index 5f7677a9..f48801da 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -701,6 +701,7 @@ extern void mousemove(int dx, int dy); extern void fixcamerarange(physent *cam = camera1); extern void updatecrouch(playerent *p, bool on); extern bool objcollide(physent *d, const vec &objpos, float objrad, float objheight); +extern bool collide(physent *d, bool spawn = false, float drop = 0, float rise = 0); extern void attack(bool on); extern void vecfromyawpitch(float yaw, float pitch, int move, int strafe, vec &m); extern void vectoyawpitch(const vec &v, float &yaw, float &pitch);