diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 091281cb5..9fe89ee74 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -380,7 +380,7 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32 extralight = FixedMul(extralight, CLAMP(*lightlevel, 0, 255) * FRACUNIT / 255); // simple OGL approximation - fixed_t tr = R_PointToDist(spr->mobj->x, spr->mobj->y); + fixed_t tr = R_QuickCamDist(spr->mobj->x, spr->mobj->y) << FRACBITS; fixed_t xscale = FixedDiv((vid.width / 2) << FRACBITS, tr); // Less change in contrast at further distances, to counteract DOOM diminished light @@ -811,6 +811,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool // Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f; + if (dist > 100.0f) numplanes = 100; else @@ -2558,18 +2559,18 @@ static boolean HWR_CheckBBox(const fixed_t *bspcoord) if (viewx < bspcoord[BOXLEFT]) // 1,4,6 { if (viewy > bspcoord[BOXTOP]) // 1 - mindist = R_PointToDist(bspcoord[BOXLEFT], bspcoord[BOXTOP]); + mindist = R_QuickCamDist(bspcoord[BOXLEFT], bspcoord[BOXTOP]) << FRACBITS; else if (viewy < bspcoord[BOXBOTTOM]) // 6 - mindist = R_PointToDist(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]); + mindist = R_QuickCamDist(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]) << FRACBITS; else // 4 mindist = bspcoord[BOXLEFT] - viewx; } else if (viewx > bspcoord[BOXRIGHT]) // 3,5,8 { if (viewy > bspcoord[BOXTOP]) // 3 - mindist = R_PointToDist(bspcoord[BOXRIGHT], bspcoord[BOXTOP]); + mindist = R_QuickCamDist(bspcoord[BOXRIGHT], bspcoord[BOXTOP]) << FRACBITS; else if (viewy < bspcoord[BOXBOTTOM]) // 8 - mindist = R_PointToDist(bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]); + mindist = R_QuickCamDist(bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]) << FRACBITS; else // 5 mindist = viewx - bspcoord[BOXRIGHT]; } diff --git a/src/k_kart.c b/src/k_kart.c index 62ab77d03..2b65709c7 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3444,8 +3444,8 @@ boolean K_CheckSlopeRollDist(mobj_t *mobj) if (!usedistance) return true; - const fixed_t rolldist = cv_sloperolldist.value * mapobjectscale; - const fixed_t m_dist = (R_QuickCamDist(mobj->x, mobj->y)*FRACUNIT); + const fixed_t rolldist = (cv_sloperolldist.value * mapobjectscale); + const fixed_t m_dist = (R_QuickCamDist(mobj->x, mobj->y) << FRACBITS); return (m_dist <= rolldist); } diff --git a/src/r_things.cpp b/src/r_things.cpp index caf6d8eec..9ed6bc0d2 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -1985,7 +1985,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis->gy = interp.y; vis->gz = gz; vis->gzt = gzt; - vis->thingheight = 4*FRACUNIT; + vis->thingheight = 4 << FRACBITS; vis->pz = interp.z; vis->pzt = vis->pz + vis->thingheight; vis->texturemid = vis->gzt - viewz; @@ -2930,7 +2930,7 @@ boolean R_ThingWithinDist(mobj_t *thing, INT32 limit_dist) { if (limit_dist) { - if (P_AproxDistance(viewx-thing->x, viewy-thing->y)/mapobjectscale > limit_dist) + if ((R_QuickCamDist(thing->x, thing->y) << FRACBITS)/mapobjectscale > limit_dist) { return false; }