stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixup pt 2

Browse source 
r_draw.c: add r_splats.h to get access to R_AllocFloorSpriteTables()
r_segs.c: resync to next
This commit is contained in:
Logan Aerl Arias 2024-03-10 10:22:07 -04:00
parent bb1292a8de
commit 104063e2ec
2 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/r_draw.c
View file

@ -18,6 +18,7 @@
#include "doomdef.h" #include "doomdef.h"
#include "doomstat.h" #include "doomstat.h"
#include "r_local.h" #include "r_local.h"
#include "r_splats.h"
#include "r_translation.h" #include "r_translation.h"
#include "st_stuff.h" // need ST_HEIGHT #include "st_stuff.h" // need ST_HEIGHT
#include "i_video.h" #include "i_video.h"

26
src/r_segs.c
View file

@ -1435,12 +1435,6 @@ static void R_RenderSegLoop (void)
floorclip[rw_x] = bottomclip; floorclip[rw_x] = bottomclip;
} }
if ((markceiling || markfloor) && (floorclip[rw_x] <= ceilingclip[rw_x] + 1))
{
solidcol[rw_x] = 1;
didsolidcol = true;
}
if (maskedtexturecol) if (maskedtexturecol)
maskedtexturecol[rw_x] = texturecolumn + rw_offsetx; maskedtexturecol[rw_x] = texturecolumn + rw_offsetx;
@ -1503,8 +1497,6 @@ static void R_RenderSegLoop (void)
topfrac += topstep; topfrac += topstep;
bottomfrac += bottomstep; bottomfrac += bottomstep;
} }
colfunc = colfuncs[BASEDRAWFUNC];
} }
// Uses precalculated seg->length // Uses precalculated seg->length
@ -2915,30 +2907,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
rw_tsilheight = &(ds_p->tsilheight); rw_tsilheight = &(ds_p->tsilheight);
rw_bsilheight = &(ds_p->bsilheight); rw_bsilheight = &(ds_p->bsilheight);
didsolidcol = false;
R_RenderSegLoop(); R_RenderSegLoop();
colfunc = colfuncs[BASEDRAWFUNC];
if (portalline) // if curline is a portal, set portalrender for drawseg if (portalline) // if curline is a portal, set portalrender for drawseg
ds_p->portalpass = portalrender+1; ds_p->portalpass = portalrender+1;
else else
ds_p->portalpass = 0; 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 // save sprite clipping info
if (maskedtexture || (ds_p->silhouette & (SIL_TOP | SIL_BOTTOM))) if (maskedtexture || (ds_p->silhouette & (SIL_TOP | SIL_BOTTOM)))
{ {