diff options
Diffstat (limited to 'src/engine/physics.cpp')
| -rw-r--r-- | src/engine/physics.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/physics.cpp b/src/engine/physics.cpp index 17dfb37..f7e5342 100644 --- a/src/engine/physics.cpp +++ b/src/engine/physics.cpp @@ -80,7 +80,7 @@ void resetclipplanes() { vec hitsurface; -static inline bool raycubeintersect(const clipplanes &p, const cube &c, const vec &v, const vec &ray, const vec &invray, float &dist) { +static inline bool raycubeintersect(const clipplanes &p, const vec &v, const vec &ray, const vec &invray, float &dist) { int entry = -1, bbentry = -1; INTERSECTPLANES(entry = i, return false); INTERSECTBOX(bbentry = i, return false); @@ -128,7 +128,7 @@ static float disttoent(octaentities *oc, const vec &o, const vec &ray, float rad return dist; } -static float disttooutsideent(const vec &o, const vec &ray, float radius, int mode, extentity *t) { +static float disttooutsideent(const vec &o, const vec &ray, float radius, extentity *t) { vec eo, es; int orient; float dist = radius, f = 0.0f; @@ -257,7 +257,7 @@ float raycube(const vec &o, const vec &ray, float radius, int mode, int size, ex if(!isempty(c)) { const clipplanes &p = getclipplanes(c, lo, lsize, false, 1); float f = 0; - if(raycubeintersect(p, c, v, ray, invray, f) && (dist+f>0 || !(mode&RAY_SKIPFIRST))) + if(raycubeintersect(p, v, ray, invray, f) && (dist+f>0 || !(mode&RAY_SKIPFIRST))) return min(dent, dist+f); } FINDCLOSEST(closest = 0, closest = 1, closest = 2); @@ -350,7 +350,7 @@ float rayent(const vec &o, const vec &ray, float radius, int mode, int size, int hitorient = -1; float dist = raycube(o, ray, radius, mode, size); if((mode&RAY_ENTS) == RAY_ENTS) { - float dent = disttooutsideent(o, ray, dist < 0 ? 1e16f : dist, mode, NULL); + float dent = disttooutsideent(o, ray, dist < 0 ? 1e16f : dist, NULL); if(dent < 1e15f && (dist < 0 || dent < dist)) dist = dent; } orient = hitorient; |