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

Remove FOF height sorting

Browse source
This commit is contained in:
James R 2020-04-15 19:16:49 -07:00
parent 77e01f61e6
commit 0b3b13b3b5
4 changed files with 0 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_mobj.c
View file

@ -12324,11 +12324,6 @@ void P_SpawnMapThing(mapthing_t *mthing)
y = mthing->y << FRACBITS; y = mthing->y << FRACBITS;
ss = R_PointInSubsector(x, y); ss = R_PointInSubsector(x, y);
if (i == MT_WAYPOINT_RISER)
{
ss->sector->ffloor_sorting = true;
}
if (i == MT_NIGHTSBUMPER) if (i == MT_NIGHTSBUMPER)
z = ( z = (
#ifdef ESLOPE #ifdef ESLOPE

4
src/p_setup.c
View file

@ -741,10 +741,6 @@ static void P_LoadRawSectors(UINT8 *data, size_t i)
ss->maxattached = 1; ss->maxattached = 1;
ss->moved = true; ss->moved = true;
ss->ffloor_sorting = false;
ss->lowest_ffloor = NULL;
ss->highest_ffloor = NULL;
ss->extra_colormap = NULL; ss->extra_colormap = NULL;
ss->floor_xoffs = ss->ceiling_xoffs = ss->floor_yoffs = ss->ceiling_yoffs = 0; ss->floor_xoffs = ss->ceiling_xoffs = ss->floor_yoffs = ss->ceiling_yoffs = 0;

35
src/p_spec.c
View file

@ -5155,46 +5155,11 @@ static inline void P_AddFFloorToList(sector_t *sec, ffloor_t *ffloor)
if (!sec->ffloors) if (!sec->ffloors)
{ {
sec->ffloors = ffloor; sec->ffloors = ffloor;
if (sec->ffloor_sorting)
{
sec->lowest_ffloor = ffloor;
sec->highest_ffloor = ffloor;
}
ffloor->next = 0; ffloor->next = 0;
ffloor->prev = 0; ffloor->prev = 0;
return; return;
} }
if (sec->ffloor_sorting)
{
top = P_VeryTopOfFOF(ffloor);
for (rover = sec->lowest_ffloor; rover; rover = rover->higher)
{
if (top < P_VeryTopOfFOF(rover))
break;
}
if (rover)
{
if (rover->lower)
rover->lower->higher = ffloor;
else
sec->lowest_ffloor = ffloor;
ffloor->lower = rover->lower;
ffloor->higher = rover;
rover->lower = ffloor;
}
else
{
sec->highest_ffloor->higher = ffloor;
ffloor->lower = sec->highest_ffloor;
sec->highest_ffloor = ffloor;
}
}
for (rover = sec->ffloors; rover->next; rover = rover->next); for (rover = sec->ffloors; rover->next; rover = rover->next);
rover->next = ffloor; rover->next = ffloor;

8
src/r_defs.h
View file

@ -170,10 +170,6 @@ typedef struct ffloor_s
struct ffloor_s *next; struct ffloor_s *next;
struct ffloor_s *prev; struct ffloor_s *prev;
/* if sector->ffloor_sorting */
struct ffloor_s *higher;/* by top height */
struct ffloor_s *lower;/* by bottom height */
INT32 lastlight; INT32 lastlight;
INT32 alpha; INT32 alpha;
tic_t norender; // for culling tic_t norender; // for culling
@ -351,10 +347,6 @@ typedef struct sector_s
INT32 numlights; INT32 numlights;
boolean moved; boolean moved;
boolean ffloor_sorting;
ffloor_t *lowest_ffloor;
ffloor_t *highest_ffloor;
// per-sector colormaps! // per-sector colormaps!
extracolormap_t *extra_colormap; extracolormap_t *extra_colormap;