From 3aff53647d9da15e87aeab6a5a2af37f21fee6b2 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 6 Apr 2025 15:14:57 +0200 Subject: [PATCH] reorder those a little --- src/hardware/hw_main.c | 21 +++++++++++---------- src/m_aatree.c | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 32379c3c9..0af1e54e3 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -3843,15 +3843,13 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) INT32 shader = SHADER_NONE; - if (P_MobjWasRemoved(spr->mobj)) - return; - - if (!spr->mobj->subsector) + if (!spr->mobj || !spr->mobj->subsector) return; const boolean papersprite = (spr->mobj->frame & FF_PAPERSPRITE); + sector_t *sector = spr->mobj->subsector->sector; - if (spr->mobj->subsector->sector->numlights) + if (sector->numlights) { HWR_SplitSprite(spr, papersprite); return; @@ -3887,7 +3885,9 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) { wallVerts[0].s = wallVerts[3].s = gpatch->max_s; wallVerts[2].s = wallVerts[1].s = 0; - }else{ + } + else + { wallVerts[0].s = wallVerts[3].s = 0; wallVerts[2].s = wallVerts[1].s = gpatch->max_s; } @@ -3897,7 +3897,9 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) { wallVerts[3].t = wallVerts[2].t = gpatch->max_t; wallVerts[0].t = wallVerts[1].t = 0; - }else{ + } + else + { wallVerts[3].t = wallVerts[2].t = 0; wallVerts[0].t = wallVerts[1].t = gpatch->max_t; } @@ -3927,17 +3929,16 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) /// \todo coloured // colormap test - sector_t *sector = spr->mobj->subsector->sector; INT32 lightlevel = 255; boolean lightset = HWR_OverrideObjectLightLevel(spr->mobj, &lightlevel); extracolormap_t *colormap = sector->extra_colormap; const boolean fullbright = R_ThingIsFullBright(spr->mobj); if (!lightset) + { lightlevel = min(sector->lightlevel, 255); - - if (!lightset) HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false); + } HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !fullbright); diff --git a/src/m_aatree.c b/src/m_aatree.c index f19fa1dc0..5e7117a5c 100644 --- a/src/m_aatree.c +++ b/src/m_aatree.c @@ -138,7 +138,7 @@ static void *M_AATreeGet_Node(aatree_node_t *node, INT32 key) { if (node->key == key) return node->value; - else if(node->key < key) + else if (node->key < key) return M_AATreeGet_Node(node->right, key); else return M_AATreeGet_Node(node->left, key);