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

Resolve one last conflict in splat sorting

Browse source 
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
This commit is contained in:
James R 2020-11-22 15:12:34 -08:00
parent 54da9552de
commit 40e954779e
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/r_things.c
View file

@ -2656,23 +2656,11 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
if (!behind)
{
fixed_t z1 = 0, z2 = 0;
if (rover->mobj->z - viewz > 0)
{
z1 = rover->pz;
z2 = r2->sprite->pz;
}
// FIXME: calculate gz and gzt for splats properly and use that
if (rover->mobj->z < viewz)
infront = (r2->sprite->mobj->z >= rover->mobj->z);
else
{
z1 = r2->sprite->pz;
z2 = rover->pz;
}
z1 -= viewz;
z2 -= viewz;
infront = (z1 >= z2);
infront = (r2->sprite->mobj->z <= rover->mobj->z);
}
}
else