Fix random duplicate code from merge in hw_main.c and r_segs.c
Whitespace cleanup
This commit is contained in:
parent
68d439a783
commit
35b789d330
|
@ -1178,9 +1178,6 @@ static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, con
|
||||||
|
|
||||||
HWD.pfnSetTexture(newmip);
|
HWD.pfnSetTexture(newmip);
|
||||||
Z_ChangeTag(newmip->grInfo.data, PU_HWRCACHE_UNLOCKED);
|
Z_ChangeTag(newmip->grInfo.data, PU_HWRCACHE_UNLOCKED);
|
||||||
|
|
||||||
HWD.pfnSetTexture(newmip);
|
|
||||||
Z_ChangeTag(newmip->grInfo.data, PU_HWRCACHE_UNLOCKED);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
11
src/r_segs.c
11
src/r_segs.c
|
@ -859,17 +859,6 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
|
||||||
leftheight -= viewz;
|
leftheight -= viewz;
|
||||||
rightheight -= viewz;
|
rightheight -= viewz;
|
||||||
|
|
||||||
if (leftheight > pfloorleft && rightheight > pfloorright && i+1 < dc_numlights)
|
|
||||||
{
|
|
||||||
lightlist_t *nextlight = &frontsector->lightlist[i+1];
|
|
||||||
if (nextlight->slope ? P_GetZAt(nextlight->slope, ds->leftpos.x, ds->leftpos.y) : nextlight->height > pfloorleft
|
|
||||||
&& nextlight->slope ? P_GetZAt(nextlight->slope, ds->rightpos.x, ds->rightpos.y) : nextlight->height > pfloorright)
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
leftheight -= viewz;
|
|
||||||
rightheight -= viewz;
|
|
||||||
|
|
||||||
overflow_test = (INT64)centeryfrac - (((INT64)leftheight*ds->scale1)>>FRACBITS);
|
overflow_test = (INT64)centeryfrac - (((INT64)leftheight*ds->scale1)>>FRACBITS);
|
||||||
if (overflow_test < 0) overflow_test = -overflow_test;
|
if (overflow_test < 0) overflow_test = -overflow_test;
|
||||||
if ((UINT64)overflow_test&0xFFFFFFFF80000000ULL) continue;
|
if ((UINT64)overflow_test&0xFFFFFFFF80000000ULL) continue;
|
||||||
|
|
Loading…
Reference in New Issue