lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix sprite-to-plane sorting on sloped FOFs

Browse source
This commit is contained in:
RedEnchilada 2015-05-17 12:03:52 -05:00
parent d138f7e14f
commit 780c568aaf
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/r_things.c
View file

@ -1752,24 +1752,32 @@ static void R_CreateDrawNodes(void)
{ {
if (r2->plane) if (r2->plane)
{ {
fixed_t planeobjectz;
if (r2->plane->minx > rover->x2 || r2->plane->maxx < rover->x1) if (r2->plane->minx > rover->x2 || r2->plane->maxx < rover->x1)
continue; continue;
if (rover->szt > r2->plane->low || rover->sz < r2->plane->high) if (rover->szt > r2->plane->low || rover->sz < r2->plane->high)
continue; continue;
// Gotta get the plane's height AT THE OBJECT POSITION if we're using slopes -Red
planeobjectz =
#ifdef ESLOPE
r2->plane->slope ? P_GetZAt(r2->plane->slope, rover->gx, rover->gy) :
#endif
r2->plane->height;
if (rover->mobjflags & MF_NOCLIPHEIGHT) if (rover->mobjflags & MF_NOCLIPHEIGHT)
{ {
//Objects with NOCLIPHEIGHT can appear halfway in. //Objects with NOCLIPHEIGHT can appear halfway in.
if (r2->plane->height < viewz && rover->pz+(rover->thingheight/2) >= r2->plane->height) if (r2->plane->height < viewz && rover->pz+(rover->thingheight/2) >= planeobjectz)
continue; continue;
if (r2->plane->height > viewz && rover->pzt-(rover->thingheight/2) <= r2->plane->height) if (r2->plane->height > viewz && rover->pzt-(rover->thingheight/2) <= planeobjectz)
continue; continue;
} }
else else
{ {
if (r2->plane->height < viewz && rover->pz >= r2->plane->height) if (r2->plane->height < viewz && rover->pz >= planeobjectz)
continue; continue;
if (r2->plane->height > viewz && rover->pzt <= r2->plane->height) if (r2->plane->height > viewz && rover->pzt <= planeobjectz)
continue; continue;
} }