From 0b3b13b3b59ada7533edd16aa9b83c97d4b10314 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Wed, 15 Apr 2020 19:16:49 -0700
Subject: [PATCH] Remove FOF height sorting

---
 src/p_mobj.c  |  5 -----
 src/p_setup.c |  4 ----
 src/p_spec.c  | 35 -----------------------------------
 src/r_defs.h  |  8 --------
 4 files changed, 52 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index a989b0019..2a12dcc7a 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12324,11 +12324,6 @@ void P_SpawnMapThing(mapthing_t *mthing)
 	y = mthing->y << FRACBITS;
 	ss = R_PointInSubsector(x, y);
 
-	if (i == MT_WAYPOINT_RISER)
-	{
-		ss->sector->ffloor_sorting = true;
-	}
-
 	if (i == MT_NIGHTSBUMPER)
 		z = (
 #ifdef ESLOPE
diff --git a/src/p_setup.c b/src/p_setup.c
index 0eb4abc5c..4ddc3c2a9 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -741,10 +741,6 @@ static void P_LoadRawSectors(UINT8 *data, size_t i)
 		ss->maxattached = 1;
 		ss->moved = true;
 
-		ss->ffloor_sorting = false;
-		ss->lowest_ffloor = NULL;
-		ss->highest_ffloor = NULL;
-
 		ss->extra_colormap = NULL;
 
 		ss->floor_xoffs = ss->ceiling_xoffs = ss->floor_yoffs = ss->ceiling_yoffs = 0;
diff --git a/src/p_spec.c b/src/p_spec.c
index 158f44dda..f6c975d9b 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -5155,46 +5155,11 @@ static inline void P_AddFFloorToList(sector_t *sec, ffloor_t *ffloor)
 	if (!sec->ffloors)
 	{
 		sec->ffloors = ffloor;
-		if (sec->ffloor_sorting)
-		{
-			sec->lowest_ffloor = ffloor;
-			sec->highest_ffloor = ffloor;
-		}
 		ffloor->next = 0;
 		ffloor->prev = 0;
 		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);
 
 	rover->next = ffloor;
diff --git a/src/r_defs.h b/src/r_defs.h
index 399dec087..c8a72044d 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -170,10 +170,6 @@ typedef struct ffloor_s
 	struct ffloor_s *next;
 	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 alpha;
 	tic_t norender; // for culling
@@ -351,10 +347,6 @@ typedef struct sector_s
 	INT32 numlights;
 	boolean moved;
 
-	boolean ffloor_sorting;
-	ffloor_t *lowest_ffloor;
-	ffloor_t *highest_ffloor;
-
 	// per-sector colormaps!
 	extracolormap_t *extra_colormap;