simpler fix for localskin minimap angle display crash

caused by localskin code.... sigh......
noticed this while messing with dynamic allocated (local)skins

src/CMakeLists.txt

@@ -246,8 +246,6 @@ set(SRB2_CONFIG_ASAN OFF CACHE BOOL
 	"Compile with AddressSanitizer (libasan).")
 set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
 	"Compile with UndefinedBehaviorSanitizer (libubsan).")
-set(SRB2_CONFIG_TSAN OFF CACHE BOOL
-	"Compile with ThreadSanitizer (libtsan).")
 
 set(SRB2_CONFIG_MUMBLE ON CACHE BOOL
 	"Enable Mumble support")
@@ -292,6 +290,7 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_script.c
 		lua_skinlib.c
 		lua_thinkerlib.c
+		lua_udatalib.c
 		lua_glib.c
 	)
 	set(SRB2_LUA_HEADERS
@@ -301,6 +300,7 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_profile.h
 		lua_libs.h
 		lua_script.h
+		lua_udatalib.h
 		lua_glib.h
 	)
 

src/Makefile

@@ -75,7 +75,6 @@
 # PROFILEMODE=1 - Enable performance profiling (gprof).
 # USEASAN=1 - Enable building with Address Sanitizer.
 # USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer.
-# USETSAN=1 - Enable building with Thread Sanitizer.
 # NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
 #
 # General flags for building:
@@ -262,35 +261,23 @@ debug_opts=-D_DEBUG
 else # build a normal optimized version
 debug_opts=-DNDEBUG
 opts+=-O3
+ifndef NOLTO
+# compile with LTO
+opts+=-flto=auto
+libs+=-flto=auto
+endif
 endif
 
 ifdef USEASAN
 # compile with asan
 opts+=-O1 -fsanitize=address -fno-omit-frame-pointer -fno-common
 libs+=-fsanitize=address
-NOLTO=1
 endif
 
 ifdef USEUBSAN
 # compile with ubsan
 opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
 libs+=-fsanitize=undefined
-NOLTO=1
-endif
-
-ifdef USETSAN
-# compile with tsan
-opts+=-O1 -fsanitize=thread -fno-omit-frame-pointer
-libs+=-fsanitize=thread
-NOLTO=1
-endif
-
-ifndef DEBUGMODE
-ifndef NOLTO
-# compile with LTO
-opts+=-flto=auto
-libs+=-flto=auto
-endif
 endif
 
 ifdef USEJEMALLOC

src/Sourcefile

@@ -97,5 +97,6 @@ lua_playerlib.c
 lua_script.c
 lua_skinlib.c
 lua_thinkerlib.c
+lua_udatalib.c
 lua_glib.c
 lua_profile.cpp

src/blua/ldo.c

@@ -55,8 +55,8 @@ struct lua_longjmp {
 
 void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
   switch (lerrcode) {
-    case LUA_ERRMEM: {  /* memory error? */
-      setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
+    case LUA_ERRMEM: {
+      setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG));
       break;
     }
     case LUA_ERRERR: {

src/blua/lmem.h

@@ -13,6 +13,8 @@
 #include "llimits.h"
 #include "lua.h"
 
+#define MEMERRMSG	"not enough memory"
+
 
 #define luaM_reallocv(L,b,on,n,e) \
 	((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ?  /* +1 to avoid warnings */ \

src/blua/lstate.c

@@ -64,9 +64,6 @@ static void freestack (lua_State *L, lua_State *L1) {
 }
 
 
-#define MEMERRMSG       "not enough memory"
-
-
 /*
 ** open parts that may cause memory-allocation errors
 */
@@ -79,9 +76,7 @@ static void f_luaopen (lua_State *L, void *ud) {
   luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
   luaT_init(L);
   luaX_init(L);
-  /* pre-create memory-error message */
-  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
-  luaS_fix(g->memerrmsg);  /* it should never be collected */
+  luaS_fix(luaS_newliteral(L, MEMERRMSG));
   g->GCthreshold = 4*g->totalbytes;
 }
 

src/blua/lstate.h

@@ -88,7 +88,6 @@ typedef struct global_State {
   lua_CFunction panic;  /* to be called in unprotected errors */
   TValue l_registry;
   struct lua_State *mainthread;
-  TString *memerrmsg;  /* memory-error message */
   UpVal uvhead;  /* head of double-linked list of all open upvalues */
   struct Table *mt[NUM_TAGS];  /* metatables for basic types */
   TString *tmname[TM_N];  /* array with tag-method names */

src/command.c

@@ -1739,7 +1739,6 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 		// send the value of the variable
 		UINT8 buf[128];
 		UINT8 *p = buf;
-
 		if (!(server || (IsPlayerAdmin(consoleplayer))))
 		{
 			CONS_Alert(CONS_NOTICE, "Only the server or admin can change: %s %s\n", var->name, var->string);

src/d_clisrv.c

@@ -3347,7 +3347,6 @@ static void Command_connect(void)
 		return;
 	}
 
-	// StarManiaKG: allow us to join servers from anywhere at any time //
 	if (Playing() || demo.title || demo.playback)
 	{
 		if (demo.title || demo.playback)
@@ -3366,9 +3365,7 @@ static void Command_connect(void)
 		D_StartTitle();
 	}
 	else
-	{
 		M_ClearMenus(true); // close the menus
-	}
 
 	// modified game check: no longer handled
 	// we don't request a restart unless the filelist differs
@@ -3384,52 +3381,37 @@ static void Command_connect(void)
 	}
 	else
 	{
-		// Get the server node.
-		if (netgame)
+		// used in menu to connect to a server in the list
+		if (netgame && fasticmp(COM_Argv(1), "node"))
 		{
-			// used in menu to connect to a server in the list
-			if (fasticmp(COM_Argv(1), "node"))
-			{
-				servernode = (SINT8)atoi(COM_Argv(2));
-			}
-			else
-			{
-				D_QuitNetGame();
-				CL_Reset();
-				D_StartTitle();
-			}
+			servernode = (SINT8)atoi(COM_Argv(2));
 		}
-		else
+		else if (netgame)
 		{
-			// Standard behaviour
-			if (I_NetOpenSocket)
-			{
-				I_NetOpenSocket();
-				netgame = true;
-				multiplayer = true;
+			CONS_Printf(M_GetText("You cannot connect while in a game. End this game first.\n"));
+			return;
+		}
+		else if (I_NetOpenSocket)
+		{
+			I_NetOpenSocket();
+			netgame = true;
+			multiplayer = true;
 
-				if (fasticmp(COM_Argv(1), "any"))
-					servernode = BROADCASTADDR;
-				else if (I_NetMakeNodewPort)
-				{
-					if (COM_Argc() >= 3) // address AND port
-						servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
-					else // address only, or address:port
-						servernode = I_NetMakeNode(COM_Argv(1));
-				}
-				else
-				{
-					CONS_Alert(CONS_ERROR, M_GetText("There is no server identification with this network driver\n"));
-					D_CloseConnection();
-					return;
-				}
-			}
+			if (fasticmp(COM_Argv(1), "any"))
+				servernode = BROADCASTADDR;
+			else if (I_NetMakeNodewPort && COM_Argc() >= 3)
+				servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
+			else if (I_NetMakeNodewPort)
+				servernode = I_NetMakeNode(COM_Argv(1));
 			else
 			{
-				CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
+				CONS_Alert(CONS_ERROR, M_GetText("There is no server identification with this network driver\n"));
+				D_CloseConnection();
 				return;
 			}
 		}
+		else
+			CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
 
 		// invalid address
 		if (servernode == -1)
@@ -3476,7 +3458,6 @@ static void ResetNode(INT32 node);
 //
 void CL_ClearPlayer(INT32 playernum)
 {
-	// Handle mobj_t pointers.
 	if (players[playernum].mo)
 	{
 		// Don't leave a NiGHTS ghost!
@@ -3485,7 +3466,6 @@ void CL_ClearPlayer(INT32 playernum)
 		P_RemoveMobj(players[playernum].mo);
 	}
 
-	// Wipe the struct.
 	memset(&players[playernum], 0, sizeof(player_t));
 }
 

src/d_main.c

@@ -1149,19 +1149,13 @@ static void D_FindAddonsToAutoload(void)
 		// ok so theres still issues with players adding stuff to autoload by accident
 		// sometimes this stuff contains maps
 		// you can probably imagine how that goes in a netgame....
-		int retmap = W_CheckAutoLoadContainsMap(wadsToAutoload);
-		if (retmap == -1)
-		{
-			CONS_Alert(CONS_WARNING, "Autoload: file %s was not found or not valid.\n", wadsToAutoload);
-			continue;
-		}
-		if (retmap > 0)
+		if (W_CheckAutoLoadContainsMap(wadsToAutoload))
 		{
 			CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload);
 			continue;
 		}
 
-		if (!postload && W_CheckPostLoadList(wadsToAutoload) > 0)
+		if (!postload && W_CheckPostLoadList(wadsToAutoload))
 		{
 			CONS_Printf("Autoload: forcing postload for file %s\n", wadsToAutoload);
 			postload = true;

src/dedicated/CMakeLists.txt

@@ -119,25 +119,20 @@ target_compile_definitions(SRB2SDL2 PRIVATE
 	-DHAVE_THREADS
 )
 
-if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE AND NOT SRB2_CONFIG_ASAN AND NOT SRB2_CONFIG_UBSAN AND NOT SRB2_CONFIG_TSAN)
+if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE)
 	set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif()
 
 if(SRB2_CONFIG_ASAN)
-	target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=address -fno-omit-frame-pointer -fno-common)
+	target_compile_options(SRB2SDL2 PRIVATE -fsanitize=address)
 	target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
 endif()
 
 if(SRB2_CONFIG_UBSAN)
-	target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=undefined -fno-omit-frame-pointer)
+	target_compile_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
 	target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
 endif()
 
-if(SRB2_CONFIG_TSAN)
-	target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=thread -fno-omit-frame-pointer)
-	target_link_options(SRB2SDL2 PRIVATE -fsanitize=thread)
-endif()
-
 ## strip debug symbols into separate file when using gcc
 # if(CMAKE_COMPILER_IS_GNUCC)
 # 	if(${CMAKE_BUILD_TYPE} MATCHES Debug)

src/discord.c

@@ -474,7 +474,6 @@ void DRPC_UpdatePresence(void)
 	char charname[11+SKINNAMESIZE+1];
 
 	boolean joinSecretSet = false;
-	char *clientJoinSecret = NULL;
 
 	DiscordRichPresence discordPresence;
 	memset(&discordPresence, 0, sizeof(discordPresence));
@@ -531,8 +530,7 @@ void DRPC_UpdatePresence(void)
 			// Grab the host's IP for joining.
 			if ((join = DRPC_GetServerIP()) != NULL)
 			{
-				clientJoinSecret = DRPC_XORIPString(join);
-				discordPresence.joinSecret = clientJoinSecret;
+				discordPresence.joinSecret = DRPC_XORIPString(join);
 				joinSecretSet = true;
 			}
 		}
@@ -714,7 +712,6 @@ void DRPC_UpdatePresence(void)
 	}
 
 	Discord_UpdatePresence(&discordPresence);
-	free(clientJoinSecret);
 }
 
 #endif // HAVE_DISCORDRPC

src/doomdef.h

@@ -147,7 +147,7 @@ extern char  logfilename[1024];
 #define VERSIONSTRING  CLIENTNAME  " v10.1"
 #define VERSIONSTRINGW CLIENTNAMEW L" v10.1"
 
-#define SATURN_TESTING // comment out for saturn release builds!
+//#define SATURN_TESTING // comment out for saturn release builds!
 
 // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
 // And change CMakeLists.txt (not src/, but in root), for CMake users!

src/g_demo.c

@@ -63,6 +63,7 @@
 
 // for replay dates
 #include <time.h>
+#include <locale.h>
 
 // menu demo things
 UINT32 demoDelayTime = 15*TICRATE;
@@ -2386,9 +2387,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 #if defined (_WIN32)
 // return the file creation time
 // useful for demos that were renamed
-// windows only, as file creation times are
-// very unreliable (or non existant depending on fs) on linux
-static time_t G_GetCreationTime(char *filepath)
+static long G_GetCreationTime(char *filepath)
 {
 	struct stat fileinfo;
 
@@ -2399,24 +2398,35 @@ static time_t G_GetCreationTime(char *filepath)
 }
 #endif
 
-static char *G_GetDemoDate(menudemo_t *pdemo, const char *dateformat)
+static char *G_GetDemoDate(menudemo_t *pdemo)
 {
 	char *endPos = NULL;
-	char *datetime;
+	static char datetime[11];
 	time_t file_time = 0;
-	struct tm tm_buf;
+	const char *format = NULL;
+	struct tm *tm_buf = NULL;
 	CLEANUP(pfree) char *filename = NULL;
 
 	// get le filepath
 	filename = strdup(pdemo->filepath);
 
 	if (!filename)
+	{
+#if defined (_WIN32)
+		// if we cant get a filename try just getting the file creation time
+		file_time = G_GetCreationTime(pdemo->filepath);
+		goto skipfilenametime;
+#else
 		return NULL;
+#endif
+	}
 
 	// get the actual filename Zzz...
 	nameonly(filename);
 
-	// the first 10 characters of a replay name is a unix timestamp
+	// the first 10 characters of a replay name usually is a unix timestamp
+
+	// not long enough to contain a valid timestamp
 	if (strlen(filename) < 10)
 	{
 #if defined (_WIN32)
@@ -2448,49 +2458,67 @@ static char *G_GetDemoDate(menudemo_t *pdemo, const char *dateformat)
 #endif
 	}
 
-	// then throw it into localtime to get an actual human readable format lmao
-#if defined(_WIN32)
+#if defined (_WIN32)
 skipfilenametime:
-	if ((localtime_s(&tm_buf, &file_time) != 0) ||
-		(tm_buf.tm_year <= 110)) // cant believe we ended up in 1970
+#endif
+
+	// then throw it into localtime to get an actual human readable format lmao
+	tm_buf = localtime(&file_time);
+
+	// cant believe we ended up in 1970
+	if (tm_buf == NULL || tm_buf->tm_year <= 110)
 	{
+#if defined (_WIN32)
 		// uh ohh, we got an invalid time
 		// try one more time getting the creation time
 		file_time = G_GetCreationTime(pdemo->filepath);
+		tm_buf = localtime(&file_time);
 
-		if ((localtime_s(&tm_buf, &file_time) != 0) ||
-			(tm_buf.tm_year <= 110))
+		if (tm_buf == NULL || tm_buf->tm_year <= 110)
 			return NULL;
-	}
+
+		goto gotcreationtime;
 #else
-	if ((localtime_r(&file_time, &tm_buf) == NULL) ||
-		(tm_buf.tm_year <= 110)) // cant believe we ended up in 1970
 		return NULL;
 #endif
+	}
 
-	datetime = malloc(sizeof(pdemo->date)); // mallocma balls
+#if defined (_WIN32)
+gotcreationtime:
+#endif
 
-	// no mallocma balls... :c
-	if (!datetime)
-		return NULL;
+	// US ppl are special (:
+	if (cv_demodateformat.value == 2)
+		format = "%m.%d.%Y";
+	else if (cv_demodateformat.value == 1)
+		format = "%d.%m.%Y";
+	else
+	{
+		const char *locale = setlocale(LC_TIME, NULL);
 
-	if (strftime(datetime, sizeof(pdemo->date), dateformat, &tm_buf) == 0)
+		if (locale == NULL)
+			format = "%d.%m.%Y"; // fallback to non US format
+		else if (strstr(locale, "en_US"))
+			format = "%m.%d.%Y";
+		else
+			format = "%d.%m.%Y";
+	}
+
+	if (strftime(datetime, sizeof(datetime), format, tm_buf) == 0)
 	{
-		free(datetime);
 		return NULL;
 	}
 
 	return datetime;
 }
 
-void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat)
+void G_LoadDemoTitle(menudemo_t *pdemo)
 {
 	UINT8 infobuffer[96], *info_p;
 	UINT16 pdemoversion;
+	char *demodate = NULL;
 	size_t count;
 
-	memset(pdemo->date, 0, sizeof(pdemo->date));
-
 	FILE *handle = fopen(pdemo->filepath, "rb");
 
 	if (!handle)
@@ -2518,6 +2546,8 @@ void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat)
 
 	pdemoversion = READUINT16(info_p);
 
+	memset(pdemo->date, 0, sizeof(pdemo->date));
+
 	switch (pdemoversion)
 	{
 		case DEMOVERSION: // latest always supported
@@ -2525,12 +2555,13 @@ void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat)
 			memcpy(pdemo->title, info_p, 64);
 
 			// demo date
-			char *demodate = G_GetDemoDate(pdemo, dateformat);
+			demodate = G_GetDemoDate(pdemo);
+
 			if (demodate)
 			{
 				strlcpy(pdemo->date, demodate, sizeof(pdemo->date));
-				free(demodate);
 			}
+
 			break;
 #ifdef DEMO_COMPAT_100
 		case 0x0001:

src/g_demo.h

@@ -98,7 +98,7 @@ void G_SetDemoTime(UINT32 ptime, UINT32 plap);
 UINT8 G_CmpDemoTime(char *oldname, char *newname);
 
 void G_LoadDemoInfo(menudemo_t *pdemo);
-void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat); // For use in replay search feature
+void G_LoadDemoTitle(menudemo_t *pdemo); // For use in replay search feature
 void G_DeferedPlayDemo(const char *demo);
 
 typedef enum

src/hardware/hw_bsp.c

@@ -96,7 +96,7 @@ static void HWR_FreePoly(poly_t *poly)
 // divfrac = how far along partline vector is crossing pt
 static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t *v2)
 {
-	double frac;
+	double frac1, frac2;
 	double num; // numerator
 	double den; // denominator
 	double v1x, v1y, v1dx, v1dy; // polygon side vector, v1->v2
@@ -122,23 +122,24 @@ static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t
 	// first check the frac along the polygon segment,
 	// (do not accept hit with the extensions)
 	num = (v3x - v1x)*v3dy + (v1y - v3y)*v3dx;
-	frac = num / den;
+	frac1 = num / den;
 
 	// 0= cross at v1, 1.0= cross at v2
-	if (frac < 0.0 || frac > 1.0)  // double
+	if (frac1 < 0.0 || frac1 > 1.0)  // double
 		return false;  // not within the polygon side
 
 	// now get the frac along the BSP line
 	// which is useful to determine what is left, what is right
 	num = (v3x - v1x)*v1dy + (v1y - v3y)*v1dx;
+	frac2 = num / den;
 
-	partline->divfrac = num / den;  // how far along partline vector
+	partline->divfrac = frac2;  // how far along partline vector
 
 	// [WDJ] find the interception point along the segment.
 	// It should be slightly more accurate because it is always closer to the
 	// crossing point than arbitrary positions on the partition line.
-	partline->divpt.x = v1x + v1dx*frac;
-	partline->divpt.y = v1y + v1dy*frac;
+	partline->divpt.x = v1x + v1dx*frac1;
+	partline->divpt.y = v1y + v1dy*frac1;
 
 	return true;
 }
@@ -160,71 +161,6 @@ static boolean SameVertex(polyvertex_t *p1, polyvertex_t *p2)
 	return true;
 }
 
-// Adapted from function in prboom.
-// Point is to rightside of divline when result > 0,
-// but result is multiplied by length of divline.
-// Returns near 0, when point is on, or nearly on, the divline.
-static inline double point_rightside(fdivline_t *dl, polyvertex_t *v4)
-{
-	// Cross product of dl and vector dl->(x,y) to v4,
-	// is > 0 when v4 is to right side of divline.
-	// Viewed along divline from vertex, looking towards positive dx,dy.
-	// If divline is rotated until dy>0 and dx = 0, then true when rotated
-	// vertex position is to the right of the divline (v4->x > dl->x).
-	return ((((double)(v4->x) - (double)(dl->x)) * (double)(dl->dy))
-		 - (((double)(v4->y) - (double)(dl->y)) * (double)(dl->dx)));
-}
-
-// [WDJ] The front and back MUST match the BSP determination, else it will assign
-// this poly to the wrong sector.
-// May have 1 point on the line, and other points might be very close to the line.
-// Can only trust a test of a point that is NOT on the line.
-// Using a tstdist = 0.5f worked, but it might break on very small poly.
-// Avactor.wad had polys with d = 9.09, 5552, 1.64, 1011, 14252, 0.0136, 0.00634, 14655, 3,
-// -0.3044, 7, 1.53, etc..,
-// and one poly with d = -0.023 with the rest of the points d > 0.
-// One 14 point poly with divline len=8, had to test 9 points to find d = 36.
-// Typical: divline len=70 d=6828, divline len=1.0 d=35, divline len=1.414 d=5.
-// The result of point_rightside is proportional to the length of divline.
-// The divline length can be from 1.414 to 14000.
-static void UnsplitPoly(fdivline_t *dlnp, poly_t *poly,
-						poly_t **frontpoly, poly_t **backpoly)
-{
-	int32_t i;
-	double d;
-	const double tstd = hypot((double)dlnp->dx, (double)dlnp->dy) / 2.0;
-	double sumd = 0; // accumulated left or rightness.
-
-	for (i = 0; i < poly->numpts; i++)
-	{
-		// Look for a point that is obviously to the left or right.
-		d = point_rightside(dlnp, &poly->pts[i]);  // d > 0 is right
-		sumd += d;
-
-		if (d > tstd)
-			goto poly_rightside;
-
-		if (d < -tstd)
-			goto poly_leftside;
-	}
-
-	// Did not find an obvious left or right point, then
-	if (sumd < 0)
-		goto poly_leftside;
-
-poly_rightside:
-	// poly is to rightside of divline.
-	*frontpoly = poly;
-	*backpoly = NULL;
-	return;
-
-poly_leftside:
-	// poly is to leftside of divline.
-	*frontpoly = NULL;
-	*backpoly = poly;
-	return;
-}
-
 // split a _CONVEX_ polygon in two convex polygons
 // outputs:
 //   frontpoly : polygon on right side of bsp line
@@ -327,7 +263,10 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 		// linedefs where each side point the same sector, that is:
 		// the deep water effect with the original Doom
 
-		UnsplitPoly(dlnp, poly, frontpoly, backpoly);
+		//TODO: make sure front poly is to front of partition line?
+
+		*frontpoly = poly;
+		*backpoly  = NULL;
 		return;
 	}
 
@@ -335,14 +274,16 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 	if (pe < 0)
 	{
 		//I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe);
-		UnsplitPoly(dlnp, poly, frontpoly, backpoly);
+		*frontpoly = poly;
+		*backpoly  = NULL;
 		return;
 	}
 
 	if (pe <= ps)
 	{
 		//I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe);
-		UnsplitPoly(dlnp, poly, frontpoly, backpoly);
+		*frontpoly = poly;
+		*backpoly  = NULL;
 		return;
 	}
 
@@ -447,10 +388,6 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
 	vertex_t *v1, *v2;
 	fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
 
-	// empty poly? just save us some time then
-	if (poly->numpts <= 0)
-		return frontpoly;
-
 	// for each seg of the subsector
 	for (; segcount--; lseg++)
 	{
@@ -552,23 +489,6 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
 			// need 2 points
 			if (pe >= 0)
 			{
-				// Cuts that miss the polygon.
-				if (ps_frac < 0.0 && cutseg.divfrac < 0.0)
-					continue;
-
-				if (ps_frac > 1.0 && cutseg.divfrac > 1.0)
-					continue;
-#define FRAC_EP 0.01f
-				// Reject cuts that could make the polygon non-convex.
-
-				// Cannot make normal cut, ps_frac end is loose.
-				if ((ps_frac < (0.0 - FRAC_EP)) || (ps_frac > (1.0f + FRAC_EP)))
-					continue;
-
-				// Cannot make normal cut, cutseg.divfrac end is loose.
-				if ((cutseg.divfrac < (0.0 - FRAC_EP)) || (cutseg.divfrac > (1.0f + FRAC_EP)))
-					continue;
-#undef FRAC_EP
 				// generate FRONT poly
 				frontpoly = HWR_AllocPoly(poly_num_pts);
 
@@ -760,11 +680,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 		memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
 	}
 	else
-	{
-		// [WDJ] Having no front poly is as likely as no back poly, since
-		// logic in Split Poly was changed to check poly direction.
-		// I_Error("HWR_WalkBSPNode: no front poly, bspnum= %d\n", bspnum);
-	}
+		I_Error("WalkBSPNode: no front poly?");
 
 	// Recursively divide back space.
 	if (backpoly)

src/hardware/hw_cache.c

@@ -614,12 +614,24 @@ void HWR_FreeMapTextures(void)
 	gl_numtextures = 0;
 }
 
+#define NAME    flatcheck
+#define KEY_TY  UINT32
+#define HASH_FN vt_hash_integer
+#define CMPR_FN vt_cmpr_integer
+#include "../verstable.h"
+
 static void HWR_PrecacheLevelFlats(void)
 {
+	// lookup for flats that may´ve been already loaded
+	flatcheck flatpresent;
 	size_t i;
+#if 0
+	size_t j;
+#endif
 	INT32 k;
 
-	// FIXME: this needs to account for FOFs to properly work
+	// this kinda messes up encore remapping behavior at times
+	// so just disable it for now ig
 #ifdef GLENCORE
 	if (encoremap)
 	{
@@ -627,6 +639,9 @@ static void HWR_PrecacheLevelFlats(void)
 	}
 #endif
 
+	flatcheck_init(&flatpresent);
+	flatcheck_reserve(&flatpresent, numlevelflats);
+
 	// special case for encore
 #if 0
 #ifdef GLENCORE
@@ -635,7 +650,6 @@ static void HWR_PrecacheLevelFlats(void)
 		// go through all sectors to determine if it should be remapped for encore
 		for (i = 0; i < numsectors; i++)
 		{
-			size_t j;
 			sector_t *sec = &sectors[i];
 
 			// gotta check sector floor and ceiling
@@ -678,7 +692,11 @@ static void HWR_PrecacheLevelFlats(void)
 		{
 			const levelflat_t *levelflat = &levelflats[i];
 
-			HWR_GetFlat(levelflat->lumpnum, false);
+			if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
+			{
+				HWR_GetFlat(levelflat->lumpnum, false);
+				flatcheck_insert(&flatpresent, levelflat->lumpnum);
+			}
 
 			if (levelflat->speed) // is it an animated flat ?
 			{
@@ -686,11 +704,17 @@ static void HWR_PrecacheLevelFlats(void)
 				for (k = 0; k < levelflat->numpics; k++)
 				{
 					lumpnum_t lump = levelflat->baselumpnum + k;
-					HWR_GetFlat(lump, false);
+					if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
+					{
+						HWR_GetFlat(lump, false);
+						flatcheck_insert(&flatpresent, lump);
+					}
 				}
 			}
 		}
 	}
+
+	flatcheck_cleanup(&flatpresent);
 }
 
 static void HWR_PrecacheLevelTextures(void)
@@ -714,7 +738,7 @@ static void HWR_PrecacheLevelTextures(void)
 	{
 		const line_t *line = &lines[i];
 #ifdef GLENCORE
-		const boolean noencoremap = (encoremap && (line->flags & ML_TFERLINE));
+		const int noencoremap = ((encoremap && (line->flags & ML_TFERLINE)) ? 2 : 1);
 #endif
 		// two sides
 		for (j = 0; j < 2; j++)
@@ -731,27 +755,25 @@ static void HWR_PrecacheLevelTextures(void)
 			{
 				const INT32 texnum = sidetex[f];
 
-				if (texnum <= 0 || (unsigned)texnum >= gl_numtextures)
+				if (texnum < 0 || texnum >= (signed)gl_numtextures)
 					continue;
 
-				if (!(texturepresent[texnum] & 1))
-				{
-					texturepresent[texnum] |= 1;
-					HWR_GetTexture(texnum, false);
-				}
+				if (texturepresent[texnum])
+					continue;
 #ifdef GLENCORE
-				if (noencoremap
-					&& !(texturepresent[texnum] & 2))
-				{
-					texturepresent[texnum] |= 2;
+				texturepresent[texnum] = 1|noencoremap;
+#else
+				texturepresent[texnum] = 1;
+#endif
+				HWR_GetTexture(texnum, false);
+#ifdef GLENCORE
+				if (noencoremap & 2)
 					HWR_GetTexture(texnum, true);
-				}
 #endif
 			}
 		}
 	}
 
-	// check for animated textures
 	for (anim = anims; anim < lastanim; anim++)
 	{
 		if (!anim->istexture)
@@ -770,7 +792,6 @@ static void HWR_PrecacheLevelTextures(void)
 			{
 				HWR_GetTexture(animtexnum, false);
 			}
-
 #ifdef GLENCORE
 			if (texpresent & 2)
 			{
@@ -892,7 +913,7 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
 	GLMapTexture_t *gltex;
 	GLMipmap_t *glMipmap;
 
-	if (tex < 0 || (unsigned)tex >= gl_numtextures)
+	if (tex < 0 || tex >= (signed)gl_numtextures)
 	{
 #ifdef PARANOIA
 		I_Error("HWR_GetTexture: Invalid texture ID %d", tex);

src/hardware/hw_main.cpp

@@ -255,7 +255,6 @@ static void CV_screentextures_OnChange(void)
 #endif
 		intermissionbginit = false;
 	}
-
 	GL_SetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_glscreentextures.value);
 	M_UpdateOGLMenu();
 }
@@ -264,11 +263,12 @@ static void CV_screentextures_OnChange(void)
 static void CV_glframebuffer_OnChange(void)
 {
 	ONLY_IF_GL_LOADED
-	// screen FBO needs screen textures currently
-	if (cv_glframebuffer.value != 0 && ((cv_glscreentextures.value != 2) || !supportFBO))
-		CV_StealthSetValue(&cv_glframebuffer, 0); // dont recursively call this lul
+	if ((cv_glframebuffer.value != 0 && cv_glscreentextures.value != 2)
+	|| (!supportFBO && cv_glframebuffer.value != 0)) // screen FBO needs screen textures
+		CV_SetValue(&cv_glframebuffer, 0);
 
-	I_CheckDownSampleState(true);
+	I_DownSample();
+	RefreshOGLSDLSurface();
 	M_UpdateOGLMenu();
 	intermissionbginit = false;
 }
@@ -610,7 +610,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 			fflatsize = 1024.0f;
 			flatflag = 1023;
 			break;
-		case 262144: // 512x512 lump
+		case 262144:// 512x512 lump
 			fflatsize = 512.0f;
 			flatflag = 511;
 			break;
@@ -721,7 +721,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 
 	HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, PolyFlags, shader, false);
 
-	if (gl_maphashorizonlines && subsector && !FOFsector && cv_glhorizonlines.value)
+	if (gl_maphashorizonlines && subsector && cv_glhorizonlines.value)
 	{
 		// Horizon lines
 		FOutVector horizonpts[6];
@@ -742,6 +742,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 
 			line_t* ld = line->linedef;
 
+			// this check sucks and is a hotspot lel
 			if (LIKELY(ld->special != HORIZONSPECIAL))
 				continue;
 
@@ -1239,44 +1240,46 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
 
 	pSurf->PolyColor.s.alpha = 0xFF;
 
-	// check if linedef alpha is within range
-	const boolean linealpha = (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT);
-
-	// set alpha for transparent walls
-	switch (gl_linedef->special)
+	if (LIKELY(!gl_curline->polyseg))
 	{
-		// Translucent linedef types
-		case 102:
-		case 121 ... 125:
-		case 141 ... 145:
-		case 174:
-		case 175:
-		case 192:
-		case 195:
-		case 221:
-		case 253:
-		case 256:
-			if (gl_linedef->blendmode && linealpha)
-				blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
-			else
-				blendmode = PF_Translucent;
-			break;
-		default:
-			if (gl_linedef->blendmode)
-			{
-				if (linealpha)
+		// check if linedef alpha is within range
+		const boolean linealpha = (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT);
+
+		// set alpha for transparent walls
+		switch (gl_linedef->special)
+		{
+			// Translucent linedef types
+			case 102:
+			case 121 ... 125:
+			case 141 ... 145:
+			case 174:
+			case 175:
+			case 192:
+			case 195:
+			case 221:
+			case 253:
+			case 256:
+				if (gl_linedef->blendmode && linealpha)
 					blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
 				else
-					blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode);
-			}
-			else if (linealpha)
-				blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
-			else
-				blendmode = PF_Masked;
-			break;
+					blendmode = PF_Translucent;
+				break;
+			default:
+				if (gl_linedef->blendmode)
+				{
+					if (linealpha)
+						blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
+					else
+						blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode);
+				}
+				else if (linealpha)
+					blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
+				else
+					blendmode = PF_Masked;
+				break;
+		}
 	}
-
-	if (gl_curline->polyseg && gl_curline->polyseg->translucency > 0)
+	else if (gl_curline->polyseg->translucency > 0)
 	{
 		// Polyobject translucency is shared between all of its lines
 		if (gl_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn
@@ -1383,8 +1386,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 	// two sided line
 	if (gl_backsector)
 	{
-		const INT32 gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
-		const INT32 gl_bottomtexture = R_GetTextureNum(gl_sidedef->bottomtexture);
+		INT32 gl_toptexture = 0, gl_bottomtexture = 0;
 
 		fixed_t texturevpeg;
 
@@ -1395,7 +1397,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		if (!gl_curline->polyseg) // Don't do it for polyobjects
 		{
 			// Sky Ceilings
-			wallVerts[2].y = wallVerts[3].y = FLOATMAX; // draw to top of map space
+			wallVerts[3].y = wallVerts[2].y = FLOATMAX;
 
 			auto draw_sky_walls = []
 			(int vert1, int vert2, fixed_t world, fixed_t worldslope, auto& wwallVerts, auto& sSurf) FUNCINLINE
@@ -1405,9 +1407,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				HWR_DrawSkyWall(wwallVerts, &sSurf);
 			};
 
-			// worldtop = front ceiling
-			// worldhigh = back ceiling
-
 			if (gl_frontsector->ceilingpic == skyflatnum)
 			{
 				if (gl_backsector->ceilingpic == skyflatnum)
@@ -1426,17 +1425,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 					worldtop = worldhigh;
 					worldtopslope = worldhighslope;
 				}
-				else if (!gl_toptexture &&
-						 (worldhigh <= worldtop && worldhighslope <= worldtopslope) && // Assuming ESLOPE is always on with my changes
-						 (worldhigh != worldtop || worldhighslope != worldtopslope))
-				{
-					// Only the frontsector is sky.
-					// If there's no upper texture, extend the sky wall
-					// down to the lower of the two ceilings.
-					fixed_t top = std::min(worldtop, worldhigh);
-					fixed_t topslope = std::min(worldtopslope, worldhighslope);
-					draw_sky_walls(0, 1, top, topslope, wallVerts, Surf);
-				}
 				else
 				{
 					// Only the frontsector is sky, just draw a skywall from the front ceiling
@@ -1449,11 +1437,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				draw_sky_walls(0, 1, worldtop, worldtopslope, wallVerts, Surf);
 			}
 
-			// worldbottom = front floor
-			// worldlow = back floor
-
 			// Sky Floors
-			wallVerts[0].y = wallVerts[1].y = FLOATMIN; // draw to bottom of map space
+			wallVerts[0].y = wallVerts[1].y = FLOATMIN;
 
 			if (gl_frontsector->floorpic == skyflatnum)
 			{
@@ -1465,7 +1450,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 					if ((worldlow >= worldbottom && worldlowslope >= worldbottomslope)
 					&& (worldlow != worldbottom || worldlowslope != worldbottomslope)
 					// Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
-					&& !(gl_bottomtexture))
+					&& !(gl_sidedef->bottomtexture))
 					{
 						draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
 					}
@@ -1476,25 +1461,15 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 					draw_sky_walls(3, 2, worldbottom, worldbottomslope, wallVerts, Surf);
 				}
 			}
-			else if ((gl_backsector->floorpic == skyflatnum) && !(gl_bottomtexture))
+			else if ((gl_backsector->floorpic == skyflatnum) && !(gl_sidedef->bottomtexture))
 			{
 				// Only the backsector has sky, just draw a skywall from the back floor if there's no bottomtexture
 				draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
 			}
-			else if (gl_frontsector->ceilingpic == skyflatnum &&
-					 gl_backsector->ceilingpic == skyflatnum &&
-					 (worldlow >= worldbottom && worldlowslope >= worldbottomslope)
-					 && (worldlow != worldbottom || worldlowslope != worldbottomslope)
-					 // Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
-					 && !(gl_bottomtexture))
-			{
-				// Both ceilings are sky, but neither floor is sky.
-				// If there's a lower wall gap without a bottom texture,
-				// draw a skywall from the backsector's higher floor.
-				draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
-			}
 		}
 
+		gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
+
 		// check TOP TEXTURE
 		if (gl_toptexture && (worldhighslope < worldtopslope || worldhigh < worldtop))
 		{
@@ -1558,6 +1533,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
 		}
 
+		gl_bottomtexture = R_GetTextureNum(gl_sidedef->bottomtexture);
+
 		// check BOTTOM TEXTURE
 		if (gl_bottomtexture && (worldlowslope > worldbottomslope || worldlow > worldbottom))
 		{
@@ -2985,7 +2962,7 @@ static void HWR_Subsector(size_t num)
 					}
 					else
 					{
-						HWR_GetFlat(flatlump, R_NoEncore(rover->master->frontsector, bottom));
+						HWR_GetFlat(flatlump, R_NoEncore(gl_frontsector, !bottom));
 						light = R_GetPlaneLight(gl_frontsector, centerHeight, underside);
 
 						HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flatlump,
@@ -3483,12 +3460,8 @@ static inline void HWR_ApplyDispoffset(gl_vissprite_t *spr, FOutVector *wallVert
 {
 	HWR_RotateSpritePolyToAim(spr, wallVerts, false, papersprite);
 
-	const float f_xdiff = (spr->x1 - gl_viewx);
-	const float f_ydiff = (spr->z1 - gl_viewy);
-	const float f_zdiff = (spr->gzt - gl_viewz);
-
-	const float sprdist = sqrtf((f_xdiff*f_xdiff) + (f_ydiff*f_ydiff) + (f_zdiff*f_zdiff));
-	const float distfact = ((2.0f * spr->dispoffset) + 20.0f) / sprdist;
+	const float sprdist = sqrtf((spr->x1 - gl_viewx)*(spr->x1 - gl_viewx) + (spr->z1 - gl_viewy)*(spr->z1 - gl_viewy) + (spr->gzt - gl_viewz)*(spr->gzt - gl_viewz));
+	const float distfact = ((2.0f*spr->dispoffset) + 20.0f) / sprdist;
 
 	for (size_t i = 0; i < 4; i++)
 	{
@@ -4314,10 +4287,7 @@ static void HWR_RenderDrawNodes(void)
 					gl_frontsector = NULL;
 
 					if (!(plane->blend & PF_NoTexture))
-					{
-						const boolean ceiling = plane->FOFSector ? !plane->isceiling : plane->isceiling; // match software!
-						HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, ceiling));
-					}
+						HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, plane->isceiling));
 
 					HWR_RenderPlane(NULL, plane->xsub, plane->isceiling, plane->fixedheight, plane->blend, plane->lightlevel,
 									plane->lumpnum, plane->FOFSector, plane->alpha, plane->planecolormap);
@@ -5899,7 +5869,7 @@ void HWR_Startup(void)
 		HWR_TogglePaletteRendering();
 
 		if (msaa)
-			GL_SetSpecialState(HWD_SET_MSAA, 1);
+			GL_SetSpecialState(HWD_SET_MSAA, a2c ? 2 : 1);
 
 		HWR_RegisterCommands();
 	}
@@ -5987,7 +5957,7 @@ void HWR_Shutdown(void)
 	GL_FlushScreenTextures();
 	HWR_ClearAllTextures();
 #ifdef USE_FBO_OGL
-	GL_FBO_Disable();
+	GL_Framebuffer_Disable();
 #endif
 }
 

src/hardware/hw_main.h

@@ -43,6 +43,7 @@ void HWR_Startup(void);
 void HWR_Shutdown(void);
 
 extern unsigned msaa;
+extern boolean a2c;
 
 extern FTransform atransform;
 extern float gl_viewsin, gl_viewcos;

src/hardware/hw_shaders.h

@@ -193,6 +193,26 @@
 	"}\n" \
 	"#endif\0"
 
+#define GLSL_SOFTWARE_FRAGMENT_SHADER_NOPAL \
+	"uniform sampler2D tex;\n" \
+	"uniform vec4 poly_color;\n" \
+	"uniform vec4 tint_color;\n" \
+	"uniform vec4 fade_color;\n" \
+	"uniform float lighting;\n" \
+	"uniform float fade_start;\n" \
+	"uniform float fade_end;\n" \
+	GLSL_DOOM_COLORMAP \
+	GLSL_DOOM_LIGHT_EQUATION \
+	"void main(void) {\n" \
+		"vec4 texel = texture2D(tex, gl_TexCoord[0].st);\n" \
+		"vec4 base_color = texel * poly_color;\n" \
+		"vec4 final_color = base_color;\n" \
+		GLSL_SOFTWARE_TINT_EQUATION \
+		GLSL_SOFTWARE_FADE_EQUATION \
+		"final_color.a = texel.a * poly_color.a;\n" \
+		"gl_FragColor = final_color;\n" \
+	"}\n" \
+
 // hand tuned adjustments for light level calculation
 #define GLSL_FLOOR_FUDGES \
 	"#define STARTMAP_FUDGE 1.06\n" \

src/hardware/r_opengl/r_opengl.c

@@ -136,7 +136,8 @@ enum
 {
 	FBO_NONE,
 	FBO_ARB,
-	FBO_EXT
+	FBO_EXT,
+	FBO_EXT_STENCIL // supports stencil attachment
 };
 
 typedef struct
@@ -160,7 +161,7 @@ GL_DEPTH24_STENCIL8 GL_DEPTH_COMPONENT_EXT
 GL_DEPTH_STENCIL_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
 #endif
 
-static void GL_FBO_DeleteAttachments(void);
+static void GL_Framebuffer_DeleteAttachments(void);
 #endif
 
 // needed for glportals
@@ -768,22 +769,28 @@ static GLRGBAFloat shader_defaultcolor = {1.0f, 1.0f, 1.0f, 1.0f};
 #ifdef USE_FBO_OGL
 static int GLFramebuffer_CheckExt(void)
 {
-	// check for the standard arb extensions
-	// these should be there from version 3.0 onwards
+	// in opengl 3.0 and up fbos are standart and always supported
+	if (majorGL >= 3)
+		return FBO_ARB;
+
+	// gl versions from 2.1 may still support framebuffer objects
+
+	// maybe, just maybe, we support the standart extensions
 	if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) &&
 		GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) &&
 		GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions))
-	{
 		return FBO_ARB;
-	}
 
-	// gl versions from 2.1 and older may still support framebuffer objects
-	// depending on vendor and driver support
+	// nope, try the older 2.1 extensions
 	if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions) &&
 		GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions) &&
-		GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions) &&
-		GL_isExtAvailable("GL_EXT_packed_depth_stencil", gl_extensions)) // we use the stencil buffer for stuff like portals, so its better to make stencil extension a requirement
+		GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions))
 	{
+		// perhaps we may even support a stencil attachment
+		if (GL_isExtAvailable("GL_EXT_packed_depth_stencil", gl_extensions))
+			return FBO_EXT_STENCIL;
+
+		// no stencil support, sad
 		return FBO_EXT;
 	}
 
@@ -901,41 +908,36 @@ void SetupGLFunc4(void)
 
 			GL_DBG_Printf("\nFBO: ARB extensions found\n");
 		}
-		else if (fbocheck == FBO_EXT) // uh oh only support old fbo extensions...
+		else if (fbocheck == FBO_EXT || fbocheck == FBO_EXT_STENCIL) // uh oh only support for EXT prefix fbos...
 		{
+			GetGLfunc(glGenFramebuffersEXT);
+			GetGLfunc(glBindFramebufferEXT);
+			GetGLfunc(glDeleteFramebuffersEXT);
+			GetGLfunc(glFramebufferTexture2DEXT);
+			GetGLfunc(glCheckFramebufferStatusEXT);
+			GetGLfunc(glGenRenderbuffersEXT);
+			GetGLfunc(glBindRenderbufferEXT);
+			GetGLfunc(glDeleteRenderbuffersEXT);
+			GetGLfunc(glRenderbufferStorageEXT);
+			GetGLfunc(glFramebufferRenderbufferEXT);
+
 			// remapping galore huehue
 			// do this so we dont have to dupe half our code
-			GetGLfunc(glGenFramebuffersEXT);
 			pglGenFramebuffers = pglGenFramebuffersEXT;
-
-			GetGLfunc(glBindFramebufferEXT);
 			pglBindFramebuffer = pglBindFramebufferEXT;
-
-			GetGLfunc(glDeleteFramebuffersEXT);
 			pglDeleteFramebuffers  = pglDeleteFramebuffersEXT;
-
-			GetGLfunc(glFramebufferTexture2DEXT);
 			pglFramebufferTexture2D = pglFramebufferTexture2DEXT;
-
-			GetGLfunc(glCheckFramebufferStatusEXT);
 			pglCheckFramebufferStatus = pglCheckFramebufferStatusEXT;
-
-			GetGLfunc(glGenRenderbuffersEXT);
 			pglGenRenderbuffers = pglGenRenderbuffersEXT;
-
-			GetGLfunc(glBindRenderbufferEXT);
 			pglBindRenderbuffer = pglBindRenderbufferEXT;
-
-			GetGLfunc(glDeleteRenderbuffersEXT);
 			pglDeleteRenderbuffers = pglDeleteRenderbuffersEXT;
-
-			GetGLfunc(glRenderbufferStorageEXT);
 			pglRenderbufferStorage = pglRenderbufferStorageEXT;
-
-			GetGLfunc(glFramebufferRenderbufferEXT);
 			pglFramebufferRenderbuffer = pglFramebufferRenderbufferEXT;
 
-			GL_DBG_Printf("\nFBO: EXT extensions with packed depth-stencil\n");
+			if (fbocheck == FBO_EXT)
+				GL_DBG_Printf("\nFBO: EXT extensions found, no stencil\n");
+			else if (fbocheck == FBO_EXT_STENCIL)
+				GL_DBG_Printf("\nFBO: EXT extensions with packed depth-stencil\n");
 		}
 
 		supportFBO = fbocheck;
@@ -1149,7 +1151,7 @@ void GL_SetModelView(GLint w, GLint h)
 		GL_FlushScreenTextures();
 
 #ifdef USE_FBO_OGL
-		GL_FBO_DeleteAttachments();
+		GL_Framebuffer_DeleteAttachments();
 #endif
 	}
 
@@ -2639,7 +2641,11 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value)
 
 		case HWD_SET_MSAA:
 			if (Value)
+			{
 				pglEnable(GL_MULTISAMPLE);
+				if (Value == 2)
+					pglEnable(GL_SAMPLE_ALPHA_TO_COVERAGE);
+			}
 			break;
 
 		case HWD_SET_TEXTUREANISOTROPICMODE:
@@ -3240,7 +3246,7 @@ void GL_SetTransform(FTransform *stransform)
 }
 
 #ifdef USE_FBO_OGL
-static void GL_FBO_DeleteAttachments(void)
+static void GL_Framebuffer_DeleteAttachments(void)
 {
 	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
@@ -3260,9 +3266,9 @@ static void GL_FBO_DeleteAttachments(void)
 	framebufferobject.init = false;
 }
 
-static void GL_FBO_Generate(void)
+static void GL_Framebuffer_Generate(void)
 {
-	if (supportFBO == FBO_NONE || framebufferobject.init)
+	if (supportFBO == FBO_NONE || framebufferobject.init || !UseScreenFBO())
 		return;
 
 	// Generate the framebuffer
@@ -3277,7 +3283,7 @@ static void GL_FBO_Generate(void)
 	{
 		pglGenTextures(1, &framebufferobject.tex);
 		pglBindTexture(GL_TEXTURE_2D, framebufferobject.tex);
-		pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, screen_width, screen_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, screen_width, screen_height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 		Clamp2D(GL_TEXTURE_WRAP_S);
@@ -3300,13 +3306,18 @@ static void GL_FBO_Generate(void)
 			pglRenderbufferStorage(GL_RENDERBUFFER_EXT, GL_DEPTH24_STENCIL8, screen_width, screen_height);
 			pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
 		}
-		else if (supportFBO == FBO_EXT)
+		else if (supportFBO == FBO_EXT || supportFBO == FBO_EXT_STENCIL)
 		{
-			pglRenderbufferStorage(GL_RENDERBUFFER_EXT, GL_DEPTH_STENCIL_EXT, screen_width, screen_height);
-			// attach the renderbuffer to depth attachment point
+			pglRenderbufferStorage(GL_RENDERBUFFER_EXT, (supportFBO == FBO_EXT_STENCIL) ? GL_DEPTH_STENCIL_EXT : GL_DEPTH_COMPONENT, screen_width, screen_height);
+
+			// attach a renderbuffer to depth attachment point
 			pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
-			// attach the renderbuffer to stencil attachment point
-			pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
+
+			if (supportFBO == FBO_EXT_STENCIL)
+			{
+				// attach a renderbuffer to stencil attachment point
+				pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
+			}
 		}
 
 		// Clear the renderbuffer
@@ -3318,7 +3329,7 @@ static void GL_FBO_Generate(void)
 	if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT)
 	{
 		//pglGetError(); TODO:implement this or smth
-		GL_MSG_Error("GL_FBO_Generate: Failed to create Framebuffer Object");
+		GL_MSG_Error("GL_Framebuffer_Generate: Failed to create Framebuffer Object");
 
 		// if this fails, dont retry it a gazillion times
 		// this wouldnt recover
@@ -3333,7 +3344,7 @@ static void GL_FBO_Generate(void)
 	framebufferobject.init = true;
 }
 
-void GL_FBO_BindMainFrameBuffer(void)
+void GL_Framebuffer_Unbind(void)
 {
 	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
@@ -3342,22 +3353,22 @@ void GL_FBO_BindMainFrameBuffer(void)
 	pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
 }
 
-void GL_FBO_Enable(void)
+void GL_Framebuffer_Enable(void)
 {
-	if (supportFBO == FBO_NONE)
+	if (supportFBO == FBO_NONE || !UseScreenFBO())
 		return;
 
-	GL_FBO_Generate();
+	GL_Framebuffer_Generate();
 
 	// failed
-	if (!framebufferobject.init)
+	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
 
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
 	pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
 }
 
-void GL_FBO_Disable(void)
+void GL_Framebuffer_Disable(void)
 {
 	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
@@ -3370,7 +3381,7 @@ void GL_FBO_Disable(void)
 		pglDeleteFramebuffers(1, &framebufferobject.fboobj);
 	framebufferobject.fboobj = 0;
 
-	GL_FBO_DeleteAttachments();
+	GL_Framebuffer_DeleteAttachments();
 }
 #endif
 
@@ -3721,7 +3732,6 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8
 void GL_MakeScreenTexture(int tex)
 {
 	boolean firstTime;
-	static GLint lastfiltermode[NUMSCREENTEXTURES] = {-1, -1, -1, -1, -1};
 
 	if (!gl_enable_screen_textures)
 		return;
@@ -3734,29 +3744,16 @@ void GL_MakeScreenTexture(int tex)
 
 	pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
 
-	// if were downsampling, choose to do that with linear filter instead of nearest neighbor
-	// otherwise well get ugly mixels
-	GLint filtermode = I_IsDownsampling() ? GL_LINEAR : GL_NEAREST;
-
-	// avoid redundant calls to this, prob doesent really matter tbh
-	if (filtermode != lastfiltermode[tex] || firstTime)
-	{
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtermode);
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtermode);
-
-		lastfiltermode[tex] = filtermode;
-	}
-
 	if (firstTime)
 	{
+		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 		Clamp2D(GL_TEXTURE_WRAP_S);
 		Clamp2D(GL_TEXTURE_WRAP_T);
 		pglCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, screen_texsizew, screen_texsizeh, 0);
 	}
 	else
-	{
 		pglCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, screen_texsizew, screen_texsizeh);
-	}
 
 	tex_downloaded = screenTextures[tex];
 }

src/hardware/r_opengl/r_opengl.h

@@ -98,9 +98,9 @@ extern PFNglGetString pglGetString;
 #endif
 
 #ifdef USE_FBO_OGL
-void GL_FBO_BindMainFrameBuffer(void);
-void GL_FBO_Enable(void);
-void GL_FBO_Disable(void);
+void GL_Framebuffer_Unbind(void);
+void GL_Framebuffer_Enable(void);
+void GL_Framebuffer_Disable(void);
 extern int supportFBO;
 #endif
 

src/i_video.h

@@ -126,9 +126,11 @@ boolean I_CheckNativeRes(void);
 void I_SetBorderlessWindow(void);
 
 #ifdef USE_FBO_OGL
-void I_CheckDownSampleState(boolean forcerefresh);
-boolean I_IsDownsampling(void);
+
+void RefreshOGLSDLSurface(void);
+void I_DownSample(void);
 boolean UseScreenFBO(void);
+extern boolean downsample;
 #endif
 
 // So we can call this from i_video event loop

src/k_kart.c

@@ -1809,56 +1809,25 @@ void K_RespawnChecker(player_t *player)
 				mobj_t *mo;
 				angle_t newangle;
 				fixed_t newx, newy, newz;
-#ifdef PHOBOS_BUILD
-				const fixed_t fscale = player->mo->scale;
-#else
-				static const fixed_t fscale = FRACUNIT; // does NOT use scale, since this effect doesn't scale properly
-#endif
+
 				newangle = FixedAngle(((360/8)*i)*FRACUNIT);
-				newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31 * fscale);
-				newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * fscale);
+				newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31<<FRACBITS); // does NOT use scale, since this effect doesn't scale properly
+				newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31<<FRACBITS);
 				if (player->mo->eflags & MFE_VERTICALFLIP)
 					newz = player->mo->z + player->mo->height;
 				else
 					newz = player->mo->z;
 
 				mo = P_SpawnMobj(newx, newy, newz, MT_DEZLASER);
-				if (!P_MobjWasRemovedCompat(mo))
+				if (mo)
 				{
 					if (player->mo->eflags & MFE_VERTICALFLIP)
 						mo->eflags |= MFE_VERTICALFLIP;
 					P_SetTarget(&mo->target, player->mo);
 					mo->angle = newangle+ANGLE_90;
-					mo->momz = (8 * fscale) * P_MobjFlip(player->mo);
-					P_SetScale(mo, (mo->destscale = fscale));
+					mo->momz = (8<<FRACBITS) * P_MobjFlip(player->mo);
+					P_SetScale(mo, (mo->destscale = FRACUNIT));
 				}
-#ifndef PHOBOS_BUILD
-				// vanilla compat really is annoying.......
-				// but this stuff is messed up on mobjscaled maps
-				// and we gotta respawn it locally to avoid desynchs...
-				if (mapobjectscale != FRACUNIT)
-				{
-					// hide the normal lazers!
-					mo->flags2 |= MF2_DONTDRAW;
-
-					newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31 * player->mo->scale);
-					newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * player->mo->scale);
-
-					// now spawn our local lazers
-					mo = P_SpawnMobj(newx, newy, newz, MT_DEZLASER);
-					if (!P_MobjWasRemovedCompat(mo))
-					{
-						if (player->mo->eflags & MFE_VERTICALFLIP)
-							mo->eflags |= MFE_VERTICALFLIP;
-						P_SetTarget(&mo->target, player->mo);
-						mo->angle = newangle+ANGLE_90;
-						mo->momz = (8 * player->mo->scale) * P_MobjFlip(player->mo);
-						P_SetScale(mo, (mo->destscale = player->mo->scale));
-
-						mo->islocal = true; // Keep this local!
-					}
-				}
-#endif
 			}
 		}
 	}
@@ -3236,8 +3205,10 @@ static void K_SpawnDriftSparks(player_t *player)
 
 	for (i = 0; i < 2; i++)
 	{
-		const angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135);
-		const fixed_t smolscale = FixedMul(32*FRACUNIT, player->mo->scale);
+		fixed_t driftExtraScale = 0;
+
+		angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135);
+		fixed_t smolscale = FixedMul(32*FRACUNIT, player->mo->scale);
 
 		newx = player->mo->x + P_ReturnThrustX(player->mo, thrustangle, smolscale);
 		newy = player->mo->y + P_ReturnThrustY(player->mo, thrustangle, smolscale);
@@ -3249,9 +3220,9 @@ static void K_SpawnDriftSparks(player_t *player)
 		spark->angle = travelangle-(ANGLE_45/5)*player->kartstuff[k_drift];
 
 		// scale increase while driftspark level gained timer is running
-		const fixed_t driftExtraScale = FixedDiv(player->driftsparkGrowTimer, DRIFTSPARKGROWTICS);
+		driftExtraScale = FixedDiv(player->driftsparkGrowTimer, DRIFTSPARKGROWTICS);
 		spark->destscale = FixedMul(player->mo->scale, FRACUNIT + FixedMul(driftExtraScale, cv_driftsparkpulse.value));
-		P_SetScale(spark, spark->destscale);
+		P_SetScale(spark, spark->destscale); // why not use what we calculated above?
 
 		spark->momx = player->mo->momx/2;
 		spark->momy = player->mo->momy/2;
@@ -3343,10 +3314,10 @@ static void K_StretchPlayerGravity(player_t *player)
 
 	mobj_t *pmo = player->mo;
 
-	const fixed_t tempxscale = pmo->realxscale;
-	const fixed_t tempyscale = pmo->realyscale;
+	fixed_t tempxscale = pmo->realxscale;
+	fixed_t tempyscale = pmo->realyscale;
 
-	stretchScaleFactor = FixedDiv(mapobjectscale*60, cv_gravstretch.value);
+	stretchScaleFactor = FixedDiv(FRACUNIT*60, cv_gravstretch.value);
 	stretchScaleFactor = min(stretchScaleFactor, MAXSTRETCHDIV);
 
 	if (pmo->slamsoundtimer)
@@ -3354,26 +3325,26 @@ static void K_StretchPlayerGravity(player_t *player)
 
 	if (!P_IsObjectOnGround(pmo))
 	{
-		const fixed_t pzmom = abs(pmo->momz);
+		fixed_t pzmom = abs(pmo->momz);
 		const fixed_t stretchDiv = FixedDiv(pzmom, stretchScaleFactor);
 
-		if (abs(pzmom/mapobjectscale) != 0)
+		if (abs(pzmom/FRACUNIT) != 0)
 		{
-			if ((tempxscale - stretchDiv) > (tempxscale / 5))
+			if (((tempxscale-(stretchDiv))) > (tempxscale/5))
 			{
 				pmo->spritexscale = (tempxscale - stretchDiv);
 				pmo->stretchslam = pzmom;
 			}
 			else
-				pmo->spritexscale = (tempxscale / 5);
+				pmo->spritexscale = (tempxscale/5);
 
-			pmo->spriteyscale = (tempyscale + ((stretchDiv * 2) / 3));
+			pmo->spriteyscale = (tempyscale + ((stretchDiv*2)/3));
 		}
 	}
 	else if (pmo->stretchslam > 0)
 	{
 		// Funni slam sound when landing
-		if (cv_slamsound.value && (pmo->eflags & MFE_JUSTHITFLOOR) && !pmo->slamsoundtimer && (pmo->stretchslam > 4*mapobjectscale))
+		if (cv_slamsound.value && (pmo->eflags & MFE_JUSTHITFLOOR) && !pmo->slamsoundtimer && (pmo->stretchslam > 4*FRACUNIT))
 		{
 			S_StartSound(pmo, sfx_s3k4c);
 			pmo->slamsoundtimer = TICRATE;
@@ -3381,9 +3352,9 @@ static void K_StretchPlayerGravity(player_t *player)
 
 		const fixed_t slamDiv = FixedDiv(pmo->stretchslam, stretchScaleFactor);
 
-		pmo->spritexscale = (tempxscale + (((slamDiv * 2) / 3 ) * 2));
+		pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2));
 		pmo->spriteyscale = (tempyscale - slamDiv);
-		pmo->stretchslam -= (4*mapobjectscale);
+		pmo->stretchslam -= (4*FRACUNIT);
 	}
 	else
 		pmo->stretchslam = 0;
@@ -3398,16 +3369,16 @@ static void K_SaltySquish(player_t *player)
 
 	mobj_t *pmo = player->mo;
 
-	const fixed_t tempxscale = pmo->realxscale;
-	const fixed_t tempyscale = pmo->realyscale;
+	fixed_t tempxscale = pmo->realxscale;
+	fixed_t tempyscale = pmo->realyscale;
 
 	if (pmo->stretchslam > 0)
 	{
-		const fixed_t slamDiv = FixedDiv(pmo->stretchslam, mapobjectscale*60); // stretchScaleFactor = FixedDiv(mapobjectscale*60, FRACUNIT)
+		const fixed_t slamDiv = FixedDiv(pmo->stretchslam, FRACUNIT*60); // stretchScaleFactor = FixedDiv(FRACUNIT*60, FRACUNIT)
 
-		pmo->spritexscale = (tempxscale + (((slamDiv * 2) / 3) * 2));
+		pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2));
 		pmo->spriteyscale = (tempyscale - slamDiv);
-		pmo->stretchslam -= (4*mapobjectscale);
+		pmo->stretchslam -= (4*FRACUNIT);
 	}
 	else
 		pmo->stretchslam = 0;
@@ -3476,7 +3447,7 @@ static void K_QuiteSaltyHop(player_t *player)
 			psalty->momz = 0;
 			// shlamma damma
 			if (cv_saltysquish.value)
-				pmo->stretchslam += 8*mapobjectscale;
+				pmo->stretchslam += 8*FRACUNIT;
 		}
 		else if (psalty->zoffset > 0)
 		{
@@ -3739,7 +3710,7 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
 	dust = P_SpawnMobj(rand_x, rand_y, mo->z, MT_WIPEOUTTRAIL);
 
 	P_SetTarget(&dust->target, mo);
-	dust->angle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
+	dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy);
 	dust->destscale = mo->scale;
 	P_SetScale(dust, mo->scale);
 	K_FlipFromObject(dust, mo);
@@ -3765,11 +3736,6 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
 void K_DriftDustHandling(mobj_t *spawner)
 {
 	angle_t anglediff;
-#ifdef PHOBOS_BUILD
-	const fixed_t fscale = spawner->scale;
-#else
-	static const fixed_t fscale = FRACUNIT; // should be spawner->scale but the below calls P_Random!
-#endif
 
 	if (leveltime % 2 != 0 || !P_IsObjectOnGround(spawner))
 		return;
@@ -3786,7 +3752,7 @@ void K_DriftDustHandling(mobj_t *spawner)
 		{
 			angle_t playerangle = spawner->angle;
 
-			if (spawner->player->speed < (5 * fscale))
+			if (spawner->player->speed < 5<<FRACBITS)
 				return;
 
 			if (spawner->player->cmd.forwardmove < 0)
@@ -3797,7 +3763,7 @@ void K_DriftDustHandling(mobj_t *spawner)
 	}
 	else
 	{
-		if (P_AproxDistance(spawner->momx, spawner->momy) < (5 * fscale))
+		if (P_AproxDistance(spawner->momx, spawner->momy) < 5<<FRACBITS)
 			return;
 
 		anglediff = abs((signed)(spawner->angle - R_PointToAngle2(0, 0, spawner->momx, spawner->momy)));
@@ -3810,29 +3776,13 @@ void K_DriftDustHandling(mobj_t *spawner)
 
 	if (anglediff > ANG10*4) // Trying to turn further than 40 degrees
 	{
-		mobj_t *dust = NULL;
-
 		fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
 		fixed_t spawny = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
 		INT32 speedrange = 2;
-
-		dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST);
-
-		const INT32 momxrand = P_RandomRange(-speedrange, speedrange);
-		const INT32 momyrand = P_RandomRange(-speedrange, speedrange);
-		const INT32 momzrand = P_RandomRange(1, 4);
-
-		if (P_MobjWasRemovedCompat(dust))
-			return;
-
-#ifdef PHOBOS_BUILD
-		dust->momx = FixedMul(spawner->momx + (momxrand * spawner->scale), 3*FRACUNIT/4);
-		dust->momy = FixedMul(spawner->momy + (momyrand * spawner->scale), 3*FRACUNIT/4);
-#else
-		dust->momx = FixedMul(spawner->momx + (momxrand<<FRACBITS), 3*(spawner->scale)/4);
-		dust->momy = FixedMul(spawner->momy + (momyrand<<FRACBITS), 3*(spawner->scale)/4);
-#endif
-		dust->momz = P_MobjFlip(spawner) * (momzrand * (spawner->scale));
+		mobj_t *dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST);
+		dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*(spawner->scale)/4);
+		dust->momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*(spawner->scale)/4);
+		dust->momz = P_MobjFlip(spawner) * (P_RandomRange(1, 4) * (spawner->scale));
 		P_SetScale(dust, spawner->scale/2);
 		dust->destscale = spawner->scale * 3;
 		dust->scalespeed = spawner->scale/12;
@@ -3841,33 +3791,6 @@ void K_DriftDustHandling(mobj_t *spawner)
 			S_StartSound(spawner, sfx_screec);
 
 		K_MatchGenericExtraFlags(dust, spawner);
-
-#ifndef PHOBOS_BUILD
-		// vanilla compat really is annoying.......
-		// but this stuff is messed up on mobjscaled maps
-		// and we gotta respawn it locally to avoid desynchs...
-		if (mapobjectscale != FRACUNIT)
-		{
-			// hide the normal dust!
-			dust->flags2 |= MF2_DONTDRAW;
-
-			// now spawn our dust locally
-			dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST);
-
-			if (P_MobjWasRemovedCompat(dust))
-				return;
-
-			dust->momx = FixedMul(spawner->momx + (momxrand * spawner->scale), 3*FRACUNIT/4);
-			dust->momy = FixedMul(spawner->momy + (momyrand * spawner->scale), 3*FRACUNIT/4);
-			dust->momz = P_MobjFlip(spawner) * (momzrand * (spawner->scale));
-			P_SetScale(dust, spawner->scale/2);
-			dust->destscale = spawner->scale * 3;
-			dust->scalespeed = spawner->scale/12;
-			dust->islocal = true; // Keep this local!
-
-			K_MatchGenericExtraFlags(dust, spawner);
-		}
-#endif
 	}
 }
 
@@ -4462,7 +4385,8 @@ void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source)
 	mobj_t *cachenext;
 
 killnext:
-	if (P_MobjWasRemovedCompat(banana))
+
+	if (!banana)
 		return;
 
 	cachenext = banana->hnext;
@@ -4501,21 +4425,10 @@ void K_UpdateHnextList(player_t *player, boolean clean)
 		nextwork = work->hnext;
 
 		if (!clean && (!work->movedir || work->movedir <= (UINT16)player->kartstuff[k_itemamount]))
-		{
 			continue;
-		}
 
 		P_RemoveMobj(work);
 	}
-
-#ifdef PHOBOS_BUILD
-	if (P_MobjWasRemoved(player->mo->hnext))
-	{
-		// Like below, try to clean up the pointer if it's NULL.
-		// Maybe this was a cause of the shrink/eggbox fails?
-		P_SetTarget(&player->mo->hnext, NULL);
-	}
-#endif
 }
 
 // For getting hit!
@@ -4580,9 +4493,7 @@ void K_DropHnextList(player_t *player)
 		}
 
 		dropwork = P_SpawnMobj(work->x, work->y, work->z, type);
-
 		P_SetTarget(&dropwork->target, player->mo);
-
 		dropwork->angle = work->angle;
 		dropwork->flags2 = work->flags2;
 		dropwork->flags |= MF_NOCLIPTHING;
@@ -4650,13 +4561,10 @@ void K_DropHnextList(player_t *player)
 
 	// we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic...
 	P_SetTarget(&player->mo->hnext, NULL);
-
 	player->kartstuff[k_bananadrag] = 0;
 
 	if (player->kartstuff[k_eggmanheld])
-	{
 		player->kartstuff[k_eggmanheld] = 0;
-	}
 	else if (player->kartstuff[k_itemheld]
 		&& (dropall || (--player->kartstuff[k_itemamount] <= 0)))
 	{
@@ -4957,9 +4865,7 @@ static void K_MoveHeldObjects(player_t *player)
 		player->kartstuff[k_bananadrag] = 0;
 
 		if (player->kartstuff[k_eggmanheld])
-		{
 			player->kartstuff[k_eggmanheld] = 0;
-		}
 		else if (player->kartstuff[k_itemheld])
 		{
 			player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
@@ -4976,9 +4882,7 @@ static void K_MoveHeldObjects(player_t *player)
 		player->kartstuff[k_bananadrag] = 0;
 
 		if (player->kartstuff[k_eggmanheld])
-		{
 			player->kartstuff[k_eggmanheld] = 0;
-		}
 		else if (player->kartstuff[k_itemheld])
 		{
 			player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;

src/lua_consolelib.c

@@ -182,19 +182,14 @@ void COM_Lua_f(void)
 			len = (argc+1)*256;
 
 		buf = malloc(len);
-		if (buf == NULL)
-			I_Error("Failed to allocate buffer for COM_Lua_f");
-
 		p = buf;
 		WRITEUINT8(p, argc);
 		for (i = 0; i < argc; i++)
 			WRITESTRINGN(p, COM_Argv(i), 255);
-
-		if (flags & COM_SPLITSCREEN)
+		if (flags & 2)
 			SendNetXCmdForPlayer(1, XD_LUACMD, buf, p-buf);
 		else
 			SendNetXCmd(XD_LUACMD, buf, p-buf);
-
 		free(buf);
 		return;
 	}

src/lua_maplib.c

@@ -18,6 +18,7 @@
 #include "p_slopes.h"
 #include "r_main.h"
 
+#include "lua_udatalib.h"
 #include "lua_script.h"
 #include "lua_libs.h"
 #include "lua_hud.h" // hud_running errors
@@ -255,6 +256,15 @@ static const char *const vector_opt[] = {
 static const char *const array_opt[] ={"iterate",NULL};
 static const char *const valid_opt[] ={"valid",NULL};
 
+#define pushsubsector(L, subsector) LUA_PushUserdata(L, subsector, META_SUBSECTOR)
+int udatalib_getter_subsector(lua_State *L)
+UDATALIB_SIMPLE_GETTER(subsector_t*, pushsubsector)
+#undef pushsubsector
+
+#define pushslope(L, slope) LUA_PushUserdata(L, slope, META_SLOPE)
+int udatalib_getter_slope(lua_State *L)
+UDATALIB_SIMPLE_GETTER(pslope_t*, pushslope)
+#undef pushslope
 // iterates through a sector's thinglist!
 static int lib_iterateSectorThinglist(lua_State *L)
 {

src/lua_script.c

@@ -62,6 +62,14 @@ static lua_CFunction liblist[] = {
 	NULL
 };
 
+// Lua asks for memory using this.
+static void *LUA_Alloc(void *ud, void *ptr, size_t osize, size_t nsize)
+{
+	(void)ud;
+	(void)osize;
+	return Z_Realloc(ptr, nsize, PU_LUA, NULL);
+}
+
 // Panic function Lua calls when there's an unprotected error.
 // This function cannot return. Lua would kill the application anyway if it did.
 FUNCNORETURN static int LUA_Panic(lua_State *L)
@@ -189,7 +197,7 @@ void LUA_ClearState(void)
 	CONS_Printf(M_GetText("Pardon me while I initialize the Lua scripting interface...\n"));
 
 	// allocate state
-	L = luaL_newstate();
+	L = lua_newstate(LUA_Alloc, NULL);
 	lua_atpanic(L, LUA_Panic);
 
 	// open base libraries
@@ -365,7 +373,7 @@ void LUA_DumpFile(const char *filename)
 
 static void createMathLibState(void)
 {
-	mL = luaL_newstate();
+	mL = lua_newstate(LUA_Alloc, NULL);
 	lua_atpanic(mL, LUA_Panic);
 
 	// open only enum lib
@@ -1457,16 +1465,3 @@ int Lua_CreateFieldTable(lua_State *L, const char *const lst[])
 
 	return luaL_ref(L, LUA_REGISTRYINDEX);
 }
-
-size_t LUA_MemoryUsage(void)
-{
-	size_t usage = 0;
-
-	if (gL)
-		usage += lua_gc(gL, LUA_GCCOUNT, 0);
-
-	if (mL)
-		usage += lua_gc(mL, LUA_GCCOUNT, 0);
-
-	return usage;
-}

src/lua_script.h

@@ -82,9 +82,6 @@ int Lua_optoption(lua_State *L, int narg, int def, int list_ref);
 int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
 void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save);
 
-// Returns lua memory usage in kbytes
-size_t LUA_MemoryUsage(void);
-
 // Console wrapper
 void COM_Lua_f(void);
 

src/lua_udatalib.c

@@ -0,0 +1,137 @@
+// SONIC ROBO BLAST 2 KART SATURN
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by Indev.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  lua_udatalib.c
+/// \brief Implementation of lua userdata object metatables based on getter/setter functions
+
+#include "doomtype.h"
+#include "m_fixed.h"
+#include "lua_udatalib.h"
+
+// Getters
+int udatalib_getter_fixed(lua_State *L)
+UDATALIB_SIMPLE_GETTER(fixed_t, lua_pushinteger)
+
+int udatalib_getter_angle(lua_State *L)
+UDATALIB_SIMPLE_GETTER(angle_t, lua_pushangle)
+
+int udatalib_getter_uint8(lua_State *L)
+UDATALIB_SIMPLE_GETTER(UINT8, lua_pushinteger)
+
+int udatalib_getter_sint8(lua_State *L)
+UDATALIB_SIMPLE_GETTER(SINT8, lua_pushinteger)
+
+int udatalib_getter_uint16(lua_State *L)
+UDATALIB_SIMPLE_GETTER(UINT16, lua_pushinteger)
+
+int udatalib_getter_int16(lua_State *L)
+UDATALIB_SIMPLE_GETTER(INT16, lua_pushinteger)
+
+int udatalib_getter_uint32(lua_State *L)
+UDATALIB_SIMPLE_GETTER(UINT32, lua_pushinteger)
+
+int udatalib_getter_int32(lua_State *L)
+UDATALIB_SIMPLE_GETTER(INT32, lua_pushinteger)
+
+int udatalib_getter_uint64(lua_State *L)
+UDATALIB_SIMPLE_GETTER(UINT64, lua_pushinteger)
+
+int udatalib_getter_int64(lua_State *L)
+UDATALIB_SIMPLE_GETTER(INT64, lua_pushinteger)
+
+int udatalib_getter_string(lua_State *L)
+UDATALIB_SIMPLE_GETTER(const char*, lua_pushstring)
+
+int udatalib_getter_boolean(lua_State *L)
+UDATALIB_SIMPLE_GETTER(boolean, lua_pushboolean)
+
+int udatalib_getter_spritenum(lua_State *L)
+UDATALIB_SIMPLE_GETTER(spritenum_t, lua_pushinteger)
+
+int udatalib_getter_tic(lua_State *L)
+UDATALIB_SIMPLE_GETTER(tic_t, lua_pushinteger)
+
+// Setters
+int udatalib_setter_fixed(lua_State *L)
+UDATALIB_SIMPLE_SETTER(fixed_t, luaL_checkfixed)
+
+int udatalib_setter_angle(lua_State *L)
+UDATALIB_SIMPLE_SETTER(angle_t, luaL_checkangle)
+
+int udatalib_setter_uint8(lua_State *L)
+UDATALIB_SIMPLE_SETTER(UINT8, (UINT8)luaL_checkinteger)
+
+int udatalib_setter_sint8(lua_State *L)
+UDATALIB_SIMPLE_SETTER(SINT8, luaL_checkinteger)
+
+int udatalib_setter_uint16(lua_State *L)
+UDATALIB_SIMPLE_SETTER(UINT16, (UINT16)luaL_checkinteger)
+
+int udatalib_setter_int16(lua_State *L)
+UDATALIB_SIMPLE_SETTER(INT16, luaL_checkinteger)
+
+int udatalib_setter_uint32(lua_State *L)
+UDATALIB_SIMPLE_SETTER(UINT32, (UINT32)luaL_checkinteger)
+
+int udatalib_setter_int32(lua_State *L)
+UDATALIB_SIMPLE_SETTER(INT32, luaL_checkinteger)
+
+int udatalib_setter_uint64(lua_State *L)
+UDATALIB_SIMPLE_SETTER(UINT64, (UINT64)luaL_checkinteger)
+
+int udatalib_setter_int64(lua_State *L)
+UDATALIB_SIMPLE_SETTER(INT64, luaL_checkinteger)
+
+int udatalib_setter_string(lua_State *L)
+UDATALIB_SIMPLE_SETTER(const char*, luaL_checkstring)
+
+int udatalib_setter_boolean(lua_State *L)
+UDATALIB_SIMPLE_SETTER(boolean, luaL_checkboolean)
+
+// ffs
+int udatalib_setter_boolean_nocheck(lua_State *L)
+UDATALIB_SIMPLE_SETTER(boolean, lua_toboolean)
+
+int udatalib_setter_spritenum(lua_State *L)
+UDATALIB_SIMPLE_SETTER(spritenum_t, luaL_checkinteger)
+
+int udatalib_setter_tic(lua_State *L)
+UDATALIB_SIMPLE_SETTER(tic_t, (tic_t)luaL_checkinteger)
+
+
+void udatalib_addfield(lua_State *L, int mt, udata_field_t field)
+{
+    int idx = abs_index(L, mt);
+
+    lua_createtable(L, 2, 0); // Push table
+
+    lua_pushinteger(L, field.offset); // Push offset
+    lua_pushcclosure(L, field.getter, 1); // Pop offset, push closure
+
+    lua_rawseti(L, -2, UDATALIB_GETTER); // Pop closure, add to table
+
+    lua_pushinteger(L, field.offset); // Push offset
+    lua_pushcclosure(L, field.setter, 1); // Pop offset, push closure
+
+    lua_rawseti(L, -2, UDATALIB_SETTER); // Pop closure, add to table
+
+    lua_pushstring(L, field.name); // Push field name
+    lua_pushvalue(L, -2); // Copy table
+    lua_rawset(L, idx); // Pop field name and table, add to metatable
+
+    lua_pop(L, 1); // Pop field table
+}
+
+void udatalib_addfields(lua_State *L, int mt, const udata_field_t fields[])
+{
+    for (unsigned i = 0; fields[i].name != NULL; ++i)
+    {
+        udatalib_addfield(L, mt, fields[i]);
+        //CONS_Printf("Add field name=%s, offset=%d, getter=%p, setter=%p\n", fields[i].name, fields[i].offset, fields[i].getter, fields[i].setter);
+    }
+}

src/lua_udatalib.h

@@ -0,0 +1,114 @@
+// SONIC ROBO BLAST 2 KART SATURN
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by Indev.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  lua_udatalib.h
+/// \brief Implementation of lua userdata object metatables based on getter/setter functions
+
+#ifndef __LUA_UDATALIB_H__
+#define __LUA_UDATALIB_H__
+
+#include "doomdef.h"
+#include "lua_script.h"
+#include "lua_libs.h"
+#include "fastcmp.h"
+
+// Indices in getter/setter tables for fields
+#define UDATALIB_GETTER 1
+#define UDATALIB_SETTER 2
+
+typedef struct udata_field_s {
+    const char *name;
+    size_t offset;
+    lua_CFunction getter;
+    lua_CFunction setter;
+} udata_field_t;
+
+// Simple setters and getters, for situations where getter is simply
+// "return obj.field" and setter is "obj.field = value"
+int udatalib_getter_fixed(lua_State *L);
+int udatalib_getter_angle(lua_State *L);
+int udatalib_getter_uint8(lua_State *L);
+int udatalib_getter_sint8(lua_State *L);
+int udatalib_getter_uint16(lua_State *L);
+int udatalib_getter_int16(lua_State *L);
+int udatalib_getter_uint32(lua_State *L);
+int udatalib_getter_int32(lua_State *L);
+int udatalib_getter_uint64(lua_State *L);
+int udatalib_getter_int64(lua_State *L);
+int udatalib_getter_string(lua_State *L);
+int udatalib_getter_boolean(lua_State *L);
+int udatalib_getter_spritenum(lua_State *L);
+int udatalib_getter_mobj(lua_State *L);
+int udatalib_getter_subsector(lua_State *L);
+int udatalib_getter_mobjtype(lua_State *L);
+int udatalib_getter_player(lua_State *L);
+int udatalib_getter_mapthing(lua_State *L);
+int udatalib_getter_slope(lua_State *L);
+int udatalib_getter_cmd(lua_State *L);
+int udatalib_getter_playerstate(lua_State *L);
+int udatalib_getter_powers(lua_State *L);
+int udatalib_getter_kartstuff(lua_State *L);
+int udatalib_getter_pflags(lua_State *L);
+int udatalib_getter_panim(lua_State *L);
+int udatalib_getter_tic(lua_State *L);
+
+int udatalib_setter_fixed(lua_State *L);
+int udatalib_setter_angle(lua_State *L);
+int udatalib_setter_uint8(lua_State *L);
+int udatalib_setter_sint8(lua_State *L);
+int udatalib_setter_uint16(lua_State *L);
+int udatalib_setter_int16(lua_State *L);
+int udatalib_setter_uint32(lua_State *L);
+int udatalib_setter_int32(lua_State *L);
+int udatalib_setter_uint64(lua_State *L);
+int udatalib_setter_int64(lua_State *L);
+int udatalib_setter_string(lua_State *L);
+int udatalib_setter_boolean(lua_State *L);
+int udatalib_setter_boolean_nocheck(lua_State *L);
+int udatalib_setter_spritenum(lua_State *L);
+int udatalib_setter_mobj(lua_State *L);
+int udatalib_setter_playerstate(lua_State *L);
+int udatalib_setter_pflags(lua_State *L);
+int udatalib_setter_panim(lua_State *L);
+int udatalib_setter_tic(lua_State *L);
+
+// Adds setter and getter for field and stores it as field.name..".get" and
+// field.name..".set" in table at index mt. (metatable, usually)
+void udatalib_addfield(lua_State *L, int mt, udata_field_t field);
+
+// Convinience function to add array of fields at once.
+void udatalib_addfields(lua_State *L, int mt, const udata_field_t fields[]);
+
+// I miss C++ template functons :(
+
+// Get pointer to field value within getter or setter
+#define UDATALIB_GETFIELD(type, field) \
+{ \
+    size_t offset = lua_tointeger(L, lua_upvalueindex(1)); \
+    field = (type*)((uint8_t*)lua_touserdata(L, 1) + offset); \
+}
+
+// Creates implementation for simple getter and setter. Super lazy, yes.
+// Assumes userdata is a pointer to actual data. Maybe not really safe.
+#define UDATALIB_SIMPLE_GETTER(type, pushf) \
+{ \
+    type *field; \
+    UDATALIB_GETFIELD(type, field) \
+    pushf(L, *field); \
+    return 1; \
+}
+
+#define UDATALIB_SIMPLE_SETTER(type, checkf) \
+{ \
+    type *field; \
+    UDATALIB_GETFIELD(type, field) \
+    *field = checkf(L, 2); \
+    return 0; \
+}
+
+#endif

src/m_argv.c

@@ -13,12 +13,6 @@
 
 #include <string.h>
 
-#ifdef HAVE_THREADS
-#define local_for_thread _Thread_local
-#else
-#define local_for_thread
-#endif
-
 #include "doomdef.h"
 #include "command.h"
 #include "m_argv.h"
@@ -37,11 +31,8 @@ char **myargv = NULL;
 boolean myargmalloc = false;
 
 /**	\brief founded the parm
- *
- * thread_local because it can potentially be used from multiple threads (global variables aaaaaa)
- * (myargc and myargv don't have to be thread_local because they are never modified after being set up)
 */
-static local_for_thread INT32 found;
+static INT32 found;
 
 
 /**	\brief	The M_CheckParm function
@@ -100,7 +91,7 @@ INT32 M_CheckProtoParam(const char *check)
 const char *M_GetProtoParam(void)
 {
 	INT32 i;
-	char *string;
+	static char *string;
 
 	for (i = 1; i < myargc; i++)
 	{

src/m_cheat.c

@@ -100,7 +100,7 @@ static UINT8 cheatf_devmode(void)
 	if (menuactive && currentMenu != &MainDef)
 		return 0; // Only on the main menu!
 
-	S_StartSound(0, sfx_itemup);
+	S_StartSound(NULL, sfx_itemup);
 
 	// Just unlock all the things and turn on -debug and console devmode.
 	G_SetGameModified(false, false); // might need to revist the latter later

src/m_menu.c

@@ -3984,14 +3984,6 @@ menudemo_t *demolist = NULL; // Replays that that have been checked to match wit
 menudemo_t *demolist_all = NULL; // All replays
 size_t demolist_all_size = 0;
 boolean replaynamesloaded = false;
-// Whenever we start a replay load thread, we increment this number and then thread will remember current value,
-// and by the end it will compare it with current value, and if it is equal it means thread can store data it has loaded.
-// If it's not equal, that means we started more than one thread (left and re-entered menu for example)
-size_t replaythreadnum = 0;
-
-// for replay dates
-#include <locale.h>
-const char *demodateformat = "%d.%m.%Y";
 
 #ifdef HAVE_THREADS
 I_mutex replayquerymutex;
@@ -4021,15 +4013,12 @@ static SINT8 replayScrollDelay = TICRATE, replayScrollDir = 1;
 
 static void ReplayNamesLoadThread(void* userdata)
 {
-	(void)userdata;
-
 	Lock_search_state();
 
 	size_t demolist_all_size_local = demolist_all_size;
 	menudemo_t *demolist_all_local = (menudemo_t*)malloc(sizeof(menudemo_t)*demolist_all_size_local);
 	memcpy(demolist_all_local, demolist_all, sizeof(menudemo_t)*demolist_all_size_local);
-	size_t localreplaythreadnum = replaythreadnum;
-	const char *localdemodateformat = demodateformat;
+	char *replaydirpath = (char*)userdata;
 
 	Unlock_search_state();
 
@@ -4037,13 +4026,19 @@ static void ReplayNamesLoadThread(void* userdata)
 	{
 		if (demolist_all_local[i].type != MD_SUBDIR)
 		{
-			G_LoadDemoTitle(&demolist_all_local[i], localdemodateformat);
+			G_LoadDemoTitle(&demolist_all_local[i]);
+
+			// this is fucking horrid, but i wanna be able to search for dates
+			/*if (demolist_all_local[i].date[0] != '\0')
+			{
+				snprintf(demolist_all_local[i].title, sizeof(demolist_all_local[i].title), "%s %s", demolist_all_local[i].title, demolist_all_local[i].date);
+			}*/
 		}
 	}
 
 	Lock_search_state();
 
-	if (replaythreadnum == localreplaythreadnum && demolist_all)
+	if (fastcmp(menupath, replaydirpath) && demolist_all)
 	{
 		memcpy(demolist_all, demolist_all_local, sizeof(menudemo_t)*demolist_all_size);
 		replaynamesloaded = true;
@@ -4052,32 +4047,22 @@ static void ReplayNamesLoadThread(void* userdata)
 	Unlock_search_state();
 
 	// Was allocated before thread start, we need to free it
+	free(replaydirpath);
 	free(demolist_all_local);
 }
 
 static void LoadReplayNames(void)
 {
+	char *replaydirpath = strdup(menupath);
+
 	Lock_search_state();
-	replaythreadnum++;
 	replaynamesloaded = false;
-	if (cv_demodateformat.value == 2)
-		demodateformat = "%m.%d.%Y";
-	else if (cv_demodateformat.value == 1)
-		demodateformat = "%d.%m.%Y";
-	else
-	{
-		// get the date format here
-		// setlocale reads/writes global state
-		const char *locale = setlocale(LC_TIME, NULL);
-		// US ppl are special (:
-		demodateformat = (locale && strstr(locale, "en_US")) ? "%m.%d.%Y" : "%d.%m.%Y";
-	}
 	Unlock_search_state();
 
 #ifdef HAVE_THREADS
-	I_spawn_thread("replay-names-load", ReplayNamesLoadThread, NULL);
+	I_spawn_thread("replay-names-load", ReplayNamesLoadThread, replaydirpath);
 #else
-	ReplayNamesLoadThread(NULL);
+	ReplayNamesLoadThread(replaydirpath);
 #endif
 }
 
@@ -4116,12 +4101,8 @@ static void M_HutCheckReplays(size_t maxnum)
 		// Mark as done
 		replayqueryfound = replayquerycheck = sizedirmenu;
 
-		Lock_search_state();
-
 		memcpy(demolist, demolist_all, sizeof(menudemo_t) * sizedirmenu);
 
-		Unlock_search_state();
-
 		return;
 	}
 
@@ -4270,15 +4251,13 @@ static boolean M_HandleReplayHutQuery(INT32 choice)
 	char tmp[MAXREPLAYQUERY+1];
 	memcpy(tmp, replayqueryinput_buffer, MAXREPLAYQUERY+1);
 
-	// Honestly not sure if locks for replaynamesloaded are necessary...
-	// Thread sanitizer does report race condition whenever replaynamesloaded is accessed without lock
-	// but really it is only ever set to false in main thread and only set to true in replay load thread,
-	// and both are done via locks. If replaynamesloaded is true, it is never gonna suddenly switch from true to false
-	// while we're in main thread, and if it would switch from false to true it is not really a big deal, we will just skip
-	// 1 frame where replay names were loaded
-
+	Lock_search_state();
 	if (!replaynamesloaded)
+	{
+		Unlock_search_state();
 		return false;
+	}
+	Unlock_search_state();
 
 	if (M_TextInputHandle(&replayqueryinput, choice))
 	{

src/p_inter.c

@@ -107,9 +107,6 @@ void P_DoNightsScore(player_t *player)
 
 	dummymo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z+player->mo->height/2, MT_NIGHTSCORE);
 
-	if (P_MobjWasRemovedCompat(dummymo))
-		return;
-
 	if (player->bot)
 		player = &players[consoleplayer];
 
@@ -2016,7 +2013,7 @@ static inline void P_NiGHTSDamage(mobj_t *target, mobj_t *source)
 	}
 }
 
-static boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
+static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
 {
 	player_t *player = target->player;
 	(void)damage; //unused parm

src/p_map.c

@@ -2026,7 +2026,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 
 	mapcampointer = thiscam;
 
-	if (newsec->flags & SF_NOCLIPCAMERA)
+	if (UNLIKELY(GETSECSPECIAL(newsec->special, 4) == 12))
 	{ // Camera noclip on entire sector.
 		tmfloorz = tmdropoffz = thiscam->z;
 		tmceilingz = tmdrpoffceilz = thiscam->z + thiscam->height;
@@ -2068,7 +2068,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 			fixed_t topheight, bottomheight, midheight;
 
 			if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL)
-			   || rover->master->frontsector->flags & SF_NOCLIPCAMERA)
+			   || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 				continue;
 
 			topheight    = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL);
@@ -2144,7 +2144,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 						// We're inside it! Yess...
 						polysec = po->lines[0]->backsector;
 
-						if (polysec->flags & SF_NOCLIPCAMERA)
+						if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
 						{ // Camera noclip polyobj.
 							plink = (polymaplink_t *)(plink->link.next);
 							continue;

src/p_maputl.cpp

@@ -328,7 +328,7 @@ void P_CameraLineOpening(line_t *linedef)
 			{
 				fixed_t topheight, bottomheight, midheight;
 
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
@@ -358,7 +358,7 @@ void P_CameraLineOpening(line_t *linedef)
 			{
 				fixed_t topheight, bottomheight, midheight;
 
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);

src/p_mobj.h

@@ -258,10 +258,12 @@ typedef enum
 // PRECIPITATION flags ?! ?! ?!
 //
 typedef enum {
-	PCF_INVISIBLE = 1,    // Don't draw.
+	PCF_INVISIBLE = 1, // Don't draw.
 	PCF_PIT       = 1<<1, // Above pit.
-	PCF_SPLASH    = 1<<2, // Splashed on the ground, return to the ceiling after the animation's over
-	PCF_THUNK     = 1<<3, // Ran the thinker this tic.
+	PCF_FOF       = 1<<2, // Above FOF.
+	PCF_MOVINGFOF = 1<<3, // Above MOVING FOF (this means we need to keep floorz up to date...)
+	PCF_SPLASH    = 1<<4, // Splashed on the ground, return to the ceiling after the animation's over
+	PCF_THUNK     = 1<<5, // Ran the thinker this tic.
 } precipflag_t;
 
 

src/p_saveg.c

@@ -1109,10 +1109,6 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
 	if (mobj->type == MT_HOOPCENTER && mobj->threshold == 4242)
 		return;
 
-	// do not send over locally spawned mobjs
-	if (mobj->islocal)
-		return;
-
 	if (mobj->spawnpoint && mobj->info->doomednum != -1)
 	{
 		// spawnpoint is not modified but we must save it since it is an identifier
@@ -1138,17 +1134,9 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
 	if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0)
 #endif
 		diff |= MD_MOM;
-#ifdef PHOBOS_BUILD
-	if (mobj->radius != FixedMul(mapobjectscale, mobj->info->radius))
-#else
 	if (mobj->radius != mobj->info->radius)
-#endif
 		diff |= MD_RADIUS;
-#ifdef PHOBOS_BUILD
-	if (mobj->height != FixedMul(mapobjectscale, mobj->info->height))
-#else
 	if (mobj->height != mobj->info->height)
-#endif
 		diff |= MD_HEIGHT;
 	if (mobj->flags != mobj->info->flags)
 		diff |= MD_FLAGS;
@@ -1191,19 +1179,11 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
 		diff |= MD_MOVEFACTOR;
 	if (mobj->fuse)
 		diff |= MD_FUSE;
-#ifdef PHOBOS_BUILD
-	if (mobj->watertop != INT32_MAX)
-#else
 	if (mobj->watertop)
-#endif
 		diff |= MD_WATERTOP;
 	if (mobj->waterbottom)
 		diff |= MD_WATERBOTTOM;
-#ifdef PHOBOS_BUILD
-	if (mobj->scale != mapobjectscale)
-#else
 	if (mobj->scale != FRACUNIT)
-#endif
 		diff |= MD_SCALE;
 	if (mobj->destscale != mobj->scale)
 		diff |= MD_DSCALE;
@@ -2110,19 +2090,11 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 	if (diff & MD_RADIUS)
 		mobj->radius = READFIXED(save->p);
 	else
-#ifdef PHOBOS_BUILD
-		mobj->radius = FixedMul(mobj->info->radius, mapobjectscale);
-#else
 		mobj->radius = mobj->info->radius;
-#endif
 	if (diff & MD_HEIGHT)
 		mobj->height = READFIXED(save->p);
 	else
-#ifdef PHOBOS_BUILD
-		mobj->height = FixedMul(mobj->info->height, mapobjectscale);
-#else
 		mobj->height = mobj->info->height;
-#endif
 	if (diff & MD_FLAGS)
 		mobj->flags = READUINT32(save->p);
 	else
@@ -2194,20 +2166,12 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 		mobj->fuse = READINT32(save->p);
 	if (diff & MD_WATERTOP)
 		mobj->watertop = READFIXED(save->p);
-#ifdef PHOBOS_BUILD
-	else
-		mobj->watertop = INT32_MAX;
-#endif
 	if (diff & MD_WATERBOTTOM)
 		mobj->waterbottom = READFIXED(save->p);
 	if (diff & MD_SCALE)
 		mobj->scale = READFIXED(save->p);
 	else
-#ifdef PHOBOS_BUILD
-		mobj->scale = mapobjectscale;
-#else
 		mobj->scale = FRACUNIT;
-#endif
 	if (diff & MD_DSCALE)
 		mobj->destscale = READFIXED(save->p);
 	else

src/p_setup.c

@@ -570,13 +570,13 @@ static void P_LoadSegs(UINT8 *data)
 
 			if (seg->sidedef == &sides[seg->linedef->sidenum[0]])
 			{
-				seg->v1 = lines[rawlinedef].v1;
-				seg->v2 = lines[rawlinedef].v2;
+				seg->v1 = lines[ms->linedef].v1;
+				seg->v2 = lines[ms->linedef].v2;
 			}
 			else
 			{
-				seg->v1 = lines[rawlinedef].v2;
-				seg->v2 = lines[rawlinedef].v1;
+				seg->v1 = lines[ms->linedef].v2;
+				seg->v2 = lines[ms->linedef].v1;
 			}
 		}
 		else
@@ -584,6 +584,7 @@ static void P_LoadSegs(UINT8 *data)
 			seg->v1 = &vertexes[v1];
 			seg->v2 = &vertexes[v2];
 		}
+
 #ifdef HWRENDER
 		if (rendermode == render_opengl)
 		{
@@ -596,6 +597,7 @@ static void P_LoadSegs(UINT8 *data)
 			//seg->fv2.z = FixedToFloat(seg->v2->z);
 		}
 #endif
+
 		seg->length = P_SegLength(seg);
 
 		P_UpdateSegLightOffset(seg);
@@ -2094,13 +2096,6 @@ static void P_LoadMapBSP(const virtres_t* virt)
 	virtlump_t* virtsegs     = vres_Find(virt, "SEGS");
 	virtlump_t* virtnodes    = vres_Find(virt, "NODES");
 
-	if (!virtssectors)
-		I_Error("SSECTORS lump not found");
-	if (!virtsegs)
-		I_Error("SEGS lump not found");
-	if (!virtnodes)
-		I_Error("NODES lump not found");
-
 	numsubsectors = virtssectors->size / sizeof(mapsubsector_t);
 	numnodes      = virtnodes->size    / sizeof(mapnode_t);
 	numsegs       = virtsegs->size     / sizeof(mapseg_t);
@@ -3336,7 +3331,6 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
 
 	return false;
 }
-
 //
 // P_CheckReplacMapReplacements
 //
@@ -3429,13 +3423,7 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 	{
 		// check if someone tries to load maps locally lol
 		// do this here so we can skip loading the file anyways
-		int retmap = W_CheckAutoLoadContainsMap(wadfilename);
-		if (retmap == -1)
-		{
-			CONS_Alert(CONS_WARNING, "addilelocal: file %s was not found or not valid.\n", wadfilename);
-			return UINT16_MAX;
-		}
-		if (retmap > 0)
+		if (W_CheckAutoLoadContainsMap(wadfilename))
 		{
 			CONS_Alert(CONS_WARNING, "addilelocal: locally added file %s contains map data, this WILL cause crashes and desynchs! not added.\n", wadfilename);
 			return UINT16_MAX;

src/p_spec.c

@@ -1962,19 +1962,13 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 					if (!dest)
 						return;
 
-					const angle_t ang = (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle;
-					const boolean dontstopmove = (line->flags & ML_EFFECT4) == ML_EFFECT4;
-
 					if (bot)
-						P_Teleport(bot, dest->x, dest->y, dest->z, ang, (line->flags & ML_BLOCKMONSTERS) == 0, dontstopmove);
-
+						P_Teleport(bot, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, (line->flags & ML_BLOCKMONSTERS) == 0, (line->flags & ML_EFFECT4) == ML_EFFECT4);
 					if (line->flags & ML_BLOCKMONSTERS)
-					{
-						P_Teleport(mo, dest->x, dest->y, dest->z, ang, false, dontstopmove);
-					}
+						P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, false, (line->flags & ML_EFFECT4) == ML_EFFECT4);
 					else
 					{
-						P_Teleport(mo, dest->x, dest->y, dest->z, ang, true, dontstopmove);
+						P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, true, (line->flags & ML_EFFECT4) == ML_EFFECT4);
 						// Play the 'bowrwoosh!' sound
 						S_StartSound(dest, sfx_mixup);
 					}
@@ -3400,7 +3394,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
 			break;
 		case 12: // SRB2kart: Invert Encore Remap
 			break;
-		case 15: // also Invert Encore Remap....
+		case 15: // no idea but keep it dont want anything to break
 			break;
 	}
 DoneSection2:
@@ -5374,11 +5368,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 			case 11: // Custom global gravity!
 				gravity = sector->floorheight/1000;
 				break;
-
-			case 12: // SRB2kart: Invert Encore Remap
-			case 15: // NOTE: vanilla kart checks only for this for some reason!
-				sector->flags |= SF_INVERTENCORE;
-				break;
 		}
 
 		// Process Section 4
@@ -5388,10 +5377,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 				if (G_RaceGametype())
 					circuitmap = true;
 				break;
-
-			case 12: // Camera noclip
-				sector->flags |= SF_NOCLIPCAMERA;
-				break;
 		}
 	}
 
@@ -5476,11 +5461,11 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 					sectors[s].gravity = &sectors[sec].floorheight; // This allows it to change in realtime!
 
 					if (lines[i].flags & ML_NOCLIMB)
-						sectors[s].flags |= SF_GRAVITYFLIP;
+						sectors[s].verticalflip = true;
 					else
-						sectors[s].flags &= ~SF_GRAVITYFLIP;
+						sectors[s].verticalflip = false;
 
-					CheckForReverseGravity = (boolean)(sectors[s].flags & SF_GRAVITYFLIP);
+					CheckForReverseGravity = sectors[s].verticalflip;
 				}
 				break;
 
@@ -5573,11 +5558,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 					sectors[s].cullheight = &lines[i]; // This allows it to change in realtime!
 				break;
 
-			case 13: // Heat wave effect
-				for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
-					sectors[s].flags |= SF_HEATWAVE;
-				break;
-
 			case 50: // Insta-Lower Sector
 				EV_DoFloor(&lines[i], instantLower);
 				break;

src/p_user.c

@@ -91,7 +91,7 @@ void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move)
 	mo->momx = FixedMul(move, FINECOSINE(angle));
 
 	if (!twodmo(mo))
-		mo->momy = FixedMul(move, FINESINE(angle));
+		mo->momy = FixedMul(move,FINESINE(angle));
 }
 
 void P_InstaThrustEvenIn2D(mobj_t *mo, angle_t angle, fixed_t move)
@@ -3561,7 +3561,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
 			for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
 			{
 				fixed_t topheight, bottomheight;
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -3626,7 +3626,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
 							// We're inside it! Yess...
 							polysec = po->lines[0]->backsector;
 
-							if (polysec->flags & SF_NOCLIPCAMERA)
+							if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
 							{ // Camera noclip polyobj.
 								plink = (polymaplink_t *)(plink->link.next);
 								continue;
@@ -3682,8 +3682,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
 			for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
 			{
 				fixed_t topheight, bottomheight;
-
-				if ((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
+				if (UNLIKELY((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 				{
 					topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
 					bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -4263,7 +4262,7 @@ boolean P_SpectatorJoinGame(player_t *player)
 
 static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector, fixed_t pviewheight)
 {
-	if (sector->flags & SF_HEATWAVE)
+	if (P_FindSpecialLineFromTag(13, sector->tag, -1) != -1)
 		return true;
 
 	if (sector->ffloors)
@@ -4281,7 +4280,7 @@ static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector,
 			if (pviewheight <= P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y))
 				continue;
 
-			if (rover->master->frontsector->flags & SF_HEATWAVE)
+			if (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
 				return true;
 		}
 	}

src/r_bsp.cpp

@@ -48,7 +48,8 @@ boolean g_walloffscreen = false;
 
 boolean R_NoEncore(sector_t *sector, boolean ceiling)
 {
-	const boolean invertEncore = (sector->flags & SF_INVERTENCORE);
+	const INT32 invspecial = GETSECSPECIAL(sector->special, 2);
+	boolean invertencore = (invspecial == 12 || invspecial == 15); // keeping this incase its used
 
 #if 0 // perfect implementation
 	const INT32 sprnspecial = GETSECSPECIAL(sector->special, 3);
@@ -58,10 +59,10 @@ boolean R_NoEncore(sector_t *sector, boolean ceiling)
 #endif
 		&& GETSECSPECIAL(sector->special, 4) != 6) // sneaker panel
 	{
-		return invertEncore;
+		return invertencore;
 	}
 
-	if (invertEncore)
+	if (invertencore)
 	{
 		return false;
 	}

src/r_defs.h

@@ -307,19 +307,10 @@ typedef struct pslope_s
 
 typedef enum
 {
-	// flipspecial - planes with effect
-	SF_FLIPSPECIAL_FLOOR       =  1,
-	SF_FLIPSPECIAL_CEILING     =  1<<1,
-	SF_FLIPSPECIAL_BOTH        =  (SF_FLIPSPECIAL_FLOOR|SF_FLIPSPECIAL_CEILING),
-	// triggerspecial - conditions under which plane touch causes effect
-	SF_TRIGGERSPECIAL_TOUCH    =  1<<2,
-
-	SF_GRAVITYFLIP             =  1<<3,
-	SF_HEATWAVE                =  1<<4,
-	SF_NOCLIPCAMERA            =  1<<5,
-
-	// invert encore color remap status
-	SF_INVERTENCORE            =  1<<6,
+	SF_FLIPSPECIAL_FLOOR    =  1,
+	SF_FLIPSPECIAL_CEILING  =  2,
+	SF_FLIPSPECIAL_BOTH     =  3,
+	SF_TRIGGERSPECIAL_TOUCH =  4,
 } sectorflags_t;
 
 //
@@ -400,6 +391,7 @@ typedef struct sector_s
 
 	// This points to the master's floorheight, so it can be changed in realtime!
 	fixed_t *gravity; // per-sector gravity
+	boolean verticalflip; // If gravity < 0, then allow flipped physics
 	sectorflags_t flags;
 
 	// Sprite culling feature

src/r_draw_flush.cpp

@@ -6,7 +6,7 @@
 // Copyright (C) 1996 by id Software, Inc.
 // Copyright (C) 1999 by Chi Hoang, Lee Killough, Jim Flynn, Rand Phares, Ty Halderman
 // Copyright (C) 1999-2000 by Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze
-// Copyright (C) 2005, 2006 by Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko
+// Copyright (C) Copyright 2005, 2006 by Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko
 // Copyright (C) 2013 by James Haley, Stephen McGranahan, et al.
 //
 // This program is free software distributed under the

src/r_segs.cpp

@@ -61,6 +61,7 @@ fixed_t rw_distance = 0;
 static INT32 rw_x, rw_stopx;
 static angle_t rw_centerangle;
 static fixed_t rw_offset;
+static fixed_t rw_offset2; // for splats
 static fixed_t rw_scale, rw_scalestep;
 static fixed_t rw_midtexturemid, rw_toptexturemid, rw_bottomtexturemid;
 static INT32 worldtop, worldbottom, worldhigh, worldlow;
@@ -263,7 +264,12 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
 		else if (P_ApplyLightOffset(lightnum, frontsector))
 			lightnum += curline->lightOffset;
 
-		walllights = R_GetWallLight(lightnum);
+		if (lightnum < 0)
+			walllights = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			walllights = scalelight[LIGHTLEVELS - 1];
+		else
+			walllights = scalelight[lightnum];
 	}
 
 	if (frontsector->heightsec != -1)
@@ -365,7 +371,12 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
 
 					lightnum = rlight->lightnum;
 
-					xwalllights = R_GetWallLight(lightnum);
+					if (lightnum < 0)
+						xwalllights = scalelight[0];
+					else if (lightnum >= LIGHTLEVELS)
+						xwalllights = scalelight[LIGHTLEVELS-1];
+					else
+						xwalllights = scalelight[lightnum];
 
 					pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
 
@@ -813,7 +824,12 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 		else if (P_ApplyLightOffset(lightnum, frontsector))
 			lightnum += curline->lightOffset;
 
-		walllights = R_GetWallLight(lightnum);
+		if (lightnum < 0)
+			walllights = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			walllights = scalelight[LIGHTLEVELS-1];
+		else
+			walllights = scalelight[lightnum];
 	}
 
 	maskedtexturecol = drawseg->thicksidecol;
@@ -955,7 +971,12 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 
 				lightnum = rlight->lightnum;
 
-				xwalllights = R_GetWallLight(lightnum);
+				if (lightnum < 0)
+					xwalllights = scalelight[0];
+				else if (lightnum >= LIGHTLEVELS)
+					xwalllights = scalelight[LIGHTLEVELS-1];
+				else
+					xwalllights = scalelight[lightnum];
 
 				pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
 
@@ -1446,7 +1467,12 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
 				else if (P_ApplyLightOffset(lightnum, curline->frontsector))
 					lightnum += curline->lightOffset;
 
-				xwalllights = R_GetWallLight(lightnum);
+				if (lightnum < 0)
+					xwalllights = scalelight[0];
+				else if (lightnum >= LIGHTLEVELS)
+					xwalllights = scalelight[LIGHTLEVELS-1];
+				else
+					xwalllights = scalelight[lightnum];
 
 				pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
 
@@ -2525,6 +2551,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			rw_offset = -rw_offset;
 
 		/// don't use texture offset for splats
+		rw_offset2 = rw_offset + curline->offset;
 		rw_offset += sidedef->textureoffset + curline->offset;
 		rw_centerangle = ANGLE_90 + viewangle - rw_normalangle;
 
@@ -2537,7 +2564,12 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		if (P_ApplyLightOffset(lightnum, frontsector))
 			lightnum += curline->lightOffset;
 
-		walllights = R_GetWallLight(lightnum);
+		if (lightnum < 0)
+			walllights = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			walllights = scalelight[LIGHTLEVELS - 1];
+		else
+			walllights = scalelight[lightnum];
 	}
 
 	// if a floor / ceiling plane is on the wrong side

src/r_segs.h

@@ -22,11 +22,6 @@ extern "C" {
 #pragma interface
 #endif
 
-FUNCINLINE static ATTRINLINE lighttable_t** R_GetWallLight(INT32 llevel)
-{
-	return scalelight[CLAMP(llevel, 0, LIGHTLEVELS-1)];
-}
-
 void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2);
 void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pffloor);
 void R_StoreWallRange(INT32 start, INT32 stop);

src/r_things.cpp

@@ -1062,7 +1062,12 @@ static void R_SplitSprite(vissprite_t *sprite)
 		{
 			INT32 lightnum = R_GetSoftLightlevel(*sector->lightlist[i].lightlevel);
 
-			spritelights = R_GetWallLight(lightnum);
+			if (lightnum < 0)
+				spritelights = scalelight[0];
+			else if (lightnum >= LIGHTLEVELS)
+				spritelights = scalelight[LIGHTLEVELS-1];
+			else
+				spritelights = scalelight[lightnum];
 
 			newsprite->extra_colormap = sector->lightlist[i].extra_colormap;
 
@@ -1740,7 +1745,12 @@ static void R_ProjectSprite(mobj_t *thing)
 			}
 		}
 
-		lights_array = R_GetWallLight(lightnum);
+		if (lightnum < 0)
+			lights_array = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			lights_array = scalelight[LIGHTLEVELS-1];
+		else
+			lights_array = scalelight[lightnum];
 	}
 
 	// store information in a vissprite
@@ -2077,11 +2087,16 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 
 	if (!sec->numlights)
 	{
-		if (sec->heightsec == -1)
-			lightlevel = sec->lightlevel;
+		if (sec->heightsec == -1) lightlevel = sec->lightlevel;
 
 		lightnum = R_GetSoftLightlevel(lightlevel);
-		spritelights = R_GetWallLight(lightnum);
+
+		if (lightnum < 0)
+			spritelights = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			spritelights = scalelight[LIGHTLEVELS-1];
+		else
+			spritelights = scalelight[lightnum];
 	}
 
 	// Handle all things in sector.

src/sdl/CMakeLists.txt

@@ -233,25 +233,20 @@ if(${SDL2_FOUND})
 		-DHAVE_THREADS
 	)
 
-	if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE AND NOT SRB2_CONFIG_ASAN AND NOT SRB2_CONFIG_UBSAN AND NOT SRB2_CONFIG_TSAN)
+	if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE)
 		set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 	endif()
 
 	if(SRB2_CONFIG_ASAN)
-		target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=address -fno-omit-frame-pointer -fno-common)
+		target_compile_options(SRB2SDL2 PRIVATE -fsanitize=address)
 		target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
 	endif()
 
 	if(SRB2_CONFIG_UBSAN)
-		target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=undefined -fno-omit-frame-pointer)
+		target_compile_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
 		target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
 	endif()
 
-	if(SRB2_CONFIG_TSAN)
-		target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=thread -fno-omit-frame-pointer)
-		target_link_options(SRB2SDL2 PRIVATE -fsanitize=thread)
-	endif()
-
 	if(NOT SRB2_CONFIG_MUMBLE)
 		target_compile_options(SRB2SDL2 PRIVATE -DNOMUMBLE)
 	endif()

src/sdl/i_video.c

@@ -97,9 +97,11 @@ static char vidModeName[33][32]; // allow 33 different modes
 rendermode_t rendermode = render_none;
 
 #ifdef HWRENDER
+unsigned msaa = 0;
+
 // Eee probably the way i organize it isn't best ><
 // Just don't know where do i put declaration and "implementation"
-unsigned msaa = 0;
+boolean a2c = false;
 #endif
 
 static void KeyboardLayout_OnChange(void)
@@ -195,6 +197,10 @@ static INT32 custom_height = 0;
 static SDL_bool Impl_CreateWindow(SDL_bool fullscreen);
 static void Impl_SetWindowIcon(void);
 
+#ifdef USE_FBO_OGL
+boolean downsample = false;
+#endif
+
 static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
 {
 	if (code >= SDL_SCANCODE_A && code <= SDL_SCANCODE_Z)
@@ -516,7 +522,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 	{
 		I_CheckDesktopRes();
 #ifdef USE_FBO_OGL
-			I_CheckDownSampleState(false);
+		I_DownSample();
 #endif
 		windowmoved = SDL_FALSE;
 	}
@@ -1257,9 +1263,8 @@ static void I_CheckDesktopRes(void)
 	int currentDisplayIndex = -1;
 	SDL_DisplayMode curmode;
 
-	// just fallback to game res ig?
-	desktopwidth = vid.width;
-	desktopheight = vid.height;
+	desktopwidth = 0;
+	desktopheight = 0;
 
 	currentDisplayIndex = SDL_GetWindowDisplayIndex(window);
 
@@ -1269,7 +1274,7 @@ static void I_CheckDesktopRes(void)
 		return;
 	}
 
-	if (SDL_GetCurrentDisplayMode(currentDisplayIndex, &curmode) < 0)
+	if (SDL_GetDesktopDisplayMode(currentDisplayIndex, &curmode) != 0)
 	{
 		return;
 	}
@@ -1284,39 +1289,47 @@ boolean I_CheckNativeRes(void)
 	return (vid.width == desktopwidth && vid.height == desktopheight);
 }
 
-static boolean I_CheckAboveDesktopRes(INT32 width, INT32 height)
-{
-	return (width > desktopwidth || height > desktopheight);
-}
-
 #ifdef USE_FBO_OGL
-static boolean vid_downsampling = false;
 
-boolean I_IsDownsampling(void)
+void RefreshOGLSDLSurface(void)
 {
-	return vid_downsampling;
+	if (rendermode == render_opengl)
+		OglSdlSurface(vid.width, vid.height);
 }
 
-void I_CheckDownSampleState(boolean forcerefresh)
+void I_DownSample(void)
 {
-	// no fbo support so we dont care
-	if (!supportFBO)
+	boolean needrefresh = false;
+
+	if (!cv_glframebuffer.value || !supportFBO || (cv_glscreentextures.value == 0)) // no sense to do this crap if we cant benefit from it
 	{
-		vid_downsampling = false;
+		downsample = false;
 		return;
 	}
 
-	// no sense to do this crap if we cant benefit from it
-	const boolean newdownsamplestate = cv_glframebuffer.value && (cv_glscreentextures.value == 2) && I_CheckAboveDesktopRes(vid.width, vid.height);
-
-	// state changed or fbo was toggled
-	if (vid_downsampling != newdownsamplestate || forcerefresh)
+	if (I_CheckNativeRes() && (downsample == true))
 	{
-		//printf("downsample changed from %d to %d\n", vid_downsampling, curdownsamplestate);
-		OglSdlSurface(vid.width, vid.height);
+		downsample = false;
+		RefreshOGLSDLSurface();
+		return;
 	}
 
-	vid_downsampling = newdownsamplestate;
+	if ((vid.width > desktopwidth) || (vid.height > desktopheight)) //check if current resolution is higher than current display resolution
+	{
+		downsample = true;
+		needrefresh = true;
+	}
+	else if (downsample == true)
+	{
+		downsample = false;
+		needrefresh = true;
+	}
+
+	if (needrefresh)
+	{
+		RefreshOGLSDLSurface();
+		needrefresh = false;
+	}
 }
 #endif
 
@@ -1346,11 +1359,10 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 			}
 
 			// Reposition window only in windowed mode
-			const int windowpos = SDL_GetWindowDisplayIndex(window);
 			SDL_SetWindowSize(window, width, height);
 			SDL_SetWindowPosition(window,
-				SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos),
-				SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos)
+				SDL_WINDOWPOS_CENTERED_DISPLAY(SDL_GetWindowDisplayIndex(window)),
+				SDL_WINDOWPOS_CENTERED_DISPLAY(SDL_GetWindowDisplayIndex(window))
 			);
 		}
 	}
@@ -1372,7 +1384,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 	{
 		I_CheckDesktopRes();
 #ifdef USE_FBO_OGL
-		I_CheckDownSampleState(false);
+		I_DownSample();
 #endif
 		OglSdlSurface(vid.width, vid.height);
 	}
@@ -1813,6 +1825,7 @@ void I_StartupGraphics(void)
 		rendermode = render_opengl;
 
 	msaa = 0; boolean msaa_set = false;
+	a2c = false; boolean a2c_set = false;
 
 	// MSAA antialiasing
 	if (M_CheckParm("-msaa") && M_IsNextParm())
@@ -1824,6 +1837,16 @@ void I_StartupGraphics(void)
 		}
 	}
 
+	if (M_CheckParm("-a2c"))
+	{
+		a2c = true;
+		a2c_set = true;
+	}
+	else if (M_CheckParm("-noa2c"))
+	{
+		a2c_set = true;
+	}
+
     {
 		char   line[16];
 		char * word;
@@ -1867,10 +1890,19 @@ void I_StartupGraphics(void)
 						}
 						else
 						{
-							CONS_Printf("Using last known MSAA value: %u\n", msaa);
+							CONS_Printf("Using last know MSAA value: %u\n", msaa);
 						}
 					}
 				}
+
+				if (!a2c_set)
+				{
+					if (fasticmp(word, "a2c"))
+					{
+						a2c = true;
+						CONS_Printf("Using a2c because it was specified to be used earlier\n");
+					}
+				}
 			}
 
 			fclose(file);
@@ -1905,6 +1937,9 @@ void I_StartupGraphics(void)
 
 #ifdef HWRENDER
 			fprintf(file, "msaa %u\n", msaa);
+
+			if (a2c)
+				fputs("a2c\n", file);
 #endif
 			fclose(file);
 		}

src/sdl/ogl_sdl.c

@@ -65,7 +65,7 @@ PFNglGetString pglGetString;
 #ifdef USE_FBO_OGL
 boolean UseScreenFBO(void)
 {
-	return (supportFBO && cv_glframebuffer.value && I_IsDownsampling() && (cv_glscreentextures.value == 2));
+	return (supportFBO && cv_glframebuffer.value && downsample);
 }
 #endif
 
@@ -203,9 +203,9 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 
 #ifdef USE_FBO_OGL
 	if (UseScreenFBO())
-		GL_FBO_Enable();
+		GL_Framebuffer_Enable();
 	else
-		GL_FBO_Disable();
+		GL_Framebuffer_Disable();
 #endif
 
 	if (!first_init)
@@ -235,7 +235,9 @@ void OglSdlFinishUpdate(SDL_Window *window)
 
 #ifdef USE_FBO_OGL
 	if (usefbo)
-		GL_FBO_BindMainFrameBuffer();
+	{
+		GL_Framebuffer_Unbind();
+	}
 #endif
 
 	if (HWR_ShouldUsePaletteRendering())
@@ -253,7 +255,9 @@ void OglSdlFinishUpdate(SDL_Window *window)
 
 #ifdef USE_FBO_OGL
 	if (usefbo)
-		GL_FBO_Enable();
+	{
+		GL_Framebuffer_Enable();
+	}
 #endif
 
 	SDL_GL_SwapWindow(window);
@@ -264,7 +268,7 @@ void OglSdlFinishUpdate(SDL_Window *window)
 	//			effects that want to take the old screen can do so after this
 	// well we dont need it on native res it seems
 #ifdef USE_FBO_OGL
-	if (!usefbo && (!I_CheckNativeRes() || WipeInAction))
+	if ((!I_CheckNativeRes() && !usefbo) || WipeInAction)
 #else
 	if (!I_CheckNativeRes() || WipeInAction)
 #endif

src/st_stuff.c

@@ -410,7 +410,7 @@ static void ST_drawDebugInfo(void)
 	}
 
 	if (cv_debug & DBG_MEMORY)
-		V_DrawRightAlignedString(320, height,     V_MONOSPACE, va("Heap used: %7sKB", sizeu1(Z_TotalUsage()>>10)));
+		V_DrawRightAlignedString(320, height,     V_MONOSPACE, va("Heap used: %7sKB", sizeu1(Z_TagsUsage(0, INT32_MAX)>>10)));
 }
 
 static void ST_drawLevelTitle(void)

src/w_wad.c

@@ -396,11 +396,6 @@ FUNCINLINE static ATTRINLINE UINT32 W_HashLumpName(const char *name)
 	return FNV1a_HashLowercaseString(name);
 }
 
-FUNCINLINE static ATTRINLINE UINT32 W_HashLumpNameLen(const char *name, size_t len)
-{
-	return FNV1a_QuickCaseHash(name, len);
-}
-
 /** Detect a file type.
  * \todo Actually detect the wad/pkzip headers and whatnot, instead of just checking the extensions.
  */
@@ -1100,14 +1095,18 @@ const char *W_CheckNameForNum(lumpnum_t lumpnum)
 UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 {
 	UINT16 i;
+	static char uname[8 + 1];
 	UINT32 hash;
 	size_t namelen;
 
 	if (!TestValidLump(wad, 0))
 		return INT16_MAX;
 
-	namelen = strnlen(name, 8); // :chaosleep:
-	hash = W_HashLumpNameLen(name, namelen);
+	memset(uname, 0, sizeof(uname));
+	strncpy(uname, name, sizeof(uname)-1);
+	strupr(uname);
+	namelen = strlen(uname);
+	hash = W_HashLumpName(uname);
 
 	//
 	// scan forward
@@ -1122,7 +1121,7 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 		{
 			if (lump_p->namelength == namelen
 				&& lump_p->hash.name == hash
-				&& !strncasecmp(lump_p->name, name, namelen))
+				&& !memcmp(lump_p->name, uname, sizeof(uname) - 1))
 				return i;
 		}
 	}

src/z_zone.cpp

@@ -75,7 +75,7 @@ typedef struct memblock_s
 #define MEMBLOCK(x) (memblock_t *)((uintptr_t)(x) - ALIGNPAD - sizeof(memblock_t))
 
 // both the head and tail of the zone memory block list
-static memblock_t headlist[NUM_PURGETAGS];
+static memblock_t head;
 
 static constexpr size_t kLevelLargePoolBlockSize = sizeof(mobj_t);
 static constexpr size_t kLevelMedPoolBlockSize = sizeof(precipmobj_t);
@@ -107,14 +107,10 @@ static void Command_Memdump_f(void);
 void Z_Init(void)
 {
 	size_t total, memfree;
-	size_t i;
 
-	memset(&headlist, 0x00, sizeof(headlist));
+	memset(&head, 0x00, sizeof(head));
 
-	for (i = 0; i < NUM_PURGETAGS; i++)
-	{
-		headlist[i].next = headlist[i].prev = &headlist[i];
-	}
+	head.next = head.prev = &head;
 
 	memfree = I_GetFreeMem(&total)>>20;
 
@@ -208,7 +204,7 @@ static void *xm(size_t size)
 	if (p == NULL)
 	{
 		// Oh crumbs: we're out of heap. Try purging the cache and reallocating.
-		Z_FreeTags(PU_PURGELEVEL, NUM_PURGETAGS-1);
+		Z_FreeTags(PU_PURGELEVEL, INT32_MAX);
 		p = malloc(padedsize);
 
 		if (p == NULL)
@@ -249,9 +245,9 @@ void *Z_Malloc(size_t size, INT32 tag, void *user)
 	ptr = MEMORY(block);
 	I_Assert((intptr_t)ptr % alignof (max_align_t) == 0);
 
-	block->next = headlist[tag].next;
-	block->prev = &headlist[tag];
-	headlist[tag].next = block;
+	block->next = head.next;
+	block->prev = &head;
+	head.next = block;
 	block->next->prev = block;
 
 	block->tag = tag;
@@ -415,7 +411,6 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
 #endif
 {
 	memblock_t *block, *next;
-	INT32 i;
 
 #ifdef ZDEBUG
 	Z_CheckHeap2(file, line);
@@ -432,13 +427,11 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
 		g_level_tiny_pool.release();
 	}
 
-	for (i = lowtag; i <= hightag; i++)
+	for (block = head.next; block != &head; block = next)
 	{
-		for (block = headlist[i].next; block != &headlist[i]; block = next)
-		{
-			next = block->next; // get link before freeing
+		next = block->next; // get link before freeing
+		if (block->tag >= lowtag && block->tag <= hightag)
 			Z_Free(MEMORY(block));
-		}
 	}
 }
 
@@ -451,20 +444,18 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
 void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *))
 {
 	memblock_t *block, *next;
-	INT32 i;
 
 	if (!iterfunc)
 		I_Error("Z_IterateTags: no iterator function was given");
 
-	for (i = lowtag; i <= hightag; i++)
+	for (block = head.next; block != &head; block = next)
 	{
-		for (block = headlist[i].next; block != &headlist[i]; block = next)
-		{
-			next = block->next; // get link before possibly freeing
+		next = block->next; // get link before possibly freeing
 
+		if (block->tag >= lowtag && block->tag <= hightag)
+		{
 			void *mem = MEMORY(block);
 			boolean free = iterfunc(mem);
-
 			if (free)
 				Z_Free(mem);
 		}
@@ -495,7 +486,7 @@ void Z_CheckMemCleanup(void)
 	if (nextcleanup-- == 0)
 	{
 		nextcleanup = CLEANUPCOUNT;
-		Z_FreeTags(PU_PURGELEVEL, NUM_PURGETAGS-1);
+		Z_FreeTags(PU_PURGELEVEL, INT32_MAX);
 	}
 }
 
@@ -513,7 +504,6 @@ void Z_CheckHeap(INT32 tag)
 {
 	memblock_t *block;
 	UINT32 blocknumon = 0;
-	size_t j;
 	void *given;
 
 #ifndef ZDEBUG
@@ -530,47 +520,40 @@ void Z_CheckHeap(INT32 tag)
 			blocknumon, block->ownerfile, block->ownerline, msg)
 #endif
 
-	for (j = 0; j < NUM_PURGETAGS; j++)
+	for (block = head.next; block != &head; block = block->next)
 	{
-		for (block = headlist[j].next; block != &headlist[j]; block = block->next)
-		{
-			blocknumon++;
-			given = MEMORY(block);
+		blocknumon++;
+		given = MEMORY(block);
 #ifdef ZDEBUG2
-			CONS_Debug(DBG_MEMORY, "block %u owned by %s:%d\n",
-				blocknumon, block->ownerfile, block->ownerline);
+		CONS_Debug(DBG_MEMORY, "block %u owned by %s:%d\n",
+			blocknumon, block->ownerfile, block->ownerline);
 #endif
 #ifdef HAVE_VALGRIND
-			if (RUNNING_ON_VALGRIND && !VALGRIND_MEMPOOL_EXISTS(block))
-			{
-				HeapError(" should not exist");
-			}
-#endif
-			if (block->user != NULL && *(block->user) != given)
-			{
-				HeapError(" doesn't have a proper user");
-			}
-
-			if (block->next->prev != block)
-			{
-				HeapError(" lacks proper backlink");
-			}
-
-			if (block->prev->next != block)
-			{
-				HeapError(" lacks proper forward link");
-			}
-#ifdef PARANOIA
-			if (block->id != ZONEID)
-			{
-				HeapError(" has the wrong ID");
-			}
-#endif
-			if (block->tag != j)
-			{
-				HeapError(va(" block is contained in the wrong headlist (got: %d expected: %s)", block->tag, sizeu1(j)));
-			}
+		if (RUNNING_ON_VALGRIND && !VALGRIND_MEMPOOL_EXISTS(block))
+		{
+			HeapError(" should not exist");
 		}
+#endif
+		if (block->user != NULL && *(block->user) != given)
+		{
+			HeapError(" doesn't have a proper user");
+		}
+
+		if (block->next->prev != block)
+		{
+			HeapError(" lacks proper backlink");
+		}
+
+		if (block->prev->next != block)
+		{
+			HeapError(" lacks proper forward link");
+		}
+#ifdef PARANOIA
+		if (block->id != ZONEID)
+		{
+			HeapError(" has the wrong ID");
+		}
+#endif
 	}
 }
 
@@ -607,14 +590,6 @@ void Z_ChangeTag(void *ptr, INT32 tag)
 		I_Error("Internal memory management error: "
 			"tried to make block purgable but it has no owner");
 
-	block->prev->next = block->next;
-	block->next->prev = block->prev;
-
-	block->next = headlist[tag].next;
-	block->prev = &headlist[tag];
-	headlist[tag].next = block;
-	block->next->prev = block;
-
 	block->tag = tag;
 }
 
@@ -665,21 +640,18 @@ void Z_SetUser(void *ptr, void **newuser)
 size_t Z_TagsUsage(INT32 lowtag, INT32 hightag)
 {
 	size_t cnt = 0;
-	memblock_t *head; // why was this called rover before?????
-	INT32 i;
+	memblock_t *rover;
 
-	for (i = lowtag; i <= hightag; i++)
+	for (rover = head.next; rover != &head; rover = rover->next)
 	{
-		for (head = headlist[i].next; head != &headlist[i]; head = head->next)
-		{
-			cnt += head->size + sizeof *head;
-		}
+		if (rover->tag < lowtag || rover->tag > hightag)
+			continue;
+		cnt += rover->size + sizeof(memblock_t);
 	}
 
 	return cnt;
 }
 
-
 // -----------------------
 // Miscellaneous functions
 // -----------------------
@@ -693,8 +665,8 @@ static void Command_Memfree_f(void)
 
 	Z_CheckHeap(-1);
 	CONS_Printf("\x82%s", M_GetText("Memory Info\n"));
-	CONS_Printf(M_GetText("Total heap used        : %7s KB\n"), sizeu1((Z_TotalUsage()>>10) + LUA_MemoryUsage()));
-	CONS_Printf(M_GetText("Lua                    : %7s KB\n"), sizeu1(LUA_MemoryUsage())); // No longer uses z_zone memory but for consistency keep it here
+	CONS_Printf(M_GetText("Total heap used        : %7s KB\n"), sizeu1(Z_TotalUsage()>>10));
+	CONS_Printf(M_GetText("Lua                    : %7s KB\n"), sizeu1(Z_TagUsage(PU_LUA)>>10));
 	CONS_Printf(M_GetText("Static                 : %7s KB\n"), sizeu1(Z_TagUsage(PU_STATIC)>>10));
 	CONS_Printf(M_GetText("Static (sound)         : %7s KB\n"), sizeu1(Z_TagUsage(PU_SOUND)>>10));
 	CONS_Printf(M_GetText("Static (music)         : %7s KB\n"), sizeu1(Z_TagUsage(PU_MUSIC)>>10));
@@ -708,7 +680,7 @@ static void Command_Memfree_f(void)
 	CONS_Printf(M_GetText("Level (pooled)         : %7s KB\n"), sizeu1(Z_LevelPoolUsage()>>10));
 	CONS_Printf(M_GetText("Special thinker        : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVSPEC)>>10));
 	CONS_Printf(M_GetText("All purgable           : %7s KB\n"),
-		sizeu1(Z_TagsUsage(PU_PURGELEVEL, NUM_PURGETAGS-1)>>10));
+		sizeu1(Z_TagsUsage(PU_PURGELEVEL, INT32_MAX)>>10));
 
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
@@ -737,24 +709,21 @@ static void Command_Memfree_f(void)
 static void Command_Memdump_f(void)
 {
 	memblock_t *block;
-	INT32 mintag = 0, maxtag = NUM_PURGETAGS-1;
-	INT32 check;
+	INT32 mintag = 0, maxtag = INT32_MAX;
 	INT32 i;
 
-	if ((check = COM_CheckParm("-min")))
-		mintag = atoi(COM_Argv(check + 1));
+	if ((i = COM_CheckParm("-min")))
+		mintag = atoi(COM_Argv(i + 1));
 
-	if ((check = COM_CheckParm("-max")))
-		maxtag = atoi(COM_Argv(check + 1));
+	if ((i = COM_CheckParm("-max")))
+		maxtag = atoi(COM_Argv(i + 1));
 
-	for (i = mintag; i <= maxtag; i++)
-	{
-		for (block = headlist[i].next; block != &headlist[i]; block = block->next)
+	for (block = head.next; block != &head; block = block->next)
+		if (block->tag >= mintag && block->tag <= maxtag)
 		{
 			const char *filename = strrchr(block->ownerfile, PATHSEP[0]);
-			CONS_Printf("[%3d] %s (%s) bytes @ %s:%d tag: %d (%d)\n", block->tag, sizeu1(block->size + sizeof(memblock_t)), sizeu2(block->size), filename ? filename + 1 : block->ownerfile, block->ownerline, block->tag, i);
+			CONS_Printf("[%3d] %s (%s) bytes @ %s:%d\n", block->tag, sizeu1(block->size + sizeof(memblock_t)), sizeu2(block->size), filename ? filename + 1 : block->ownerfile, block->ownerline);
 		}
-	}
 }
 #endif
 

src/z_zone.h

@@ -42,42 +42,39 @@ extern "C" {
 enum
 {
 	// Tags < PU_LEVEL are not purged until freed explicitly.
-	PU_STATIC                = 0, // static entire execution time
-	PU_LUA, // static entire execution time -- used by lua so it doesn't get caught in loops forever
-	PU_PERFSTATS, // static between changes to ps_samplesize cvar
+	PU_STATIC                = 1, // static entire execution time
+	PU_LUA                   = 2, // static entire execution time -- used by lua so it doesn't get caught in loops forever
+	PU_PERFSTATS             = 3, // static between changes to ps_samplesize cvar
 
-	PU_SOUND, // static while playing
-	PU_MUSIC, // static while playing
+	PU_SOUND                 = 11, // static while playing
+	PU_MUSIC                 = 12, // static while playing
 
-	PU_PATCH, // static entire execution time
-	PU_PATCH_LOWPRIORITY, // lower priority patch, static until level exited
-	PU_PATCH_ROTATED, // rotated patch, static until level exited or WAD added
-	PU_PATCH_DATA, // patch data, lifetime depends on the patch that owns it
-	PU_SPRITE, // sprite patch, static until WAD added
-	PU_HUDGFX, // HUD patch, static until WAD added
+	PU_PATCH                 = 14, // static entire execution time
+	PU_PATCH_LOWPRIORITY     = 15, // lower priority patch, static until level exited
+	PU_PATCH_ROTATED         = 16, // rotated patch, static entire execution time
+	PU_PATCH_DATA            = 17, // patch data, lifetime depends on the patch that owns it
+	PU_SPRITE                = 18, // sprite patch, static until WAD added
+	PU_HUDGFX                = 19, // HUD patch, static until WAD added
 
-	PU_HWRPATCHINFO, // Hardware GLPatch_t struct for OpenGL texture cache
-	PU_HWRPATCHCOLMIPMAP, // Hardware GLMipmap_t struct colormap variation of patch
-	PU_HWRMODELTEXTURE, // Hardware model texture
+	PU_HWRPATCHINFO          = 21, // Hardware GLPatch_t struct for OpenGL texture cache
+	PU_HWRPATCHCOLMIPMAP     = 22, // Hardware GLMipmap_t struct colormap variation of patch
+	PU_HWRMODELTEXTURE       = 23, // Hardware model texture
 
-	PU_HWRCACHE, // static until unlocked
-	PU_CACHE, // static until unlocked
+	PU_HWRCACHE              = 48, // static until unlocked
+	PU_CACHE                 = 49, // static until unlocked
 
 	// Tags s.t. PU_LEVEL <= tag < PU_PURGELEVEL are purged at level start
-	PU_LEVEL, // static until level exited
-	PU_LEVSPEC, // a special thinker in a level
-	PU_HWRPLANE, // if ZPLANALLOC is enabled in hw_bsp.c, this is used to alloc polygons for OpenGL
+	PU_LEVEL                 = 50, // static until level exited
+	PU_LEVSPEC               = 51, // a special thinker in a level
+	PU_HWRPLANE              = 52, // if ZPLANALLOC is enabled in hw_bsp.c, this is used to alloc polygons for OpenGL
 
 	// Tags >= PU_PURGELEVEL are purgable whenever needed
-	PU_PURGELEVEL, // Note: this is never actually used as a tag
-	PU_CACHE_UNLOCKED, // Note: unused
-	PU_HWRCACHE_UNLOCKED, // 'unlocked' PU_HWRCACHE memory:
+	PU_PURGELEVEL            = 100, // Note: this is never actually used as a tag
+	PU_CACHE_UNLOCKED        = 101, // Note: unused
+	PU_HWRCACHE_UNLOCKED     = 102, // 'unlocked' PU_HWRCACHE memory:
 									// 'second-level' cache for graphics
-
-									// stored in hardware format and downloaded as needed
-	PU_HWRMODELTEXTURE_UNLOCKED, // 'unlocked' PU_HWRMODELTEXTURE memory
-
-	NUM_PURGETAGS
+                                    // stored in hardware format and downloaded as needed
+	PU_HWRMODELTEXTURE_UNLOCKED = 103, // 'unlocked' PU_HWRMODELTEXTURE memory
 };
 
 //
@@ -160,7 +157,7 @@ void Z_SetUser(void *ptr, void **newuser);
 //
 #define Z_TagUsage(tagnum) Z_TagsUsage(tagnum, tagnum)
 size_t Z_TagsUsage(INT32 lowtag, INT32 hightag);
-#define Z_TotalUsage() Z_TagsUsage(0, NUM_PURGETAGS-1)
+#define Z_TotalUsage() Z_TagsUsage(0, INT32_MAX)
 
 //
 // Miscellaneous functions