From 496435ef3b9fa53c0fcc42456995ff517a19c1cb Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 19 Jan 2024 02:14:04 +0100 Subject: [PATCH] dont check for precip in sprite sorting + smol cleanup --- src/hardware/hw_main.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 40139c850..1aafee1f4 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4798,25 +4798,34 @@ static int CompareVisSprites(const void *p1, const void *p2) gr_vissprite_t* spr2 = *(gr_vissprite_t*const*)p2; int idiff; float fdiff; + float tz1, tz2; + + int transparency1; + int transparency2; // make transparent sprites last // "boolean to int" - int transparency1 = (spr1->mobj->flags2 & MF2_SHADOW) || (spr1->mobj->frame & FF_TRANSMASK); - int transparency2 = (spr2->mobj->flags2 & MF2_SHADOW) || (spr2->mobj->frame & FF_TRANSMASK); + // check for precip first, because then sprX->mobj is actually a precipmobj_t and does not have flags2 or tracer + tz1 = spr1->tz; + transparency1 = (!spr1->precip && (spr1->mobj->flags2 & MF2_SHADOW)) || (spr1->mobj->frame & FF_TRANSMASK); + tz2 = spr2->tz; + transparency2 = (!spr2->precip && (spr2->mobj->flags2 & MF2_SHADOW)) || (spr2->mobj->frame & FF_TRANSMASK); + + // first compare transparency flags, then compare tz, then compare dispoffset + idiff = transparency1 - transparency2; if (idiff != 0) return idiff; - fdiff = spr2->tz - spr1->tz;// this order seems correct when checking with apitrace. Back to front. + fdiff = tz2 - tz1; // this order seems correct when checking with apitrace. Back to front. if (fabsf(fdiff) < 1.0E-36f) - return spr1->dispoffset - spr2->dispoffset;// smallest dispoffset first if sprites are at (almost) same location. + return spr1->dispoffset - spr2->dispoffset; // smallest dispoffset first if sprites are at (almost) same location. else if (fdiff > 0) return 1; else return -1; } - static void HWR_SortVisSprites(void) { UINT32 i;