fix: does not compile after merge

collide() needs its prototype
2014-06-26 12:23:10 +02:00
parent 90a3e5bcbd
commit 80a0fdc1be
2 changed files with 2 additions and 1 deletions
@@ -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