From 104063e2ecbd87fa969510cc79479d1e3da955ab Mon Sep 17 00:00:00 2001
From: Logan Aerl Arias <logana@srb2.org>
Date: Sun, 10 Mar 2024 10:22:07 -0400
Subject: [PATCH] fixup pt 2
r_draw.c: add r_splats.h to get access to R_AllocFloorSpriteTables()
r_segs.c: resync to next
---
src/r_draw.c | 1 +
src/r_segs.c | 26 +-------------------------
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/src/r_draw.c b/src/r_draw.c
index 2f3e28c250..ad107eb98a 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -18,6 +18,7 @@
#include "doomdef.h"
#include "doomstat.h"
#include "r_local.h"
+#include "r_splats.h"
#include "r_translation.h"
#include "st_stuff.h" // need ST_HEIGHT
#include "i_video.h"
diff --git a/src/r_segs.c b/src/r_segs.c
index 4f67188527..097eff37c2 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -1435,12 +1435,6 @@ static void R_RenderSegLoop (void)
floorclip[rw_x] = bottomclip;
}
- if ((markceiling || markfloor) && (floorclip[rw_x] <= ceilingclip[rw_x] + 1))
- {
- solidcol[rw_x] = 1;
- didsolidcol = true;
- }
-
if (maskedtexturecol)
maskedtexturecol[rw_x] = texturecolumn + rw_offsetx;
@@ -1503,8 +1497,6 @@ static void R_RenderSegLoop (void)
topfrac += topstep;
bottomfrac += bottomstep;
}
-
- colfunc = colfuncs[BASEDRAWFUNC];
}
// Uses precalculated seg->length
@@ -2915,30 +2907,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
rw_tsilheight = &(ds_p->tsilheight);
rw_bsilheight = &(ds_p->bsilheight);
- didsolidcol = false;
-
R_RenderSegLoop();
+ colfunc = colfuncs[BASEDRAWFUNC];
if (portalline) // if curline is a portal, set portalrender for drawseg
ds_p->portalpass = portalrender+1;
else
ds_p->portalpass = 0;
- // cph - if a column was made solid by this wall, we _must_ save full clipping info
- if (backsector && didsolidcol)
- {
- if (!(ds_p->silhouette & SIL_BOTTOM))
- {
- ds_p->silhouette |= SIL_BOTTOM;
- ds_p->bsilheight = backsector->f_slope ? INT32_MAX : backsector->floorheight;
- }
- if (!(ds_p->silhouette & SIL_TOP))
- {
- ds_p->silhouette |= SIL_TOP;
- ds_p->tsilheight = backsector->c_slope ? INT32_MIN : backsector->ceilingheight;
- }
- }
-
// save sprite clipping info
if (maskedtexture || (ds_p->silhouette & (SIL_TOP | SIL_BOTTOM)))
{
--
GitLab