thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor R_PlaneIsHighlighted

Browse source
This commit is contained in:
James R 2024-01-26 18:04:10 -08:00
parent b323c6bdb7
commit 1698e80650
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/r_plane.cpp
View file

@ -940,7 +940,7 @@ void R_DrawSinglePlane(drawspandata_t *ds, visplane_t *pl, boolean allow_paralle
INT32 type, spanfunctype = BASEDRAWFUNC; INT32 type, spanfunctype = BASEDRAWFUNC;
debugrender_highlight_t debug = debugrender_highlight_t::SW_HI_PLANES; debugrender_highlight_t debug = debugrender_highlight_t::SW_HI_PLANES;
void (*mapfunc)(drawspandata_t*, void(*)(drawspandata_t*), INT32, INT32, INT32, boolean) = R_MapPlane; void (*mapfunc)(drawspandata_t*, void(*)(drawspandata_t*), INT32, INT32, INT32, boolean) = R_MapPlane;
bool highlight = R_PlaneIsHighlighted(pl); INT16 highlight = R_PlaneIsHighlighted(pl);
if (!(pl->minx <= pl->maxx)) if (!(pl->minx <= pl->maxx))
return; return;
@ -952,10 +952,10 @@ void R_DrawSinglePlane(drawspandata_t *ds, visplane_t *pl, boolean allow_paralle
// sky flat // sky flat
if (pl->picnum == skyflatnum) if (pl->picnum == skyflatnum)
{ {
if (highlight) if (highlight != -1)
{ {
drawcolumndata_t dc = {}; drawcolumndata_t dc = {};
dc.r8_flatcolor = 35; // red dc.r8_flatcolor = highlight;
dc.lightmap = colormaps; dc.lightmap = colormaps;
for (dc.x = pl->minx; dc.x <= pl->maxx; ++dc.x) for (dc.x = pl->minx; dc.x <= pl->maxx; ++dc.x)
@ -1021,7 +1021,7 @@ void R_DrawSinglePlane(drawspandata_t *ds, visplane_t *pl, boolean allow_paralle
// Hacked up support for alpha value in software mode Tails 09-24-2002 // Hacked up support for alpha value in software mode Tails 09-24-2002
// ...unhacked by toaster 04-01-2021 // ...unhacked by toaster 04-01-2021
if (!highlight) if (highlight == -1)
{ {
INT32 trans = (10*((256+12) - pl->ffloor->alpha))/255; INT32 trans = (10*((256+12) - pl->ffloor->alpha))/255;
if (trans >= 10) if (trans >= 10)
@ -1221,9 +1221,9 @@ void R_DrawSinglePlane(drawspandata_t *ds, visplane_t *pl, boolean allow_paralle
ds->planezlight = zlight[light]; ds->planezlight = zlight[light];
} }
if (highlight && R_SetSpanFuncFlat(BASEDRAWFUNC)) if (highlight != -1 && R_SetSpanFuncFlat(BASEDRAWFUNC))
{ {
ds->r8_flatcolor = 35; // red ds->r8_flatcolor = highlight;
ds->flatlighting = colormaps; ds->flatlighting = colormaps;
} }
else else
@ -1267,7 +1267,15 @@ void R_PlaneBounds(visplane_t *plane)
plane->low = low; plane->low = low;
} }
boolean R_PlaneIsHighlighted(const visplane_t *pl) INT16 R_PlaneIsHighlighted(const visplane_t *pl)
{ {
return pl->damage == SD_DEATHPIT || pl->damage == SD_INSTAKILL; switch (pl->damage)
{
case SD_DEATHPIT:
case SD_INSTAKILL:
return 35; // red
default:
return -1;
}
} }

3
src/r_plane.h
View file

@ -105,7 +105,8 @@ void R_CalculateSlopeVectors(drawspandata_t* ds);
// Sets the slope vector pointers for the current tilted span. // Sets the slope vector pointers for the current tilted span.
void R_SetTiltedSpan(drawspandata_t* ds, INT32 span); void R_SetTiltedSpan(drawspandata_t* ds, INT32 span);
boolean R_PlaneIsHighlighted(const visplane_t *pl); // Returns a palette index or -1 if not highlighted
INT16 R_PlaneIsHighlighted(const visplane_t *pl);
struct visffloor_t struct visffloor_t
{ {