zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 20:43:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Non-wall sprites need their original depth checks

Browse source
This commit is contained in:
Edward Richardson 2014-08-21 20:01:05 +12:00
parent f482dc094d
commit 07d7f690e8
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/r_things.cpp
View file

@ -2076,9 +2076,22 @@ void R_DrawSprite (vissprite_t *spr)
r1 = MAX<int> (ds->x1, x1); r1 = MAX<int> (ds->x1, x1);
r2 = MIN<int> (ds->x2, x2); r2 = MIN<int> (ds->x2, x2);
fixed_t neardepth, fardepth;
if (!spr->bWallSprite)
{
if (ds->sz1 < ds->sz2)
{
neardepth = ds->sz1, fardepth = ds->sz2;
}
else
{
neardepth = ds->sz2, fardepth = ds->sz1;
}
}
// Check if sprite is in front of draw seg: // Check if sprite is in front of draw seg:
if (DMulScale32(spr->gy - ds->curline->v1->y, ds->curline->v2->x - ds->curline->v1->x, if ((!spr->bWallSprite && neardepth > spr->depth) || ((spr->bWallSprite || fardepth > spr->depth) &&
ds->curline->v1->x - spr->gx, ds->curline->v2->y - ds->curline->v1->y) <= 0) DMulScale32(spr->gy - ds->curline->v1->y, ds->curline->v2->x - ds->curline->v1->x,
ds->curline->v1->x - spr->gx, ds->curline->v2->y - ds->curline->v1->y) <= 0))
{ {
// seg is behind sprite, so draw the mid texture if it has one // seg is behind sprite, so draw the mid texture if it has one
if (ds->maskedtexturecol != -1 || ds->bFogBoundary) if (ds->maskedtexturecol != -1 || ds->bFogBoundary)