a thousand curses upon you polyobjects!

Merge remote-tracking branch 'origin/Saturn-Next' into deletglseg
experiment: remove opengl adjusted segs
2025-10-02 18:37:18 +02:00 · 2025-10-02 18:00:59 +02:00 · 2025-10-02 17:57:52 +02:00
134 changed files with 3987 additions and 4156 deletions
@@ -5,13 +5,13 @@
 # met:

 #     (1) Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
+#     notice, this list of conditions and the following disclaimer. 

 #     (2) Redistributions in binary form must reproduce the above copyright
 #     notice, this list of conditions and the following disclaimer in
 #     the documentation and/or other materials provided with the
-#     distribution.
-
+#     distribution.  
+    
 #     (3) The name of the author may not be used to
 #     endorse or promote products derived from this software without
 #     specific prior written permission.
@@ -26,4 +26,4 @@
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# POSSIBILITY OF SUCH DAMAGE.
@@ -10,18 +10,8 @@ The libbacktrace library may be linked into a program or library and
 used to produce symbolic backtraces.
 Sample uses would be to print a detailed backtrace when an error
 occurs or to gather detailed profiling information.
-
 In general the functions provided by this library are async-signal-safe,
 meaning that they may be safely called from a signal handler.
-That said, on systems that use `dl_iterate_phdr`, such as GNU/Linux,
-the first call to a libbacktrace function will call `dl_iterate_phdr`,
-which is not in general async-signal-safe.  Therefore, programs
-that call libbacktrace from a signal handler should ensure that they
-make an initial call from outside of a signal handler.
-Similar considerations apply when arranging to call libbacktrace
-from within malloc; `dl_iterate_phdr` can also call malloc,
-so make an initial call to a libbacktrace function outside of
-malloc before trying to call libbacktrace functions within malloc.

 The libbacktrace library is provided under a BSD license.
 See the source files for the exact license text.
@@ -35,7 +25,7 @@ will work.
 See the source file backtrace-supported.h.in for the macros that it
 defines.

-As of July 2024, libbacktrace supports ELF, PE/COFF, Mach-O, and
+As of October 2020, libbacktrace supports ELF, PE/COFF, Mach-O, and
 XCOFF executables with DWARF debugging information.
 In other words, it supports GNU/Linux, *BSD, macOS, Windows, and AIX.
 The library is written to make it straightforward to add support for
@@ -1,41 +0,0 @@
-# libbacktrace.la - a libtool library file
-# Generated by libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libbacktrace.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libbacktrace.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=no
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/mingw64/lib'
@@ -1,41 +0,0 @@
-# libbacktrace.la - a libtool library file
-# Generated by libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libbacktrace.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libbacktrace.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/mingw64/lib'
@@ -49,7 +49,6 @@
 #                    Already enabled by default for 32-bit
 #                    Windows.
 # NOCURL=1 - Disable libcurl--HTTP capability.
-# NOHOLEPUNCH=1 - Disable holepunch capability.
 # NOLIBGME=1 - Disable game music emu, retro VGM support.
 # NOOPENMPT=1 - Disable module (tracker) music support.
 # NOMIXER=1 - Disable SDL Mixer (audio playback).
@@ -70,7 +69,6 @@
 # VALGRIND=1 - Enable Valgrind memory debugging support.
 # PROFILEMODE=1 - Enable performance profiling (gprof).
 # USEASAN=1 - Enable building with Address Sanitizer.
-# USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer.
 # NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
 #
 # General flags for building:
@@ -245,14 +243,10 @@ ifdef STATIC
 libs+=-static
 endif

-ifneq (,$(filter $(CC) $(CXX),gcc g++))
- opts+=-mno-ms-bitfields
-endif
-
 # build with profiling information
 ifdef PROFILEMODE
 opts+=-pg
-libs+=-pg
+LDFLAGS+=-pg
 endif

 ifdef DEBUGMODE
@@ -262,32 +256,29 @@ debug_opts=-DNDEBUG
 opts+=-O3
 ifdef USELTO
 # compile with LTO
+ifdef MINGW
+opts+=-flto=auto -g
+LDFLAGS+=-flto=auto -g
+else
 opts+=-flto=auto
-libs+=-flto=auto
+LDFLAGS+=-flto=auto
+endif
 endif
 endif

 ifdef USEASAN
 # compile with asan
+ifdef MINGW
+opts+=-fsanitize=address -g
+libs+=-fsanitize=address -g
+else
 opts+=-fsanitize=address
 libs+=-fsanitize=address
 endif
-
-ifdef USEUBSAN
-# compile with asan
-opts+=-fsanitize=undefined
-libs+=-fsanitize=undefined
 endif

-ifneq (,$(filter $(CC) $(CXX),clang clang++))
- libs+=-fuse-ld=lld
-endif
-
-ifdef MINGW
-# mingw needs this passed AFTER lto and the likes were passed
-# otherwise libbacktrace may break
-opts+=-g
-libs+=-g
+ifeq ($(CC),clang)
+ LDFLAGS+= -fuse-ld=lld
 endif

 # debug_opts also get passed to windres
@@ -6,8 +6,7 @@ passthru_opts+=\
 	NOHW NOMD5 NOPOSTPROCESSING\
 	MOBJCONSISTANCY PACKETDROP ZDEBUG\
 	HAVE_MINIUPNPC\
-	HAVE_DISCORDRPC DEVELOP\
-	NOHOLEPUNCH\
+	HAVE_DISCORDRPC DEVELOP

 # build with debugging information
 ifdef DEBUGMODE
@@ -10,7 +10,7 @@

 makedir:=$(makedir)/SDL

-opts+=-DHAVE_SDL
+opts+=-DDIRECTFULLSCREEN -DHAVE_SDL
 sources+=$(call List,sdl/Sourcefile)

 NOUPNP=1
@@ -2,8 +2,6 @@
 # Mingw, if you don't know, that's Win32/Win64
 #

-sources+=$(call List,win32/Sourcefile)
-
 ifndef MINGW64
 EXENAME?=srb2kart-saturn_32bit.exe
 else
@@ -97,7 +95,7 @@ LIBBACKTRACE_libs:=-L$(lib)/lib/x86_64 -lbacktrace
 $(eval $(call _set,LIBBACKTRACE))
 else
 lib:=../libs/drmingw
-opts+=-I$(lib)/include -DHAVE_DRMINGW
+opts+=-I$(lib)/include
 libs+=-L$(lib)/lib/win32 -lmgwhelp -lexchndl
 endif

@@ -53,7 +53,7 @@ r_data.c
 r_draw.c
 r_fps.cpp
 r_main.cpp
-r_patch.cpp
+r_patch.c
 r_patchrotation.c
 r_plane.cpp
 r_segs.cpp
@@ -110,7 +110,7 @@ void I_Error(const char *error, ...)
  char logbuf[8192];

  va_start(argptr, error);
-  vsnprintf(logbuf, 8192, error, argptr);
+  vsprintf(logbuf, error, argptr);
  va_end(argptr);

  LOGE(logbuf);
@@ -166,7 +166,7 @@ void I_OutputMsg(const char *fmt, ...)
  char logbuf[8192];

  va_start(argptr, fmt);
-  vsnprintf(logbuf, 8192, fmt, argptr);
+  vsprintf(logbuf, fmt, argptr);
  va_end(argptr);

  LOGD(logbuf);
@@ -10,13 +10,8 @@
 /// \file  b_bot.h
 /// \brief Basic bot handling

-#ifndef __B_BOT__
-#define __B_BOT__
-
 void B_BuildTiccmd(player_t *player, ticcmd_t *cmd);
 void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward, boolean left, boolean right, boolean strafeleft, boolean straferight, boolean jump, boolean spin);
 boolean B_CheckRespawn(player_t *player);
 void B_MoveBlocked(player_t *player);
 void B_RespawnBot(INT32 playernum);
-
-#endif
@@ -24,8 +24,6 @@

 #include "lauxlib.h"

-#include "../doomdef.h"
-

 #define FREELIST_REF	0	/* free list of references */

@@ -42,7 +40,7 @@ LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) {
  if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
    return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
  lua_getinfo(L, "n", &ar);
-  if (fastcmp(ar.namewhat, "method")) {
+  if (strcmp(ar.namewhat, "method") == 0) {
    narg--;  /* do not count `self' */
    if (narg == 0)  /* error is in the self argument itself? */
      return luaL_error(L, "calling " LUA_QS " on bad self (%s)",
@@ -99,7 +97,7 @@ LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def,
                             luaL_checkstring(L, narg);
  int i;
  for (i=0; lst[i]; i++)
-    if (fastcmp(lst[i], name))
+    if (strcmp(lst[i], name) == 0)
      return i;
  return luaL_argerror(L, narg,
                       lua_pushfstring(L, "invalid option " LUA_QS, name));
@@ -161,13 +161,12 @@ static int io_tostring (lua_State *L) {

 static int StartsWith(const char *a, const char *b) // this is wolfs being lazy yet again
 {
-   if (strncmp(a, b, strlen(b)) == 0) return 1;
+   if(strncmp(a, b, strlen(b)) == 0) return 1;
   return 0;
 }


-static int io_open(lua_State *L)
-{
+static int io_open (lua_State *L) {
 	FILE **pf;
 	const char *filename = luaL_checkstring(L, 1);
 	int pass = 0;
@@ -179,13 +178,12 @@ static int io_open(lua_State *L)

 	for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
 	{
-		if (fasticmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
+		if (!stricmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
 		{
 			pass = 1;
 			break;
 		}
 	}
-
 	if (l_unlikely(strstr(filename, "..") || strchr(filename, ':') || StartsWith(filename, "\\")
 		|| StartsWith(filename, "/") || !pass))
 	{
@@ -359,7 +359,7 @@ size_t COM_CheckParm(const char *check)
 	size_t i;

 	for (i = 1; i < com_argc; i++)
-		if (fasticmp(check, com_argv[i]))
+		if (!strcasecmp(check, com_argv[i]))
 			return i;
 	return 0;
 }
@@ -456,7 +456,7 @@ void COM_AddCommand(const char *name, com_func_t func)
 	// fail if the command already exists
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (fasticmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			// don't I_Error for Lua commands
 			// Lua commands can replace game commands, and they have priority.
@@ -492,7 +492,7 @@ int COM_AddLuaCommand(const char *name)
 	// command already exists
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (fasticmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			// replace the built in command.
 			cmd->function = COM_Lua_f;
@@ -519,7 +519,7 @@ static boolean COM_Exists(const char *com_name)
 	xcommand_t *cmd;

 	for (cmd = com_commands; cmd; cmd = cmd->next)
-		if (fasticmp(com_name, cmd->name))
+		if (!stricmp(com_name, cmd->name))
 			return true;

 	return false;
@@ -571,7 +571,7 @@ static void COM_ExecuteString(char *ptext)
 	// check functions
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (fasticmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (!stricmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			cmd->function();
 			return;
@@ -581,7 +581,7 @@ static void COM_ExecuteString(char *ptext)
 	// check aliases
 	for (a = com_alias; a; a = a->next)
 	{
-		if (fasticmp(com_argv[0], a->name))
+		if (!stricmp(com_argv[0], a->name))
 		{
 			if (recursion > MAX_ALIAS_RECURSION)
 				CONS_Alert(CONS_WARNING, M_GetText("Alias recursion cycle detected!\n"));
@@ -700,7 +700,6 @@ static void COM_Echo_f(void)

 	for (i = 1; i < COM_Argc(); i++)
 		CONS_Printf("%s ", COM_Argv(i));
-
 	CONS_Printf("\n");
 }

@@ -709,11 +708,11 @@ static void COM_Echo_f(void)
 static void COM_CEcho_f(void)
 {
 	size_t i;
-	char cechotext[1024] = {0};
+	char cechotext[1024] = "";

 	for (i = 1; i < COM_Argc(); i++)
 	{
-		strlcat(cechotext, COM_Argv(i), sizeof(cechotext)-1);
+		strlcpy(cechotext, COM_Argv(i), sizeof(cechotext)-1);
 		strlcat(cechotext, " ", sizeof(cechotext)-1);
 	}

@@ -836,7 +835,7 @@ static void COM_Help_f(void)
 			if (cvar->PossibleValue)
 			{
 				{
-					if (fasticmp(cvar->PossibleValue[0].strvalue, "MIN") && fasticmp(cvar->PossibleValue[1].strvalue, "MAX"))
+					if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX"))
 					{
 						if (floatmode)
 						{
@@ -879,7 +878,7 @@ static void COM_Help_f(void)
 		{
 			for (cmd = com_commands; cmd; cmd = cmd->next)
 			{
-				if (!fastcmp(cmd->name, help))
+				if (strcmp(cmd->name, help))
 					continue;

 				CONS_Printf("\x82""Command %s:\n", cmd->name);
@@ -939,8 +938,6 @@ static void COM_Find_f(void)
 	}

 	help = COM_Argv(1);
-	if (!help)
-		return;
 	helplen = strlen(help);
 	CONS_Printf("\x82""Variables:\n");
 	matchesany = false;
@@ -1176,7 +1173,7 @@ consvar_t *CV_FindVar(const char *name)
 	consvar_t *cvar;

 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if (fasticmp(name,cvar->name))
+		if (!stricmp(name,cvar->name))
 			return cvar;

 	return NULL;
@@ -1366,7 +1363,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 				v = INT32_MIN; // Invalid integer trigger
 		}

-		if (var->PossibleValue[0].strvalue && fasticmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
+		if (var->PossibleValue[0].strvalue && !stricmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
 		{
 #define MINVAL 0
 #define MAXVAL 1
@@ -1379,21 +1376,21 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)

 			// search for other
 			for (i = MAXVAL+1; var->PossibleValue[i].strvalue; i++)
-				if (v == var->PossibleValue[i].value || fasticmp(var->PossibleValue[i].strvalue, valstr))
+				if (v == var->PossibleValue[i].value || !stricmp(var->PossibleValue[i].strvalue, valstr))
 				{
 					var->value = var->PossibleValue[i].value;
 					var->string = var->PossibleValue[i].strvalue;
 					goto finish;
 				}

-			if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || fasticmp(valstr, "MIN"))
+			if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || !stricmp(valstr, "MIN"))
 			{
 				v = var->PossibleValue[MINVAL].value;
 				valstr = var->PossibleValue[MINVAL].strvalue;
 				override = true;
 				overrideval = v;
 			}
-			else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || fasticmp(valstr, "MAX"))
+			else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || !stricmp(valstr, "MAX"))
 			{
 				v = var->PossibleValue[MAXVAL].value;
 				valstr = var->PossibleValue[MAXVAL].strvalue;
@@ -1411,7 +1408,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)

 			// check first strings
 			for (i = 0; var->PossibleValue[i].strvalue; i++)
-				if (fasticmp(var->PossibleValue[i].strvalue, valstr))
+				if (!stricmp(var->PossibleValue[i].strvalue, valstr))
 					goto found;
 			if (v != INT32_MIN)
 			{
@@ -1424,9 +1421,9 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 			if (var->PossibleValue == CV_OnOff || var->PossibleValue == CV_YesNo)
 			{
 				overrideval = -1;
-				if (fasticmp(valstr, "on") || fasticmp(valstr, "yes"))
+				if (!stricmp(valstr, "on") || !stricmp(valstr, "yes"))
 					overrideval = 1;
-				else if (fasticmp(valstr, "off") || fasticmp(valstr, "no"))
+				else if (!stricmp(valstr, "off") || !stricmp(valstr, "no"))
 					overrideval = 0;

 				if (overrideval != -1)
@@ -1610,7 +1607,7 @@ void CV_ResetCheatNetVars(void)
 // Returns true if the variable's current value is its default value
 boolean CV_IsSetToDefault(consvar_t *v)
 {
-	return (fastcmp(v->defaultvalue, v->string));
+	return (!(strcmp(v->defaultvalue, v->string)));
 }

 // If any cheats CVars are not at their default settings, return true.
@@ -1622,7 +1619,7 @@ UINT8 CV_CheatsEnabled(void)
 	consvar_t *cvar;

 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if ((cvar->flags & CV_CHEAT) && !fastcmp(cvar->defaultvalue, cvar->string))
+		if ((cvar->flags & CV_CHEAT) && strcmp(cvar->defaultvalue, cvar->string))
 			return 1;
 	return 0;
 }
@@ -1643,7 +1640,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 	if (!var->string)
 		I_Error("CV_Set: %s no string set!\n", var->name);
 #endif
-	if (!var || !var->string || !value || fasticmp(var->string, value))
+	if (!var || !var->string || !value || !stricmp(var->string, value))
 		return; // no changes

 	if (var->flags & CV_NETVAR)
@@ -1653,21 +1650,21 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 		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);
+			CONS_Printf(M_GetText("Only the server or admin can change: %s %s\n"), var->name, var->string);
 			return;
 		}

 		if (var == &cv_kartencore && !M_SecretUnlocked(SECRET_ENCORE))
 		{
-			CONS_Alert(CONS_NOTICE, "You haven't unlocked Encore Mode yet!\n");
+			CONS_Printf(M_GetText("You haven't unlocked Encore Mode yet!\n"));
 			return;
 		}

 		if (var == &cv_kartspeed && !M_SecretUnlocked(SECRET_HARDSPEED))
 		{
-			if (fasticmp(value, "Hard") || atoi(value) == 2)
+			if (!stricmp(value, "Hard") || atoi(value) == 2)
 			{
-				CONS_Alert(CONS_NOTICE, "You haven't unlocked this yet!\n");
+				CONS_Printf(M_GetText("You haven't unlocked this yet!\n"));
 				return;
 			}
 		}
@@ -1684,13 +1681,14 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 		else
 			Setvalue(var, value, stealth);
 	}
-	else if ((var->flags & CV_NOTINNET) && netgame)
-	{
-		CONS_Alert(CONS_NOTICE, "This variable can't be changed while in netgame: %s %s\n", var->name, var->string);
-		return;
-	}
 	else
-		Setvalue(var, value, stealth);
+		if ((var->flags & CV_NOTINNET) && netgame)
+		{
+			CONS_Printf(M_GetText("This variable can't be changed while in netgame: %s %s\n"), var->name, var->string);
+			return;
+		}
+		else
+			Setvalue(var, value, stealth);
 }

 /** Sets a value to a variable without calling its callback function.
@@ -1773,7 +1771,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 				newvalue = var->value - 1;
 				do
 				{
-					if (increment > 0) // Going up!
+					if(increment > 0) // Going up!
 					{
 						if (++newvalue == NUMMAPS)
 							newvalue = -1;
@@ -1787,7 +1785,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 					if (newvalue == oldvalue)
 						break; // don't loop forever if there's none of a certain gametype

-					if (newvalue >= 0 && !mapheaderinfo[newvalue])
+					if(!mapheaderinfo[newvalue])
 						continue; // Don't allocate the header.  That just makes memory usage skyrocket.

 				} while (!M_CanShowLevelInList(newvalue, gt));
@@ -1799,7 +1797,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 		}
 #define MINVAL 0
 #define MAXVAL 1
-		else if (var->PossibleValue[MINVAL].strvalue && fastcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
+		else if (var->PossibleValue[MINVAL].strvalue && !strcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
 		{ // SRB2Kart
 #ifdef PARANOIA
 			if (!var->PossibleValue[MAXVAL].strvalue)
@@ -1916,14 +1914,13 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 				max = (M_SecretUnlocked(SECRET_HARDSPEED) ? 3 : 2);
 			}
 #ifdef PARANOIA
-			if (currentindice == -1 || max == 0)
-				I_Error("CV_AddValue: current value %d not found in possible value\n", var->value);
+			if (currentindice == -1)
+				I_Error("CV_AddValue: current value %d not found in possible value\n",
+					var->value);
 #endif
-			if (max > 0)
-			{
-				newindice = (currentindice + increment + max) % max;
-				CV_Set(var, var->PossibleValue[newindice].strvalue);
-			}
+
+			newindice = (currentindice + increment + max) % max;
+			CV_Set(var, var->PossibleValue[newindice].strvalue);
 		}
 	}
 	else
@@ -1971,12 +1968,12 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 	{
 		if (joyaxis_default[i])
 		{
-			if (fasticmp(v->name, "joyaxis_fire"))
+			if (!stricmp(v->name, "joyaxis_fire"))
 			{
 				if (joyaxis_count[i] > 7) return false;
 				else if (joyaxis_count[i] == 7) return true;

-				if (fasticmp(valstr, "None")) joyaxis_count[i]++;
+				if (!stricmp(valstr, "None")) joyaxis_count[i]++;
 				else joyaxis_default[i] = false;
 			}
 			// reset all axis settings to defaults
@@ -2008,37 +2005,37 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 // Block the Xbox DInput default axes and reset to the current defaults
 static boolean CV_FilterJoyAxisVars2(consvar_t *v, const char *valstr)
 {
-	if (fasticmp(v->name, "joyaxis_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis2_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis3_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis4_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis2_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis3_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis4_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis2_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis3_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis4_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis_drift") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis2_drift") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis3_drift") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis4_drift") && !stricmp(valstr, "None"))
 		return false;

 	return true;
@@ -2055,8 +2052,8 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr)

 	if (GETMAJOREXECVERSION(cv_execversion.value) < 8) // 8 = 1.4
 	{
-		if (fasticmp(v->name, "masterserver") // Replaces a hack in MasterServer_OnChange for the original SRB2 MS.
-			|| fasticmp(v->name, "gamma")) // Too easy to accidentially change in prior versions.
+		if (!stricmp(v->name, "masterserver") // Replaces a hack in MasterServer_OnChange for the original SRB2 MS.
+			|| !stricmp(v->name, "gamma")) // Too easy to accidentially change in prior versions.
 			return false;
 	}

@@ -2139,7 +2136,7 @@ void CV_SaveVariables(FILE *f)
 			char stringtowrite[MAXTEXTCMD+1];

 			// Silly hack for Min/Max vars
-			if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
+			if (!strcmp(cvar->string, "MAX") || !strcmp(cvar->string, "MIN"))
 			{
 				if (cvar->flags & CV_FLOAT)
 					sprintf(stringtowrite, "%f", FixedToFloat(cvar->value));
@@ -69,9 +69,14 @@ static boolean consoleready;  // console prompt is ready
       INT32 con_destlines; // vid lines used by console at final position
 static INT32 con_curlines;  // vid lines currently used by console

+       INT32 con_clipviewtop; // (useless)
+
 static UINT8  con_hudlines;             // number of console heads up message lines
 static UINT32 con_hudtime[MAXHUDLINES]; // remaining time of display for hud msg lines

+       INT32 con_clearlines;      // top screen lines to refresh when view reduced
+       boolean con_hudupdate;   // when messages scroll, we need a backgrnd refresh
+
 // console text output
 static char *con_line;          // console text output current line
 static size_t con_cx;           // cursor position in current line
@@ -388,6 +393,9 @@ void CON_Init(void)

 	Lock_state();

+	//note: CON_Ticker should always execute at least once before D_Display()
+	con_clipviewtop = -1; // -1 does not clip
+
 	con_hudlines = atoi(cons_hudlines.defaultvalue);

 	Unlock_state();
@@ -719,6 +727,7 @@ void CON_ToggleOff(void)
 	con_curlines = 0;
 	CON_ClearHUD();
 	con_forcepic = 0;
+	con_clipviewtop = -1; // remove console clipping of view

 	I_SetTextInput(false);

@@ -770,6 +779,18 @@ void CON_Ticker(void)
 		}
 	}

+	// clip the view, so that the part under the console is not drawn
+	con_clipviewtop = -1;
+	if (cons_backpic.value) // clip only when using an opaque background
+	{
+		if (con_curlines > 0)
+			con_clipviewtop = con_curlines - viewwindowy - 1 - 10;
+		// NOTE: BIG HACK::SUBTRACT 10, SO THAT WATER DON'T COPY LINES OF THE CONSOLE
+		//       WINDOW!!! (draw some more lines behind the bottom of the console)
+		if (con_clipviewtop < 0)
+			con_clipviewtop = -1; // maybe not necessary, provided it's < 0
+	}
+
 	// check if console ready for prompt
 	if (con_destlines >= minheight)
 	{
@@ -1010,7 +1031,7 @@ boolean CON_Responder(event_t *ev)
 		Lock_state();

 		// Only add command to history if it differs from previous one
-		if (!fastcmp(input.buffer, inputlines[(inputline-1) & 31]))
+		if (strcmp(input.buffer, inputlines[(inputline-1) & 31]))
 		{
 			inputline = (inputline+1) & 31;
 			M_TextInputInit(&input, inputlines[inputline], CON_MAXPROMPTCHARS);
@@ -1079,6 +1100,9 @@ static void CON_Linefeed(void)

 	con_line = &con_buffer[(con_cy%con_totallines)*con_width];
 	memset(con_line, ' ', con_width);
+
+	// make sure the view borders are refreshed if hud messages scroll
+	con_hudupdate = true; // see HU_Erase()
 }

 // Outputs text into the console text buffer
@@ -1258,7 +1282,7 @@ void CONS_Alert(alerttype_t level, const char *fmt, ...)
 		txt = malloc(8192);

 	va_start(argptr, fmt);
-	vsnprintf(txt, 8192, fmt, argptr);
+	vsprintf(txt, fmt, argptr);
 	va_end(argptr);

 	switch (level)
@@ -1294,7 +1318,7 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...)
 		txt = malloc(8192);

 	va_start(argptr, fmt);
-	vsnprintf(txt, 8192, fmt, argptr);
+	vsprintf(txt, fmt, argptr);
 	va_end(argptr);

 	// Again I am lazy, oh well
@@ -1465,6 +1489,9 @@ static void CON_DrawHudlines(void)
 		//V_DrawCharacter(x, y, (p[c]&0xff) | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 		y += charheight;
 	}
+
+	// top screen lines that might need clearing when view is reduced
+	con_clearlines = y; // this is handled by HU_Erase();
 }

 // draw the console background, text, and prompt if enough place
@@ -1482,6 +1509,10 @@ static void CON_DrawConsole(void)
 	if (con_curlines <= 0)
 		return;

+	//FIXME: refresh borders only when console bg is translucent
+	con_clearlines = con_curlines; // clear console draw from view borders
+	con_hudupdate = true; // always refresh while console is on
+
 	// draw console background
 	if (cons_backpic.value || con_forcepic)
 	{
@@ -30,9 +30,14 @@ extern boolean con_recalc;

 extern boolean con_startup;

+// top clip value for view render: do not draw part of view hidden by console
+extern INT32 con_clipviewtop;
+
 // 0 means console if off, or moving out
 extern INT32 con_destlines;

+extern INT32 con_clearlines; // lines of top of screen to refresh
+extern boolean con_hudupdate; // hud messages have changed, need refresh
 extern UINT32 con_scalefactor; // console text scale factor

 extern consvar_t cons_backcolor, cons_menuhighlight;
@@ -1,4 +1,4 @@
-// SONIC ROBO BLAST 2 KART
+// BLANKART
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Ronald "Eidolon" Kinard
 // Copyright (C) 2024 by Kart Krew
@@ -1,4 +1,4 @@
-// SONIC ROBO BLAST 2 KART
+// BLANKART
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Ronald "Eidolon" Kinard
 // Copyright (C) 2024 by Kart Krew
@@ -1,4 +1,4 @@
-// SONIC ROBO BLAST 2 KART
+// BLANKART
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Ronald "Eidolon" Kinard
 // Copyright (C) 2024 by Kart Krew
@@ -823,7 +823,7 @@ static void resynch_read_player(resynch_pak *rsp)
 	P_SetThingPosition(players[i].mo);
 }

-static void resynch_write_ctf(resynchend_pak *rst)
+static inline void resynch_write_ctf(resynchend_pak *rst)
 {
 	mobj_t *mflag;
 	UINT8 i, j;
@@ -863,7 +863,7 @@ static void resynch_write_ctf(resynchend_pak *rst)
 	}
 }

-static void resynch_read_ctf(resynchend_pak *p)
+static inline void resynch_read_ctf(resynchend_pak *p)
 {
 	UINT8 i;

@@ -1656,7 +1656,12 @@ static void SV_SendPlayerInfo(INT32 node)

 		netbuffer->u.playerinfo[i].node = i;

-		strlcpy(netbuffer->u.playerinfo[i].name, (const char *)&player_names[i], MAXPLAYERNAME+1);
+		// Can't really change this because net compatibility, but the warning is annoying
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+		strncpy(netbuffer->u.playerinfo[i].name, (const char *)&player_names[i], MAXPLAYERNAME+1);
+#pragma GCC diagnostic pop
+		netbuffer->u.playerinfo[i].name[MAXPLAYERNAME] = '\0';

 		//fetch IP address
 		//No, don't do that, you fuckface.
@@ -2174,7 +2179,7 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
 		if (info->subversion != SUBVERSION)
 			return; // Close, but no cigar.

-		if (!fastcmp(info->application, SRB2APPLICATION))
+		if (strcmp(info->application, SRB2APPLICATION))
 			return;/* that's a different mod */

 		i = serverlistcount++;
@@ -2219,7 +2224,7 @@ void CL_QueryServerList (msg_server_t *server_list)
 		// thwart nefarious servers who lie to the MS.

 		/* lol bruh, that version COMES from the servers */
-		//if (fastcmp(version, server_list[i].version))
+		//if (strcmp(version, server_list[i].version) == 0)
 		{
 			INT32 node = I_NetMakeNodewPort(server_list[i].ip, server_list[i].port);
 			if (node == -1)
@@ -3215,7 +3220,7 @@ static void Command_connect(void)

 	server = false;

-	if (fasticmp(COM_Argv(1), "self"))
+	if (!stricmp(COM_Argv(1), "self"))
 	{
 		servernode = 0;
 		server = true;
@@ -3225,7 +3230,7 @@ static void Command_connect(void)
 	else
 	{
 		// used in menu to connect to a server in the list
-		if (netgame && fasticmp(COM_Argv(1), "node"))
+		if (netgame && !stricmp(COM_Argv(1), "node"))
 		{
 			servernode = (SINT8)atoi(COM_Argv(2));
 		}
@@ -3240,7 +3245,7 @@ static void Command_connect(void)
 			netgame = true;
 			multiplayer = true;

-			if (fasticmp(COM_Argv(1), "any"))
+			if (!stricmp(COM_Argv(1), "any"))
 				servernode = BROADCASTADDR;
 			else if (I_NetMakeNodewPort && COM_Argc() >= 3)
 				servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
@@ -3264,7 +3269,6 @@ static void Command_connect(void)
 		splitscreen = cv_splitplayers.value-1;
 		SplitScreen_OnChange();
 	}
-
 	botingame = false;
 	botskin = 0;
 	CL_ConnectToServer();
@@ -4157,10 +4161,7 @@ static void Joinable_OnChange(void)
 	UINT8 maxplayer;

 	if (!server)
-	{
-		CONS_Alert(CONS_NOTICE, ("Only the server can change: %s %s\n"), cv_allownewplayer.name, cv_allownewplayer.string);
 		return;
-	}

 #ifdef SATURNJOIN
 	// disabling joins should also disable saturn joins unless its called with CV_StealthSet and vice versa to make life a bit easier
@@ -4650,22 +4651,11 @@ void SV_StopServer(void)
 		Y_EndIntermission();
 	if (gamestate == GS_VOTING)
 		Y_EndVote();
-
-	G_SetGamestate(GS_NULL);
-	wipegamestate = GS_NULL;
+	gamestate = wipegamestate = GS_NULL;

 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
-	{
 		localtextcmd[i][0] = 0;

-		while (textcmdbuf[i] != NULL)
-		{
-			textcmdbuf_t *buf = textcmdbuf[i];
-			textcmdbuf[i] = textcmdbuf[i]->next;
-			Z_Free(buf);
-		}
-	}
-
 	for (i = firstticstosend; i < firstticstosend + BACKUPTICS; i++)
 		D_Clearticcmd(i);

@@ -97,15 +97,15 @@
 UINT8 window_notinfocus = false;

 static char *startupiwadfiles[MAX_WADFILES];
-static size_t startupiwadcount = 0;
 static char *startuppwads[MAX_WADFILES];
-static size_t startuppwadcount = 0;

 // autoloading
 static char *autoloadwadfiles[MAX_WADFILES];
 static char *autoloadwadfilespost[MAX_WADFILES];
-static size_t autoloadcount = 0;
-static size_t postloadcount = 0;
+boolean autoloading;
+boolean autoloaded;
+boolean postautoloaded = false;
+boolean wasautoloaded = false;
 //

 boolean devparm = false; // started game with -devparm
@@ -113,9 +113,7 @@ boolean devparm = false; // started game with -devparm
 boolean singletics = false; // timedemo
 boolean lastdraw = false;

-#ifdef MOTIONBLUR
 INT32 postimgparam[MAXSPLITSCREENPLAYERS];
-#endif

 // These variables are only true if
 // whether the respective sound system is disabled
@@ -349,69 +347,11 @@ static void D_Renderview(void)
 		}
 	}

-	for (i = 0; i <= splitscreen; i++)
-	{
-		if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
-		{
-			viewssnum = i;
-
-			switch (i)
-			{
-				case 1:
-					if (splitscreen > 1)
-					{
-						viewwindowx = viewwidth;
-						viewwindowy = 0;
-					}
-					else
-					{
-						viewwindowx = 0;
-						viewwindowy = viewheight;
-					}
-					break;
-				case 2:
-					viewwindowx = 0;
-					viewwindowy = viewheight;
-					break;
-				case 3:
-					viewwindowx = viewwidth;
-					viewwindowy = viewheight;
-					break;
-				default: // Initialize for P1
-					viewwindowy = viewwindowx = 0;
-					objectsdrawn = 0;
-					break;
-			}
-
-#ifdef HWRENDER
-			if (rendermode == render_opengl)
-			{
-				HWR_RenderPlayerView();
-			}
-			else if (rendermode == render_soft)
-#endif
-
-			R_RenderPlayerView(&players[displayplayers[i]]);
-		}
-
-		if (rendermode == render_soft)
-		{
-			if (i == 0)
-				R_ApplyViewMorph();
-
-#ifdef MOTIONBLUR
-			V_DoPostProcessor(i, postimgparam[i]);
-#else
-			V_DoPostProcessor(i, 0);
-#endif
-		}
-	}
-
 	// Draw over the fourth screen so you don't have to stare at a HOM :V
 	if (splitscreen == 2)
 	{
 		// V_DrawPatchFill, but for the fourth screen only
-		patch_t *pat = W_CachePatchName("SRB2BACK", PU_PATCH);
+		patch_t *pat = W_CachePatchName("SRB2BACK", PU_CACHE);
 		INT32 x, y, pw = SHORT(pat->width) * vid.dup, ph = SHORT(pat->height) * vid.dup;

 		for (x = vid.width>>1; x < vid.width; x += pw)
@@ -421,6 +361,65 @@ static void D_Renderview(void)
 		}
 	}

+	for (i = 0; i <= splitscreen; i++)
+	{
+		const boolean issplitscreen = (i > 0);
+
+		if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
+		{
+			viewssnum = i;
+
+			if (!issplitscreen) // Initialize for P1
+			{
+				viewwindowy = viewwindowx = 0;
+				objectsdrawn = 0;
+			}
+
+#ifdef HWRENDER
+			if (rendermode == render_opengl)
+			{
+				HWR_RenderPlayerView();
+				R_RestoreLevelInterpolators();
+				continue;
+			}
+#endif
+			if (issplitscreen) // Splitscreen-specific
+			{
+				switch (i)
+				{
+					case 1:
+						if (splitscreen > 1)
+						{
+							viewwindowx = viewwidth;
+							viewwindowy = 0;
+						}
+						else
+						{
+							viewwindowx = 0;
+							viewwindowy = viewheight;
+						}
+						break;
+					case 2:
+						viewwindowx = 0;
+						viewwindowy = viewheight;
+						break;
+					case 3:
+						viewwindowx = viewwidth;
+						viewwindowy = viewheight;
+					default:
+						break;
+				}
+			}
+
+			R_RenderPlayerView(&players[displayplayers[i]]);
+		}
+
+		if (!issplitscreen)
+			R_ApplyViewMorph();
+
+		V_DoPostProcessor(i, postimgparam[i]);
+	}
+
 	R_RestoreLevelInterpolators();
 }

@@ -523,16 +522,19 @@ static boolean D_Display(void)
 		case GS_LEVEL:
 			if (!gametic)
 				break;
+			HU_Erase();
 			AM_Drawer();
 			break;

 		case GS_INTERMISSION:
 			Y_IntermissionDrawer();
+			HU_Erase();
 			HU_Drawer();
 			break;

 		case GS_VOTING:
 			Y_VoteDrawer();
+			HU_Erase();
 			HU_Drawer();
 			break;

@@ -547,6 +549,7 @@ static boolean D_Display(void)

 		case GS_CUTSCENE:
 			F_CutsceneDrawer();
+			HU_Erase();
 			HU_Drawer();
 			break;

@@ -556,6 +559,7 @@ static boolean D_Display(void)

 		case GS_EVALUATION:
 			F_GameEvaluationDrawer();
+			HU_Erase();
 			HU_Drawer();
 			break;

@@ -565,6 +569,7 @@ static boolean D_Display(void)

 		case GS_CREDITS:
 			F_CreditDrawer();
+			HU_Erase();
 			HU_Drawer();
 			break;

@@ -581,6 +586,7 @@ static boolean D_Display(void)
 			{
 				// I don't think HOM from nothing drawing is independent...
 				F_WaitingPlayersDrawer();
+				HU_Erase();
 				HU_Drawer();
 			}
 		case GS_TIMEATTACK:
@@ -768,7 +774,6 @@ void D_SRB2Loop(void)
 		precise_t capbudget;
 		precise_t enterprecise = I_GetPreciseTime();

-		memset(&g_dc, 0, sizeof(g_dc));
 		Z_Frame_Reset();

 		// Casting the return value of a function is bad practice (apparently)
@@ -884,6 +889,12 @@ void D_SRB2Loop(void)
 				// always update console and hud
 				// otherwise it may take minutes to open it
 				CON_Drawer();
+
+				if (gamestate == GS_LEVEL)
+				{
+					ST_Drawer();
+					HU_Drawer();
+				}
 			}
 		}

@@ -967,11 +978,8 @@ void D_ClearState(void)
 {
 	INT32 i;

-	demo.title = false;
-
 	// okay, stop now
 	// (otherwise the game still thinks we're playing!)
-	CURLAbortFile();
 	SV_StopServer();
 	SV_ResetServer();
 	serverlistultimatecount = 0;
@@ -980,10 +988,7 @@ void D_ClearState(void)
 		CL_ClearPlayer(i);

 	splitscreen = 0;
-
-	// recompute screen size
-	R_ExecuteSetViewSize();
-
+	SplitScreen_OnChange();
 	botingame = false;
 	botskin = 0;
 	cv_debug = 0;
@@ -1002,6 +1007,7 @@ void D_ClearState(void)
 	gameaction = ga_nothing;
 	memset(displayplayers, 0, sizeof(displayplayers));
 	consoleplayer = 0;
+	//demosequence = -1;
 	gametype = GT_RACE; // SRB2kart
 	paused = false;

@@ -1020,15 +1026,10 @@ void D_ClearState(void)
 	S_StopSounds();
 	S_ResetKeepAndSpecialMus(); // just in case

-	//P_FreeLevelState();
+	P_FreeLevelState();

 	G_SetGamestate(GS_NULL);
 	wipegamestate = GS_NULL;
-
-	M_ClearMenus(true);
-
-	// map palettes affect this
-	D_ResetDeviceLED();
 }

 //
@@ -1036,18 +1037,25 @@ void D_ClearState(void)
 //
 void D_StartTitle(void)
 {
+	demo.title = false;
 	D_ClearState();
-	multiplayer = netgame = false; // title menu shouldnt be a netgame or multiplayer lmao
+	netgame = false; // title menu shouldnt be a netgame lmao
+	M_ClearMenus(true);
 	F_StartTitleScreen();
+	D_ResetDeviceLED();
 }

 //
 // D_AddFile
 //
-static void D_AddFile(const char *file, char **filearray, size_t index)
+static void D_AddFile(const char *file, char **filearray)
 {
+	size_t pnumwadfiles;
 	char *newfile;

+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
+		;
+
 	newfile = malloc(strlen(file) + 1);
 	if (!newfile)
 	{
@@ -1055,17 +1063,16 @@ static void D_AddFile(const char *file, char **filearray, size_t index)
 	}
 	strcpy(newfile, file);

-	filearray[index] = newfile;
+	filearray[pnumwadfiles] = newfile;
 }

-static void D_CleanFile(char **filearray, size_t count)
+static void D_CleanFile(char **filearray)
 {
-	size_t i;
-
-	for (i = 0; i < count; i++)
+	size_t pnumwadfiles;
+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
 	{
-		free(filearray[i]);
-		filearray[i] = NULL;
+		free(filearray[pnumwadfiles]);
+		filearray[pnumwadfiles] = NULL;
 	}
 }

@@ -1078,27 +1085,28 @@ static INT32 D_DetectFileType(const char* filename)

 	const size_t len = strlen(filename);

-	if (fasticmp(&filename[len - 4], ".wad"))
+	if (!stricmp(&filename[len - 4], ".wad"))
 		return 2;
-	else if (fasticmp(&filename[len - 4], ".pk3"))
+	else if (!stricmp(&filename[len - 4], ".pk3"))
 		return 3;
-	else if (fasticmp(&filename[len - 5], ".kart"))
+	else if (!stricmp(&filename[len - 5], ".kart"))
 		return 4;
-	else if (fasticmp(&filename[len - 4], ".lua"))
+	else if (!stricmp(&filename[len - 4], ".lua"))
 		return 5;
-	else if (fasticmp(&filename[len - 4], ".soc"))
+	else if (!stricmp(&filename[len - 4], ".soc"))
 		return 6;
-	else if (fasticmp(&filename[len - 4], ".cfg"))
+	else if (!stricmp(&filename[len - 4], ".cfg"))
 		return 7;
-	else if (fasticmp(&filename[len - 4], ".txt"))
+	else if (!stricmp(&filename[len - 4], ".txt"))
 		return 8;

 	return 0;
 }

 // autoload that shit
-static void D_AutoloadFile(const char *file, char **filearray, size_t index)
+static void D_AutoloadFile(const char *file, char **filearray)
 {
+	size_t pnumwadfiles;
 	char *newfile;
 	INT32 fileType = D_DetectFileType(file);

@@ -1108,6 +1116,9 @@ static void D_AutoloadFile(const char *file, char **filearray, size_t index)
 		return;
 	}

+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
+		;
+
 	if (fileType <= 6)
 	{
 		newfile = malloc(strlen(file) + 1);
@@ -1115,7 +1126,7 @@ static void D_AutoloadFile(const char *file, char **filearray, size_t index)
 			I_Error("No more free memory to AutoloadFile %s",file);

 		strcpy(newfile, file);
-		filearray[index] = newfile;
+		filearray[pnumwadfiles] = newfile;
 	}
 	else
 	{
@@ -1145,44 +1156,42 @@ static void D_FindAddonsToAutoload(void)
 {
 	FILE *autoloadconfigfile;
 	const char *autoloadpath;
-	char *newline;
-
 	boolean postload;

+	INT32 i;
 	char wadsToAutoload[256] = "";

 	// does it exist tho
-	autoloadpath = va("%s"PATHSEP"%s", srb2home, AUTOLOADCONFIGFILENAME);
+	autoloadpath = va("%s"PATHSEP"%s",srb2home,AUTOLOADCONFIGFILENAME);
 	autoloadconfigfile = fopen(autoloadpath, "r");

 	// If the file is found, run our shit
 	if (!autoloadconfigfile) // nope outta here
 	{
-		autoloadcount = postloadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
+		wasautoloaded = postautoloaded = true; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
 		return;
 	}

-	while (fgets(wadsToAutoload, sizeof(wadsToAutoload), autoloadconfigfile) != NULL)
+	while (fgets(wadsToAutoload, sizeof wadsToAutoload, autoloadconfigfile) != NULL)
 	{
 		postload = false;
-
 		// skip if commented or empty
-		if (wadsToAutoload[0] == '\n' ||
-			wadsToAutoload[0] == '#'  ||
-			wadsToAutoload[0] == '\0')
+		if ((wadsToAutoload[1] == '\0' || wadsToAutoload[1] == '\n')
+			|| (wadsToAutoload[0] == '#'))
 			continue;
-
 		// this marks it so that it loads after loading server addons
-		if (fastncmp(wadsToAutoload, "postload ", 9))
+		else if (fastncmp(wadsToAutoload, "postload ", 9))
 		{
 			strremove(wadsToAutoload, "postload ");
 			postload = true;
 		}

 		// Remove Any Empty or Skipped Lines
-		newline = strchr(wadsToAutoload, '\n');
-		if (newline)
-			*newline = '\0';
+		for (i = 0; wadsToAutoload[i] != '\0'; i++)
+		{
+			if (wadsToAutoload[i] == '\n')
+				wadsToAutoload[i] = '\0';
+		}

 		if (!postload && W_CheckPostLoadList(wadsToAutoload))
 		{
@@ -1192,19 +1201,14 @@ static void D_FindAddonsToAutoload(void)

 		// LOAD IT
 		if (!postload)
-		{
-			D_AutoloadFile(wadsToAutoload, autoloadwadfiles, autoloadcount);
-			autoloadcount++;
-		}
+			D_AutoloadFile(wadsToAutoload, autoloadwadfiles);
 		else
-		{
-			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, postloadcount);
-			postloadcount++;
-		}
-	}
+			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost);

-	autoloadwadfiles[autoloadcount] = NULL;
-	autoloadwadfilespost[postloadcount] = NULL;
+		// end it here
+		for (i = 0; wadsToAutoload[i] != '\0'; i++)
+			wadsToAutoload[i] = '\0';
+	}

 	// we dont want memory leaks around here do we?
 	fclose(autoloadconfigfile);
@@ -1212,47 +1216,41 @@ static void D_FindAddonsToAutoload(void)

 static void D_AddAutoloadFiles(void)
 {
-	// nothing to autoload
-	if (autoloadcount == 0)
+	if (wasautoloaded)
 		return;

 	CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
-
 	if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
 		CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
+	D_CleanFile(autoloadwadfiles);

-	D_CleanFile(autoloadwadfiles, autoloadcount);
-
-	autoloadcount = 0;
+	wasautoloaded = true;
 }

 void D_AddPostloadFiles(void)
 {
-	// nothing to postload
-	if (postloadcount == 0 || !netgame)
+	if (postautoloaded || !netgame)
 		return;

 	CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
-
 	if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
 		CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
+	D_CleanFile(autoloadwadfilespost);

-	D_CleanFile(autoloadwadfilespost, postloadcount);
-
-	postloadcount = 0;
+	postautoloaded = true;
 }

 // ==========================================================================
 // Identify the SRB2 version, and IWAD file to use.
 // ==========================================================================

-static boolean AddIWAD(const char * file, const char *dir)
+static boolean AddIWAD(void)
 {
-	char * path = va(pandf, dir, file);
+	char * path = va(pandf, srb2path, "srb2.srb");

 	if (FIL_ReadFileOK(path))
 	{
-		D_AddFile(path, startupiwadfiles, startupiwadcount++);
+		D_AddFile(path, startupiwadfiles);
 		return true;
 	}

@@ -1288,14 +1286,14 @@ static void IdentifyVersion(void)
 	}

 #if (1) // reduce the amount of findfile by only using full cwd in this func
-	if (!fastcmp(tempsrb2path, srb2waddir))
+	if (strcmp(tempsrb2path, srb2waddir))
 #endif
 	{
 		strlcpy(srb2path, srb2waddir, sizeof (srb2path));
 	}

 	// Load the IWAD
-	if (!AddIWAD("srb2.srb", srb2path)) // not sure why this uses srb2path and not srb2waddir?
+	if (!AddIWAD())
 	{
 		I_Error("SRB2.SRB not found! Expected in %s\n", srb2waddir);
 	}
@@ -1309,60 +1307,57 @@ static void IdentifyVersion(void)

 #ifdef USE_PATCH_DTA
 	// Add our crappy patches to fix our bugs
-	if (!AddIWAD("patch.dta", srb2waddir))
-	{
-		I_Error("patch.dta not found! Expected in %s\n", srb2waddir);
-	}
+	D_AddFile(va(pandf,srb2waddir,"patch.dta"));
 #endif
-	if (!AddIWAD("gfx.kart", srb2waddir))
-	{
-		I_Error("gfx.kart not found! Expected in %s\n", srb2waddir);
-	}

-	if (!AddIWAD("textures.kart", srb2waddir))
-	{
-		I_Error("textures.kart not found! Expected in %s\n", srb2waddir);
-	}
-
-	if (!AddIWAD("chars.kart", srb2waddir))
-	{
-		I_Error("chars.kart not found! Expected in %s\n", srb2waddir);
-	}
-
-	if (!AddIWAD("maps.kart", srb2waddir))
-	{
-		I_Error("maps.kart not found! Expected in %s\n", srb2waddir);
-	}
+	D_AddFile(va(pandf, srb2waddir, "gfx.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "textures.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "chars.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "maps.kart"), startupiwadfiles);
 #ifdef USE_PATCH_KART
-	if (!AddIWAD("patch.kart", srb2waddir))
-	{
-		I_Error("patch.kart not found! Expected in %s\n", srb2waddir);
-	}
+	D_AddFile(va(pandf,srb2waddir,"patch.kart"), startupiwadfiles);
 #endif

+	const char *path = NULL;
+
+	path = va(pandf, srb2waddir, "extra.kart");
+
 	// completely optional
-	if (AddIWAD("extra.kart", srb2waddir))
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
 		found_extra_kart = true;
+	}
+
+	path = va(pandf, srb2waddir, "extra2.kart");

 	// completely optional 2: Back with a vengence
-	if (AddIWAD("extra2.kart", srb2waddir))
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
 		found_extra2_kart = true;
+	}

-	if (AddIWAD("extra3.kart", srb2waddir))
+	path = va(pandf, srb2waddir, "extra3.kart");
+
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
 		found_extra3_kart = true;
+	}

 #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
 #define MUSICTEST(str) \
-	musicpath = va(pandf, srb2waddir, str);\
+	musicpath = va(pandf,srb2waddir,str);\
 	handle = W_OpenWadFile(&musicpath, false); \
 	if (handle) \
-	{ \
+	{\
 		int ms = W_VerifyNMUSlumps(musicpath, handle, false); \
 		fclose(handle); \
 		if (ms == 0) \
 			I_Error("File " str " has been modified with non-music/sound lumps"); \
 		if (ms == 1) \
-			D_AddFile(musicpath, startupiwadfiles, startupiwadcount++); \
+			D_AddFile(musicpath, startupiwadfiles); \
 	}
 	{
 		const char *musicpath;
@@ -1736,14 +1731,8 @@ void D_SRB2Main(void)
 		else
 		{
 			// use user specific config file
-			if (M_CheckParm("-workdir") && M_IsNextParm())
-				snprintf(srb2home, sizeof srb2home, "%s", M_GetNextParm());
-			else
 #ifdef DEFAULTDIR
-				snprintf(srb2home, sizeof srb2home, "%s" PATHSEP DEFAULTDIR, userhome);
-#else // DEFAULTDIR
-				snprintf(srb2home, sizeof srb2home, "%s", userhome);
-#endif // DEFAULTDIR
+			snprintf(srb2home, sizeof srb2home, "%s" PATHSEP DEFAULTDIR, userhome);
 			snprintf(downloaddir, sizeof downloaddir, "%s" PATHSEP "DOWNLOAD", srb2home);
 			if (dedicated)
 				snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, srb2home);
@@ -1752,6 +1741,17 @@ void D_SRB2Main(void)

 			// can't use sprintf since there is %u in savegamename
 			strcatbf(savegamename, srb2home, PATHSEP);
+#else
+			snprintf(srb2home, sizeof srb2home, "%s", userhome);
+			snprintf(downloaddir, sizeof downloaddir, "%s", userhome);
+			if (dedicated)
+				snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, userhome);
+			else
+				snprintf(configfile, sizeof configfile, "%s" PATHSEP CONFIGFILENAME, userhome);
+
+			// can't use sprintf since there is %u in savegamename
+			strcatbf(savegamename, userhome, PATHSEP);
+#endif
 		}

 		configfile[sizeof configfile - 1] = '\0';
@@ -1777,9 +1777,6 @@ void D_SRB2Main(void)
 		}
 	}

-	// make sure workdir exists
-	I_mkdir(srb2home, 0755);
-
 	// Create addons dir
 	snprintf(addonsdir, sizeof addonsdir, "%s%s%s", srb2home, PATHSEP, "addons");
 	I_mkdir(addonsdir, 0755);
@@ -1808,7 +1805,7 @@ void D_SRB2Main(void)
 				const char *s = M_GetNextParm();

 				if (s) // Check for NULL?
-					D_AddFile(s, startuppwads, startuppwadcount++);
+					D_AddFile(s, startuppwads);
 			}
 		}
 	}
@@ -1841,10 +1838,8 @@ void D_SRB2Main(void)
 	// load wad, including the main wad file
 	CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");

-	W_InitMultipleFiles(startupiwadfiles, startupiwadcount, false);
-	//mainwads = startupiwadcount - musicwads;
-	D_CleanFile(startupiwadfiles, startupiwadcount);
-	startupiwadcount = 0;
+	W_InitMultipleFiles(startupiwadfiles, false);
+	D_CleanFile(startupiwadfiles);
 	mainwads = 0;

 #ifndef DEVELOP
@@ -1883,16 +1878,15 @@ void D_SRB2Main(void)

 	D_CheckMaps(false);

-	W_InitMultipleFiles(startuppwads, startuppwadcount, true);
+	W_InitMultipleFiles(startuppwads, true);

 	// Only search for pwad maps if we actually have a pwad added
-	if (startuppwadcount > 0)
+	if (startuppwads[0] != NULL)
 	{
 		D_CheckMaps(true);
 	}

-	D_CleanFile(startuppwads, startuppwadcount);
-	startuppwadcount = 0;
+	D_CleanFile(startuppwads);

 	cht_Init();

@@ -1936,7 +1930,9 @@ void D_SRB2Main(void)

 	G_LoadGameData();

+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
 	VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen
+#endif

 	// set user default mode or mode set at cmdline
 	SCR_CheckDefaultMode();
@@ -2156,14 +2152,11 @@ void D_SRB2Main(void)
 			const char *sskill = M_GetNextParm();

 			for (j = 0; kartspeed_cons_t[j].strvalue; j++)
-			{
-				if (fasticmp(kartspeed_cons_t[j].strvalue, sskill))
+				if (!strcasecmp(kartspeed_cons_t[j].strvalue, sskill))
 				{
 					newskill = (INT16)kartspeed_cons_t[j].value;
 					break;
 				}
-			}
-
 			if (!kartspeed_cons_t[j].strvalue) // reached end of the list with no match
 			{
 				j = atoi(sskill); // assume they gave us a skill number, which is okay too
@@ -61,6 +61,9 @@ extern boolean minilighticon;     // mkwii-style minimap headlight
 //

 // autoload stuff
+extern boolean autoloading;
+extern boolean autoloaded;
+extern boolean postautoloaded;
 void D_AddPostloadFiles(void);

 // the infinite loop of D_SRB2Loop() called from win_main for windows version
@@ -1127,7 +1127,9 @@ boolean HGetPacket(void)

 	while (true)
 	{
-		if (!I_NetGet()) // No packets received
+		I_NetGet();
+
+		if (doomcom->remotenode == -1) // No packet received
 			return false;

 		getbytes += packetheaderlength + doomcom->datalength; // For stat
@@ -1163,7 +1165,6 @@ boolean HGetPacket(void)
 			GotAcks();
 			continue;
 		}
-
 		doomcom->datalength -= BASEPACKETSIZE;
 		break;
 	}
@@ -292,10 +292,6 @@ consvar_t cv_mouseturn = {"mouseturn", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL,
 // Lagless camera! Yay!
 consvar_t cv_laglesscam = {"lagless_camera", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};

-// makes the camera use the saved angleturn in replays instead of the players angle
-// more accurate to how the recording player seen things in game, but may be jittery if they encountered net issues
-consvar_t cv_demoangturn = {"useangleturninreplays", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_verticallook[MAXSPLITSCREENPLAYERS] = {
 	{"verticallook",  "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"verticallook2", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
@@ -968,11 +964,10 @@ void D_RegisterClientCommands(void)

 	// g_input.c
 	CV_RegisterVar(&cv_controlperkey);
+	CV_RegisterVar(&cv_turnsmooth);

 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		CV_RegisterVar(&cv_turnsmooth[i]);
-
 		CV_RegisterVar(&cv_turnaxis[i]);
 		CV_RegisterVar(&cv_moveaxis[i]);
 		CV_RegisterVar(&cv_camturnaxis[i]);
@@ -989,8 +984,6 @@ void D_RegisterClientCommands(void)
 		CV_RegisterVar(&cv_xdeadzone[i]);
 		CV_RegisterVar(&cv_ydeadzone[i]);

-		CV_RegisterVar(&cv_litesteer[i]);
-
 		CV_RegisterVar(&cv_usejoystick[i]);
 		CV_RegisterVar(&cv_joyscale[i]);
 		CV_RegisterVar(&cv_rumble[i]);
@@ -1047,7 +1040,6 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_betainterscreen);

 	CV_RegisterVar(&cv_laglesscam);
-	CV_RegisterVar(&cv_demoangturn);

 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
@@ -1219,7 +1211,7 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
 	for (ix = 0; ix < MAXPLAYERS; ix++)
 	{
 		if (ix != playernum && playeringame[ix]
-			&& fasticmp(name, player_names[ix]))
+			&& strcasecmp(name, player_names[ix]) == 0)
 		{
 			// We shouldn't kick people out just because
 			// they joined the game with the same name
@@ -1336,7 +1328,7 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
 			if (i != playernum && playeringame[i]
-				&& fasticmp(tmpname, player_names[i]))
+				&& strcasecmp(tmpname, player_names[i]) == 0)
 			{
 				break;
 			}
@@ -1386,7 +1378,7 @@ static void SetPlayerName(INT32 playernum, char *newname)
 {
 	if (EnsurePlayerNameIsGood(newname, playernum))
 	{
-		if (!fasticmp(newname, player_names[playernum]))
+		if (strcasecmp(newname, player_names[playernum]) != 0)
 		{
 			if (netgame)
 				HU_AddChatText(va("\x82*%s renamed to %s", player_names[playernum], newname), false);
@@ -1508,9 +1500,9 @@ static void SendNameAndColor(void)
 			CV_StealthSet(&cv_playercolor, cv_playercolor.defaultvalue);
 	}

-	if (fastcmp(cv_playername.string, player_names[consoleplayer])
+	if (!strcmp(cv_playername.string, player_names[consoleplayer])
 		&& cv_playercolor.value == players[consoleplayer].skincolor
-		&& fastcmp(cv_skin.string, skins[players[consoleplayer].skin].name))
+		&& !strcmp(cv_skin.string, skins[players[consoleplayer].skin].name))
 		return;

 	// We'll handle it later if we're not playing.
@@ -1945,7 +1937,7 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
 	// set name
 	if (player_name_changes[playernum] < MAXNAMECHANGES)
 	{
-		if (!fasticmp(player_names[playernum], name))
+		if (strcasecmp(player_names[playernum], name) != 0)
 			SetPlayerName(playernum, name);
 	}

@@ -1999,6 +1991,11 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
 	}
 	else
 		SetPlayerSkinByNum(playernum, skin);
+
+#ifdef HAVE_DISCORDRPC
+	if (playernum == consoleplayer)
+		DRPC_UpdatePresence();
+#endif
 }

 void SendWeaponPref(void)
@@ -2322,8 +2319,8 @@ static void Command_Playdemo_f(void)

 	CONS_Printf(M_GetText("Playing back demo '%s'.\n"), name);

-	demo.loadfiles = fastcmp(COM_Argv(2), "-addfiles");
-	demo.ignorefiles = fastcmp(COM_Argv(2), "-force");
+	demo.loadfiles = strcmp(COM_Argv(2), "-addfiles") == 0;
+	demo.ignorefiles = strcmp(COM_Argv(2), "-force") == 0;

 	// Internal if no extension, external if one exists
 	// If external, convert the file name to a path in SRB2's home directory
@@ -2492,18 +2489,15 @@ void D_SetupVote(void)
 	INT32 i;
 	UINT8 gt = (cv_kartgametypepreference.value == -1) ? gametype : cv_kartgametypepreference.value;
 	UINT8 secondgt = G_SometimesGetDifferentGametype(gt);
-	INT16 votebuffer[4] = {-1,-1,-1, 0};
+	INT16 votebuffer[4] = {-1,-1,-1,0};
 	INT16 luamaps[4] = {0, 0, 0, 0};

 	LUA_HookSetupVote(luamaps, sizeof(luamaps)/sizeof(luamaps[0]), gt, secondgt);

 	// Correct secondgt if needed
-	if (luamaps[2])
-	{
-		UINT8 typeoflevel = mapheaderinfo[luamaps[2]-1]->typeoflevel;
-		if ((typeoflevel & G_TOLFlag(secondgt&(~0x80))) == 0)
-			secondgt = ((typeoflevel & TOL_RACE) ? GT_RACE : GT_MATCH)|(secondgt&0x80);
-	}
+	UINT8 typeoflevel = mapheaderinfo[luamaps[2]-1]->typeoflevel;
+	if (luamaps[2] && (typeoflevel & G_TOLFlag(secondgt&(~0x80))) == 0)
+		secondgt = ((typeoflevel & TOL_RACE) ? GT_RACE : GT_MATCH)|(secondgt&0x80);

 	if (cv_kartencore.value && gt == GT_RACE)
 		WRITEUINT8(p, (gt|0x80));
@@ -2604,18 +2598,14 @@ ConcatCommandArgv (int start, int end)
 		size += strlen(COM_Argv(i)) + 1;
 	}

-	p = final = ZZ_Alloc(size);
-
-	if (!p)
-		I_Error("ConcatCommandArgv: Out of memory!\n");
+	final = ZZ_Alloc(size);
+	p = final;

 	--end;/* handle the final argument separately */
-
 	for (i = start; i < end; ++i)
 	{
 		p += sprintf(p, "%s ", COM_Argv(i));
 	}
-
 	/* at this point "end" is actually the last argument's position */
 	strcpy(p, COM_Argv(end));

@@ -3194,20 +3184,20 @@ static void Command_Teamchange_f(void)

 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3284,20 +3274,20 @@ static void Command_Teamchange2_f(void)

 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3375,20 +3365,20 @@ static void Command_Teamchange3_f(void)

 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3466,20 +3456,20 @@ static void Command_Teamchange4_f(void)

 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3565,33 +3555,33 @@ static void Command_ServerTeamChange_f(void)

 	if (G_TagGametype())
 	{
-		if (fasticmp(COM_Argv(2), "it") || fasticmp(COM_Argv(2), "1"))
+		if (!strcasecmp(COM_Argv(2), "it") || !strcasecmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(2), "notit") || fasticmp(COM_Argv(2), "2"))
+		else if (!strcasecmp(COM_Argv(2), "notit") || !strcasecmp(COM_Argv(2), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(2), "playing") || fasticmp(COM_Argv(2), "3"))
+		else if (!strcasecmp(COM_Argv(2), "playing") || !strcasecmp(COM_Argv(2), "3"))
 			NetPacket.packet.newteam = 3;
-		else if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
+		else if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(2), "red") || fasticmp(COM_Argv(2), "1"))
+		if (!strcasecmp(COM_Argv(2), "red") || !strcasecmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(2), "blue") || fasticmp(COM_Argv(2), "2"))
+		else if (!strcasecmp(COM_Argv(2), "blue") || !strcasecmp(COM_Argv(2), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
+		else if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
+		if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(2), "playing") || fasticmp(COM_Argv(2), "1"))
+		else if (!strcasecmp(COM_Argv(2), "playing") || !strcasecmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -4226,32 +4216,23 @@ static void Command_MotD_f(void)

 	mymotd = Z_Malloc(sizeof(motd), PU_STATIC, NULL);

-	if (!mymotd)
-		return;
-		//I_Error("Command_MotD_f: Out of memory!\n"); // idk if this aint a bit too much lel
-
-	strlcpy(mymotd, COM_Argv(1), sizeof(motd));
-
+	strlcpy(mymotd, COM_Argv(1), sizeof motd);
 	for (i = 2; i < j; i++)
 	{
-		strlcat(mymotd, " ", sizeof(motd));
-		strlcat(mymotd, COM_Argv(i), sizeof(motd));
+		strlcat(mymotd, " ", sizeof motd);
+		strlcat(mymotd, COM_Argv(i), sizeof motd);
 	}

 	// Disallow non-printing characters and semicolons.
 	for (i = 0; mymotd[i] != '\0'; i++)
-	{
 		if (!isprint(mymotd[i]) || mymotd[i] == ';')
 		{
 			Z_Free(mymotd);
 			return;
 		}
-	}

 	if ((netgame || multiplayer) && client)
-	{
 		SendNetXCmd(XD_SETMOTD, mymotd, i); // send the actual size of the motd string, not the full buffer's size
-	}
 	else
 	{
 		strcpy(motd, mymotd);
@@ -4450,7 +4431,7 @@ static void Command_Addfile(void)
 	}

 	// Add file on your client directly if it is trivial, or you aren't in a netgame.
-	if (!netgame || musiconly)
+	if (!(netgame || multiplayer) || musiconly)
 	{
 		P_AddWadFile(fn, false);
 		return;
@@ -4493,7 +4474,7 @@ static void Command_Addfile(void)
 	if (IsPlayerAdmin(consoleplayer) && (!server)) // Request to add file
 		SendNetXCmd(XD_REQADDFILE, buf, buf_p - buf);
 	else
-		SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
+		SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);;
 }

 /** Adds something at runtime.
@@ -5209,14 +5190,14 @@ static void Ringslinger_OnChange(void)
 static void Gravity_OnChange(void)
 {
 	if (!M_SecretUnlocked(SECRET_PANDORA) && !netgame && !cv_debug
-		&& !fastcmp(cv_gravity.string, cv_gravity.defaultvalue))
+		&& strcmp(cv_gravity.string, cv_gravity.defaultvalue))
 	{
 		CONS_Printf(M_GetText("You haven't earned this yet.\n"));
 		CV_StealthSet(&cv_gravity, cv_gravity.defaultvalue);
 		return;
 	}
 #ifndef NETGAME_GRAVITY
-	if (netgame)
+	if(netgame)
 	{
 		CV_StealthSet(&cv_gravity, cv_gravity.defaultvalue);
 		return;
@@ -209,8 +209,6 @@ extern consvar_t cv_betainterscreen;

 extern consvar_t cv_laglesscam;

-extern consvar_t cv_demoangturn;
-
 typedef enum
 {
 	SKINMENUTYPE_SCROLL = 0,
@@ -550,8 +550,7 @@ INT32 CL_CheckFiles(void)
 		for (j = mainwads+1; j < numwadfiles; j++)
 		{
 			nameonly(strcpy(wadfilename, wadfiles[j]->filename));
-
-			if (fasticmp(wadfilename, fileneeded[i].filename) &&
+			if (!stricmp(wadfilename, fileneeded[i].filename) &&
 				!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
 			{
 				CONS_Debug(DBG_NETPLAY, "already loaded\n");
@@ -666,7 +665,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 		strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
 		nameonly(wadfilename);

-		if (fasticmp(wadfilename, p->id.filename))
+		if (!stricmp(wadfilename, p->id.filename))
 		{
 			// Copy file name with full path
 			strlcpy(p->id.filename, wadfiles[wadnum]->filename, MAX_WADPATH);
@@ -947,17 +946,17 @@ void Got_Filetxpak(void)
 	char *filename = file->filename;
 	static INT32 filetime = 0;

-	if ((fastcmp(filename, "srb2.srb")
-		//|| fastcmp(filename, "srb2.wad")
-		//|| fastcmp(filename, "patch.dta")
-		//|| fastcmp(filename, "music.dta")
-		|| fastcmp(filename, "gfx.kart")
-		|| fastcmp(filename, "textures.kart")
-		|| fastcmp(filename, "chars.kart")
-		|| fastcmp(filename, "maps.kart")
-		|| fastcmp(filename, "sounds.kart")
-		|| fastcmp(filename, "music.kart")
-		|| fastcmp(filename, "patch.kart")
+	if (!(strcmp(filename, "srb2.srb")
+		//&& strcmp(filename, "srb2.wad")
+		//&& strcmp(filename, "patch.dta")
+		//&& strcmp(filename, "music.dta")
+		&& strcmp(filename, "gfx.kart")
+		&& strcmp(filename, "textures.kart")
+		&& strcmp(filename, "chars.kart")
+		&& strcmp(filename, "maps.kart")
+		&& strcmp(filename, "sounds.kart")
+		&& strcmp(filename, "music.kart")
+		&& strcmp(filename, "patch.kart")
 		))
 		I_Error("Tried to download \"%s\"", filename);

@@ -1198,7 +1197,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}

 	// next, check SRB2's "home" directory (if non-'.')
-	if (!fastcmp(srb2home, "."))
+	if (strcmp(srb2home, "."))
 	{
 		homecheck = filesearch(filename, srb2home, wantedmd5sum, completepath, 10);

@@ -1210,7 +1209,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}

 	// next, check SRB2's "path" directory (also if non-'.')
-	if (!fastcmp(srb2path, "."))
+	if (strcmp(srb2path, "."))
 	{
 		homecheck = filesearch(filename, srb2path, wantedmd5sum, completepath, 10);

@@ -1555,7 +1554,7 @@ CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
 			( login = (*prev_next));
 			prev_next = &login->next
 	){
-		if (fastcmp(login->url, url) != 0)
+		if (strcmp(login->url, url) == 0)
 		{
 			if (return_prev_next)
 				(*return_prev_next) = prev_next;
@@ -211,12 +211,12 @@ void D_SetupProtocol(void)

 	if (result)
 	{
-		if (!fastcmp(buffer, "no"))
+		if (strcmp(buffer, "no") == 0)
 		{
 			fclose(fp);
 			return;
 		}
-		else if (fastcmp(buffer, exe_path))
+		else if (strcmp(buffer, exe_path) != 0)
 		{
 			// overwrite
 			fclose(fp);
@@ -9,9 +9,6 @@
 /// \file  d_protocol.h
 /// \brief srb2kart:// protocol stuff

-#ifndef __D_PROTOCOL__
-#define __D_PROTOCOL__
-
 void D_SetupProtocol(void);

 void D_CreateProtocol(void);
@@ -19,5 +16,3 @@ void D_DeleteProtocol(void);
 #ifdef HAVE_CURL
 void D_DownloadReplay(const char *url, const char *path);
 #endif
-
-#endif //__D_PROTOCOL__
@@ -1442,7 +1442,7 @@ static INT32 errorcount = 0;
 */
 static boolean shutdowning = false;

-FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
+void I_Error(const char *error, ...)
 {
 	va_list argptr;
 	char buffer[8192];
@@ -1468,7 +1468,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 		if (errorcount > 20)
 		{
 			va_start(argptr, error);
-			vsnprintf(buffer, 8192, error, argptr);
+			vsprintf(buffer, error, argptr);
 			va_end(argptr);

 			I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
@@ -1482,7 +1482,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)

 	// Display error message in the console before we start shutting it down
 	va_start(argptr, error);
-	vsnprintf(buffer, 8192, error, argptr);
+	vsprintf(buffer, error, argptr);
 	va_end(argptr);
 	I_OutputMsg("\nI_Error(): %s\n", buffer);

@@ -1709,9 +1709,9 @@ char *I_GetUserName(void)
 		strncpy(username, p, MAXPLAYERNAME);
 	}

-	if (!fastcmp(username, ""))
-		return username;

+	if (strcmp(username, "") != 0)
+		return username;
 	return NULL; // dummy for platform independent version
 }

@@ -49,27 +49,6 @@ discordRequest_t *discordRequestList = NULL;

 static char self_ip[IP_SIZE+1];

-/*--------------------------------------------------
- *	const char *DRPC_HideUsername(const char *input)
- *
- *		See header file for description.
- * --------------------------------------------------*/
-const char *DRPC_HideUsername(const char *input)
-{
-	static char buffer[5];
-	int i;
-
-	buffer[0] = input[0];
-
-	for (i = 1; i < 4; ++i)
-	{
-		buffer[i] = '.';
-	}
-
-	buffer[4] = '\0';
-	return buffer;
-}
-
 boolean drpc_init = false;

 /*--------------------------------------------------
@@ -126,7 +105,7 @@ static void DRPC_HandleReady(const DiscordUser *user)
 	}
 	else
 	{
-		CONS_Printf("Discord: connected to %s (%s)\n", user->username, user->userId);
+		CONS_Printf("Discord: connected to %s#%s (%s)\n", user->username, user->discriminator, user->userId);
 	}
 }

@@ -262,10 +241,8 @@ static void DRPC_HandleJoinRequest(const DiscordUser *requestUser)
 	newRequest->username = Z_Calloc(344, PU_STATIC, NULL);
 	snprintf(newRequest->username, 344, "%s", requestUser->username);

-#if 0
 	newRequest->discriminator = Z_Calloc(8, PU_STATIC, NULL);
 	snprintf(newRequest->discriminator, 8, "%s", requestUser->discriminator);
-#endif

 	newRequest->userID = Z_Calloc(32, PU_STATIC, NULL);
 	snprintf(newRequest->userID, 32, "%s", requestUser->userId);
@@ -277,7 +254,7 @@ static void DRPC_HandleJoinRequest(const DiscordUser *requestUser)
 		while (append != NULL)
 		{
 			// CHECK FOR DUPES!! Ignore any that already exist from the same user.
-			if (fastcmp(newRequest->userID, append->userID))
+			if (!strcmp(newRequest->userID, append->userID))
 			{
 				Discord_Respond(newRequest->userID, DISCORD_REPLY_IGNORE);
 				DRPC_RemoveRequest(newRequest);
@@ -331,9 +308,6 @@ void DRPC_RemoveRequest(discordRequest_t *removeRequest)
 	}

 	Z_Free(removeRequest->username);
-#if 0
-	Z_Free(removeRequest->discriminator);
-#endif
 	Z_Free(removeRequest->userID);
 	Z_Free(removeRequest);
 }
@@ -419,7 +393,7 @@ static const char *DRPC_GetServerIP(void)
 	// If you're connected
 	if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL)
 	{
-		if (!fastcmp(address, "self"))
+		if (strcmp(address, "self"))
 		{
 			// We're not the server, so we could successfully get the IP!
 			// No need to do anything else :)
@@ -684,7 +658,7 @@ void DRPC_UpdatePresence(void)
 		// Character image
 		while (supportedSkins[checkSkin] != NULL)
 		{
-			if (fastcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
+			if (!strcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
 			{
 				snprintf(charimg, 21, "char%s", supportedSkins[checkSkin]);
 				discordPresence.smallImageKey = charimg;
@@ -29,9 +29,7 @@ extern struct discordInfo_s {

 typedef struct discordRequest_s {
 	char *username; // Discord user name.
-#if 0 // Good night, sweet prince...
 	char *discriminator; // Discord discriminator (The little hashtag thing after the username). Separated for a "hide discriminators" cvar.
-#endif
 	char *userID; // The ID of the Discord user, gets used with Discord_Respond()

 	// HAHAHA, no.
@@ -46,15 +44,6 @@ typedef struct discordRequest_s {

 extern discordRequest_t *discordRequestList;

-/*--------------------------------------------------
- *	const char *DRPC_HideUsername(const char *input);
- *
- *		Handle usernames while cv_discordstreamer is activated.
- *		(The loss of discriminators is still a dumbass regression
- *		that I will never forgive the Discord developers for.)
- * --------------------------------------------------*/
-
-const char *DRPC_HideUsername(const char *input);

 /*--------------------------------------------------
 	void DRPC_RemoveRequest(void);
@@ -69,8 +69,6 @@ extern "C" {
 #include <sys/stat.h>
 #include <ctype.h>

-#include "fastcmp.h"
-
 #ifdef _WIN32
 #include <io.h>
 #endif
@@ -92,6 +90,12 @@ extern FILE *logstream;
 extern char  logfilename[1024];
 #endif

+// not sure if this belongs here lul
+// TODO: figure out whats preventing 32bit windows from working with libbacktrace
+#if defined(_WIN32) && !defined(MINGW64)
+#define HAVE_DRMINGW
+#endif
+
 #if defined (HAVE_LIBBACKTRACE)
 #define CRASH_LOGFILE_NAME "srb2kart-crash-log.txt"
 #elif defined (HAVE_DRMINGW)
@@ -116,9 +120,6 @@ extern char  logfilename[1024];
 #define SUBVERSION 6 // more precise version number
 #define VERSIONSTRING "Saturn v9"
 #define VERSIONSTRINGW L"Saturn v9"
-
-#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!
 #endif
@@ -653,9 +654,7 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;

 #if defined (HAVE_CURL)
 #define MASTERSERVER
-#ifndef NOHOLEPUNCH
 #define HOLEPUNCH
-#endif
 #else
 #undef UPDATE_ALERT
 #endif
@@ -116,10 +116,7 @@ extern UINT8 window_notinfocus; // are we in focus? (backend independant -- hand
 extern boolean nodrawers;
 extern boolean noblit;
 extern boolean lastdraw;
-
-#ifdef MOTIONBLUR
 extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
-#endif

 extern INT32 viewwindowx, viewwindowy;
 extern INT32 viewwidth;
@@ -43,6 +43,7 @@ extern "C" {
 #define UINT64 uint64_t

 #ifdef __APPLE_CC__
+#define DIRECTFULLSCREEN 1
 #define DEBUG_LOG
 #define NOIPX
 #endif
@@ -963,7 +963,6 @@ void F_StartTitleScreen(void)
 		finalecount = 0;
 	else
 		wipegamestate = GS_TITLESCREEN;
-
 	G_SetGamestate(GS_TITLESCREEN);
 	CON_ClearHUD();

@@ -44,7 +44,7 @@ consvar_t cv_addons_search_case = {"addons_search_case", "No", CV_SAVE, CV_YesNo
 static CV_PossibleValue_t addons_search_type_cons_t[] = {{0, "Start"}, {1, "Anywhere"}, {0, NULL}};
 consvar_t cv_addons_search_type = {"addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

-char menupath[MAXFILEPATH];
+char menupath[1024];
 size_t menupathindex[menudepth];
 size_t menudepthleft = menudepth;

@@ -111,7 +111,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 	int found = 0;
 	char *searchname;
 	int depthleft = maxsearchdepth;
-	char searchpath[MAXFILEPATH];
+	char searchpath[1024];
 	size_t *searchpathindex;

 	dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
@@ -198,7 +198,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want

 				for (; *path != NULL; path++)
 				{
-					if (fasticmp(*path, dent->d_name))
+					if (strcasecmp(*path, dent->d_name) == 0)
 					{
 						skipfolder = true;
 						break;
@@ -212,7 +212,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 				}
 			}

-			if (!fasticmp(".git", dent->d_name) // sanity if you're weird like me
+			if (strcasecmp(".git", dent->d_name) // sanity if you're weird like me
 				&& (dirhandle[depthleft-1] = opendir(searchpath)) != NULL)
 			{
 				// Got read permissions!
@@ -227,7 +227,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want

 		// I am a file!

-		if (!fasticmp(searchname, dent->d_name))
+		if (strcasecmp(searchname, dent->d_name))
 			continue; // Not what we're looking for!

 		switch (checkfilemd5(searchpath, wantedmd5sum))
@@ -353,7 +353,7 @@ void searchfilemenu(char *tempname)
 		{
 			for (i = first; i < sizedirmenu; i++)
 			{
-				if (fastcmp(dirmenu[i]+DIR_STRING, tempname))
+				if (!strcmp(dirmenu[i]+DIR_STRING, tempname))
 				{
 					dir_on[menudepthleft] = i;
 					break;
@@ -400,7 +400,7 @@ void searchfilemenu(char *tempname)
 	{
 		if (filemenucmp(coredirmenu[i]+DIR_STRING, localmenusearch))
 		{
-			if (tempname && fastcmp(coredirmenu[i]+DIR_STRING, tempname))
+			if (tempname && !strcmp(coredirmenu[i]+DIR_STRING, tempname))
 			{
 				dir_on[menudepthleft] = sizedirmenu;
 				Z_Free(tempname);
@@ -478,14 +478,14 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)

 				if (replayhut)
 				{
-					if (!fasticmp(".lmp", dent->d_name+len-5))
+					if (strcasecmp(".lmp", dent->d_name+len-5))
 						continue; // Not a replay
 				}
 				else if (!cv_addons_showall.value)
 				{
 					UINT8 ext;
 					for (ext = 0; ext < NUM_EXT_TABLE; ext++)
-						if (fasticmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
 							break; // extension comparison

 					if (ext == NUM_EXT_TABLE)
@@ -559,7 +559,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)

 				if (replayhut)
 				{
-					if (!fasticmp(".lmp", dent->d_name+len-5))
+					if (strcasecmp(".lmp", dent->d_name+len-5))
 						continue; // Not a replay

 					ext = EXT_TXT; // This isn't used anywhere but better safe than sorry for messing with this...
@@ -567,7 +567,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 				else
 				{
 					for (; ext < NUM_EXT_TABLE; ext++)
-						if (fasticmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
 							break; // extension comparison

 					if (ext == NUM_EXT_TABLE && !cv_addons_showall.value)
@@ -587,7 +587,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 								nameonly(filenamebuf[i]);
 							}

-							if (!fastcmp(dent->d_name, filenamebuf[i]))
+							if (strcmp(dent->d_name, filenamebuf[i]))
 								continue;

 							if (cv_addons_md5.value && !checkfilemd5(menupath, wadfiles[i]->md5sum))
@@ -598,11 +598,11 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 					}
 					else if (ext == EXT_TXT)
 					{
-						if (!strncmp(dent->d_name, "log-", 4) || fastcmp(dent->d_name, "errorlog.txt"))
+						if (!strncmp(dent->d_name, "log-", 4) || !strcmp(dent->d_name, "errorlog.txt"))
 							ext |= EXT_LOADED;
 					}

-					if (fastcmp(dent->d_name, configfile))
+					if (!strcmp(dent->d_name, configfile))
 						ext |= EXT_LOADED;
 				}

@@ -34,8 +34,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want

 #define menudepth 20

-#define MAXFILEPATH 1024
-extern char menupath[MAXFILEPATH];
+extern char menupath[1024];
 extern size_t menupathindex[menudepth];
 extern size_t menudepthleft;

@@ -67,7 +67,7 @@ typedef enum {
 } menudemotype_e;

 typedef struct menudemo_s {
-	char filepath[1023 + 256]; // see M_PrepReplayList and sizeof menupath
+	char filepath[256];
 	menudemotype_e type;

 	char title[65]; // Null-terminated for string prints
@@ -452,13 +452,6 @@ consvar_t cv_ydeadzone[MAXSPLITSCREENPLAYERS] = {
 	{"joy4_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
 };

-consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS] = {
-	{"litesteer",  "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
-	{"litesteer2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
-	{"litesteer3", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
-	{"litesteer4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
-};
-
 static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}};
 consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL};

@@ -1021,8 +1014,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	else
 		th = 0;

-	if (th < (cv_turnsmooth[forplayer].value * 3))
-		tspeed = cv_turnsmooth[forplayer].value == 2 ? 2 : 0; // slow turn
+	if (th < SLOWTURNTICS)
+		tspeed = cv_turnsmooth.value == 2 ? 2 : 0; // slow turn
 	else
 		tspeed = 1;

@@ -1031,32 +1024,30 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	// let movement keys cancel each other out
 	if (turnright && !(turnleft))
 	{
-		cmd->angleturn -= angleturn[tspeed];
+		cmd->angleturn = (INT16)(cmd->angleturn - (angleturn[tspeed]));
+		cmd->driftturn = (INT16)(cmd->driftturn - (angleturn[tspeed]));
 		side += sidemove[1];
 	}
 	else if (turnleft && !(turnright))
 	{
-		cmd->angleturn += angleturn[tspeed];
+		cmd->angleturn = (INT16)(cmd->angleturn + (angleturn[tspeed]));
+		cmd->driftturn = (INT16)(cmd->driftturn + (angleturn[tspeed]));
 		side -= sidemove[1];
 	}

 	if (analogjoystickmove && axis != 0)
 	{
-		cmd->angleturn -= (axis * KART_FULLTURN) / JOYAXISRANGE;
-		side += (axis * sidemove[0]) / JOYAXISRANGE;
+		// JOYAXISRANGE should be 1023 (divide by 1024)
+		cmd->angleturn = (INT16)(cmd->angleturn - (((axis * angleturn[1]) >> 10))); // ANALOG!
+		cmd->driftturn = (INT16)(cmd->driftturn - (((axis * angleturn[1]) >> 10)));
+		side += ((axis * sidemove[0]) >> 10);
 	}

 	if (cv_mouseturn.value)
 	{
 		//THIS WORKS WTF????????
-		cmd->angleturn -= (mousex*(encoremode ? -1 : 1)*8);
-	}
-
-	// Digital users can input diagonal-back for shallow turns.
-	if (cv_litesteer[forplayer].value && InputDown(gc_aimbackward, ssplayer)
-		&& abs(cmd->angleturn) == KART_FULLTURN) // My keyboard hits 1024 but my keyboard only hits 1023, video games
-	{
-		cmd->angleturn /= 2;
+		cmd->angleturn = (INT16)(cmd->angleturn - ((mousex*(encoremode ? -1 : 1)*8)));
+		cmd->driftturn = (INT16)(cmd->driftturn - ((mousex*(encoremode ? -1 : 1)*8)));
 	}

 	if (objectplacing) // SRB2Kart: spectators need special controls // not anymore huehuehue
@@ -1169,8 +1160,10 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	else if (cmd->angleturn < (-angleturn[1]))
 		cmd->angleturn = (-angleturn[1]);

-	// until here both are the very same
-	cmd->driftturn = cmd->angleturn;
+	if (cmd->driftturn > (angleturn[1]))
+		cmd->driftturn = (angleturn[1]);
+	else if (cmd->driftturn < (-angleturn[1]))
+		cmd->driftturn = (-angleturn[1]);

 	if (player->mo)
 		cmd->angleturn = K_GetKartTurnValue(player, cmd->angleturn);
@@ -2768,7 +2761,7 @@ INT32 G_GetGametypeByName(const char *gametypestr)
 	INT32 i;

 	for (i = 0; i < NUMGAMETYPES; i++)
-		if (fasticmp(gametypestr, Gametype_Names[i]))
+		if (!stricmp(gametypestr, Gametype_Names[i]))
 			return i;

 	return -1; // unknown gametype
@@ -3463,8 +3456,7 @@ void G_LoadGameData(void)
 	if (READUINT32(save.p) != 0xFCAFE211)
 	{
 		const char *gdfolder = "the SRB2Kart folder";
-
-		if (!fastcmp(srb2home,"."))
+		if (strcmp(srb2home,"."))
 			gdfolder = srb2home;

 		Z_Free(save.buffer);
@@ -3548,8 +3540,7 @@ void G_LoadGameData(void)
 	datacorrupt:
 	{
 		const char *gdfolder = "the SRB2Kart folder";
-
-		if (!fastcmp(srb2home,"."))
+		if (strcmp(srb2home,"."))
 			gdfolder = srb2home;

 		Z_Free(save.buffer);
@@ -3760,8 +3751,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)

 	memset(vcheck, 0, sizeof (vcheck));
 	sprintf(vcheck, "version %d", VERSION);
-
-	if (!fastcmp((const char *)save.p, (const char *)vcheck))
+	if (strcmp((const char *)save.p, (const char *)vcheck))
 	{
 #ifdef SAVEGAME_OTHERVERSIONS
 		M_StartMessage(M_GetText("Save game from different version.\nYou can load this savegame, but\nsaving afterwards will be disabled.\n\nDo you want to continue anyway?\n\n(Press 'Y' to confirm)\n"),
@@ -4039,7 +4029,7 @@ char *G_BuildMapTitle(INT32 mapnum)
 	if (!mapheaderinfo[mapnum-1])
 		P_AllocMapHeader(mapnum-1);

-	if (!fastcmp(mapheaderinfo[mapnum-1]->lvlttl, ""))
+	if (strcmp(mapheaderinfo[mapnum-1]->lvlttl, ""))
 	{
 		size_t len = 1;
 		const char *zonetext = NULL;
@@ -4064,11 +4054,7 @@ char *G_BuildMapTitle(INT32 mapnum)

 		title = Z_Malloc(len, PU_STATIC, NULL);

-		if (!title)
-			return NULL;
-
 		sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);
-
 		if (zonetext) sprintf(title + strlen(title), " %s", zonetext);
 		if (actnum) sprintf(title + strlen(title), " %s", actnum);
 	}
@@ -72,8 +72,6 @@ extern consvar_t cv_custom3axis[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_xdeadzone[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_ydeadzone[MAXSPLITSCREENPLAYERS];

-extern consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS];
-
 extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_guest, cv_ghost_staff;

 // Hud offsets
@@ -155,6 +153,7 @@ typedef enum
 // mouseaiming (looking up/down with the mouse or keyboard)
 #define KB_LOOKSPEED (1<<25)
 #define MAXPLMOVE (50)
+#define SLOWTURNTICS (cv_turnsmooth.value * 3)

 // build an internal map name MAPxx from map number
 const char *G_BuildMapName(INT32 map);
@@ -37,13 +37,7 @@ static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "
 consvar_t cv_mousesens = {"mousesens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS] = {
-	{"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
-	{"turnsmoothing2", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
-	{"turnsmoothing3", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
-	{"turnsmoothing4", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
-};
+consvar_t cv_turnsmooth = {"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

 static void G_ResetPlayerDeviceRumble(INT32 player);
 static void rumble_off_handle(void);
@@ -1033,7 +1027,7 @@ INT32 G_KeyStringtoNum(const char *keystr)
 		return atoi(&keystr[3]);

 	for (j = 0; j < NUMKEYNAMES; j++)
-		if (fasticmp(keynames[j].name, keystr))
+		if (!stricmp(keynames[j].name, keystr))
 			return keynames[j].keynum;

 	return 0;
@@ -1333,15 +1327,14 @@ static void setcontrol(INT32 (*gc)[2])
 		player = 0;

 	namectrl = COM_Argv(1);
-	for (numctrl = 0; numctrl < num_gamecontrols && !fasticmp(namectrl, gamecontrolname[numctrl]); numctrl++)
+	for (numctrl = 0; numctrl < num_gamecontrols && stricmp(namectrl, gamecontrolname[numctrl]);
+		numctrl++)
 		;
-
 	if (numctrl == num_gamecontrols)
 	{
 		CONS_Printf(M_GetText("Control '%s' unknown\n"), namectrl);
 		return;
 	}
-
 	keynum1 = G_KeyStringtoNum(COM_Argv(2));
 	keynum2 = G_KeyStringtoNum(COM_Argv(3));
 	keynum = G_FilterKeyByVersion(numctrl, 0, player, &keynum1, &keynum2, &nestedoverride);
@@ -110,8 +110,7 @@ typedef enum

 // mouse values are used once
 extern consvar_t cv_mousesens, cv_mouseysens;
-extern consvar_t cv_controlperkey;
-extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_controlperkey, cv_turnsmooth;
 extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];

@@ -80,14 +80,6 @@ static poly_t *HWR_AllocPoly(INT32 numpts)
 	return p;
 }

-static polyvertex_t *HWR_AllocVertex(void)
-{
-	polyvertex_t *p;
-	size_t size = sizeof(polyvertex_t);
-	p = Z_Malloc(size, PU_HWRPLANE, NULL);
-	return p;
-}
-
 /// \todo polygons should be freed in reverse order for efficiency,
 /// for now don't free because it doesn't free in reverse order
 static void HWR_FreePoly(poly_t *poly)
@@ -855,100 +847,6 @@ static INT32 SolveTProblem(void)
 	return numsplitpoly;
 }

-#define NEARDIST (0.75f)
-#define MYMAX    (10000000000000.0f)
-
-/* Adjust true segs (from the segs lump) to be exactely the same as
- * plane polygone segs
- * This also convert fixed_t point of segs in float (in moste case
- * it share the same vertice
- */
-static void AdjustSegs(void)
-{
-	size_t i, count;
-	INT32 j;
-	seg_t *lseg;
-	poly_t *p;
-	INT32 v1found = 0, v2found = 0;
-	float nearv1, nearv2;
-
-	for (i = 0; i < numsubsectors; i++)
-	{
-		count = subsectors[i].numlines;
-		lseg = &segs[subsectors[i].firstline];
-		p = extrasubsectors[i].planepoly;
-
-		if (!p)
-			continue;
-
-		for (; count--; lseg++)
-		{
-			float distv1,distv2,tmp;
-			nearv1 = nearv2 = MYMAX;
-
-			// Don't touch polyobject segs. We'll compensate
-			// for this when we go about drawing them.
-			if (lseg->polyseg)
-				continue;
-
-			for (j = 0; j < p->numpts; j++)
-			{
-				distv1 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v1->x);
-				tmp    = p->pts[j].y - FIXED_TO_FLOAT(lseg->v1->y);
-				distv1 = distv1*distv1+tmp*tmp;
-
-				if (distv1 <= nearv1)
-				{
-					v1found = j;
-					nearv1 = distv1;
-				}
-
-				// the same with v2
-				distv2 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v2->x);
-				tmp    = p->pts[j].y - FIXED_TO_FLOAT(lseg->v2->y);
-				distv2 = distv2*distv2+tmp*tmp;
-
-				if (distv2 <= nearv2)
-				{
-					v2found = j;
-					nearv2 = distv2;
-				}
-			}
-
-			if (nearv1 <= NEARDIST*NEARDIST)
-				// share vertice with segs
-				lseg->pv1 = &(p->pts[v1found]);
-			else
-			{
-				// BP: here we can do better, using PointInSeg and compute
-				// the right point position also split a polygone side to
-				// solve a T-intersection, but too mush work
-
-				// convert fixed vertex to float vertex
-				polyvertex_t *pv = HWR_AllocVertex();
-				pv->x = FIXED_TO_FLOAT(lseg->v1->x);
-				pv->y = FIXED_TO_FLOAT(lseg->v1->y);
-				lseg->pv1 = pv;
-			}
-
-			if (nearv2 <= NEARDIST*NEARDIST)
-				lseg->pv2 = &(p->pts[v2found]);
-			else
-			{
-				polyvertex_t *pv = HWR_AllocVertex();
-				pv->x = FIXED_TO_FLOAT(lseg->v2->x);
-				pv->y = FIXED_TO_FLOAT(lseg->v2->y);
-				lseg->pv2 = pv;
-			}
-
-			lseg->pv1->x2 = FloatToFixed(lseg->pv1->x);
-			lseg->pv1->y2 = FloatToFixed(lseg->pv1->y);
-			lseg->pv2->x2 = FloatToFixed(lseg->pv2->x);
-			lseg->pv2->y2 = FloatToFixed(lseg->pv2->y);
-		}
-	}
-}
-

 // call this routine after the BSP of a Doom wad file is loaded,
 // and it will generate all the convex polys for the hardware renderer
@@ -1017,7 +915,6 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 #else
 	SolveTProblem();
 #endif
-	AdjustSegs();

 #ifdef DEBUG_HWBSP
 	//debug debug..
@@ -437,16 +437,8 @@ void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipma
 //             CACHING HANDLING
 // =================================================

-typedef struct
-{
-	GLMapTexture_t normal;
-#ifdef GLENCORE
-	GLMapTexture_t encore;
-#endif
-} GLMapTextureSet_t; // idk i suck at naming things
-
 static size_t gl_numtextures = 0; // Texture count
-static GLMapTextureSet_t *gl_textures; // For all textures
+static GLMapTexture_t *gl_textures; // For all textures

 static void HWR_FreeTextureData(patch_t *patch)
 {
@@ -586,12 +578,13 @@ void HWR_FreeMapTextures(void)
 {
 	size_t i;

-	for (i = 0; i < gl_numtextures; i++)
-	{
-		FreeMapTexture(&gl_textures[i].normal);
 #ifdef GLENCORE
-		FreeMapTexture(&gl_textures[i].encore);
+	for (i = 0; i < gl_numtextures*2; i++)
+#else
+	for (i = 0; i < gl_numtextures; i++)
 #endif
+	{
+		FreeMapTexture(&gl_textures[i]);
 	}

 	// now the heap don't have any 'user' pointing to our
@@ -610,7 +603,7 @@ static void HWR_PrecacheLevelFlats(void)

 	// special case for encore
 #ifdef GLENCORE
-	if (encoremap)
+	if (encoremode)
 	{
 		// go through all sectors to determine if it should be remapped for encore
 		for (i = 0; i < numsectors; i++)
@@ -685,6 +678,8 @@ static void HWR_PrecacheLevelTextures(void)
 		const line_t *line = &lines[i];
 #ifdef GLENCORE
 		const int noencoremap = ((encoremap && (line->flags & ML_TFERLINE)) ? 2 : 1);
+#else
+		const int noencoremap = 1;
 #endif
 		// two sides
 		for (j = 0; j < 2; j++)
@@ -700,14 +695,11 @@ static void HWR_PrecacheLevelTextures(void)
 			for (f = 0; f < 3; f++)
 			{
 				const INT32 texnum = sidetex[f];
-
 				if (texnum < 0 || texnum >= numtextures || texturepresent[texnum])
 					continue;
-#ifdef GLENCORE
+
 				texturepresent[texnum] = 1|noencoremap;
-#else
-				texturepresent[texnum] = 1;
-#endif
+
 				HWR_GetTexture(texnum, false);
 #ifdef GLENCORE
 				if (noencoremap & 2)
@@ -745,7 +737,7 @@ static void HWR_PrecacheLevelTextures(void)
 	free(texturepresent);
 }

-/*static void HWR_PrecacheLevelSprites(void)
+static void HWR_PrecacheLevelSprites(void)
 {
 	patch_t *spritepatch;
 	char *spritepresent;
@@ -808,11 +800,11 @@ static void HWR_PrecacheLevelTextures(void)
 		}
 	}
 	free(spritepresent);
-}*/
+}

 void HWR_PrecacheLevel(void)
 {
-	if (gamestate != GS_LEVEL || !cv_precachetextures.value)
+	if (rendermode != render_opengl)
 		return;

 	// Precache flats.
@@ -822,7 +814,7 @@ void HWR_PrecacheLevel(void)
 	HWR_PrecacheLevelTextures();

 	// Precache sprites.
-	//HWR_PrecacheLevelSprites();
+	HWR_PrecacheLevelSprites();
 }

 void HWR_LoadMapTextures(size_t pnumtextures)
@@ -831,8 +823,11 @@ void HWR_LoadMapTextures(size_t pnumtextures)
 	HWR_FreeMapTextures();

 	gl_numtextures = pnumtextures;
-	gl_textures = calloc(gl_numtextures, sizeof(*gl_textures)); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
-
+#ifdef GLENCORE
+	gl_textures = calloc(gl_numtextures, sizeof (*gl_textures)*2); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore)
+#else
+	gl_textures = calloc(gl_numtextures, sizeof (*gl_textures));
+#endif
 	if (gl_textures == NULL)
 		I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
 }
@@ -856,7 +851,7 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
 	// Every texture in memory, stored in the
 	// hardware renderer's bit depth format. Wow!
 #ifdef GLENCORE
-	gltex = (encoremap && !noencore) ? &gl_textures[tex].encore : &gl_textures[tex].normal;
+	gltex = &gl_textures[tex*2 + (encoremap && !noencore ? 0 : 1)];
 #else
 	gltex = &gl_textures[tex];
 #endif
@@ -31,6 +31,11 @@
 #include "../st_stuff.h"

 #include <fcntl.h>
+#include "../i_video.h"  // for rendermode != render_glide
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif

 typedef struct
 {
@@ -46,13 +51,75 @@ typedef struct
 	UINT8 image_descriptor; //18
 } ATTRPACK TGAHeader; // sizeof is 18

-static const UINT8 softwaretranstogl[11]    = {  0, 25, 51, 76,102,127,153,178,204,229,255};
-static const UINT8 softwaretranstogl_hi[11] = {  0, 51,102,153,204,255,255,255,255,255,255};
-static const UINT8 softwaretranstogl_lo[11] = {  0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
+static UINT8 softwaretranstogl[11]    = {  0, 25, 51, 76,102,127,153,178,204,229,255};
+static UINT8 softwaretranstogl_hi[11] = {  0, 51,102,153,204,255,255,255,255,255,255};
+static UINT8 softwaretranstogl_lo[11] = {  0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};

 static const float FLOATBASEVIDWIDTH  = (float)BASEVIDWIDTH;
 static const float FLOATBASEVIDHEIGHT = (float)BASEVIDHEIGHT;

+//
+// -----------------+
+// HWR_DrawPatch    : Draw a 'tile' graphic
+// Notes            : x,y : positions relative to the original Doom resolution
+//                  : textes(console+score) + menus + status bar
+// -----------------+
+void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option)
+{
+	FOutVector v[4];
+	FBITFIELD flags;
+	GLPatch_t *hwrPatch;
+
+//  3--2
+//  | /|
+//  |/ |
+//  0--1
+	float sdup = FIXED_TO_FLOAT(vid.fdup)*2.0f;
+	float pdup = FIXED_TO_FLOAT(vid.fdup)*2.0f;
+
+	// make patch ready in hardware cache
+	HWR_GetPatch(gpatch);
+	hwrPatch = ((GLPatch_t *)gpatch->hardware);
+
+	switch (option & V_SCALEPATCHMASK)
+	{
+	case V_NOSCALEPATCH:
+		pdup = 2.0f;
+		break;
+	case V_SMALLSCALEPATCH:
+		pdup = 2.0f * FIXED_TO_FLOAT(vid.smalldup*FRACUNIT);
+		break;
+	case V_MEDSCALEPATCH:
+		pdup = 2.0f * FIXED_TO_FLOAT(vid.meddup*FRACUNIT);
+		break;
+	}
+
+	if (option & V_NOSCALESTART)
+		sdup = 2.0f;
+
+	v[0].x = v[3].x = (x*sdup-gpatch->leftoffset*pdup)/vid.width - 1;
+	v[2].x = v[1].x = (x*sdup+(gpatch->width - gpatch->leftoffset)*pdup)/vid.width - 1;
+	v[0].y = v[1].y = 1-(y*sdup-gpatch->topoffset*pdup)/vid.height;
+	v[2].y = v[3].y = 1-(y*sdup+(gpatch->height - gpatch->topoffset)*pdup)/vid.height;
+
+	v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
+
+	v[0].s = v[3].s = 0.0f;
+	v[2].s = v[1].s = hwrPatch->max_s;
+	v[0].t = v[1].t = 0.0f;
+	v[2].t = v[3].t = hwrPatch->max_t;
+
+	flags = PF_Translucent|PF_NoDepthTest;
+
+	if (option & V_WRAPX)
+		flags |= PF_ForceWrapX;
+	if (option & V_WRAPY)
+		flags |= PF_ForceWrapY;
+
+	// clip it since it is used for bunny scroll in doom I
+	GL_DrawPolygon(NULL, v, 4, flags);
+}
+
 void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, INT32 bflags)
 {
 	FOutVector v[4];
@@ -87,15 +154,15 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p

 	switch (option & V_SCALEPATCHMASK)
 	{
-		case V_NOSCALEPATCH:
-			dup = 1.0f;
-			break;
-		case V_SMALLSCALEPATCH:
-			dup = (float)vid.smalldup;
-			break;
-		case V_MEDSCALEPATCH:
-			dup = (float)vid.meddup;
-			break;
+	case V_NOSCALEPATCH:
+		dup = 1.0f;
+		break;
+	case V_SMALLSCALEPATCH:
+		dup = (float)vid.smalldup;
+		break;
+	case V_MEDSCALEPATCH:
+		dup = (float)vid.meddup;
+		break;
 	}

 	fscalew = fscaleh = FIXED_TO_FLOAT(pscale);
@@ -269,15 +336,15 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,

 	switch (option & V_SCALEPATCHMASK)
 	{
-		case V_NOSCALEPATCH:
-			dup = 1.0f;
-			break;
-		case V_SMALLSCALEPATCH:
-			dup = (float)vid.smalldup;
-			break;
-		case V_MEDSCALEPATCH:
-			dup = (float)vid.meddup;
-			break;
+	case V_NOSCALEPATCH:
+		dup = 1.0f;
+		break;
+	case V_SMALLSCALEPATCH:
+		dup = (float)vid.smalldup;
+		break;
+	case V_MEDSCALEPATCH:
+		dup = (float)vid.meddup;
+		break;
 	}

 	fscale = FIXED_TO_FLOAT(pscale);
@@ -506,7 +573,7 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)

 	if (color & 0xFF00) // Do COLORMAP fade.
 	{
-		if (cv_glscreentextures.value && HWR_ShouldUsePaletteRendering())
+		if (HWR_ShouldUsePaletteRendering() && cv_glscreentextures.value)
 		{
 			const hwdscreentexture_t scr_tex = HWD_SCREENTEXTURE_GENERIC2;

@@ -518,10 +585,12 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 			GL_UnSetShader();
 			return;
 		}
-
-		Surf.PolyColor.rgba = UINT2RGBA(0x01010160);
-		Surf.PolyColor.s.alpha = (strength*8);
-		poly_flags |= PF_Translucent;
+		else
+		{
+			Surf.PolyColor.rgba = UINT2RGBA(0x01010160);
+			Surf.PolyColor.s.alpha = (strength*8);
+			poly_flags |= PF_Translucent;
+		}
 	}
 	else // Do TRANSMAP** fade.
 	{
@@ -567,6 +636,133 @@ void HWR_DrawConsoleBack(UINT32 color, INT32 height)
 }


+// ==========================================================================
+//                                                             R_DRAW.C STUFF
+// ==========================================================================
+
+// ------------------
+// HWR_DrawViewBorder
+// Fill the space around the view window with a Doom flat texture, draw the
+// beveled edges.
+// 'clearlines' is useful to clear the heads up messages, when the view
+// window is reduced, it doesn't refresh all the view borders.
+// ------------------
+void HWR_DrawViewBorder(INT32 clearlines)
+{
+	INT32 x, y;
+	INT32 top, side;
+	INT32 baseviewwidth, baseviewheight;
+	INT32 basewindowx, basewindowy;
+	patch_t *patch;
+
+	if (!clearlines)
+		clearlines = BASEVIDHEIGHT; // refresh all
+
+	// calc view size based on original game resolution
+	baseviewwidth =  FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwidth), vid.fdup)); //(cv_viewsize.value * BASEVIDWIDTH/10)&~7;
+	baseviewheight = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewheight), vid.fdup));
+	top = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowy), vid.fdup));
+	side = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowx), vid.fdup));
+
+	// top
+	HWR_DrawFlatFill(0, 0,
+		BASEVIDWIDTH, (top < clearlines ? top : clearlines),
+		st_borderpatchnum);
+
+	// left
+	if (top < clearlines)
+		HWR_DrawFlatFill(0, top, side,
+			(clearlines-top < baseviewheight ? clearlines-top : baseviewheight),
+			st_borderpatchnum);
+
+	// right
+	if (top < clearlines)
+		HWR_DrawFlatFill(side + baseviewwidth, top, side,
+			(clearlines-top < baseviewheight ? clearlines-top : baseviewheight),
+			st_borderpatchnum);
+
+	// bottom
+	if (top + baseviewheight < clearlines)
+		HWR_DrawFlatFill(0, top + baseviewheight,
+			BASEVIDWIDTH, BASEVIDHEIGHT, st_borderpatchnum);
+
+	//
+	// draw the view borders
+	//
+
+	basewindowx = (BASEVIDWIDTH - baseviewwidth)>>1;
+	if (baseviewwidth == BASEVIDWIDTH)
+		basewindowy = 0;
+	else
+		basewindowy = top;
+
+	// top edge
+	if (clearlines > basewindowy - 8)
+	{
+		patch = W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH);
+		for (x = 0; x < baseviewwidth; x += 8)
+			HWR_DrawPatch(patch, basewindowx + x, basewindowy - 8,
+				0);
+	}
+
+	// bottom edge
+	if (clearlines > basewindowy + baseviewheight)
+	{
+		patch = W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH);
+		for (x = 0; x < baseviewwidth; x += 8)
+			HWR_DrawPatch(patch, basewindowx + x,
+				basewindowy + baseviewheight, 0);
+	}
+
+	// left edge
+	if (clearlines > basewindowy)
+	{
+		patch = W_CachePatchNum(viewborderlump[BRDR_L], PU_PATCH);
+		for (y = 0; y < baseviewheight && basewindowy + y < clearlines;
+			y += 8)
+		{
+			HWR_DrawPatch(patch, basewindowx - 8, basewindowy + y,
+				0);
+		}
+	}
+
+	// right edge
+	if (clearlines > basewindowy)
+	{
+		patch = W_CachePatchNum(viewborderlump[BRDR_R], PU_PATCH);
+		for (y = 0; y < baseviewheight && basewindowy+y < clearlines;
+			y += 8)
+		{
+			HWR_DrawPatch(patch, basewindowx + baseviewwidth,
+				basewindowy + y, 0);
+		}
+	}
+
+	// Draw beveled corners.
+	if (clearlines > basewindowy - 8)
+		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_TL],
+				PU_PATCH),
+			basewindowx - 8, basewindowy - 8, 0);
+
+	if (clearlines > basewindowy - 8)
+		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_TR],
+				PU_PATCH),
+			basewindowx + baseviewwidth, basewindowy - 8, 0);
+
+	if (clearlines > basewindowy+baseviewheight)
+		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_BL],
+				PU_PATCH),
+			basewindowx - 8, basewindowy + baseviewheight, 0);
+
+	if (clearlines > basewindowy + baseviewheight)
+		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_BR],
+				PU_PATCH),
+			basewindowx + baseviewwidth,
+			basewindowy + baseviewheight, 0);
+}
+
+
+
 // ==========================================================================
 //                                                     AM_MAP.C DRAWING STUFF
 // ==========================================================================
@@ -888,13 +1084,11 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)

 	if (fx >= vid.width || fy >= vid.height)
 		return;
-
 	if (fx < 0)
 	{
 		fw += fx;
 		fx = 0;
 	}
-
 	if (fy < 0)
 	{
 		fh += fy;
@@ -906,7 +1100,6 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)

 	if (fx + fw > vid.width)
 		fw = fvw - fx;
-
 	if (fy + fh > vid.height)
 		fh = fvh - fy;

@@ -975,7 +1168,7 @@ static inline boolean saveTGA(const char *file_name, void *buffer,
 	INT32 i;
 	UINT8 *buf8 = buffer;

-	fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+	fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
 	if (fd < 0)
 		return false;

@@ -65,6 +65,8 @@
 // Globals
 // ==========================================================================

+#define ABS(x) ((x) < 0 ? -(x) : (x))
+
 // false if shaders have not been initialized yet, or if shaders are not available
 boolean gl_shadersavailable = false;

@@ -75,6 +77,11 @@ boolean gl_drawing_stencil = false;

 static INT32 current_bsp_culling_distance = 0;

+// base values set at SetViewSize
+float gl_baseviewwindowy, gl_baseviewwindowx;
+static float gl_viewwindowy, gl_viewwindowx; // top left corner of view window
+float gl_viewwidth, gl_viewheight; // viewport clipping boundaries (screen coords)
+
 FTransform atransform;

 // Float variants of viewx, viewy, viewz, etc.
@@ -277,7 +284,6 @@ static void CV_glshaders_OnChange(void)
 	{
 		// can't do palette rendering without shaders, so update the state if needed
 		HWR_TogglePaletteRendering();
-		HWR_PrecacheLevel();
 	}
 	M_UpdateOGLMenu();
 }
@@ -295,21 +301,18 @@ static void CV_gltextureformat_OnChange(void)
 {
 	ONLY_IF_GL_LOADED
 	GL_SetSpecialState(HWD_SET_TEXTURE_FORMAT, cv_gltexturedepth.value);
-	HWR_PrecacheLevel();
 }

 static void CV_filtermode_OnChange(void)
 {
 	ONLY_IF_GL_LOADED
 	GL_SetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_glfiltermode.value);
-	HWR_PrecacheLevel();
 }

 static void CV_anisotropic_OnChange(void)
 {
 	ONLY_IF_GL_LOADED
 	GL_SetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_glanisotropicmode.value);
-	HWR_PrecacheLevel();
 }

 static void CV_glpaletterendering_OnChange(void)
@@ -322,9 +325,7 @@ static void CV_glpaletterendering_OnChange(void)
 	{
 		HWR_CompileShaders();
 		HWR_TogglePaletteRendering();
-		HWR_PrecacheLevel();
 	}
-
 	M_UpdateOGLMenu();
 }

@@ -728,6 +729,9 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool

 		for (i = 0; i < subsector->numlines; i++, line++)
 		{
+			if (line->polyseg)
+				continue;
+
 			line_t* ld = line->linedef;

 			// this check sucks and is a hotspot lel
@@ -740,27 +744,11 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 			P_ClosestPointOnLine(viewx, viewy, ld, &v);
 			dist = FixedToFloat(R_PointToDist(v.x, v.y));

-			if (line->pv1)
-			{
-				x1 = line->pv1->x;
-				y1 = line->pv1->y;
-			}
-			else
-			{
-				x1 = FixedToFloat(line->v1->x);
-				y1 = FixedToFloat(line->v1->y);
-			}
+			x1 = (line->fv1.x);
+			y1 = (line->fv1.y);

-			if (line->pv2)
-			{
-				xd = line->pv2->x - x1;
-				yd = line->pv2->y - y1;
-			}
-			else
-			{
-				xd = FixedToFloat(line->v2->x) - x1;
-				yd = FixedToFloat(line->v2->y) - y1;
-			}
+			xd = (line->fv2.x) - x1;
+			yd = (line->fv2.y) - y1;

 			// Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion
 			dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f;
@@ -824,11 +812,11 @@ static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)

 	M_ClearBox(segbbox);
 	M_AddToBox(segbbox,
-		FloatToFixed(gl_curline->pv1->x),
-		FloatToFixed(gl_curline->pv1->y));
+		FloatToFixed(gl_curline->fv1.x),
+		FloatToFixed(gl_curline->fv1.y));
 	M_AddToBox(segbbox,
-		FloatToFixed(gl_curline->pv2->x),
-		FloatToFixed(gl_curline->pv2->y));
+		FloatToFixed(gl_curline->fv2.x),
+		FloatToFixed(gl_curline->fv2.y));

 	splat = (wallsplat_t *)gl_curline->linedef->splats;
 	for (; splat; splat = splat->next)
@@ -1323,34 +1311,24 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom

 	const boolean noencore = (gl_linedef->flags & ML_TFERLINE);

-	if (LIKELY(gl_curline->pv1))
-	{
-		vs.x = gl_curline->pv1->x;
-		vs.y = gl_curline->pv1->y;
-		v1x = gl_curline->pv1->x2;
-		v1y = gl_curline->pv1->y2;
-	}
-	else
-	{
-		vs.x = FixedToFloat(gl_curline->v1->x);
-		vs.y = FixedToFloat(gl_curline->v1->y);
-		v1x = gl_curline->v1->x;
-		v1y = gl_curline->v1->y;
-	}
+	v1x = gl_curline->v1->x;
+	v1y = gl_curline->v1->y;
+	v2x = gl_curline->v2->x;
+	v2y = gl_curline->v2->y;

-	if (LIKELY(gl_curline->pv2))
+	if (gl_curline->polyseg)
 	{
-		ve.x = gl_curline->pv2->x;
-		ve.y = gl_curline->pv2->y;
-		v2x = gl_curline->pv2->x2;
-		v2y = gl_curline->pv2->y2;
+		vs.x = FixedToFloat(v1x);
+		vs.y = FixedToFloat(v1y);
+		ve.x = FixedToFloat(v2x);
+		ve.y = FixedToFloat(v2y);
 	}
 	else
 	{
-		ve.x = FixedToFloat(gl_curline->v2->x);
-		ve.y = FixedToFloat(gl_curline->v2->y);
-		v2x = gl_curline->v2->x;
-		v2y = gl_curline->v2->y;
+		vs.x = gl_curline->fv1.x;
+		vs.y = gl_curline->fv1.y;
+		ve.x = gl_curline->fv2.x;
+		ve.y = gl_curline->fv2.y;
 	}

 #define SLOPEPARAMS(slope, end1, end2, normalheight) \
@@ -2202,27 +2180,11 @@ static boolean CheckClip(sector_t * afrontsector, sector_t * abacksector)
 	{
 		fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t

-		if (LIKELY(gl_curline->pv1))
-		{
-			v1x = gl_curline->pv1->x2;
-			v1y = gl_curline->pv1->y2;
-		}
-		else
-		{
-			v1x = gl_curline->v1->x;
-			v1y = gl_curline->v1->y;
-		}
+		v1x = gl_curline->v1->x;
+		v1y = gl_curline->v1->y;

-		if (LIKELY(gl_curline->pv2))
-		{
-			v2x = gl_curline->pv2->x2;
-			v2y = gl_curline->pv2->y2;
-		}
-		else
-		{
-			v2x = gl_curline->v2->x;
-			v2y = gl_curline->v2->y;
-		}
+		v2x = gl_curline->v2->x;
+		v2y = gl_curline->v2->y;

 #define SLOPEPARAMS(slope, end1, end2, normalheight) \
 		end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
@@ -2427,27 +2389,11 @@ static void HWR_AddLine(seg_t *line)

 	gl_curline = line;

-	if (LIKELY(gl_curline->pv1))
-	{
-		v1x = gl_curline->pv1->x2;
-		v1y = gl_curline->pv1->y2;
-	}
-	else
-	{
-		v1x = gl_curline->v1->x;
-		v1y = gl_curline->v1->y;
-	}
+	v1x = gl_curline->v1->x;
+	v1y = gl_curline->v1->y;

-	if (LIKELY(gl_curline->pv2))
-	{
-		v2x = gl_curline->pv2->x2;
-		v2y = gl_curline->pv2->y2;
-	}
-	else
-	{
-		v2x = gl_curline->v2->x;
-		v2y = gl_curline->v2->y;
-	}
+	v2x = gl_curline->v2->x;
+	v2y = gl_curline->v2->y;

 	// OPTIMIZE: quickly reject orthogonal back sides.
 	angle1 = R_PointToAngle64(v1x, v1y);
@@ -3376,9 +3322,6 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
 	fixed_t slopez;
 	float offset = 0;

-	if (!spr->mobj)
-		return;
-
 	R_GetShadowZ(spr->mobj, &floorslope);

 	mobjfloor = HWR_OpaqueFloorAtPos(
@@ -3390,7 +3333,14 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
 		angle_t shadowdir;

 		// Set direction
-		shadowdir = localangle[viewssnum] + FixedAngle(cv_cam_rotate[viewssnum].value);
+		if (splitscreen && R_GetViewNumber() == 1)
+			shadowdir = localangle[1] + FixedAngle(cv_cam_rotate[1].value);
+		else if (splitscreen > 1 && R_GetViewNumber() == 2)
+			shadowdir = localangle[2] + FixedAngle(cv_cam_rotate[2].value);
+		else if (splitscreen > 2 && R_GetViewNumber() == 3)
+			shadowdir = localangle[3] + FixedAngle(cv_cam_rotate[3].value);
+		else
+			shadowdir = localangle[0] + FixedAngle(cv_cam_rotate[0].value);

 		// Find floorheight
 		floorheight = HWR_OpaqueFloorAtPos(
@@ -3402,17 +3352,18 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
 		// Don't draw it, then!
 		if (spr->mobj->z < floorheight)
 			return;
-
-		fixed_t floorz;
-		floorz = HWR_OpaqueFloorAtPos(
-			spr->mobj->x + P_ReturnThrustX(spr->mobj, shadowdir, spr->mobj->z - floorheight),
-			spr->mobj->y + P_ReturnThrustY(spr->mobj, shadowdir, spr->mobj->z - floorheight),
-			spr->mobj->z, spr->mobj->height);
-
-		// The shadow would be falling on a wall? Don't draw it, then.
-		// Would draw midair otherwise.
-		if (floorz < floorheight)
-			return;
+		else
+		{
+			fixed_t floorz;
+			floorz = HWR_OpaqueFloorAtPos(
+				spr->mobj->x + P_ReturnThrustX(spr->mobj, shadowdir, spr->mobj->z - floorheight),
+				spr->mobj->y + P_ReturnThrustY(spr->mobj, shadowdir, spr->mobj->z - floorheight),
+				spr->mobj->z, spr->mobj->height);
+			// The shadow would be falling on a wall? Don't draw it, then.
+			// Would draw midair otherwise.
+			if (floorz < floorheight)
+				return;
+		}

 		floorheight = FixedInt(spr->mobj->z - floorheight);

@@ -3422,11 +3373,12 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
 		floorheight = FixedInt(spr->mobj->z - mobjfloor);

 	// technically this_scale gets multiplied and added to sprite y/x scale, but this thing needs it for some crap so ill just throw it in here again
-	this_scale = FixedToFloat(spr->mobj->scale);
+	const boolean hires = (spr->mobj && spr->mobj->skin && K_GetMobjSkin(spr->mobj)->flags & SF_HIRES);

-	const skin_t *moskin = K_GetMobjSkin(spr->mobj);
-	if (moskin && moskin->flags & SF_HIRES)
-		this_scale *= FixedToFloat(moskin->highresscale);
+	if (spr->mobj)
+		this_scale = FixedToFloat(spr->mobj->scale);
+	if (hires)
+		this_scale = this_scale * FixedToFloat(K_GetMobjSkin(spr->mobj)->highresscale);

 	// create the sprite billboard
 	//
@@ -4047,7 +3999,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)

 	const precipmobj_t *sprmo = spr->precip;

-	if (UNLIKELY(!sprmo->subsector))
+	if (UNLIKELY(!sprmo || !sprmo->subsector))
 		return;

 	// cache sprite graphics
@@ -4328,7 +4280,7 @@ static int CompareDrawNodePlanes(const void *p1, const void *p2)
 	const INT32 n1 = *(const INT32*)p1;
 	const INT32 n2 = *(const INT32*)p2;

-	return abs(drawnodes[n2].u.plane.fixedheight - viewz) - abs(drawnodes[n1].u.plane.fixedheight - viewz);
+	return ABS(drawnodes[n2].u.plane.fixedheight - viewz) - ABS(drawnodes[n1].u.plane.fixedheight - viewz);
 }

 //
@@ -5309,10 +5261,10 @@ static void HWR_DrawSkyBackground(void)
 // -----------------+
 static inline void HWR_ClearView(void)
 {
-	GL_GClipRect(viewwindowx,
-				 viewwindowy,
-				(viewwindowx + viewwidth),
-				(viewwindowy + viewheight),
+	GL_GClipRect((INT32)gl_viewwindowx,
+				(INT32)gl_viewwindowy,
+				(INT32)(gl_viewwindowx + gl_viewwidth),
+				(INT32)(gl_viewwindowy + gl_viewheight),
 						ZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
 	GL_ClearBuffer(false, true, true, NULL);
 }
@@ -5322,6 +5274,19 @@ static inline void HWR_ClearView(void)
 // -----------------+
 void HWR_SetViewSize(void)
 {
+	// setup view size
+	gl_viewwidth = (float)vid.width;
+	gl_viewheight = (float)vid.height;
+
+	if (splitscreen)
+		gl_viewheight /= 2;
+
+	if (splitscreen > 1)
+		gl_viewwidth /= 2;
+
+	gl_baseviewwindowy = 0;
+	gl_baseviewwindowx = 0;
+
 	GL_FlushScreenTextures();
 }

@@ -5332,9 +5297,7 @@ static void HWR_SetTransformAiming(FTransform *trans)
 	if (cv_glshearing.value)
 	{
 		fixed_t fixedaiming = AIMINGTODY(aimingangle);
-		trans->viewaiming = FixedToFloat(fixedaiming) * ((float)vid.width / vid.height) / ((float)BASEVIDWIDTH / BASEVIDHEIGHT);
-		if (splitscreen == 1) // only for 2 player splitscreen
-			trans->viewaiming *= 2.125; // splitscreen adjusts fov with 0.8, so compensate (but only halfway, since splitscreen means only half the screen is used)
+		trans->viewaiming = FixedToFloat(fixedaiming);
 		trans->shearing = true;
 		gl_aimingangle = 0;
 	}
@@ -5576,6 +5539,20 @@ extern "C" {
 // ==========================================================================
 static void HWR_RenderFrame(player_t *player, boolean skybox)
 {
+	// set window position
+	gl_viewwindowx = gl_baseviewwindowx;
+	gl_viewwindowy = gl_baseviewwindowy;
+
+	if ((splitscreen == 1 && viewssnum == 1) || (splitscreen > 1 && viewssnum > 1))
+	{
+		gl_viewwindowy += gl_viewheight;
+	}
+
+	if (splitscreen > 1 && viewssnum & 1)
+	{
+		gl_viewwindowx += gl_viewwidth;
+	}
+
 	// check for new console commands.
 	NetUpdate();

@@ -5591,10 +5568,10 @@ static void HWR_RenderFrame(player_t *player, boolean skybox)

 	if (!skybox && cv_glrenderdistance.value)
 	{
-		GL_GClipRect(viewwindowx,
-					 viewwindowy,
-					(viewwindowx + viewwidth),
-					(viewwindowy + viewheight),
+		GL_GClipRect((INT32)gl_viewwindowx,
+					(INT32)gl_viewwindowy,
+					(INT32)(gl_viewwindowx + gl_viewwidth),
+					(INT32)(gl_viewwindowy + gl_viewheight),
 					ZCLIP_PLANE, clipping_distances[cv_glrenderdistance.value - 1]);
 		current_bsp_culling_distance = bsp_culling_distances[cv_glrenderdistance.value - 1];
 	}
@@ -5840,7 +5817,7 @@ static void COM_HWR_glinfo(void)
 	{
 		argv = COM_Argv(i);

-		if (fastcmp(argv, "--list-extensions")|| fastcmp(argv, "-l"))
+		if (strcmp(argv, "--list-extensions") == 0 || strcmp(argv, "-l") == 0)
 		{
 			list_extensions = 1;
 		}
@@ -42,6 +42,10 @@ extern "C" {
 void HWR_Startup(void);
 void HWR_Shutdown(void);

+extern float gl_viewwidth, gl_viewheight, gl_baseviewwindowx, gl_baseviewwindowy;
+
+extern float gl_basewindowcenterx, gl_basewindowcentery;
+
 extern unsigned msaa;
 extern boolean a2c;

@@ -85,6 +89,7 @@ extern ps_metric_t ps_hw_batchdrawtime;
 extern boolean gl_shadersavailable;

 // hw_draw.c
+void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option);
 void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, INT32 bflags);
 void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
 void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color);
@@ -93,6 +98,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color);
 void HWR_drawAMline(const fline_t *fl, INT32 color);
 void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength);
 void HWR_DrawConsoleBack(UINT32 color, INT32 height);
+void HWR_DrawViewBorder(INT32 clearlines);
 void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum);

 UINT8 *HWR_GetScreenshot(INT32 scale);
@@ -549,7 +549,7 @@ void HWR_InitMD2(void)
 	{
 		for (i = 0; i < NUMSPRITES; i++)
 		{
-			if (fasticmp(name, sprnames[i]))
+			if (stricmp(name, sprnames[i]) == 0)
 			{
 				md2_models[i].scale = scale;
 				md2_models[i].offset = offset;
@@ -561,7 +561,7 @@ void HWR_InitMD2(void)

 		for (s = 0; s < MAXSKINS; s++)
 		{
-			if (fasticmp(name, skins[s].name))
+			if (stricmp(name, skins[s].name) == 0)
 			{
 				md2_playermodels[s].skin = s;
 				md2_playermodels[s].scale = scale;
@@ -607,12 +607,11 @@ void HWR_AddPlayerMD2(int skin, boolean local) // For MD2's that were added afte
 		}
 	}

-	md2s = (local ? md2_localplayermodels : md2_playermodels);
-
+	md2s = ( (local) ? md2_localplayermodels : md2_playermodels );
 	// Check for any MD2s that match the names of player skins!
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
-		if (fasticmp(name, K_GetSkinArray(local)[skin].name))
+		if (stricmp(name, K_GetSkinArray(local)[skin].name) == 0)
 		{
 			md2s[skin].skin = skin;
 			md2s[skin].scale = scale;
@@ -651,7 +650,6 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
 	if (!f)
 	{
 		f = fopen(va("%s"PATHSEP"%s", srb2path, "mdls.dat"), "rt");
-
 		if (!f)
 		{
 			CONS_Printf("%s %s\n", M_GetText("Error while loading mdls.dat:"), strerror(errno));
@@ -663,7 +661,7 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
 	// Check for any MD2s that match the names of sprite names!
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
-		if (fasticmp(name, sprnames[spritenum]))
+		if (stricmp(name, sprnames[spritenum]) == 0)
 		{
 			md2_models[spritenum].scale = scale;
 			md2_models[spritenum].offset = offset;
@@ -114,6 +114,7 @@ void UnloadModel(model_t *model)
 	if (model->materials)
 		Z_Free(model->materials);

+	DeleteVBOs(model);
 	Z_Free(model);
 }

@@ -126,7 +127,7 @@ tag_t *GetTagByName(model_t *model, char *name, int frame)
 		int i;
 		for (i = 0; i < model->numTags; i++)
 		{
-			if (fasticmp(iterator[i].name, name))
+			if (!stricmp(iterator[i].name, name))
 				return &iterator[i];
 		}
 	}
@@ -163,22 +164,22 @@ model_t *LoadModel(const char *filename, int ztag)
 		return NULL;
 	}

-	if (fastcmp(extension, ".md3"))
+	if (!strcmp(extension, ".md3"))
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (fastcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
+	else if (!strcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, true)))
 			return NULL;
 	}
-	else if (fastcmp(extension, ".md2"))
+	else if (!strcmp(extension, ".md2"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (fastcmp(extension, ".md2s"))
+	else if (!strcmp(extension, ".md2s"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, true)))
 			return NULL;
@@ -193,6 +194,7 @@ model_t *LoadModel(const char *filename, int ztag)
 	strcpy(model->mdlFilename, filename);

 	Optimize(model);
+	GeneratePolygonNormals(model, ztag);

 	// Default material properties
 	for (i = 0 ; i < model->numMaterials; i++)
@@ -244,6 +246,13 @@ void GenerateVertexNormals(model_t *model)

 			M_Memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);

+/*			if (!systemSucks)
+			{
+				memTag = Z_GetTag(frame->tangents);
+				float *newTangents = (float*)Z_Malloc(sizeof(float)*3*mesh->numTriangles*3, memTag);
+				M_Memcpy(newTangents, frame->tangents, sizeof(float)*3*mesh->numTriangles*3);
+			}*/
+
 			for (k = 0; k < mesh->numVertices; k++)
 			{
 				float x, y, z;
@@ -279,15 +288,32 @@ void GenerateVertexNormals(model_t *model)

 				if (vCount > 1)
 				{
+//					Vector::Normalize(&normal);
 					newNormals[3 * k + 0] = (float)normal.x;
 					newNormals[3 * k + 1] = (float)normal.y;
 					newNormals[3 * k + 2] = (float)normal.z;
+
+/*					if (!systemSucks)
+					{
+						Vector::vector_t tangent;
+						Vector::Tangent(&normal, &tangent);
+						newTangents[3 * k + 0] = tangent.x;
+						newTangents[3 * k + 1] = tangent.y;
+						newTangents[3 * k + 2] = tangent.z;
+					}*/
 				}
 			}

 			oldNormals = frame->normals;
 			frame->normals = newNormals;
 			Z_Free(oldNormals);
+
+/*			if (!systemSucks)
+			{
+				float *oldTangents = frame->tangents;
+				frame->tangents = newTangents;
+				Z_Free(oldTangents);
+			}*/
 		}
 	}
 }
@@ -378,11 +404,15 @@ void Optimize(model_t *model)
 		newMesh->numTriangles = numTriangles;
 		newMesh->numVertices = numTriangles * 3;
 		newMesh->uvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, 0);
+//		if (node->material->lightmap)
+//			newMesh->lightuvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, 0);
 		newMesh->frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t), memTag, 0);
 		curFrame = &newMesh->frames[0];

 		curFrame->material = curMat;
 		curFrame->normals = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
+//		if (!systemSucks)
+//			curFrame->tangents = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
 		curFrame->vertices = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
 		curFrame->colors = (char*)Z_Malloc(sizeof(char)*4*numTriangles*3, memTag, 0);

@@ -406,6 +436,12 @@ void Optimize(model_t *model)
 					curMesh->uvs,
 					sizeof(float)*2*curMesh->numTriangles*3);

+/*				if (node->material->lightmap)
+				{
+					M_Memcpy(&newMesh->lightuvs[uvCount],
+						curMesh->lightuvs,
+						sizeof(float)*2*curMesh->numTriangles*3);
+				}*/
 				uvCount += 2*curMesh->numTriangles*3;

 				dest = (float*)newMesh->frames[0].vertices;
@@ -420,6 +456,15 @@ void Optimize(model_t *model)
 					src,
 					sizeof(float)*3*curMesh->numTriangles*3);

+/*				if (!systemSucks)
+				{
+					dest = (float*)newMesh->frames[0].tangents;
+					src = (float*)curMesh->frames[0].tangents;
+					M_Memcpy(&dest[vertCount],
+						src,
+						sizeof(float)*3*curMesh->numTriangles*3);
+				}*/
+
 				vertCount += 3 * curMesh->numTriangles * 3;

 				destByte = (char*)newMesh->frames[0].colors;
@@ -449,3 +494,103 @@ void Optimize(model_t *model)
 	model->meshes = newMeshes;
 	model->numMeshes = numMeshes;
 }
+
+void GeneratePolygonNormals(model_t *model, int ztag)
+{
+	int i;
+	for (i = 0; i < model->numMeshes; i++)
+	{
+		int j;
+		mesh_t *mesh = &model->meshes[i];
+
+		if (!mesh->frames)
+			continue;
+
+		for (j = 0; j < mesh->numFrames; j++)
+		{
+			int k;
+			mdlframe_t *frame = &mesh->frames[j];
+			const float *vertices = frame->vertices;
+			vector_t *polyNormals;
+
+			frame->polyNormals = (vector_t*)Z_Malloc(sizeof(vector_t) * mesh->numTriangles, ztag, 0);
+
+			polyNormals = frame->polyNormals;
+
+			for (k = 0; k < mesh->numTriangles; k++)
+			{
+				/// TODO: normalize vectors
+				(void)vertices;
+				(void)polyNormals;
+//				Vector::Normal(vertices, polyNormals);
+				vertices += 3 * 3;
+				polyNormals++;
+			}
+		}
+	}
+}
+
+//
+// Reload
+//
+// Reload VBOs
+//
+#if 0
+static void Reload(void)
+{
+/*	model_t *node;
+	for (node = modelHead; node; node = node->next)
+	{
+		int i;
+		for (i = 0; i < node->numMeshes; i++)
+		{
+			mesh_t *mesh = &node->meshes[i];
+
+			if (mesh->frames)
+			{
+				int j;
+				for (j = 0; j < mesh->numFrames; j++)
+					CreateVBO(mesh, &mesh->frames[j]);
+			}
+			else if (mesh->tinyframes)
+			{
+				int j;
+				for (j = 0; j < mesh->numFrames; j++)
+					CreateVBO(mesh, &mesh->tinyframes[j]);
+			}
+		}
+	}*/
+}
+#endif
+
+void DeleteVBOs(model_t *model)
+{
+	(void)model;
+/*	for (int i = 0; i < model->numMeshes; i++)
+	{
+		mesh_t *mesh = &model->meshes[i];
+
+		if (mesh->frames)
+		{
+			for (int j = 0; j < mesh->numFrames; j++)
+			{
+				mdlframe_t *frame = &mesh->frames[j];
+				if (!frame->vboID)
+					continue;
+				bglDeleteBuffers(1, &frame->vboID);
+				frame->vboID = 0;
+			}
+		}
+		else if (mesh->tinyframes)
+		{
+			for (int j = 0; j < mesh->numFrames; j++)
+			{
+				tinyframe_t *frame = &mesh->tinyframes[j];
+				if (!frame->vboID)
+					continue;
+				bglDeleteBuffers(1, &frame->vboID);
+				frame->vboID = 0;
+			}
+		}
+	}*/
+}
@@ -28,6 +28,8 @@ typedef struct
 	float ambient[4], diffuse[4], specular[4], emissive[4];
 	float shininess;
 	boolean spheremap;
+//	Texture::texture_t *texture;
+//	Texture::texture_t *lightmap;
 } material_t;

 typedef struct
@@ -38,6 +40,7 @@ typedef struct
 	float *tangents;
 	char *colors;
 	unsigned int vboID;
+	vector_t *polyNormals;
 } mdlframe_t;

 typedef struct
@@ -67,6 +70,7 @@ typedef struct mesh_s
 typedef struct tag_s
 {
 	char name[64];
+//	matrix_t transform;
 } tag_t;

 typedef struct model_s
@@ -92,7 +96,9 @@ model_t *LoadModel(const char *filename, int ztag);
 void UnloadModel(model_t *model);
 void Optimize(model_t *model);
 void GenerateVertexNormals(model_t *model);
+void GeneratePolygonNormals(model_t *model, int ztag);
 void CreateVBOTiny(mesh_t *mesh, tinyframe_t *frame);
 void CreateVBO(mesh_t *mesh, mdlframe_t *frame);
+void DeleteVBOs(model_t *model);

 #endif
@@ -586,7 +586,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 			goto skip_field;
 		}

-		if (fasticmp(stoken, "GLSL"))
+		if (!stricmp(stoken, "GLSL"))
 		{
 			value = strtok(NULL, "\r\n ");
 			if (!value)
@@ -596,9 +596,9 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 				goto skip_lump;
 			}

-			if (fasticmp(value, "VERTEX"))
+			if (!stricmp(value, "VERTEX"))
 				shadertype = 1;
-			else if (fasticmp(value, "FRAGMENT"))
+			else if (!stricmp(value, "FRAGMENT"))
 				shadertype = 2;

 skip_lump:
@@ -624,7 +624,7 @@ skip_lump:

 			for (i = 0; shaderxlat[i].type; i++)
 			{
-				if (fasticmp(shaderxlat[i].type, stoken))
+				if (!stricmp(shaderxlat[i].type, stoken))
 				{
 					size_t shader_string_length;
 					char *shader_source;
@@ -253,9 +253,6 @@ HMS_connect (const char *format, ...)
 	cc = curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)cv_masterserver_timeout.value);
 	if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);

-	cc = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 30L);
-	if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
-
 	cc = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read);
 	if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);

@@ -431,7 +431,7 @@ void HU_Start(void)

 void HU_Shiftform(void)
 {
-	shiftxform = (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
+	shiftxform = cv_keyboardlayout.value == 3 ? french_shiftxform : english_shiftxform;
 }

 //======================================================================
@@ -465,8 +465,8 @@ static INT16 addy = 0; // use this to make the messages scroll smoothly when one
 static void HU_removeChatText_Mini(void)
 {
 	// MPC: Don't create new arrays, just iterate through an existing one
-	for (size_t i = 0; i < chat_nummsg_min - 1; i++)
-	{
+	size_t i;
+	for(i=0;i<chat_nummsg_min-1;i++) {
 		strcpy(chat_mini[i], chat_mini[i+1]);
 		chat_timers[i] = chat_timers[i+1];
 	}
@@ -485,8 +485,8 @@ static void HU_removeChatText_Log(void)
 		return;

 	free(chat_log[0]);
-
-	for (size_t i = 0; i < chat_nummsg_log - 1;i++)
+	size_t i;
+	for(i=0;i<chat_nummsg_log-1;i++)
 	{
 		chat_log[i] = chat_log[i+1];
 	}
@@ -1101,14 +1101,14 @@ void HU_Ticker(void)
 		size_t i = 0;

 		// handle spam while we're at it:
-		for(; (i < MAXPLAYERS); i++)
+		for(; (i<MAXPLAYERS); i++)
 		{
 			if (stop_spamming[i] > 0)
 				stop_spamming[i]--;
 		}

 		// handle chat timers
-		for (i = 0; (i < chat_nummsg_min); i++)
+		for (i=0; (i<chat_nummsg_min); i++)
 		{
 			if (chat_timers[i] > 0)
 				chat_timers[i]--;
@@ -1231,7 +1231,7 @@ static void HU_SendChatMessage(void)
 		nodenum[2] = '\0';

 		// check for undesirable characters in our "number"
-		if (((nodenum[0] < '0') || (nodenum[0] > '9')) || ((nodenum[1] < '0') || (nodenum[1] > '9')))
+		if 	(((nodenum[0] < '0') || (nodenum[0] > '9')) || ((nodenum[1] < '0') || (nodenum[1] > '9')))
 		{
 			// check if nodenum[1] is a space
 			if (nodenum[1] == ' ')
@@ -1499,7 +1499,7 @@ static void HU_drawMiniChat(void)
 	if (splitscreen > 1)
 		boxw = max(64, boxw/2);

-	for (; i > 0; i--)
+	for (; i>0; i--)
 	{
 		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i-1]);
 		size_t j = 0;
@@ -1572,7 +1572,7 @@ static void HU_drawMiniChat(void)
 	i = 0;
 	prev_linereturn = false;

-	for (; i <= (chat_nummsg_min-1); i++) // iterate through our hot messages
+	for (; i<=(chat_nummsg_min-1); i++) // iterate through our hot messages
 	{
 		INT32 clrflag = 0;
 		INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below...
@@ -1749,6 +1749,7 @@ static void HU_drawChatLog(INT32 offset)
 			Z_Free(msg);
 	}

+
 	if (((chat_scroll >= chat_maxscroll) || (chat_scrollmedown)) && !(justscrolleddown || justscrolledup || chat_scrolltime)) // was already at the bottom of the page before new maxscroll calculation and was NOT scrolling.
 	{
 		atbottom = true; // we should scroll
@@ -2283,7 +2284,6 @@ static void HU_DrawSongCreditsBox(void)
 		V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, 28|flags|(bgt<<V_ALPHASHIFT));
 		V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, 30|flags|(bgt<<V_ALPHASHIFT));
 	}
-
 	if (cursongcredit.trans < NUMTRANSMAPS)
 	{
 		V_DrawSmallString(x+2*dup, y+2*dup, V_ALLOWLOWERCASE|flags|(cursongcredit.trans<<V_ALPHASHIFT), str);
@@ -2391,6 +2391,76 @@ void HU_Drawer(void)
 	}
 }

+//======================================================================
+//                 HUD MESSAGES CLEARING FROM SCREEN
+//======================================================================
+
+// Clear old messages from the borders around the view window
+// (only for reduced view, refresh the borders when needed)
+//
+// startline: y coord to start clear,
+// clearlines: how many lines to clear.
+//
+static INT32 oldclearlines;
+
+void HU_Erase(void)
+{
+	INT32 topline, bottomline;
+	INT32 y, yoffset;
+
+#ifdef HWRENDER
+	// clear hud msgs on double buffer (OpenGL mode)
+	boolean secondframe;
+	static INT32 secondframelines;
+#endif
+
+	if (con_clearlines == oldclearlines && !con_hudupdate && !chat_on)
+		return;
+
+#ifdef HWRENDER
+	// clear the other frame in double-buffer modes
+	secondframe = (con_clearlines != oldclearlines);
+	if (secondframe)
+		secondframelines = oldclearlines;
+#endif
+
+	// clear the message lines that go away, so use _oldclearlines_
+	bottomline = oldclearlines;
+	oldclearlines = con_clearlines;
+	if (chat_on && OLDCHAT)
+		if (bottomline < 8)
+			bottomline = 8; // only do it for consolechat. consolechat is gay.
+
+	if (automapactive || viewwindowx == 0) // hud msgs don't need to be cleared
+		return;
+
+	// software mode copies view border pattern & beveled edges from the backbuffer
+	if (rendermode == render_soft)
+	{
+		topline = 0;
+		for (y = topline, yoffset = y*vid.width; y < bottomline; y++, yoffset += vid.width)
+		{
+			if (y < viewwindowy || y >= viewwindowy + viewheight)
+				R_VideoErase(yoffset, vid.width); // erase entire line
+			else
+			{
+				R_VideoErase(yoffset, viewwindowx); // erase left border
+				// erase right border
+				R_VideoErase(yoffset + viewwindowx + viewwidth, viewwindowx);
+			}
+		}
+		con_hudupdate = false; // if it was set..
+	}
+#ifdef HWRENDER
+	else if (rendermode != render_none)
+	{
+		// refresh just what is needed from the view borders
+		HWR_DrawViewBorder(secondframelines);
+		con_hudupdate = secondframe;
+	}
+#endif
+}
+
 //======================================================================
 //                   IN-LEVEL MULTIPLAYER RANKINGS
 //======================================================================
@@ -2470,91 +2540,17 @@ Ping_conversion (UINT32 lag)
 // HU_drawPing
 //

-static void HU_drawOldPing(INT32 x, INT32 y, UINT32 lag, INT32 flags, boolean gentleman)
-{
-	const INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
-
-	if (vid.width >= 640)	// how sad, we're using a shit resolution.
-	{
-		if (measureid == 1)
-		{
-			V_DrawRightAlignedSmallString(x+12, y+13, V_ALLOWLOWERCASE|flags, va("%dms", Ping_conversion(lag)));
-		}
-		else if (measureid == 0)
-		{
-			V_DrawRightAlignedSmallString(x+12, y+13, flags, va("d%d", Ping_conversion(lag)));
-		}
-	}
-
-	if (cv_pingicon.value)
-	{
-		UINT8 numbars = 0; // how many ping bars do we draw?
-		UINT8 barcolor = 31; // color we use for the bars (green, yellow, red or black)
-		SINT8 i = 0;
-		SINT8 yoffset = 6;
-
-		switch (lag)
-		{
-			case 0 ... 1:
-				numbars = 3;
-				barcolor = 215; // Blue
-				break;
-			case 2 ... 3:
-				numbars = 3;
-				barcolor = 184; // Green
-				break;
-			case 4 ... 6:
-				numbars = 2;    // Apparently ternaries w/ multiple statements don't look good in C so I decided against it.
-				barcolor = 103; // Yellow
-				break;
-			case 7 ... 9:
-				numbars = 1;
-				barcolor = 155; // Red
-				break;
-			default:            // Brazil
-				numbars = 0;
-				barcolor = 31;  // black
-				break;
-		}
-
-		if (gentleman)
-		{
-			barcolor = 194; // make it purplish
-			// bars get indirectly set earlier
-		}
-
-		for (i = 0; (i < 3); i++) // Draw the ping bar
-		{
-			V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-4, 2, 8-yoffset, 31|flags);
-			if (i < numbars)
-				V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-3, 1, 8-yoffset-1, barcolor|flags);
-
-			yoffset -= 2;
-		}
-	}
-}
-
-static void HU_drawKartPing(INT32 x, INT32 y, UINT32 lag, INT32 flags, boolean gentleman)
-{
-	const INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
-
-	if (measureid == 1)
-		V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
-
-	if (cv_pingicon.value)
-	{
-		INT32 gfxnum = Ping_gfx_num(lag); // gfx to draw
-		V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]);
-	}
-
-	x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, Ping_conversion(lag), Ping_gfx_colormap(lag, gentleman));
-
-	if (measureid == 0)
-		V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
-}
-
 void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
 {
+	INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
+	INT32 gfxnum; // gfx to draw
+
+	//SRB2/Kart v1.0 style
+	UINT8 numbars = 0; // how many ping bars do we draw?
+	UINT8 barcolor = 31; // color we use for the bars (green, yellow, red or black)
+	SINT8 i = 0;
+	SINT8 yoffset = 6;
+
 	UINT32 lag = playerpingtable[pnum];
 	const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag));

@@ -2565,11 +2561,74 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)

 	if (cv_pingstyle.value == 0) // kart
 	{
-		HU_drawKartPing(x, y, lag, flags, gentleman);
+		gfxnum = Ping_gfx_num(lag);
+
+		if (measureid == 1)
+			V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
+
+		if (cv_pingicon.value)
+			V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]);
+
+		x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, Ping_conversion(lag), Ping_gfx_colormap(lag, gentleman));
+
+		if (measureid == 0)
+			V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
 	}
 	else if (cv_pingstyle.value == 1) // old style ping
 	{
-		HU_drawOldPing(x, y, lag, flags, gentleman);
+		if (vid.width >= 640)	// how sad, we're using a shit resolution.
+		{
+			if (measureid == 1)
+			{
+				V_DrawRightAlignedSmallString(x+12, y+13, V_ALLOWLOWERCASE|flags, va("%dms", Ping_conversion(lag)));
+			}
+			else if (measureid == 0)
+			{
+				V_DrawRightAlignedSmallString(x+12, y+13, flags, va("d%d", Ping_conversion(lag)));
+			}
+		}
+
+		if (cv_pingicon.value)
+		{
+			switch (lag)
+			{
+				case 0 ... 1:
+					numbars = 3;
+					barcolor = 215; // Blue
+					break;
+				case 2 ... 3:
+					numbars = 3;
+					barcolor = 184; // Green
+					break;
+				case 4 ... 6:
+					numbars = 2;    // Apparently ternaries w/ multiple statements don't look good in C so I decided against it.
+					barcolor = 103; // Yellow
+					break;
+				case 7 ... 9:
+					numbars = 1;
+					barcolor = 155; // Red
+					break;
+				default:            // Brazil
+					numbars = 0;
+					barcolor = 31;  // black
+					break;
+			}
+
+			if (gentleman)
+			{
+				barcolor = 194; // make it purplish
+				// bars get indirectly set earlier
+			}
+
+			for (i = 0; (i < 3); i++) // Draw the ping bar
+			{
+				V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-4, 2, 8-yoffset, 31|flags);
+				if (i < numbars)
+					V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-3, 1, 8-yoffset-1, barcolor|flags);
+
+				yoffset -= 2;
+			}
+		}
 	}
 }

@@ -2845,8 +2904,12 @@ void HU_SetCEchoFlags(INT32 flags)

 void HU_DoCEcho(const char *msg)
 {
-	strlcpy(cechotext, msg, sizeof(cechotext));
-	strlcat(cechotext, "\\", sizeof(cechotext));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation" // This is fine, we set null byte later
+	strncpy(cechotext, msg, sizeof(cechotext));
+#pragma GCC diagnostic pop
+	strncat(cechotext, "\\", sizeof(cechotext) - strlen(cechotext) - 1);
+	cechotext[sizeof(cechotext) - 1] = '\0';

 	// just print it to console
 	if (cv_cechotoggle.value == 2)
@@ -2855,20 +2918,8 @@ void HU_DoCEcho(const char *msg)
 		strncpy(temp, cechotext, sizeof(temp));

 		for (char *p = temp; *p != '\0'; ++p)
-		{
 			if (*p == '\\')
-			{
 				*p = '\n';
-				++p;
-				char *skip_p = p; // Point at which we will move part of string after all \'s
-
-				while (*p == '\\')
-					++p;
-
-				memmove(skip_p, p, strlen(p)+1); // move the rest of string with null byte
-				p = skip_p; // Restore p
-			}
-		}

 		CONS_Printf("%s\n", temp);

@@ -117,6 +117,7 @@ void HU_TickSongCredits(void);
 void HU_DrawSongCredits(void);
 void HU_Drawer(void);
 char HU_dequeueChatChar(void);
+void HU_Erase(void);
 void HU_clearChatChars(void);
 void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags);	// Lat': Ping drawer for scoreboard.
 //void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer);
@@ -0,0 +1,680 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2011-2018 by Sonic Team Junior.
+//
+// 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  i_addrinfo.c
+/// \brief getaddr stubs, for lesser OSes
+///
+///        Some systems/SDKs, like PSL1GHT v2 does not have addrinfo functions
+///        So a stub is needed
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#ifdef _WIN32
+#ifdef USE_WINSOCK2
+#include <ws2tcpip.h>
+#else
+#include <winsock.h>
+#endif
+#else
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#endif
+
+#include "i_addrinfo.h"
+
+/*
+ * This addrinfo stub have a testcases:
+ * To test the stub, use this command to compile the stub testcase:
+ * gcc -g -DTESTCASE -Dtest_stub -Wall -W i_addrinfo.c -o stub
+ * To test the real getaddrinfo API, use this command to get real one:
+ * gcc -g -DTESTCASE -Utest_stub -Wall -W i_addrinfo.c -o real
+ * For Win32,you need the WinSock library, version 1.1 or 2.2
+ * for 1.1, add -lwsock32
+ * i686-w64-mingw32-gcc -g -DTESTCASE -Dtest_stub -UUSE_WINSOCK2 -Wall -W i_addrinfo.c -o stub.exe -lwsock32
+ * for 2.2, add -DUSE_WINSOCK2 -lws2_32
+ * i686-w64-mingw32-gcc -g -DTESTCASE -Utest_stub -DUSE_WINSOCK2 -Wall -W i_addrinfo.c -o real.exe -lws2_32
+ */
+
+#ifndef I_getaddrinfo
+
+#include <stdbool.h>
+
+#ifdef _WIN32
+// it seems windows doesn't define that... maybe some other OS? OS/2
+static int inet_aton(const char *cp, struct in_addr *addr)
+{
+	if( cp == NULL || addr == NULL )
+	{
+		return(0);
+	}
+	if (strcmp(cp, "255.255.255.225") == 0)
+	{
+		addr->s_addr = htonl(INADDR_BROADCAST);
+		return 0;
+	}
+	return (addr->s_addr = inet_addr(cp)) != htonl(INADDR_NONE);
+}
+#endif
+
+#ifdef USE_WINSOCK2
+static HMODULE ipv6dll = NULL;
+typedef int (WSAAPI *p_getaddrinfo) (const char *, const char *,
+                                     const struct my_addrinfo *,
+                                     struct my_addrinfo **);
+typedef void (WSAAPI *p_freeaddrinfo) (struct my_addrinfo *);
+
+static p_getaddrinfo WS_getaddrinfo = NULL;
+static p_freeaddrinfo WS_freeaddrinfo = NULL;
+
+static HMODULE WS_getfunctions(HMODULE tmp)
+{
+	if (tmp != NULL)
+	{
+		WS_getaddrinfo = (p_getaddrinfo)(LPVOID)GetProcAddress(tmp, "getaddrinfo");
+		if (WS_getaddrinfo == NULL)
+			return NULL;
+		WS_freeaddrinfo = (p_freeaddrinfo)(LPVOID)GetProcAddress(tmp, "freeaddrinfo");
+		if (WS_freeaddrinfo == NULL)
+		{
+			WS_getaddrinfo = NULL;
+			return NULL;
+		}
+	}
+	return tmp;
+}
+
+static void WS_addrinfosetup(void)
+{
+	if (WS_getaddrinfo && WS_freeaddrinfo)
+		return; // already have the functions
+	// why not hold it into ipv6dll? becase we already link with ws2_32, silly!
+	if (WS_getfunctions(GetModuleHandleA("ws2_32.dll")) == NULL)
+		ipv6dll = WS_getfunctions(LoadLibraryA("wship6.dll"));
+}
+
+void WS_addrinfocleanup(void)
+{
+	if (ipv6dll)
+		FreeLibrary(ipv6dll);
+	ipv6dll = NULL;
+	WS_getaddrinfo = NULL;
+	WS_freeaddrinfo = NULL;
+}
+#else
+void WS_addrinfocleanup(void) {}
+#endif
+
+int I_getaddrinfo(const char *node, const char *service,
+                  const struct my_addrinfo *hints,
+                  struct my_addrinfo **res)
+{
+	struct hostent *nodename = NULL;
+	bool hostlookup = true, passivemode = false;
+	int flags = 0;
+	int socktype = 0;
+	int sockport = 0;
+	struct my_addrinfo *ai;
+	struct sockaddr_in *addr;
+	struct in_addr ipv4;
+	size_t addrlen = 1;
+	size_t ailen = 1, i = 0, j;
+	size_t famsize = sizeof(struct sockaddr_in);
+#ifdef USE_WINSOCK2
+	WS_addrinfosetup();
+	if (WS_getaddrinfo)
+		return WS_getaddrinfo(node, service, hints, res);
+#endif
+
+	// param check
+	if (node == NULL && service == NULL)
+		return EAI_NONAME;
+	//note: testcase show NULL as res crashes libc
+	if (res == NULL)
+		return -1;
+
+	// check hints
+	if (hints)
+	{
+		// no support for IPv6
+		if (hints->ai_family != AF_INET && hints->ai_family != AF_UNSPEC)
+			return -1; //EAI_FAMILY
+#ifdef AI_NUMERICHOST
+		// do not look up hostnames
+		if ((hints->ai_flags & AI_NUMERICHOST) == AI_NUMERICHOST)
+		{
+			hostlookup = false;
+			flags |= AI_NUMERICHOST;
+		}
+#endif
+#ifdef AI_PASSIVE
+		// return loopback or any address?
+		if ((hints->ai_flags & AI_PASSIVE) == AI_PASSIVE)
+		{
+			passivemode = true;
+			flags |= AI_PASSIVE;
+		}
+#endif
+		// why no support for canon names? lazy
+		//AI_CANONNAME
+		// what kind of socket?
+		socktype = hints->ai_socktype;
+	}
+	else
+	{
+#ifdef AI_V4MAPPED
+		flags |= AI_V4MAPPED;
+#endif
+#ifdef AI_ADDRCONFIG
+		flags |= AI_ADDRCONFIG;
+#endif
+	}
+
+	// we need gethostbyname to convert numeric strings
+	if (node && hostlookup)
+	{
+		if (node == NULL)
+			return -1;
+		nodename = gethostbyname(node);
+		if (nodename == NULL)
+		{
+			if (inet_aton(node, &ipv4) != 0)
+				addrlen = 1;
+			else
+				return -1;
+		}
+		else while (nodename->h_addr_list[addrlen] != NULL)
+			addrlen++;
+	}
+	else if (node)
+	{
+		if (inet_aton(node, &ipv4) != 0)
+			addrlen = 1;
+		else if (!hostlookup)
+			return EAI_NONAME;
+	}
+	else
+		addrlen = 1;
+
+	if (service) //AI_NUMERICSERV
+		sockport = atoi(service);
+
+	if (socktype == 0)
+		ailen = addrlen*3;
+	else
+		ailen = addrlen;
+
+	ai = calloc(ailen, sizeof(struct my_addrinfo));
+	if  (ai == NULL)
+		return -1;
+	else
+		*res = ai;
+
+	addr = calloc(ailen*2, famsize);
+	if (addr == NULL)
+	{
+		free(ai);
+		return -1;
+	}
+	else
+		ai->ai_addr = memset(addr, 0x00, ailen*ai->ai_addrlen);
+
+	for (i = 0; i < ailen; i++)
+	{
+		ai = *res+i;
+		ai->ai_flags = flags;
+		ai->ai_family = AF_INET;
+		ai->ai_socktype = socktype;
+		switch (ai->ai_socktype)
+		{
+			case SOCK_STREAM:
+				ai->ai_protocol = IPPROTO_TCP;
+				break;
+			case SOCK_DGRAM:
+				ai->ai_protocol = IPPROTO_UDP;
+				break;
+			default:
+				ai->ai_protocol = 0;
+		}
+		ai->ai_addrlen = famsize;
+		ai->ai_addr = (struct sockaddr *)&addr[i];
+		//ai_cannonname
+		ai->ai_next = ai+1;
+	}
+	ai->ai_next = NULL;
+	ai = *res;
+
+	for (i = 0, j = 0; i < ailen; i++, j++)
+	{
+		ai = *res+i;
+		addr[i].sin_port = htons((UINT16)sockport);
+		if (nodename)
+		{
+			memcpy(&addr[i].sin_addr, nodename->h_addr_list[j], ai->ai_addrlen);
+			addr[i].sin_family = nodename->h_addrtype;
+		}
+		else if (node)
+		{
+			memcpy(&addr[i].sin_addr, &ipv4, ai->ai_addrlen);
+			addr[i].sin_family = AF_INET;
+		}
+		else
+		{
+			if (passivemode)
+				addr[i].sin_addr.s_addr = htonl(INADDR_ANY);
+			else
+				addr[i].sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+			addr[i].sin_family = AF_INET;
+		}
+		if (socktype == 0)
+		{
+			ai->ai_socktype = SOCK_STREAM;
+			ai->ai_protocol = IPPROTO_TCP;
+			memcpy(&addr[i+1], &addr[i], ai->ai_addrlen);
+			i++; ai++;
+			ai->ai_socktype = SOCK_DGRAM;
+			ai->ai_protocol = IPPROTO_UDP;
+			memcpy(&addr[i+1], &addr[i], ai->ai_addrlen);
+			i++; ai++;
+			ai->ai_socktype = SOCK_RAW;
+			ai->ai_protocol = IPPROTO_IP;
+		}
+	}
+	return 0;
+}
+#endif
+
+#ifndef I_freeaddrinfo
+void I_freeaddrinfo(struct my_addrinfo *res)
+{
+#ifdef USE_WINSOCK2
+	if (WS_freeaddrinfo)
+	{
+		WS_freeaddrinfo(res);
+		return;
+	}
+#endif
+	if (!res)
+		return;
+	free(res->ai_addr);
+	free(res);
+}
+#endif
+
+#ifdef TESTCASE
+#include <stdio.h>
+
+#ifdef USE_WINSOCK2
+#define inet_ntop inet_ntopA
+#define HAVE_NTOP
+static const char* inet_ntopA(int af, const void *cp, char *buf, socklen_t len)
+{
+	DWORD Dlen = len, AFlen = 0;
+	SOCKADDR_STORAGE any;
+	LPSOCKADDR anyp = (LPSOCKADDR)&any;
+	LPSOCKADDR_IN any4 = (LPSOCKADDR_IN)&any;
+	LPSOCKADDR_IN6 any6 = (LPSOCKADDR_IN6)&any;
+
+	if (!buf)
+	{
+		WSASetLastError(STATUS_INVALID_PARAMETER);
+		return NULL;
+	}
+
+	if (af != AF_INET && af != AF_INET6)
+	{
+		WSASetLastError(WSAEAFNOSUPPORT);
+		return NULL;
+	}
+
+	ZeroMemory(&any, sizeof(SOCKADDR_STORAGE));
+	any.ss_family = af;
+
+	switch (af)
+	{
+		case AF_INET:
+		{
+			CopyMemory(&any4->sin_addr, cp, sizeof(IN_ADDR));
+			AFlen = sizeof(SOCKADDR_IN);
+			break;
+		}
+		case AF_INET6:
+		{
+			CopyMemory(&any6->sin6_addr, cp, sizeof(IN6_ADDR));
+			AFlen = sizeof(SOCKADDR_IN6);
+			break;
+		}
+	}
+
+	if (WSAAddressToStringA(anyp, AFlen, NULL, buf, &Dlen) == SOCKET_ERROR)
+		return NULL;
+	return buf;
+}
+#elif defined (_WIN32)
+// w32api, ws2tcpip.h, r1.12
+static inline char* gai_strerror(int ecode)
+{
+        static char message[1024+1];
+        DWORD dwFlags = FORMAT_MESSAGE_FROM_SYSTEM
+                      | FORMAT_MESSAGE_IGNORE_INSERTS
+                      | FORMAT_MESSAGE_MAX_WIDTH_MASK;
+        DWORD dwLanguageId = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT);
+        FormatMessageA(dwFlags, NULL, ecode, dwLanguageId, message, 1024, NULL);
+        return message;
+}
+#else
+#define HAVE_NTOP
+#endif
+
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
+static inline void printflags(int ai_flags)
+{
+	printf("flags: %x(", ai_flags);
+	if (ai_flags == 0)
+		printf("NONE|");
+#ifdef AI_PASSIVE
+	if ((ai_flags & AI_PASSIVE) == AI_PASSIVE)
+		printf("AI_PASSIVE|");
+	ai_flags &= ~AI_PASSIVE;
+#endif
+#ifdef AI_CANONNAME
+	if ((ai_flags & AI_CANONNAME) == AI_CANONNAME)
+		printf("AI_CANONNAME|");
+	ai_flags &= ~AI_CANONNAME;
+#endif
+#ifdef AI_NUMERICHOST
+	if ((ai_flags & AI_NUMERICHOST) == AI_NUMERICHOST)
+		printf("AI_NUMERICHOST|");
+	ai_flags &= ~AI_NUMERICHOST;
+#endif
+#ifdef AI_V4MAPPED
+	if ((ai_flags & AI_V4MAPPED) == AI_V4MAPPED)
+		printf("AI_V4MAPPED|");
+	ai_flags &= ~AI_V4MAPPED;
+#endif
+#ifdef AI_ALL
+	if ((ai_flags & AI_ALL) == AI_ALL)
+		printf("AI_ALL|");
+	ai_flags &= ~AI_ALL;
+#endif
+#ifdef AI_ADDRCONFIG
+	if ((ai_flags & AI_ADDRCONFIG) == AI_ADDRCONFIG)
+		printf("AI_ADDRCONFIG|");
+	ai_flags &= ~AI_ADDRCONFIG;
+#endif
+#ifdef AI_IDN
+	if ((ai_flags & AI_IDN) == AI_IDN)
+		printf("AI_IDN|");
+	ai_flags &= ~AI_IDN;
+#endif
+#ifdef AI_CANONIDN
+	if ((ai_flags & AI_CANONIDN) == AI_CANONIDN)
+		printf("AI_CANONIDN|");
+	ai_flags &= ~AI_CANONIDN;
+#endif
+#ifdef AI_IDN_ALLOW_UNASSIGNED
+	if ((ai_flags & AI_IDN_ALLOW_UNASSIGNED) == AI_IDN_ALLOW_UNASSIGNED)
+		printf("AI_IDN_ALLOW_UNASSIGNED|");
+	ai_flags &= ~AI_IDN_ALLOW_UNASSIGNED;
+#endif
+#ifdef AI_IDN_USE_STD3_ASCII_RULES
+	if ((ai_flags & AI_IDN_USE_STD3_ASCII_RULES) == AI_IDN_USE_STD3_ASCII_RULES)
+		printf("AI_IDN_USE_STD3_ASCII_RULES|");
+	ai_flags &= ~AI_PASSIVE;
+#endif
+#ifdef AI_NUMERICSERV
+	if ((ai_flags & AI_NUMERICSERV) == AI_NUMERICSERV)
+		printf("AI_NUMERICSERV|");
+	ai_flags &= ~AI_NUMERICSERV;
+#endif
+	printf("%x", ai_flags);
+	printf(")\n");
+}
+
+static inline void printsocktype(int ai_socktype)
+{
+	printf("socktype: %d(", ai_socktype);
+	switch (ai_socktype)
+	{
+		case 0:
+			printf("SOCK_ Woe32");
+			break;
+		case SOCK_STREAM:
+			printf("SOCK_STREAM");
+			break;
+		case SOCK_DGRAM:
+			printf("SOCK_DGRAM");
+			break;
+		case SOCK_RAW:
+			printf("SOCK_RAW");
+			break;
+		default:
+			printf("SOCK_ERROR\n");
+			exit(-1);
+	}
+	printf(")\n");
+}
+
+static inline void printprotocol(int ai_protocol)
+{
+	printf("protocol: %d(", ai_protocol);
+	switch (ai_protocol)
+	{
+		case IPPROTO_IP:
+			printf("IPPROTO_IP");
+			break;
+		case IPPROTO_TCP:
+			printf("IPPROTO_TCP");
+			break;
+		case IPPROTO_UDP:
+			printf("IPPROTO_UDP");
+			break;
+		default:
+			printf("IPPROTO_ERROR\n");
+			exit(-1);
+	}
+	printf(")\n");
+}
+
+static inline void printaddr(int ai_family, const struct sockaddr *ai_addr)
+{
+	char str[INET_ADDRSTRLEN+1] = "FAKE";
+	printf("family: %d(", ai_family);
+	switch (ai_family)
+	{
+		case AF_UNSPEC:
+			printf("AF_UNSPEC");
+			break;
+		case AF_INET:
+			printf("AF_INET");
+			break;
+#ifdef AF_INET6
+		case AF_INET6:
+			printf("AF_INET6");
+			break;
+#endif
+		default:
+			printf("AF_ERROR\n");
+			exit(-1);
+	}
+	printf(")\n");
+	if (ai_family == AF_INET && ai_addr)
+	{
+		const struct sockaddr_in *ip4 = (void *)ai_addr;
+#ifdef HAVE_NTOP
+		inet_ntop(ai_family, &ip4->sin_addr, str, INET_ADDRSTRLEN);
+#else
+		strncpy(str, inet_ntoa(ip4->sin_addr), INET_ADDRSTRLEN);
+#endif
+		printf("port: %d\n", ntohs(ip4->sin_port));
+	}
+	printf("addr: %s\n", str);
+}
+
+void printaddrinfo(const struct my_addrinfo *data)
+{
+	if(data == NULL)
+	{
+		printf("no data\n");
+		return;
+	}
+	else
+		printf("starting addrinfo dump\n");
+	while (data != NULL)
+	{
+		printflags(data->ai_flags);
+		printsocktype(data->ai_socktype);
+		printaddr(data->ai_family, data->ai_addr);
+		printprotocol(data->ai_protocol);
+		//addrlen
+		data = data->ai_next;
+	}
+}
+
+int main(int argc, char **argv)
+{
+	struct my_addrinfo *res = NULL, hints;
+	int gaie;
+
+	(void)argc;
+	(void)argv;
+	memset(&hints, 0x00, sizeof(struct my_addrinfo));
+	hints.ai_family = AF_INET;
+
+#ifdef _WIN32
+	{
+#ifdef USE_WINSOCK2
+		const WORD VerNeed = MAKEWORD(2,2);
+#else
+		const WORD VerNeed = MAKEWORD(1,1);
+#endif
+		WSADATA WSAData;
+		WSAStartup(VerNeed, &WSAData);
+	}
+#endif
+	printf("-----------------------------------------------------------\n");
+#ifndef _WIN32 //NULL as res crashes Win32
+	gaie = I_getaddrinfo(NULL, NULL, &hints, NULL);
+	if (gaie != EAI_NONAME)
+		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	I_freeaddrinfo(res);
+#endif
+#if 0 //NULL as res crashes
+	gaie = I_getaddrinfo("localhost", "5029", NULL, NULL);
+    if (gaie == 0)
+		printf("NULL crashes: %s(%d)\n", gai_strerror(gaie), gaie);
+	I_freeaddrinfo(res);
+#endif
+	gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
+    //if (gaie != 0)
+		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	printf("-----------------------------------------------------------\n");
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+	gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
+    //if (gaie != 0)
+		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	printf("-----------------------------------------------------------\n");
+	hints.ai_socktype = SOCK_DGRAM;
+	hints.ai_protocol = IPPROTO_UDP;
+	gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
+    //if (gaie != 0)
+		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	printf("-----------------------------------------------------------\n");
+	hints.ai_flags = AI_NUMERICHOST;
+	gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
+    //if (gaie != 0)
+		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	printf("-----------------------------------------------------------\n");
+	gaie = I_getaddrinfo("127.0.0.1", NULL, &hints, &res);
+    //if (gaie != 0)
+		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo("127.0.0.1", "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	printf("-----------------------------------------------------------\n");
+	gaie = I_getaddrinfo("255.255.255.255", NULL, &hints, &res);
+    //if (gaie != 0)
+		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo("255.255.255.255", "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	printf("-----------------------------------------------------------\n");
+	hints.ai_flags = AI_PASSIVE;
+	gaie = I_getaddrinfo("0.0.0.0", NULL, &hints, &res);
+    //if (gaie != 0)
+		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+	gaie = I_getaddrinfo("0.0.0.0", "5029", &hints, &res);
+    //if (gaie != 0)
+		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
+	printaddrinfo(res);
+	I_freeaddrinfo(res); res = NULL;
+    return 0;
+}
+#endif
@@ -0,0 +1,71 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2011-2018 by Sonic Team Junior.
+//
+// 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  i_addrinfo.h
+/// \brief getaddrinfo stub
+
+#ifndef __I_ADDRINFO__
+#define __I_ADDRINFO__
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#ifndef AI_PASSIVE
+#define AI_PASSIVE     0x01
+#endif
+#ifndef AI_NUMERICHOST
+#define AI_NUMERICHOST 0x04
+#endif
+#ifndef AI_V4MAPPED
+#define AI_V4MAPPED    0x08
+#endif
+#ifndef AI_ADDRCONFIG
+#define AI_ADDRCONFIG  0x20
+#endif
+
+#ifdef _WIN32
+#ifndef EAI_NONAME
+#define EAI_NONAME WSAHOST_NOT_FOUND
+#endif
+#endif
+
+#ifndef EAI_NONAME
+#define EAI_NONAME -2
+#endif
+
+#ifdef _WIN32 // already use the stub for Win32
+// w32api, ws2tcpip.h, r1.12
+struct my_addrinfo {
+        int     ai_flags;
+        int     ai_family;
+        int     ai_socktype;
+        int     ai_protocol;
+        size_t  ai_addrlen;
+        char   *ai_canonname;
+        struct sockaddr  *ai_addr;
+        struct my_addrinfo  *ai_next;
+};
+#else
+#define my_addrinfo addrinfo
+#endif
+
+void WS_addrinfocleanup(void);
+
+#ifndef my_addrinfo
+void I_freeaddrinfo(struct my_addrinfo *res);
+int I_getaddrinfo(const char *node, const char *service,
+                         const struct my_addrinfo *hints,
+                         struct my_addrinfo **res);
+#elif !defined (test_stub)
+#define I_getaddrinfo getaddrinfo
+#define I_freeaddrinfo freeaddrinfo
+#endif
+
+
+#endif
@@ -28,37 +28,43 @@
 #endif

 #ifdef _WIN32
-	#define USE_WINSOCK
+#define USE_WINSOCK
+#if defined (_WIN64) || defined (HAVE_IPV6)
+#define USE_WINSOCK2
+#else //_WIN64/HAVE_IPV6
+#define USE_WINSOCK1
+#endif
 #endif //WIN32 OS

-#ifdef USE_WINSOCK
-	#include <ws2tcpip.h>
-	#define addrinfo_t ADDRINFOA
-#else
-	#define addrinfo_t struct addrinfo
+#ifdef USE_WINSOCK2
+#include <ws2tcpip.h>
 #endif

 #include "doomdef.h"

-#ifndef USE_WINSOCK
-	#include <arpa/inet.h>
-	#ifdef __APPLE_CC__
-		#ifndef _BSD_SOCKLEN_T_
-			#define _BSD_SOCKLEN_T_
-		#endif //_BSD_SOCKLEN_T_
-	#endif //__APPLE_CC__
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <netdb.h>
-	#include <sys/ioctl.h>
-#endif //normal BSD API
-
-#include <errno.h>
 #include <time.h>
+#ifdef USE_WINSOCK1
+	#include <winsock.h>
+#else
+	#ifndef USE_WINSOCK
+		#include <arpa/inet.h>
+		#ifdef __APPLE_CC__
+			#ifndef _BSD_SOCKLEN_T_
+				#define _BSD_SOCKLEN_T_
+			#endif //_BSD_SOCKLEN_T_
+		#endif //__APPLE_CC__
+		#include <sys/socket.h>
+		#include <netinet/in.h>
+		#include <netdb.h>
+		#include <sys/ioctl.h>
+	#endif //normal BSD API

-#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
-	#include <sys/time.h>
-#endif // UNIXCOMMON
+	#include <errno.h>
+
+	#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
+		#include <sys/time.h>
+	#endif // UNIXCOMMON
+#endif

 #ifdef USE_WINSOCK
 	// some undefined under win32
@@ -146,22 +152,27 @@ static UINT8 UPNP_support = TRUE;
 	#define close closesocket
 #endif

+#include "i_addrinfo.h"
 #define DEFAULTPORT "5029"

-#ifdef USE_WINSOCK
-	typedef SOCKET SOCKET_TYPE;
-	#define ERRSOCKET (SOCKET_ERROR)
+#if defined (USE_WINSOCK)
+typedef SOCKET SOCKET_TYPE;
+#define ERRSOCKET (SOCKET_ERROR)
 #else
-	#if defined (__unix__) || defined (__APPLE__) || defined (__HAIKU__)
-		typedef int SOCKET_TYPE;
-	#else
-		typedef unsigned long SOCKET_TYPE;
-	#endif
-	#define ERRSOCKET (-1)
+#if defined (__unix__) || defined (__APPLE__) || defined (__HAIKU__)
+typedef int SOCKET_TYPE;
+#else
+typedef unsigned long SOCKET_TYPE;
+#endif
+#define ERRSOCKET (-1)
 #endif

 #define IPV6_MULTICAST_ADDRESS "ff15::57e1:1a12"

+#ifdef USE_WINSOCK1
+typedef int socklen_t;
+#endif
+
 typedef struct
 {
 	mysockaddr_t address;
@@ -221,8 +232,9 @@ static char *get_WSAErrorStr(int e)
 #define strerror get_WSAErrorStr
 #endif

-#ifdef USE_WINSOCK
+#ifdef USE_WINSOCK2
 #define inet_ntop inet_ntopA
+#define HAVE_NTOP
 static const char* inet_ntopA(short af, const void *cp, char *buf, socklen_t len)
 {
 	DWORD Dlen = len, AFlen = 0;
@@ -266,6 +278,8 @@ static const char* inet_ntopA(short af, const void *cp, char *buf, socklen_t len
 		return NULL;
 	return buf;
 }
+#elif !defined (USE_WINSOCK1)
+#define HAVE_NTOP
 #endif

 #ifdef HAVE_MINIUPNPC // based on old XChat patch
@@ -345,15 +359,18 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 {
 	static char s[64]; // 255.255.255.255:65535 or
 	// [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535
+
+#ifdef HAVE_NTOP
 #ifdef HAVE_IPV6
 	int v6 = (sk->any.sa_family == AF_INET6);
 #else
 	int v6 = 0;
 #endif
+
 	void *addr;
 	int e = 0; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once

-	if (sk->any.sa_family == AF_INET)
+	if(sk->any.sa_family == AF_INET)
 		addr = &sk->ip4.sin_addr;
 #ifdef HAVE_IPV6
 	else if(sk->any.sa_family == AF_INET6)
@@ -362,11 +379,9 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 	else
 		addr = NULL;

-	if (addr == NULL)
-	{
+	if(addr == NULL)
 		sprintf(s, "No address");
-	}
-	else if (inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
+	else if(inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
 	{
 		e = errno;
 		sprintf(s, "Unknown family type, error #%u: %s", e, strerror(e));
@@ -381,9 +396,17 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 			strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
 	}
 #endif
-	else if (sk->any.sa_family == AF_INET  && sk->ip4.sin_port != 0)
+	else if(sk->any.sa_family == AF_INET  && sk->ip4.sin_port  != 0)
 		strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
-
+#else
+	if (sk->any.sa_family == AF_INET)
+	{
+		strcpy(s, inet_ntoa(sk->ip4.sin_addr));
+		if (sk->ip4.sin_port != 0) strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
+	}
+	else
+		sprintf(s, "Unknown type");
+#endif
 	return s;
 }

@@ -481,6 +504,7 @@ static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
 		return false;
 }

+
 // This is a hack. For some reason, nodes aren't being freed properly.
 // This goes through and cleans up what nodes were supposed to be freed.
 /** \warning This function causes the file downloading to stop if someone joins.
@@ -635,7 +659,7 @@ static boolean SOCK_Get(void)
 		c = recvfrom(mysockets[n], (char *)&doomcom->data, MAXPACKETLENGTH, 0,
 			(void *)&fromaddress, &fromlen);

-		if (c != ERRSOCKET)
+		if (c > 0)
 		{
 #ifdef USE_STUN
 			if (STUN_got_response(doomcom->data, c))
@@ -651,21 +675,20 @@ static boolean SOCK_Get(void)
 #endif

 			// find remote node number
-			for (j = 1; j <= MAXNETNODES; j++) // include LAN
+			for (j = 1; j <= MAXNETNODES; j++) //include LAN
 			{
 				if (SOCK_cmpaddr(&fromaddress, &clientaddress[j], 0))
 				{
 					doomcom->remotenode = (INT16)j; // good packet from a game player
 					doomcom->datalength = (INT16)c;
 					nodesocket[j] = mysockets[n];
-					return true;
+					return false;
 				}
 			}
 			// not found

 			// find a free slot
 			j = getfreenode();
-
 			if (j > 0)
 			{
 				const time_t curTime = time(NULL);
@@ -752,7 +775,7 @@ static void SOCK_Send(void)
 	int e = 0; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once
 	size_t i, j;

-	if (doomcom->remotenode < 0 || !nodeconnected[doomcom->remotenode])
+	if (!nodeconnected[doomcom->remotenode])
 		return;

 	if (doomcom->remotenode == BROADCASTADDR)
@@ -845,11 +868,15 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen

 #ifdef USE_WINSOCK
 	{ // Alam_GBC: disable the new UDP connection reset behavior for Win2k and up
+#ifdef USE_WINSOCK2
 		DWORD dwBytesReturned = 0;
 		BOOL bfalse = FALSE;
 		rc = WSAIoctl(s, SIO_UDP_CONNRESET, &bfalse, sizeof(bfalse),
 		         NULL, 0, &dwBytesReturned, NULL, NULL);
-
+#else
+		unsigned long falseval = false;
+		rc = ioctl(s, SIO_UDP_CONNRESET, &falseval);
+#endif
 		if (rc == -1)
 		{
 			e = errno;
@@ -970,7 +997,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 		e = errno;
 		I_OutputMsg("getting SO_RCVBUF failed: #%u, %s\n", e, strerror(e));
 	}
-	CONS_Printf(M_GetText("Network receive buffer: %dKb\n"), opt>>10);
+	CONS_Printf(M_GetText("Network system buffer: %dKb\n"), opt>>10);

 	if (opt < 64<<10) // 64k
 	{
@@ -991,44 +1018,9 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 		}

 		if (opt < 64<<10)
-			CONS_Alert(CONS_WARNING, M_GetText("Can't set receive buffer length to 64k, file transfer will be bad\n"));
+			CONS_Alert(CONS_WARNING, M_GetText("Can't set buffer length to 64k, file transfer will be bad\n"));
 		else
-			CONS_Printf(M_GetText("Network receive buffer set to: %dKb\n"), opt>>10);
-	}
-
-	opt = 0;
-	opts = (socklen_t)sizeof(opt);
-	rc = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, &opts);
-	if (rc <= -1)
-	{
-		e = errno;
-		I_OutputMsg("getting SO_SNDBUF failed: #%u, %s\n", e, strerror(e));
-	}
-	CONS_Printf(M_GetText("Network send buffer: %dKb\n"), opt>>10);
-
-	if (opt < 64<<10) // 64k
-	{
-		opt = 64<<10;
-		opts = (socklen_t)sizeof(opt);
-		rc = setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, opts);
-		if (rc <= -1)
-		{
-			e = errno;
-			I_OutputMsg("setting SO_SNDBUF to %dKb failed: #%u, %s\n", opt>>10, e, strerror(e));
-		}
-
-		opt = 0;
-		rc = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, &opts);
-		if (rc <= -1)
-		{
-			e = errno;
-			I_OutputMsg("getting SO_SNDBUF failed: #%u, %s\n", e, strerror(e));
-		}
-
-		if (opt < 64<<10)
-			CONS_Alert(CONS_WARNING, M_GetText("Can't set send buffer length to 64k, file transfer will be bad\n"));
-		else
-			CONS_Printf(M_GetText("Network send system buffer set to: %dKb\n"), opt>>10);
+			CONS_Printf(M_GetText("Network system buffer set to: %dKb\n"), opt>>10);
 	}

 	rc = getsockname(s, &straddr.any, &len);
@@ -1054,7 +1046,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 static boolean UDP_Socket(void)
 {
 	size_t s;
-	addrinfo_t *ai, *runp, hints;
+	struct my_addrinfo *ai, *runp, hints;
 	int gaie;
 #ifdef HAVE_IPV6
 	const INT32 b_ipv6 = M_CheckParm("-ipv6");
@@ -1083,7 +1075,7 @@ static boolean UDP_Socket(void)
 	{
 		while (M_IsNextParm())
 		{
-			gaie = getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
+			gaie = I_getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
 			if (gaie == 0)
 			{
 				runp = ai;
@@ -1097,13 +1089,13 @@ static boolean UDP_Socket(void)
 					}
 					runp = runp->ai_next;
 				}
-				freeaddrinfo(ai);
+				I_freeaddrinfo(ai);
 			}
 		}
 	}
 	else
 	{
-		gaie = getaddrinfo("0.0.0.0", serv, &hints, &ai);
+		gaie = I_getaddrinfo("0.0.0.0", serv, &hints, &ai);
 		if (gaie == 0)
 		{
 			runp = ai;
@@ -1124,7 +1116,7 @@ static boolean UDP_Socket(void)
 				}
 				runp = runp->ai_next;
 			}
-			freeaddrinfo(ai);
+			I_freeaddrinfo(ai);
 		}
 	}

@@ -1136,7 +1128,7 @@ static boolean UDP_Socket(void)
 		{
 			while (M_IsNextParm())
 			{
-				gaie = getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
+				gaie = I_getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
 				if (gaie == 0)
 				{
 					runp = ai;
@@ -1150,13 +1142,13 @@ static boolean UDP_Socket(void)
 						}
 						runp = runp->ai_next;
 					}
-					freeaddrinfo(ai);
+					I_freeaddrinfo(ai);
 				}
 			}
 		}
 		else
 		{
-			gaie = getaddrinfo("::", serv, &hints, &ai);
+			gaie = I_getaddrinfo("::", serv, &hints, &ai);
 			if (gaie == 0)
 			{
 				runp = ai;
@@ -1170,7 +1162,7 @@ static boolean UDP_Socket(void)
 					}
 					runp = runp->ai_next;
 				}
-				freeaddrinfo(ai);
+				I_freeaddrinfo(ai);
 			}
 		}
 	}
@@ -1224,7 +1216,11 @@ boolean I_InitTcpDriver(void)
 	if (!init_tcp_driver)
 	{
 #ifdef USE_WINSOCK
+#ifdef USE_WINSOCK2
 		const WORD VerNeed = MAKEWORD(2,2);
+#else
+		const WORD VerNeed = MAKEWORD(1,1);
+#endif
 		WSADATA WSAData;
 		const int WSAresult = WSAStartup(VerNeed, &WSAData);
 		if (WSAresult != 0)
@@ -1251,14 +1247,21 @@ boolean I_InitTcpDriver(void)
 			if (WSAresult != WSAVERNOTSUPPORTED)
 				CONS_Debug(DBG_NETPLAY, "WinSock(TCP/IP) error: %s\n",WSError);
 		}
-
-		if (LOBYTE(WSAData.wVersion) != 2 ||
+#ifdef USE_WINSOCK2
+		if(LOBYTE(WSAData.wVersion) != 2 ||
 			HIBYTE(WSAData.wVersion) != 2)
 		{
 			WSACleanup();
 			CONS_Debug(DBG_NETPLAY, "No WinSock(TCP/IP) 2.2 driver detected\n");
 		}
-
+#else
+		if (LOBYTE(WSAData.wVersion) != 1 ||
+			HIBYTE(WSAData.wVersion) != 1)
+		{
+			WSACleanup();
+			CONS_Debug(DBG_NETPLAY, "No WinSock(TCP/IP) 1.1 driver detected\n");
+		}
+#endif
 		CONS_Debug(DBG_NETPLAY, "WinSock description: %s\n",WSAData.szDescription);
 		CONS_Debug(DBG_NETPLAY, "WinSock System Status: %s\n",WSAData.szSystemStatus);
 #endif
@@ -1298,31 +1301,35 @@ void I_ShutdownTcpDriver(void)

 	CONS_Printf("I_ShutdownTcpDriver: ");
 #ifdef USE_WINSOCK
+	WS_addrinfocleanup();
 	WSACleanup();
 #endif
 	CONS_Printf("shut down\n");
 	init_tcp_driver = false;
 }

-static boolean SOCK_GetAddr(mysockaddr_t *sin, const char *address, const char *port, boolean test)
+static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const char *port, boolean test)
 {
-	addrinfo_t *ai, *runp, hints;
+	struct my_addrinfo *ai = NULL, *runp, hints;
 	int gaie;
 	size_t i;

 	if (!port || !port[0])
 		port = DEFAULTPORT;

-	memset(&hints, 0x00, sizeof (hints));
+	memset (&hints, 0x00, sizeof (hints));
 	hints.ai_flags = AI_ADDRCONFIG;
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = IPPROTO_UDP;

-	gaie = getaddrinfo(address, port, &hints, &ai);
+	gaie = I_getaddrinfo(address, port, &hints, &ai);

 	if (gaie != 0)
+	{
+		I_freeaddrinfo(ai);
 		return false;
+	}

 	runp = ai;

@@ -1349,7 +1356,7 @@ static boolean SOCK_GetAddr(mysockaddr_t *sin, const char *address, const char *
 	if (runp != NULL)
 		memcpy(sin, runp->ai_addr, runp->ai_addrlen);

-	freeaddrinfo(ai);
+	I_freeaddrinfo(ai);

 	return (runp != NULL);
 }
@@ -1362,7 +1369,7 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port)

 	if (newnode != -1)
 	{
-		if (!SOCK_GetAddr(&clientaddress[newnode], address, port, true))
+		if (!SOCK_GetAddr(&clientaddress[newnode].ip4, address, port, true))
 		{
 			nodeconnected[newnode] = false;
 			return -1;
@@ -1390,7 +1397,7 @@ static void rendezvous(int size)

 	if (tic != refreshtic)
 	{
-		if (SOCK_GetAddr(&rzv, host, (port ? port : "7777"), false))
+		if (SOCK_GetAddr(&rzv.ip4, host, (port ? port : "7777"), false))
 		{
 			refreshtic = tic;
 		}
@@ -1547,7 +1554,7 @@ static boolean SOCK_SetUnbanTime(time_t timestamp)

 static boolean SOCK_SetBanAddress(const char *address, const char *mask)
 {
-	addrinfo_t *ai, *runp, hints;
+	struct my_addrinfo *ai, *runp, hints;
 	int gaie;

 	if (!address)
@@ -1559,7 +1566,7 @@ static boolean SOCK_SetBanAddress(const char *address, const char *mask)
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = IPPROTO_UDP;

-	gaie = getaddrinfo(address, "0", &hints, &ai);
+	gaie = I_getaddrinfo(address, "0", &hints, &ai);
 	if (gaie != 0)
 		return false;

@@ -1604,7 +1611,7 @@ static boolean SOCK_SetBanAddress(const char *address, const char *mask)
 		runp = runp->ai_next;
 	}

-	freeaddrinfo(ai);
+	I_freeaddrinfo(ai);

 	return true;
 }
@@ -1653,6 +1660,8 @@ boolean I_InitTcpNetwork(void)
 		// FIXME: for dedicated server, numnodes needs to be set to 0 upon start
 		if (dedicated)
 			doomcom->numnodes = 0;
+/*		else if (M_IsNextParm())
+			doomcom->numnodes = (INT16)atoi(M_GetNextParm());*/
 		else
 			doomcom->numnodes = 1;

@@ -1737,3 +1746,5 @@ boolean I_InitTcpNetwork(void)

 	return ret;
 }
+
+#include "i_addrinfo.c"
@@ -94,8 +94,8 @@ INT32 VID_SetMode(INT32 modenum);
 	\return	name of video mode
 */
 const char *VID_GetModeName(INT32 modenum);
+void VID_PrepareModeList(void); /// note hack for SDL

-void VID_PrepareModeList(void);

 /**	\brief can video system do fullscreen
 */
@@ -10,14 +10,9 @@
 /// \file  k_director.h
 /// \brief SRB2kart automatic spectator camera.

-#ifndef __K_DIRECTOR__
-#define __K_DIRECTOR__
-
 boolean K_DirectorIsAvailable(void);
 void K_InitDirector(void);
 void K_UpdateDirector(void);
 void K_DrawDirectorDebugger(void);
 void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source);
 void K_ToggleDirector(void);
-
-#endif
@@ -4333,7 +4333,7 @@ static void K_drawInput(void)
 			target = 0;
 		else // turning of multiple strengths!
 		{
-			target = ((abs(cmd->driftturn) - 1)/200)+1; // was 125, do we need another toggle for this? Zzz...
+			target = ((abs(cmd->driftturn) - 1)/125)+1;
 			if (target > 4)
 				target = 4;
 			if (cmd->driftturn < 0)
@@ -608,6 +608,9 @@ void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, bo
 	if (color >= MAXTRANSLATIONS)
 		I_Error("Invalid skin color #%hu.", (UINT16)color);

+	if (skinnum < 0 && skinnum > TC_DEFAULT)
+		I_Error("Invalid translation colormap index %d.", skinnum);
+
 	starttranscolor = (skinnum != TC_DEFAULT) ? K_GetSkinArray(local)[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;

 	if (starttranscolor >= NUM_PALETTE_ENTRIES)
@@ -637,14 +640,11 @@ void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, bo
 UINT8 K_GetKartColorByName(const char *name)
 {
 	UINT8 color = (UINT8)atoi(name);
-
 	if (color > 0 && color < MAXSKINCOLORS)
 		return color;
-
 	for (color = 1; color < MAXSKINCOLORS; color++)
-		if (fasticmp(KartColor_Names[color], name))
+		if (!stricmp(KartColor_Names[color], name))
 			return color;
-
 	return 0;
 }

@@ -1,14 +1,3 @@
-// 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  k_stats.c
-/// \brief Game statistics handling
-
 #include "k_stats.h"
 #include "doomstat.h"
 #include "g_game.h"
@@ -1,14 +1,3 @@
-// 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  k_stats.h
-/// \brief Game statistics handling
-
 #ifndef __K_STATS__
 #define __K_STATS__

@@ -453,7 +453,7 @@ static int lib_cvRegisterVar(lua_State *L)
 	if (cvar->flags & CV_MODIFIED)
 		return luaL_error(L, "failed to register cvar (probable conflict with internal variable/command names)");

-	if (!(((cvar->flags & CV_HIDEN)) || (cvar->flags & CV_NOSHOWHELP)) && (cvar->PossibleValue || !(cvar->value == 0 && !fasticmp(cvar->string, "0"))))
+	if (!(((cvar->flags & CV_HIDEN)) || (cvar->flags & CV_NOSHOWHELP)) && (cvar->PossibleValue || !(cvar->value == 0 && stricmp(cvar->string, "0"))))
 	{
 		if (!category)
 		{
@@ -10,9 +10,6 @@
 /// \file  lua_hook.h
 /// \brief hooks for Lua scripting

-#ifndef __LUA_HOOK__
-#define __LUA_HOOK__
-
 #include "r_defs.h"
 #include "d_player.h"
 #include "s_sound.h"
@@ -149,5 +146,3 @@ boolean LUA_HookPlayerSquish(player_t *player, mobj_t *inflictor, mobj_t *source
 // (note: function format in lua doesn't include maxresults, so its function(result, gametype, secondgametype, prevmap)
 // to get maxresults use #result)
 void LUA_HookSetupVote(INT16 result[], INT16 maxresults, UINT8 gt, UINT8 secondgt);
-
-#endif //__LUA_HOOK__
@@ -83,7 +83,7 @@ FUNCINLINE static ATTRINLINE unsigned hook_in_list

 	for (type = 0; list[type] != NULL; ++type)
 	{
-		if (fastcmp(name, list[type]))
+		if (strcmp(name, list[type]) == 0)
 			break;
 	}

@@ -240,7 +240,7 @@ static int lib_addHook(lua_State *L)
 	{
 		add_hook(&hookIds[type]);
 	}
-	/*else if (fastcmp(name, "HUD")) // ehh this is cool and all, but i dont want modders potentially breaking vanilla clients lol
+	/*else if (strcmp(name, "HUD") == 0) // ehh this is cool and all, but i dont want modders potentially breaking vanilla clients lol
 	{
 		add_hud_hook(L, 3);
 	}*/
@@ -818,7 +818,7 @@ typedef struct {

 FUNCINLINE static ATTRINLINE boolean checkbotkey(const char *field)
 {
-	return lua_toboolean(gL, -1) && fastcmp(lua_tostring(gL, -2), field);
+	return lua_toboolean(gL, -1) && strcmp(lua_tostring(gL, -2), field) == 0;
 }

 static void res_botai(Hook_State *hook)
@@ -10,9 +10,6 @@
 /// \file  lua_libs.h
 /// \brief libraries for Lua scripting

-#ifndef __LUA_LIBS__
-#define __LUA_LIBS__
-
 #include "doomtype.h"
 #include "blua/lua.h"

@@ -76,5 +73,3 @@ int LUA_ThinkerLib(lua_State *L);
 int LUA_MapLib(lua_State *L);
 int LUA_BlockmapLib(lua_State *L);
 int LUA_HudLib(lua_State *L);
-
-#endif //__LUA_LIBS__
@@ -455,12 +455,12 @@ int mobj_localskin_setter(lua_State *L)
 		strlcpy(skin, luaL_optstring(L, 2, "none"), sizeof skin);
 		strlwr(skin); // all skin names are lowercase

-		if (!fasticmp(skin, "none"))
+		if (stricmp(skin, "none"))
 		{
 			// Try localskins
 			for (i = 0; i < numlocalskins; i++)
 			{
-				if (fasticmp(localskins[i].name, skin))
+				if (stricmp(localskins[i].name, skin) == 0)
 				{
 					mo->localskin = &localskins[i];
 					mo->skinlocal = true;
@@ -471,7 +471,7 @@ int mobj_localskin_setter(lua_State *L)
 			// Try other skins
 			for (i = 0; i < numskins; i++)
 			{
-				if (fasticmp(skins[i].name, skin))
+				if (stricmp(skins[i].name, skin) == 0)
 				{
 					mo->localskin = &skins[i];
 					mo->skinlocal = false;
@@ -288,10 +288,6 @@ void LUA_LoadLump(UINT16 wad, UINT16 lump)
 		lumpinfo_t *lump_p = &wadfiles[wad]->lumpinfo[lump];
 		len += 1 + strlen(lump_p->fullname); // length of file name, '|', and lump name
 		name = malloc(len+1);
-
-		if (!name)
-			I_Error("LUA_LoadLump: Out of memory!\n");
-
 		sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->fullname);
 		name[len] = '\0';
 	}
@@ -801,12 +797,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			mobj_t *mobj = *((mobj_t **)lua_touserdata(gL, myindex));
 			if (!mobj)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_MOBJ);
 				WRITEUINT32(*p, mobj->mobjnum);
 			}
@@ -816,12 +808,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			player_t *player = *((player_t **)lua_touserdata(gL, myindex));
 			if (!player)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_PLAYER);
 				WRITEUINT8(*p, player - players);
 			}
@@ -831,12 +819,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			mapthing_t *mapthing = *((mapthing_t **)lua_touserdata(gL, myindex));
 			if (!mapthing)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_MAPTHING);
 				WRITEUINT16(*p, mapthing - mapthings);
 			}
@@ -846,12 +830,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			vertex_t *vertex = *((vertex_t **)lua_touserdata(gL, myindex));
 			if (!vertex)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_VERTEX);
 				WRITEUINT16(*p, vertex - vertexes);
 			}
@@ -861,12 +841,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			line_t *line = *((line_t **)lua_touserdata(gL, myindex));
 			if (!line)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_LINE);
 				WRITEUINT16(*p, line - lines);
 			}
@@ -876,12 +852,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			side_t *side = *((side_t **)lua_touserdata(gL, myindex));
 			if (!side)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_SIDE);
 				WRITEUINT16(*p, side - sides);
 			}
@@ -891,12 +863,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			subsector_t *subsector = *((subsector_t **)lua_touserdata(gL, myindex));
 			if (!subsector)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_SUBSECTOR);
 				WRITEUINT16(*p, subsector - subsectors);
 			}
@@ -906,12 +874,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			sector_t *sector = *((sector_t **)lua_touserdata(gL, myindex));
 			if (!sector)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_SECTOR);
 				WRITEUINT16(*p, sector - sectors);
 			}
@@ -921,12 +885,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			pslope_t *slope = *((pslope_t **)lua_touserdata(gL, myindex));
 			if (!slope)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_SLOPE);
 				WRITEUINT16(*p, slope->id);
 			}
@@ -936,12 +896,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 		{
 			mapheader_t *header = *((mapheader_t **)lua_touserdata(gL, myindex));
 			if (!header)
-			{
 				WRITEUINT8(*p, ARCH_NULL);
-				return 3;
-			}
-			else
-			{
+			else {
 				WRITEUINT8(*p, ARCH_MAPHEADER);
 				WRITEUINT16(*p, header - *mapheaderinfo);
 			}
@@ -1047,23 +1003,19 @@ static void ArchiveTables(UINT8 **p)
 			e = ArchiveValue(p, TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
 			if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
 			{
-				CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -2), luaL_typename(gL, -2), i);
-			}
-			else if (e == 3) // nil key due to invalid userdata. NOT an error.
-			{
+				lua_pushvalue(gL, -2);
+				CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -1), luaL_typename(gL, -1), i);
 				lua_pop(gL, 1);
-				continue;
 			}
-
 			// Write value
 			e = ArchiveValue(p, TABLESINDEX, -1);
 			if (e == 1)
-			{
 				n++; // the table contained a new table we'll have to archive. :(
-			}
 			else if (e == 2) // invalid value type
 			{
-				CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -2), luaL_typename(gL, -1));
+				lua_pushvalue(gL, -2);
+				CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -1), luaL_typename(gL, -1));
+				lua_pop(gL, 1);
 			}

 			lua_pop(gL, 1);
@@ -1,14 +1,3 @@
-// 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"
@@ -1,14 +1,3 @@
-// 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__

@@ -111,4 +100,4 @@ void udatalib_addfields(lua_State *L, int mt, const udata_field_t fields[]);
    return 0; \
 }

-#endif
+#endif
@@ -183,7 +183,7 @@ static aatree_node_t *M_AATreeSetString_Node(aatree_node_t *node, UINT32 flags,
 		else
 		{
 			aatree_entry_t *entry = node->value;
-			if (entry != NULL && !fastcmp(entry->key, key))
+			if (entry != NULL && strcmp(entry->key, key) != 0)
 				entry = entry->next;
 			if (entry != NULL)
 			{
@@ -252,7 +252,7 @@ void *M_AATreeGetString(aatree_t *aatree, const char *key)
 	I_Assert((aatree->flags & AATREE_STRING) == AATREE_STRING);
 	UINT32 hash = FNV1a_HashString(key);
 	aatree_entry_t *entry = M_AATreeGet_Node(aatree->root, hash);
-	while (entry != NULL && !fastcmp(entry->key, key))
+	while (entry != NULL && strcmp(entry->key, key) != 0)
 		entry = entry->next;
 	return entry != NULL ? entry->value : NULL;
 }
@@ -49,7 +49,7 @@ INT32 M_CheckParm(const char *check)

 	for (i = 1; i < myargc; i++)
 	{
-		if (fasticmp(check, myargv[i]))
+		if (!strcasecmp(check, myargv[i]))
 		{
 			found = i;
 			return i;
@@ -69,18 +69,16 @@ INT32 M_CheckProtoParam(const char *check)

 	for (i = 1; i < myargc; i++)
 	{
-		if (strncmp(myargv[i], "srb2kart://", 11) == 0)
+                if (strncmp(myargv[i], "srb2kart://", 11) == 0)
 		{
-			if (strncmp(myargv[i]+11, check, strlen(check)) == 0)
+                	if (strncmp(myargv[i]+11, check, strlen(check))==0)
 			{
 				found = i;
 				return i;
 			}
 		}
 	}
-
 	found = 0;
-
 	return 0;
 }

@@ -95,7 +93,7 @@ const char *M_GetProtoParam(void)

 	for (i = 1; i < myargc; i++)
 	{
-		if (strncmp(myargv[i], "srb2kart://", 11) == 0)
+                if (strncmp(myargv[i], "srb2kart://", 11) == 0)
 		{
 			string = strchr(myargv[i], '/');
 			string = strchr(string+1, '/');
@@ -10,9 +10,6 @@
 /// \file  m_cond.h
 /// \brief Unlockable condition system for SRB2 version 2.1

-#ifndef __M_COND__
-#define __M_COND__
-
 #include "doomdef.h"

 // --------
@@ -185,5 +182,3 @@ UINT8 M_GotLowEnoughTime(INT32 tictime);
 //UINT8 M_GotHighEnoughRings(INT32 trings);

 #define M_Achieved(a) ((a) >= MAXCONDITIONSETS || conditionSets[a].achieved)
-
-#endif //__M_COND__
@@ -1,14 +1,3 @@
-// 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  m_curl.c
-/// \brief Common curl-related functions shared across http-mserv and file download
-
 #include "m_curl.h"
 #include "doomtype.h"
 #include "i_system.h" // I_OutputMsg
@@ -1,14 +1,3 @@
-// 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  m_curl.h
-/// \brief Common curl-related functions shared across http-mserv and file download
-
 #ifndef __M_CURL__
 #define __M_CURL__

@@ -1,14 +1,3 @@
-// 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  m_emotes.cpp
-/// \brief Chat emotes handling
-
 #include <map>
 #include <string>
 #include <sstream>
@@ -92,7 +81,7 @@ void M_LoadEmotes(UINT16 wadnum)
 			if (emote_name.size() > MAXEMOTENAME)
 			{
 				CONS_Alert(CONS_WARNING, "EMOTES: Emote name is too long, truncating. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
-				emote_name.resize(MAXEMOTENAME);
+				emote_name = emote_name.substr(0, MAXEMOTENAME);
 			}

 			emote = &emotes[emote_name];
@@ -112,7 +101,7 @@ void M_LoadEmotes(UINT16 wadnum)
 			trim(field);
 			trim(value);

-			if (fasticmp(field.c_str(), "frames"))
+			if (stricmp(field.c_str(), "frames") == 0)
 			{
 				UINT8 numframes = 0;

@@ -139,7 +128,7 @@ void M_LoadEmotes(UINT16 wadnum)
 					if (framelumpname.size() > 8)
 					{
 						CONS_Alert(CONS_WARNING, "EMOTES: Frame %d name is too long. (file %s, line %d)", numframes, wadfiles[wadnum]->filename, linenum);
-						framelumpname.resize(8);
+						framelumpname = framelumpname.substr(0, 8);
 					}

 					std::strncpy(emote->frames[numframes], framelumpname.c_str(), framelumpname.size()+1);
@@ -158,7 +147,7 @@ void M_LoadEmotes(UINT16 wadnum)

 				emote->numframes = numframes;
 			}
-			else if (fasticmp(field.c_str(), "timeperframe"))
+			else if (stricmp(field.c_str(), "timeperframe") == 0)
 			{
 				emote->timeperframe = std::stoi(value);

@@ -1,14 +1,3 @@
-// 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  m_emotes.h
-/// \brief Chat emotes handling
-
 #ifndef __M_EMOTES__
 #define __M_EMOTES__

@@ -702,13 +702,7 @@ static void M_CheckStringItem(void)

 		// Just in case
 		memset(menu_text_input_buf, 0, sizeof menu_text_input_buf);
-
-		// special case: name input, cap it to prevent writing outside the textbox
-		// kinda ugly but itll work
-		if (cv == &cv_playername)
-			M_TextInputInit(&menuinput, menu_text_input_buf, MAXPLAYERNAME +1);
-		else
-			M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf);
+		M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf);

 		M_TextInputSetString(&menuinput, cv->string);
 	}
@@ -1438,11 +1432,10 @@ void M_Drawer(void)
 				V_DrawThinString(vid.dup, vid.height - 20*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch);
 				V_DrawThinString(vid.dup, vid.height - 10*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision);
 #else // Regular build
-#ifdef SATURN_TESTING // ok not regular build lmao, we dont need to show this stuff in Saturn release builds
-				V_DrawThinString(vid.dup, vid.height - 20*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision);
-#endif
+				V_DrawThinString(vid.dup, vid.height - 20*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision); // Removeur this for release! im just lazy to make a new flag or smth
 				V_DrawThinString(vid.dup, vid.height - 10*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING));
 #endif
+
 #ifdef HWRENDER
 				if (rendermode == render_opengl)
 					V_DrawThinString(0, 0, V_GREENMAP|V_SNAPTOTOP|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("Opengl"));
@@ -2719,10 +2712,6 @@ static void M_PrepareLevelSelect(void)
 //
 boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt)
 {
-	// invalid mapnum
-	if (mapnum < -1)
-		return false;
-
 	// Random map!
 	if (mapnum == -1)
 		return (gamestate != GS_TIMEATTACK && !modeattacking);
@@ -3113,7 +3102,7 @@ static void M_AddonsInternal(void)
 			break;
 	}

-	strlcpy(menupath, pathname, MAXFILEPATH);
+	strlcpy(menupath, pathname, 1024);
 	menupathindex[(menudepthleft = menudepth-1)] = strlen(menupath) + 1;

 	if (menupath[menupathindex[menudepthleft]-2] != PATHSEP[0])
@@ -3226,9 +3215,9 @@ static void M_DrawTemperature(INT32 x, fixed_t t)
 static char *M_AddonsHeaderPath(void)
 {
 	UINT32 len;
-	static char header[MAXFILEPATH];
+	static char header[1024];

-	strlcpy(header, va("%s folder%s", cv_addons_option.string, menupath+menupathindex[menudepth-1]-1), MAXFILEPATH);
+	strlcpy(header, va("%s folder%s", cv_addons_option.string, menupath+menupathindex[menudepth-1]-1), 1024);
 	len = strlen(header);
 	if (len > 34)
 	{
@@ -3719,10 +3708,10 @@ static void M_HandleAddons(INT32 choice)
 							break;
 						case EXT_TXT:
 						case EXT_CFG:
-							if (fastcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, CONFIGFILENAME)
-								|| fastcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, AUTOLOADCONFIGFILENAME)
-								|| fastcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartserv.cfg")
-								|| fastcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartexec.cfg"))
+							if ((strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, CONFIGFILENAME) == 0)
+								|| (strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, AUTOLOADCONFIGFILENAME) == 0)
+								|| (strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartserv.cfg") == 0)
+								|| (strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartexec.cfg") == 0))
 							{
 								M_StartMessage(va("%c%s\x80\nYou can't autoload this builds' base console scripts, silly!\n They're already autoloaded on startup! \n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
 								S_StartSound(NULL, sfx_s26d);
@@ -3830,7 +3819,7 @@ static void ReplayNamesLoadThread(void* userdata)

 	Lock_search_state();

-	if (fastcmp(menupath, replaydirpath))
+	if (strcmp(menupath, replaydirpath) == 0)
 	{
 		memcpy(demolist_all, demolist_all_local, sizeof(menudemo_t)*sizedirmenu);
 		replaynamesloaded = true;
@@ -3964,7 +3953,9 @@ static void PrepReplayList(boolean reset)

 	Lock_search_state();

-	Z_Free(demolist_all);
+	if (demolist_all)
+		Z_Free(demolist_all);
+
 	demolist_all = Z_Calloc(sizeof(menudemo_t) * sizedirmenu, PU_STATIC, NULL);

 	for (i = 0; i < sizedirmenu; i++)
@@ -3982,9 +3973,9 @@ static void PrepReplayList(boolean reset)
 		else
 		{
 			demolist_all[i].type = MD_NOTLOADED;
-			snprintf(demolist_all[i].filepath, sizeof(demolist_all[i].filepath),
-					 // 255 = UINT8 limit. dirmenu entries are restricted to this length (see DIR_LEN).
-					 "%s%.255s", menupath, dirmenu[i] + DIR_STRING);
+			// FIXME - do something with buffer sizes. menupath is 1024 chars but filepath is only
+			// 256. I'm not really sure what to do here but don't want to leave warnings...
+			snprintf(demolist_all[i].filepath, 255, "%.254s%s", menupath, dirmenu[i] + DIR_STRING);
 			sprintf(demolist_all[i].title, ".....");
 		}
 	}
@@ -4339,7 +4330,7 @@ static void DrawReplayHutReplayInfo(void)
 static void M_DrawReplayHut(void)
 {
 	INT32 x, y, cursory = 0;
-	INT32 i;
+	INT16 i;
 	INT16 replaylistitem = currentMenu->numitems-2;
 	boolean processed_one_this_frame = false;
 	const INT32 scaledviewheight = (vid.height/vid.dup);
@@ -4412,7 +4403,7 @@ static void M_DrawReplayHut(void)
 		V_DrawCenteredString(160, 100, V_ALLOWLOWERCASE, msg);
 	}

-	for (i = 0; i < (INT32)replayqueryfound; i++)
+	for (i = 0; i < (INT16)replayqueryfound; i++)
 	{
 		INT32 localy = y+i*10;
 		INT32 localx = x;
@@ -6956,9 +6947,9 @@ static void M_ConnectMenuModChecks(INT32 choice)
 	(void)choice;
 	// okay never mind we want to COMMUNICATE to the player pre-emptively instead of letting them try and then get confused when it doesn't work

-	if (modifiedgame)
+	if (modifiedgame || autoloaded)
 	{
-		M_StartMessage("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nSRB2Kart will automatically add\neverything you need when you join.\n\n(Press a key)\n", M_ConnectMenu, MM_EVENTHANDLER);
+		M_StartMessage(M_GetText("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nSRB2Kart will automatically add\neverything you need when you join.\n\n(Press a key)\n"),M_ConnectMenu,MM_EVENTHANDLER);
 		return;
 	}

@@ -7179,21 +7170,17 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
 			namescroll = 0;
 		}

-		if (renderisnewtic)
-			namescroll++;
+		if (renderisnewtic) namescroll++;

 		char *addonname = wadfiles[mapwads[cv_nextmap.value-1]]->filename;
 		INT32 len;
 		INT32 charlimit = min((size_t)(21 + (dupadjust/5)), sizeof(namescrollbuf)-1);
-
 		nameonly(addonname);
 		len = strlen(addonname);
-
 		if (len > charlimit)
 			M_ScrollString(addonname, len, namescrollbuf, charlimit, namescroll);
 		else
-			strncpy(namescrollbuf, addonname, sizeof(namescrollbuf) - 1);
-
+			strncpy(namescrollbuf, addonname, sizeof(namescrollbuf));
 		V_DrawThinString(x+w+5, y+i-8, V_TRANSLUCENT|MENUCAPS, namescrollbuf); // variable reuse...
 	}

@@ -7232,7 +7219,7 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
 			if (i == oldval)
 				return;

-			if (i >= 0 && !mapheaderinfo[i])
+			if(!mapheaderinfo[i])
 				continue; // Don't allocate the header.  That just makes memory usage skyrocket.

 		} while (!M_CanShowLevelInList(i, cv_newgametype.value));
@@ -7270,7 +7257,7 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
 			if (i == oldval)
 				return;

-			if (i >= 0 && !mapheaderinfo[i])
+			if(!mapheaderinfo[i])
 				continue; // Don't allocate the header.  That just makes memory usage skyrocket.

 		} while (!M_CanShowLevelInList(i, cv_newgametype.value));
@@ -8283,12 +8270,12 @@ static void M_DrawSetupMultiPlayerMenu(void)

 	sprframe = &sprdef->spriteframes[frame];

-	// minenice's speen css, it's a piece of shit but hey
+	//minenice's speen css, it's a piece of shit but hey
 	speenframe = (I_GetTime()*cv_skinselectspin.value/TICRATE + 1)%8;

-	// this is a very shitty solution for checking if a sprite needs flipping
-	// but it works
-	if ((speenframe > 4) && (sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]))
+	//this is a very shitty solution for checking if a sprite needs flipping
+	//but it works
+	if ((sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]) && (speenframe > 4))
 		flags = V_FLIP; // This sprite is left/right flipped!

 	patch = (patch_t *)W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
@@ -8808,7 +8795,7 @@ static boolean M_QuitMultiPlayerMenu(void)
 	size_t l;

 	// send name if changed
-	if (!fastcmp(setupm_name, setupm_cvname->string))
+	if (strcmp(setupm_name, setupm_cvname->string))
 	{
 		// remove trailing whitespaces
 		for (l= strlen(setupm_name)-1;
@@ -9450,8 +9437,9 @@ static void M_VideoModeMenu(INT32 choice)

 	memset(modedescs, 0, sizeof(modedescs));

+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
 	VID_PrepareModeList(); // FIXME: hack
-
+#endif
 	vidm_nummodes = 0;
 	vidm_selected = 0;
 	nummodes = VID_NumModes();
@@ -9469,7 +9457,7 @@ static void M_VideoModeMenu(INT32 choice)
 			// VESA mode, which is always a higher modenum
 			for (j = 0; j < vidm_nummodes; j++)
 			{
-				if (fastcmp(modedescs[j].desc, desc))
+				if (!strcmp(modedescs[j].desc, desc))
 				{
 					// mode(0): 320x200 is always standard VGA, not vesa
 					if (modedescs[j].modenum)
@@ -9643,7 +9631,7 @@ static void M_DrawLocalSkinMenu(void)

 	//this is a very shitty solution for checking if a sprite needs flipping
 	//but it works
-	if ((speenframe > 4) && (sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]))
+	if ((sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]) && (speenframe > 4))
 	{
 		flags = V_FLIP; // This sprite is left/right flipped!
 	}
@@ -10342,9 +10330,9 @@ static const char *M_GetDiscordName(discordRequest_t *r)
 		return "";

 	if (cv_discordstreamer.value)
-		return DRPC_HideUsername(r->username);
+		return r->username;

-	return r->username;
+	return va("%s#%s", r->username, r->discriminator);
 }

 // (this goes in k_hud.c when merged into v2)
@@ -645,20 +645,10 @@ static menuitem_t OP_ControlsMenu[] =
 	{IT_CALL | IT_STRING, NULL, "Player 3 Controls...", &M_Setup3PControlsMenu, 30},
 	{IT_CALL | IT_STRING, NULL, "Player 4 Controls...", &M_Setup4PControlsMenu, 40},

-	{IT_SUBMENU | IT_STRING, NULL, "Mouse Options...",  &OP_MouseOptionsDef,    55},
+	{IT_SUBMENU | IT_STRING, NULL, "Mouse Options...", &OP_MouseOptionsDef,     60},

-	{IT_STRING | IT_CVAR, NULL, "Controls per key",     &cv_controlperkey,      75},
-
-	{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P1)",  &cv_turnsmooth[0],         85},
-	{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P2)",  &cv_turnsmooth[1],         95},
-	{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P3)",  &cv_turnsmooth[2],         105},
-	{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P4)",  &cv_turnsmooth[3],         115},
-
-	// i hate our menus sincerly
-	{IT_STRING | IT_CVAR, NULL, "Lite Steer (P1)",      &cv_litesteer[0],       135},
-	{IT_STRING | IT_CVAR, NULL, "Lite Steer (P2)",      &cv_litesteer[1],       145},
-	{IT_STRING | IT_CVAR, NULL, "Lite Steer (P3)",      &cv_litesteer[2],       155},
-	{IT_STRING | IT_CVAR, NULL, "Lite Steer (P4)",      &cv_litesteer[3],       165},
+	{IT_STRING | IT_CVAR, NULL, "Controls per key",    &cv_controlperkey,       80},
+	{IT_STRING | IT_CVAR, NULL, "Digital turn easing", &cv_turnsmooth,          90},
 };

 static const char* OP_ControlsTooltips[] =
@@ -669,15 +659,7 @@ static const char* OP_ControlsTooltips[] =
 	"Setup player 4 controls.",
 	"Options for mouse control.",
 	"Allowed amount of controls per key.",
-	"Turn smoothing for non-analog turning (Player 1).",
-	"Turn smoothing for non-analog turning (Player 2).",
-	"Turn smoothing for non-analog turning (Player 3).",
-	"Turn smoothing for non-analog turning (Player 4).",
-
-	"Hold DOWN on d-pad/keyboard for shallow turns (Player 1).",
-	"Hold DOWN on d-pad/keyboard for shallow turns (Player 2).",
-	"Hold DOWN on d-pad/keyboard for shallow turns (Player 3).",
-	"Hold DOWN on d-pad/keyboard for shallow turns (Player 4).",
+	"Turn smoothing for non-analog turning.",
 };

 static menuitem_t OP_AllControlsMenu[] =
@@ -944,23 +926,21 @@ static menuitem_t OP_ExpOptionsMenu[] =

 	{IT_STRING | IT_CVAR,	NULL, "Skyboxes",						&cv_skybox,				 	 40},

-	{IT_STRING | IT_CVAR,	NULL, "Precache Level Textures",		&cv_precachetextures,		 50},
+	{IT_STRING | IT_CVAR,	NULL, "FPS counter sampling",			&cv_accuratefps,			 50},

-	{IT_STRING | IT_CVAR,	NULL, "FPS counter sampling",			&cv_accuratefps,			 60},
+	{IT_STRING | IT_CVAR,	NULL, "Frameskip",						&cv_frameskip,			 	 60},

-	{IT_STRING | IT_CVAR,	NULL, "Frameskip",						&cv_frameskip,			 	 70},
-
-	{IT_STRING | IT_CVAR,	NULL, "Votescreen Scaling",				&cv_votebgscaling,			 80},
+	{IT_STRING | IT_CVAR,	NULL, "Votescreen Scaling",				&cv_votebgscaling,			 70},

 #ifdef HWRENDER
-	{IT_STRING | IT_CVAR, 	NULL, "Screen Textures", 				&cv_glscreentextures, 		 90},
+	{IT_STRING | IT_CVAR, 	NULL, "Screen Textures", 				&cv_glscreentextures, 		 80},
 #ifdef USE_FBO_OGL
-	{IT_STRING | IT_CVAR, 	NULL, "FBO Downsampling support", 		&cv_glframebuffer, 			 95},
-	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		105},
-	{IT_DISABLED, 			NULL, "", 								NULL,     			 		115}, // dummy text
+	{IT_STRING | IT_CVAR, 	NULL, "FBO Downsampling support", 		&cv_glframebuffer, 			 85},
+	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		 95},
+	{IT_DISABLED, 			NULL, "", 								NULL,     			 		105}, // dummy text
 #else
-	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		100},
-	{IT_DISABLED, 			NULL, "", 								NULL,     			 		110}, // dummy text
+	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		 90},
+	{IT_DISABLED, 			NULL, "", 								NULL,     			 		100}, // dummy text
 #endif
 #endif
 };
@@ -970,17 +950,16 @@ static const char* OP_ExpTooltips[] =
 	NULL,
 	"How far Mobj interpolation should take effect.",
 	"When weather is on this will cut the object amount used in half.",
-	"Sets minimum sector brightness, useful for dark areas.",
+	"Sets minimum sector brightness, useful for dark areas",
 	//"Should the directional lightning be randomized each map?\nTakes effect on next map load.",
 	"Toggle being able to see the sky.",
-	"Preload all level textures on level load.\nMassively reduces texture related stuttering during gameplay\nat the cost of longer level loading times.\nDisable this if you experience timeouts during level switches.",
-	"Change the FPS counter sampling method\nInaccurate updates slower\nand might miss sudden framerate changes and drops,\nproviding a more averaged result.\nAccurate updates faster, but might be less readable.", // how to ingles??
-	"Skips rendering frames if game logic takes too long\npreventing gameplay issues during performance drops.", // idk im shit as describing things
+	"Change the FPS counter sampling method\nInaccurate updates slower and might miss frame drops and such\nAccurate updates faster and is more accurate, but might be less readable", // how to ingles??
+	"Skips rendering frames if game logic takes too long preventing issues during performance drops." // idk im shit as describing things
 	"Different methods of scaling the votescreen backgrounds.",
 #ifdef HWRENDER
 	"Should the game do Screen Textures? Provides a good boost to frames\nat the cost of some visual effects not working when disabled.",
 #ifdef USE_FBO_OGL
-	"Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nRequires a GPU with atleast OpenGL 2.1 support.",
+	"Allows the game to downsample from a higher resolution than your display\nin OpenGL renderer mode. Requires a GPU with atleast OpenGL 3.0 support.",
 #endif
 	"Change the bit depth of the Lookup Palette in Palette rendering mode\n 16 bits is like software looks ingame\nwhile 24 bits is how software looks in screenshots.",
 #endif
@@ -994,7 +973,6 @@ enum
 	op_exp_secbright,
 	//op_exp_dirlight,
 	op_exp_skybox,
-	op_exp_texcache,
 	op_exp_accuratefps,
 	op_exp_frameskip,
 	op_exp_votescrn,
@@ -1379,15 +1357,15 @@ static menuitem_t OP_Player4CamOptionsMenu[] =
 static const char* OP_PlayerCamOptionsTooltips[] =
 {
 	NULL,
-	"Should the Camera flip on gravity flipped sections?",
+	"Should the Camera flip on gravity flipped sections?.",
 	"Camera distance relative to the Player.",
-	"Height of the Camera.",
-	"Pitch Camera on Upwards or Downhill Slopes.",
-	"Speed of the Camera.",
-	"Should looking back inherit the Players Momentum?\nEither inherit Player Momentum or double of it\nmay make looking back while boosting or going in high speed less jarring.",
+	"Height of the Camera",
+	"Pitch Camera on Upwards or Downhill Slopes",
+	"Speed of the Camera",
+	"Should looking back inherit the Players Momentum?\nEither inherit Player Momentum or double of it\nmay make looking back while boosting or going in high speed less jarring",
 	"Allows looking up/down by holding\naim forward/backward while standing still.",
-	"Speed of the Freecam/Spectator Camera.",
-	"Toggle between Third or First Person camera.",
+	"Speed of the Freecam/Spectator Camera",
+	"Toggle between Third or First Person camera",
 };

 // Ok it's still called chatoptions but we'll put ping display in here to be clean
@@ -1767,7 +1745,7 @@ static const char* OP_PlayerDistortTooltips[] =
 	"Distance object rotation should be visable.",
 	"Player rotation when sliptiding.",
 	"Rotation of a player's boost trails and drift sparks.",
-	"Should banans rotate when thrown?\nAnd should they stay rotated when on the ground?",
+	"Should banans rotate when thrown?\nAnd should they stay rotated when on the ground?.",
 	"Player squash and stretch.",
 	"Player landing sound effect.",
 	"Kart hopping while drifting. This is purely visual.",
@@ -2446,7 +2424,7 @@ menu_t OP_MainDef =
 	NULL
 };

-menu_t OP_ControlsDef     = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 40, 15, OP_ControlsTooltips);
+menu_t OP_ControlsDef     = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 60, 30, OP_ControlsTooltips);
 //WTF
 menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_ControlsDef, 60, 30, OP_MouseTooltips);
 menu_t OP_AllControlsDef  = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef);
@@ -423,7 +423,7 @@ void Command_SaveConfig_f(void)
 	FIL_ForceExtension(tmpstr, ".cfg");

 	M_SaveConfig(tmpstr);
-	if (!fasticmp(COM_Argv(2), "-silent"))
+	if (stricmp(COM_Argv(2), "-silent"))
 		CONS_Printf(M_GetText("config saved as %s\n"), configfile);
 }

@@ -916,7 +916,7 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 		int len = (int)strlen(str);
 		char* str_ptr;

-		if (fastcmp(".lua", str + len - 4))
+		if (strcmp(".lua", str + len - 4) == 0)
 		{
 			str[len-4] = '\0'; // remove .lua at end
 		}
@@ -1,14 +1,3 @@
-// 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  m_textinput.c
-/// \brief User text input implementation
-
 #include "m_textinput.h"
 #include "m_menu.h" // MAXSTRINGLENGTH
 #include "v_video.h"
@@ -239,8 +228,8 @@ void M_TextInputClear(textinput_t *input)
 void M_TextInputSetString(textinput_t *input, const char *c)
 {
 	memset(input->buffer, 0, input->buffer_size);
-	strncpy(input->buffer, c, input->buffer_size);
-	input->cursor = input->select = input->length = strlen(input->buffer);
+	strcpy(input->buffer, c);
+	input->cursor = input->select = input->length = strlen(c);
 }

 static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emotes)
@@ -1,14 +1,3 @@
-// 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  m_textinput.h
-/// \brief User text input implementation
-
 #ifndef __M_TEXTINPUT__
 #define __M_TEXTINPUT__

@@ -345,7 +345,6 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		blockdist = thing->radius + tmthing->radius;
 		if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
 			return true; // didn't hit it
-
 		// see if it went over / under
 		if (tmthing->z > thing->z + thing->height)
 			return true; // overhead
@@ -708,7 +707,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 			HU_SetCEchoFlags(0);
 			HU_SetCEchoDuration(5);
 			HU_DoCEcho(va("%s\\was hit by a kitchen sink.\\\\\\\\", player_names[thing->player-players]));
-			//I_OutputMsg("%s was hit by a kitchen sink.\n", player_names[thing->player-players]);
+			I_OutputMsg("%s was hit by a kitchen sink.\n", player_names[thing->player-players]);
 			P_DamageMobj(thing, tmthing, tmthing->target, DMG_INSTAKILL);
 			P_KillMobj(tmthing, thing, thing);
 		}
@@ -977,7 +976,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 			HU_SetCEchoFlags(0);
 			HU_SetCEchoDuration(5);
 			HU_DoCEcho(va("%s\\was hit by a kitchen sink.\\\\\\\\", player_names[tmthing->player-players]));
-			//I_OutputMsg("%s was hit by a kitchen sink.\n", player_names[tmthing->player-players]);
+			I_OutputMsg("%s was hit by a kitchen sink.\n", player_names[tmthing->player-players]);
 			P_DamageMobj(tmthing, thing, thing->target, DMG_INSTAKILL);
 			P_KillMobj(thing, tmthing, tmthing);
 		}
@@ -1713,14 +1712,10 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 	tmbbox[BOXRIGHT] = x + tmthing->radius;
 	tmbbox[BOXLEFT] = x - tmthing->radius;

-	if (thing->x != x || thing->y != y || !thing->subsector)
-	{
+	if (thing->x != x || thing->y != y || thing->subsector == NULL)
 		newsec = R_PointInSubsector(x, y)->sector;
-	}
 	else
-	{
 		newsec = thing->subsector->sector;
-	}

 	ceilingline = blockingline = NULL;

@@ -1813,17 +1808,17 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)

 			midheight = (bottomheight + ((topheight - bottomheight)/2));

-			delta1 = abs(thing->z - midheight);
-			delta2 = abs(thingtop - midheight);
+			delta1 = thing->z - midheight;
+			delta2 = thingtop - midheight;

-			if (topheight > tmfloorz && delta1 < delta2
+			if (topheight > tmfloorz && abs(delta1) < abs(delta2)
 				&& !(rover->flags & FF_REVERSEPLATFORM))
 			{
 				tmfloorz = tmdropoffz = topheight;
 				tmfloorslope = *rover->t_slope;
 			}

-			if (bottomheight < tmceilingz && delta1 >= delta2
+			if (bottomheight < tmceilingz && abs(delta1) >= abs(delta2)
 				&& !(rover->flags & FF_PLATFORM)
 				&& !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)))
 			{
@@ -1874,7 +1869,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 					{
 						sector_t *polysec;
 						fixed_t delta1, delta2, thingtop;
-						fixed_t polytop, polybottom, polymid;
+						fixed_t polytop, polybottom;

 						po->validcount = validcount;

@@ -1900,24 +1895,21 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 						}

 						thingtop = thing->z + thing->height;
-						polymid = (polybottom + ((polytop - polybottom)/2));
+						delta1 = thing->z - (polybottom + ((polytop - polybottom)/2));
+						delta2 = thingtop - (polybottom + ((polytop - polybottom)/2));

-						delta1 = abs(thing->z - polymid);
-						delta2 = abs(thingtop - polymid);
-
-						if (polytop > tmfloorz && delta1 < delta2)
+						if (polytop > tmfloorz && abs(delta1) < abs(delta2))
 						{
 							tmfloorz = tmdropoffz = polytop;
 							tmfloorslope = NULL;
 						}

-						if (polybottom < tmceilingz && delta1 >= delta2)
+						if (polybottom < tmceilingz && abs(delta1) >= abs(delta2))
 						{
 							tmceilingz = tmdrpoffceilz = polybottom;
 							tmceilingslope = NULL;
 						}
 					}
-
 					plink = (polymaplink_t *)(plink->link.next);
 				}
 			}
@@ -2002,14 +1994,10 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 	tmbbox[BOXRIGHT] = x + thiscam->radius;
 	tmbbox[BOXLEFT] = x - thiscam->radius;

-	if (thiscam->x != x || thiscam->y != y || !thiscam->subsector)
-	{
-		newsec = R_PointInSubsector(x, y)->sector;
-	}
+	if (thiscam->x != x || thiscam->y != y || thiscam->subsector == NULL)
+		newsec = R_PointInSubsectorFast(x, y)->sector;
 	else
-	{
 		newsec = thiscam->subsector->sector;
-	}

 	ceilingline = blockingline = NULL;

@@ -2054,25 +2042,24 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)

 		for (rover = newsec->ffloors; rover; rover = rover->next)
 		{
-			fixed_t topheight, bottomheight, midheight;
+			fixed_t topheight, bottomheight;

-			if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL)
-			   || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
+			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, newsec, rover, x, y, NULL);
 			bottomheight = P_CameraGetFOFBottomZ(thiscam, newsec, rover, x, y, NULL);
-			midheight = (bottomheight + ((topheight - bottomheight)/2));

-			delta1 = abs(thiscam->z - midheight);
-			delta2 = abs(thingtop - midheight);
+			delta1 = thiscam->z - (bottomheight
+				+ ((topheight - bottomheight)/2));
+			delta2 = thingtop - (bottomheight
+				+ ((topheight - bottomheight)/2));

-			if (topheight > tmfloorz && delta1 < delta2)
+			if (topheight > tmfloorz && abs(delta1) < abs(delta2))
 			{
 				tmfloorz = tmdropoffz = topheight;
 			}
-
-			if (bottomheight < tmceilingz && delta1 >= delta2)
+			if (bottomheight < tmceilingz && abs(delta1) >= abs(delta2))
 			{
 				tmceilingz = tmdrpoffceilz = bottomheight;
 			}
@@ -2098,7 +2085,6 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 		validcount++;

 		for (by = yl; by <= yh; by++)
-		{
 			for (bx = xl; bx <= xh; bx++)
 			{
 				INT32 offset;
@@ -2120,7 +2106,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 					{
 						sector_t *polysec;
 						fixed_t delta1, delta2, thingtop;
-						fixed_t polytop, polybottom, polymid;
+						fixed_t polytop, polybottom;

 						po->validcount = validcount;

@@ -2151,21 +2137,18 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 						}

 						thingtop = thiscam->z + thiscam->height;
-						polymid = (polybottom + ((polytop - polybottom)/2));
+						delta1 = thiscam->z - (polybottom + ((polytop - polybottom)/2));
+						delta2 = thingtop - (polybottom + ((polytop - polybottom)/2));

-						delta1 = abs(thiscam->z - polymid);
-						delta2 = abs(thingtop - polymid);
-
-						if (polytop > tmfloorz && delta1 < delta2)
+						if (polytop > tmfloorz && abs(delta1) < abs(delta2))
 							tmfloorz = tmdropoffz = polytop;

-						if (polybottom < tmceilingz && delta1 >= delta2)
+						if (polybottom < tmceilingz && abs(delta1) >= abs(delta2))
 							tmceilingz = tmdrpoffceilz = polybottom;
 					}
 					plink = (polymaplink_t *)(plink->link.next);
 				}
 			}
-		}
 	}

 	// check lines
@@ -2189,7 +2172,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 //
 boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 {
-	subsector_t *subsec;
+	subsector_t *s;
 	UINT8 i;

 	floatok = false;
@@ -2198,9 +2181,9 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 		return false;

 	if (thiscam->x != x || thiscam->y != y || thiscam->subsector == NULL)
-		subsec = R_PointInSubsectorFast(x, y);
+		s = R_PointInSubsectorFast(x, y);
 	else
-		subsec = thiscam->subsector;
+		s = thiscam->subsector;

 	if (players[displayplayers[0]].mo)
 	{
@@ -2220,7 +2203,7 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 				thiscam->ceilingz = thiscam->z + thiscam->height;
 				thiscam->x = x;
 				thiscam->y = y;
-				thiscam->subsector = subsec;
+				thiscam->subsector = s;
 				return true;
 			}
 		}
@@ -2232,7 +2215,6 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 				tryx -= MAXRADIUS;
 			else
 				tryx = x;
-
 			if (y-tryy > MAXRADIUS)
 				tryy += MAXRADIUS;
 			else if (y-tryy < -MAXRADIUS)
@@ -2250,14 +2232,14 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)

 			if (tmceilingz - thiscam->z < thiscam->height)
 			{
-				if (subsec == thiscam->subsector && tmceilingz >= thiscam->z)
+				if (s == thiscam->subsector && tmceilingz >= thiscam->z)
 				{
 					floatok = true;
 					thiscam->floorz = tmfloorz;
 					thiscam->ceilingz = tmfloorz + thiscam->height;
 					thiscam->x = x;
 					thiscam->y = y;
-					thiscam->subsector = subsec;
+					thiscam->subsector = s;
 					return true;
 				}
 				else
@@ -2282,7 +2264,7 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 	thiscam->ceilingz = tmceilingz;
 	thiscam->x = x;
 	thiscam->y = y;
-	thiscam->subsector = subsec;
+	thiscam->subsector = s;

 	return true;
 }
@@ -2395,7 +2377,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 				tryx -= radius;
 			else
 				tryx = x;
-
 			if (y-tryy > radius)
 				tryy += radius;
 			else if (y-tryy < -radius)
@@ -2411,34 +2392,28 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 		{
 			//All things are affected by their scale.
 			fixed_t maxstep = FixedMul(MAXSTEPMOVE, mapobjectscale);
-			INT32 special = 0;

 			if (thing->player)
 			{
-				special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1);
+				const INT32 special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1);

 				// If using type Section1:13, double the maxstep.
-				if (P_PlayerTouchingSectorSpecial(thing->player, 1, 13) || special == 13)
-				{
+				if (P_PlayerTouchingSectorSpecial(thing->player, 1, 13)
+				|| special == 13)
 					maxstep <<= 1;
-				}
 				// If using type Section1:12, no maxstep. For ledges you don't want the player to climb! (see: Egg Zeppelin & SMK port walls)
-				else if (P_PlayerTouchingSectorSpecial(thing->player, 1, 12) || special == 12)
-				{
+				else if (P_PlayerTouchingSectorSpecial(thing->player, 1, 12)
+				|| special == 12)
 					maxstep = 0;
-				}
 			}

 			if (thing->type == MT_SKIM)
-			{
 				maxstep = 0;
-			}

 			if (tmceilingz - tmfloorz < thing->height)
 			{
 				if (tmfloorthing)
 					tmhitthing = tmfloorthing;
-
 				return false; // doesn't fit
 			}

@@ -2471,8 +2446,11 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 					return false; // mobj must lower itself to fit
 				}
 			}
-			else if (maxstep > 0 && !(thing->player &&
-					(P_PlayerTouchingSectorSpecial(thing->player, 1, 14) || special == 14))) // Step down
+			else if (maxstep > 0 && !(
+				thing->player && (
+				P_PlayerTouchingSectorSpecial(thing->player, 1, 14)
+				|| GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 14)
+				)) // Step down
 			{
 				// If the floor difference is MAXSTEPMOVE or less, and the sector isn't Section1:14, ALWAYS
 				// step down! Formerly required a Section1:13 sector for the full MAXSTEPMOVE, but no more.
@@ -2494,14 +2472,10 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 				if (thing->eflags & MFE_VERTICALFLIP)
 				{
 					if (tmdrpoffceilz - tmceilingz > maxstep)
-					{
 						return false;
-					}
 				}
 				else if (tmfloorz - tmdropoffz > maxstep)
-				{
 					return false; // don't stand over a dropoff
-				}
 			}
 		}
 	} while (tryx != x || tryy != y);
@@ -2577,7 +2551,6 @@ boolean P_SceneryTryMove(mobj_t *thing, fixed_t x, fixed_t y)

 	tryx = thing->x;
 	tryy = thing->y;
-
 	do {
 		if (x-tryx > MAXRADIUS)
 			tryx += MAXRADIUS;
@@ -2585,7 +2558,6 @@ boolean P_SceneryTryMove(mobj_t *thing, fixed_t x, fixed_t y)
 			tryx -= MAXRADIUS;
 		else
 			tryx = x;
-
 		if (y-tryy > MAXRADIUS)
 			tryy += MAXRADIUS;
 		else if (y-tryy < -MAXRADIUS)
@@ -2598,14 +2570,14 @@ boolean P_SceneryTryMove(mobj_t *thing, fixed_t x, fixed_t y)

 		if (!(thing->flags & MF_NOCLIP))
 		{
+			const fixed_t maxstep = FixedMul(MAXSTEPMOVE, mapobjectscale);
+
 			if (tmceilingz - tmfloorz < thing->height)
 				return false; // doesn't fit

 			if (tmceilingz - thing->z < thing->height)
 				return false; // mobj must lower itself to fit

-			const fixed_t maxstep = FixedMul(MAXSTEPMOVE, mapobjectscale);
-
 			if (tmfloorz - thing->z > maxstep)
 				return false; // too big a step up
 		}
@@ -2939,7 +2911,6 @@ static boolean PTR_SlideTraverse(intercept_t *in)
 	{
 		if (P_PointOnLineSide(slidemo->x, slidemo->y, li))
 			return true; // don't hit the back side
-
 		goto isblocking;
 	}

@@ -3231,46 +3202,32 @@ stairstep:
 	}

 	do {
-		if (tmxmove > mo->radius)
-		{
+		if (tmxmove > mo->radius) {
 			newx = mo->x + mo->radius;
 			tmxmove -= mo->radius;
-		}
-		else if (tmxmove < -mo->radius)
-		{
+		} else if (tmxmove < -mo->radius) {
 			newx = mo->x - mo->radius;
 			tmxmove += mo->radius;
-		}
-		else
-		{
+		} else {
 			newx = mo->x + tmxmove;
 			tmxmove = 0;
 		}
-
-		if (tmymove > mo->radius)
-		{
+		if (tmymove > mo->radius) {
 			newy = mo->y + mo->radius;
 			tmymove -= mo->radius;
-		}
-		else if (tmymove < -mo->radius)
-		{
+		} else if (tmymove < -mo->radius) {
 			newy = mo->y - mo->radius;
 			tmymove += mo->radius;
-		}
-		else
-		{
+		} else {
 			newy = mo->y + tmymove;
 			tmymove = 0;
 		}
-
-		if (!P_TryMove(mo, newx, newy, true))
-		{
+		if (!P_TryMove(mo, newx, newy, true)) {
 			if (success)
 				return; // Good enough!!
 			else
 				goto retry;
 		}
-
 		success = true;
 	} while(tmxmove || tmymove);
 }
@@ -3358,12 +3315,10 @@ void P_BouncePlayerMove(mobj_t *mo)

 	{
 		mobj_t *fx = P_SpawnMobj(mo->x, mo->y, mo->z, MT_BUMP);
-
 		if (mo->eflags & MFE_VERTICALFLIP)
 			fx->eflags |= MFE_VERTICALFLIP;
 		else
 			fx->eflags &= ~MFE_VERTICALFLIP;
-
 		fx->scale = mo->scale;

 		S_StartSound(mo, sfx_s3k49);
@@ -3377,8 +3332,7 @@ void P_BouncePlayerMove(mobj_t *mo)
 	mo->player->cmomx = tmxmove;
 	mo->player->cmomy = tmymove;

-	if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true))
-	{
+	if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true)) {
 		P_TryMove(mo, mo->x - oldmomx, mo->y - oldmomy, true);
 	}
 }
@@ -3649,7 +3603,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
 		if (thing->subsector->sector->ffloors && (realcrush || thing->flags & MF_PUSHABLE))
 		{
 			ffloor_t *rover;
-			fixed_t topheight, bottomheight, midheight;
+			fixed_t topheight, bottomheight;
 			fixed_t delta1, delta2;
 			INT32 thingtop = thing->z + thing->height;

@@ -3661,12 +3615,10 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)

 				topheight = *rover->topheight;
 				bottomheight = *rover->bottomheight;
-				midheight = ((bottomheight + topheight)/2);

-				delta1 = abs(thing->z - midheight);
-				delta2 = abs(thingtop - midheight);
-
-				if (bottomheight <= thing->ceilingz && delta1 >= delta2)
+				delta1 = thing->z - (bottomheight + topheight)/2;
+				delta2 = thingtop - (bottomheight + topheight)/2;
+				if (bottomheight <= thing->ceilingz && abs(delta1) >= abs(delta2))
 				{
 					if (thing->flags & MF_PUSHABLE)
 					{
@@ -3715,7 +3667,6 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
 					killer = P_SpawnMobj(thing->x, thing->y, thing->z, MT_NULL);
 					killer->threshold = 44; // Special flag for crushing
 				}
-
 				if (!thing->player)
 					P_DamageMobj(thing, killer, killer, DMG_INSTAKILL);
 				else
@@ -3755,7 +3706,6 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
 	{
 		size_t i;
 		sector_t *sec;
-
 		for (i = 0; i < sector->numattached; i++)
 		{
 			sec = &sectors[sector->attached[i]];
@@ -3796,11 +3746,9 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
 	do
 	{
 		for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list
-		{
 			if (!n->visited) // unprocessed thing found
 			{
 				n->visited = true; // mark thing as processed
-
 				if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these
 				{
 					if (!PIT_ChangeSector(n->m_thing, false)) // process it
@@ -3809,10 +3757,8 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
 						return nofit;
 					}
 				}
-
 				break; // exit and start over
 			}
-		}
 	} while (n); // repeat from scratch until all things left are marked valid

 	// Nothing blocked us, so lets crush for real!
@@ -3834,18 +3780,15 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
 			do
 			{
 				for (n = sec->touching_thinglist; n; n = n->m_thinglist_next)
+				if (!n->visited)
 				{
-					if (!n->visited)
+					n->visited = true;
+					if (!(n->m_thing->flags & MF_NOBLOCKMAP))
 					{
-						n->visited = true;
-
-						if (!(n->m_thing->flags & MF_NOBLOCKMAP))
-						{
-							PIT_ChangeSector(n->m_thing, true);
-							return nofit;
-						}
-						break;
+						PIT_ChangeSector(n->m_thing, true);
+						return nofit;
 					}
+					break;
 				}
 			} while (n);
 		}
@@ -3860,11 +3803,9 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
 	do
 	{
 		for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list
-		{
 			if (!n->visited) // unprocessed thing found
 			{
 				n->visited = true; // mark thing as processed
-
 				if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these
 				{
 					PIT_ChangeSector(n->m_thing, true); // process it
@@ -3872,7 +3813,6 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
 				}
 				break; // exit and start over
 			}
-		}
 	} while (n); // repeat from scratch until all things left are marked valid

 	return nofit;
@@ -3962,7 +3902,6 @@ static msecnode_t *P_DelSecnode(msecnode_t *node)

 	tp = node->m_sectorlist_prev;
 	tn = node->m_sectorlist_next;
-
 	if (tp)
 		tp->m_sectorlist_next = tn;
 	if (tn)
@@ -3973,7 +3912,6 @@ static msecnode_t *P_DelSecnode(msecnode_t *node)

 	sp = node->m_thinglist_prev;
 	sn = node->m_thinglist_next;
-
 	if (sp)
 		sp->m_thinglist_next = sn;
 	else
@@ -4021,7 +3959,7 @@ static inline boolean PIT_GetSectors(line_t *ld)
 	// allowed to move to this position, then the sector_list
 	// will be attached to the Thing's mobj_t at touching_sectorlist.

-	sector_list = P_AddSecnode(ld->frontsector, tmthing, sector_list);
+	sector_list = P_AddSecnode(ld->frontsector,tmthing,sector_list);

 	// Don't assume all lines are 2-sided, since some Things
 	// like MT_TFOG are allowed regardless of whether their radius takes
@@ -4149,7 +4087,7 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)

 		for (rover = sec->ffloors; rover; rover = rover->next)
 		{
-			fixed_t topheight, bottomheight, midheight;
+			fixed_t topheight, bottomheight;

 			if (!(rover->flags & FF_EXISTS))
 				continue;
@@ -4167,16 +4105,13 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
 					if (floorz < z)
 						floorz = z;
 				}
-
 				continue;
 			}

-			midheight = (bottomheight + ((topheight - bottomheight)/2));
+			delta1 = z - (bottomheight + ((topheight - bottomheight)/2));
+			delta2 = thingtop - (bottomheight + ((topheight - bottomheight)/2));

-			delta1 = abs(z - midheight);
-			delta2 = abs(thingtop - midheight);
-
-			if (topheight > floorz && delta1 < delta2)
+			if (topheight > floorz && abs(delta1) < abs(delta2))
 				floorz = topheight;
 		}
 	}
@@ -11889,7 +11889,7 @@ void P_SpawnHoops(mapthing_t *mthing)

 	z += P_GetSectorFloorZAt(sec, x, y);

-	hoopcenter->z = z - hoopcenter->height/2;
+	hoopcenter->z -= hoopcenter->height/2;

 	P_UnsetThingPosition(hoopcenter);
 	hoopcenter->x = x;
@@ -61,7 +61,7 @@ typedef enum
 //
 // P_ArchivePlayer
 //
-FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save)
+static inline void P_ArchivePlayer(savebuffer_t *save)
 {
 	const player_t *player = &players[consoleplayer];
 	INT32 pllives = player->lives;
@@ -85,7 +85,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save)
 //
 // P_UnArchivePlayer
 //
-FUNCINLINE static ATTRINLINE void P_UnArchivePlayer(savebuffer_t *save)
+static inline void P_UnArchivePlayer(savebuffer_t *save)
 {
 	savedata.skincolor = READUINT8(save->p);
 	savedata.skin = READUINT8(save->p);
@@ -1043,25 +1043,25 @@ typedef enum
 	tc_end
 } specials_e;

-FUNCINLINE static ATTRINLINE UINT32 SaveMobjnum(const mobj_t *mobj)
+static inline UINT32 SaveMobjnum(const mobj_t *mobj)
 {
 	if (mobj) return mobj->mobjnum;
 	return 0;
 }

-FUNCINLINE static ATTRINLINE UINT32 SaveSector(const sector_t *sector)
+static inline UINT32 SaveSector(const sector_t *sector)
 {
 	if (sector) return (UINT32)(sector - sectors);
 	return 0xFFFFFFFF;
 }

-FUNCINLINE static ATTRINLINE UINT32 SaveLine(const line_t *line)
+static inline UINT32 SaveLine(const line_t *line)
 {
 	if (line) return (UINT32)(line - lines);
 	return 0xFFFFFFFF;
 }

-FUNCINLINE static ATTRINLINE UINT32 SavePlayer(const player_t *player)
+static inline UINT32 SavePlayer(const player_t *player)
 {
 	if (player) return (UINT32)(player - players);
 	return 0xFFFFFFFF;
@@ -1476,7 +1476,7 @@ static void SaveElevatorThinker(savebuffer_t *save, const thinker_t *th, const U
 //
 // Saves a scroll_t thinker
 //
-FUNCINLINE static ATTRINLINE void SaveScrollThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
+static inline void SaveScrollThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const scroll_t *ht = (const void *)th;
 	WRITEUINT8(save->p, type);
@@ -1497,7 +1497,7 @@ FUNCINLINE static ATTRINLINE void SaveScrollThinker(savebuffer_t *save, const th
 //
 // Saves a friction_t thinker
 //
-FUNCINLINE static ATTRINLINE void SaveFrictionThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
+static inline void SaveFrictionThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const friction_t *ht = (const void *)th;
 	WRITEUINT8(save->p, type);
@@ -1513,7 +1513,7 @@ FUNCINLINE static ATTRINLINE void SaveFrictionThinker(savebuffer_t *save, const
 //
 // Saves a pusher_t thinker
 //
-FUNCINLINE static ATTRINLINE void SavePusherThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
+static inline void SavePusherThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const pusher_t *ht = (const void *)th;
 	WRITEUINT8(save->p, type);
@@ -1598,7 +1598,7 @@ static void SaveDisappearThinker(savebuffer_t *save, const thinker_t *th, const
 //
 // Saves a polyrotate_t thinker
 //
-FUNCINLINE static ATTRINLINE void SavePolyrotatetThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
+static inline void SavePolyrotatetThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const polyrotate_t *ht = (const void *)th;
 	WRITEUINT8(save->p, type);
@@ -1935,25 +1935,25 @@ mobj_t *P_FindNewPosition(UINT32 oldposition)
 	return NULL;
 }

-FUNCINLINE static ATTRINLINE mobj_t *LoadMobj(UINT32 mobjnum)
+static inline mobj_t *LoadMobj(UINT32 mobjnum)
 {
 	if (mobjnum == 0) return NULL;
 	return (mobj_t *)(size_t)mobjnum;
 }

-FUNCINLINE static ATTRINLINE sector_t *LoadSector(UINT32 sector)
+static inline sector_t *LoadSector(UINT32 sector)
 {
 	if (sector >= numsectors) return NULL;
 	return &sectors[sector];
 }

-FUNCINLINE static ATTRINLINE line_t *LoadLine(UINT32 line)
+static inline line_t *LoadLine(UINT32 line)
 {
 	if (line >= numlines) return NULL;
 	return &lines[line];
 }

-FUNCINLINE static ATTRINLINE player_t *LoadPlayer(UINT32 player)
+static inline player_t *LoadPlayer(UINT32 player)
 {
 	if (player >= MAXPLAYERS) return NULL;
 	return &players[player];
@@ -2529,7 +2529,7 @@ static void LoadScrollThinker(savebuffer_t *save, actionf_p1 thinker)
 //
 // Loads a friction_t from a save game
 //
-FUNCINLINE static ATTRINLINE void LoadFrictionThinker(savebuffer_t *save, actionf_p1 thinker)
+static inline void LoadFrictionThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	friction_t *ht = (friction_t*)Z_LevelPoolMalloc(sizeof (*ht));
 	ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2576,7 +2576,7 @@ static void LoadPusherThinker(savebuffer_t *save, actionf_p1 thinker)
 //
 // Loads a laserthink_t from a save game
 //
-FUNCINLINE static ATTRINLINE void LoadLaserThinker(savebuffer_t *save, actionf_p1 thinker)
+static inline void LoadLaserThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	laserthink_t *ht = (laserthink_t*)Z_LevelPoolMalloc(sizeof (*ht));
 	ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2621,7 +2621,7 @@ FUNCINLINE static ATTRINLINE void LoadLightlevelThinker(savebuffer_t *save, acti
 //
 // Loads a executor_t from a save game
 //
-FUNCINLINE static ATTRINLINE void LoadExecutorThinker(savebuffer_t *save, actionf_p1 thinker)
+static inline void LoadExecutorThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	executor_t *ht = (executor_t*)Z_LevelPoolMalloc(sizeof (*ht));
 	ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2639,7 +2639,7 @@ FUNCINLINE static ATTRINLINE void LoadExecutorThinker(savebuffer_t *save, action
 //
 // Loads a disappear_t thinker
 //
-FUNCINLINE static ATTRINLINE void LoadDisappearThinker(savebuffer_t *save, actionf_p1 thinker)
+static inline void LoadDisappearThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	disappear_t *ht = (disappear_t*)Z_LevelPoolMalloc(sizeof (*ht));
 	ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2660,7 +2660,7 @@ FUNCINLINE static ATTRINLINE void LoadDisappearThinker(savebuffer_t *save, actio
 //
 // Loads a polyrotate_t thinker
 //
-FUNCINLINE static ATTRINLINE void LoadPolyrotatetThinker(savebuffer_t *save, actionf_p1 thinker)
+static inline void LoadPolyrotatetThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polyrotate_t *ht = (polyrotate_t*)Z_LevelPoolMalloc(sizeof (*ht));
 	ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2720,7 +2720,7 @@ static void LoadPolymoveThinker(savebuffer_t *save, actionf_p1 thinker)
 //
 // Loads a polywaypoint_t thinker
 //
-FUNCINLINE static ATTRINLINE void LoadPolywaypointThinker(savebuffer_t *save, actionf_p1 thinker)
+static inline void LoadPolywaypointThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polywaypoint_t *ht = (polywaypoint_t*)Z_LevelPoolMalloc(sizeof (*ht));
 	ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2776,7 +2776,7 @@ FUNCINLINE static ATTRINLINE void LoadPolywaypointThinker(savebuffer_t *save, ac
 //
 // loads a polyslidedoor_t thinker
 //
-FUNCINLINE static ATTRINLINE void LoadPolyslidedoorThinker(savebuffer_t *save, actionf_p1 thinker)
+static inline void LoadPolyslidedoorThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polyslidedoor_t *ht = (polyslidedoor_t*)Z_LevelPoolMalloc(sizeof (*ht));
 	ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2814,7 +2814,7 @@ FUNCINLINE static ATTRINLINE void LoadPolyslidedoorThinker(savebuffer_t *save, a
 //
 // Loads a polyswingdoor_t thinker
 //
-FUNCINLINE static ATTRINLINE void LoadPolyswingdoorThinker(savebuffer_t *save, actionf_p1 thinker)
+static inline void LoadPolyswingdoorThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polyswingdoor_t *ht = (polyswingdoor_t*)Z_LevelPoolMalloc(sizeof (*ht));
 	ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2847,7 +2847,7 @@ FUNCINLINE static ATTRINLINE void LoadPolyswingdoorThinker(savebuffer_t *save, a
 //
 // Loads a polydisplace_t thinker
 //
-FUNCINLINE static ATTRINLINE void LoadPolydisplaceThinker(savebuffer_t *save, actionf_p1 thinker)
+static inline void LoadPolydisplaceThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polydisplace_t *ht = (polydisplace_t*)Z_LevelPoolMalloc(sizeof (*ht));
 	ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -3115,7 +3115,7 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save)
 #define PD_FLAGS  0x01
 #define PD_TRANS   0x02

-FUNCINLINE static ATTRINLINE void P_ArchivePolyObj(savebuffer_t *save, polyobj_t *po)
+static inline void P_ArchivePolyObj(savebuffer_t *save, polyobj_t *po)
 {
 	UINT8 diff = 0;
 	WRITEINT32(save->p, po->id);
@@ -3137,7 +3137,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePolyObj(savebuffer_t *save, polyobj_t
 		WRITEINT32(save->p, po->translucency);
 }

-FUNCINLINE static ATTRINLINE void P_UnArchivePolyObj(savebuffer_t *save, polyobj_t *po)
+static inline void P_UnArchivePolyObj(savebuffer_t *save, polyobj_t *po)
 {
 	INT32 id;
 	UINT32 angle;
@@ -3172,7 +3172,7 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePolyObj(savebuffer_t *save, polyobj
 	Polyobj_MoveOnLoad(po, angle, x, y);
 }

-FUNCINLINE static ATTRINLINE void P_ArchivePolyObjects(savebuffer_t *save)
+static inline void P_ArchivePolyObjects(savebuffer_t *save)
 {
 	INT32 i;

@@ -3185,7 +3185,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePolyObjects(savebuffer_t *save)
 		P_ArchivePolyObj(save, &PolyObjects[i]);
 }

-FUNCINLINE static ATTRINLINE void P_UnArchivePolyObjects(savebuffer_t *save)
+static inline void P_UnArchivePolyObjects(savebuffer_t *save)
 {
 	INT32 i, numSavedPolys;

@@ -3203,7 +3203,7 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePolyObjects(savebuffer_t *save)
 //
 // P_FinishMobjs
 //
-FUNCINLINE static ATTRINLINE void P_FinishMobjs(void)
+static inline void P_FinishMobjs(void)
 {
 	thinker_t *currentthinker;
 	mobj_t *mobj;
@@ -3220,7 +3220,7 @@ FUNCINLINE static ATTRINLINE void P_FinishMobjs(void)
 	}
 }

-FUNCINLINE static ATTRINLINE mobj_t *RelinkMobj(mobj_t **ptr)
+static inline mobj_t *RelinkMobj(mobj_t **ptr)
 {
 	UINT32 temp = (UINT32)(size_t)*ptr;
 	*ptr = NULL;
@@ -3269,7 +3269,7 @@ static void P_RelinkPointers(void)
 //
 // P_NetArchiveSpecials
 //
-FUNCINLINE static ATTRINLINE void P_NetArchiveSpecials(savebuffer_t *save)
+static inline void P_NetArchiveSpecials(savebuffer_t *save)
 {
 	size_t i, z;

@@ -3347,7 +3347,7 @@ static void P_NetUnArchiveSpecials(savebuffer_t *save)
 // =======================================================================
 //          Misc
 // =======================================================================
-FUNCINLINE static ATTRINLINE void P_ArchiveMisc(savebuffer_t *save)
+static inline void P_ArchiveMisc(savebuffer_t *save)
 {
 	if (gamecomplete)
 		WRITEINT16(save->p, gamemap | 8192);
@@ -3360,7 +3360,7 @@ FUNCINLINE static ATTRINLINE void P_ArchiveMisc(savebuffer_t *save)
 	WRITESTRINGN(save->p, timeattackfolder, sizeof(timeattackfolder));
 }

-FUNCINLINE static ATTRINLINE void P_UnArchiveSPGame(savebuffer_t *save, INT16 mapoverride)
+static inline void P_UnArchiveSPGame(savebuffer_t *save, INT16 mapoverride)
 {
 	char testname[sizeof(timeattackfolder)];

@@ -3391,7 +3391,7 @@ FUNCINLINE static ATTRINLINE void P_UnArchiveSPGame(savebuffer_t *save, INT16 ma

 	READSTRINGN(save->p, testname, sizeof(testname));

-	if (!fastcmp(testname, timeattackfolder))
+	if (strcmp(testname, timeattackfolder))
 	{
 		if (modifiedgame)
 			I_Error("Save game not for this modification.");
@@ -3531,8 +3531,7 @@ static void P_ReloadSaveLevelData(void)
 		ss->floorpic_angle = spawnss->floorpic_angle;
 		ss->ceilingpic_angle = spawnss->ceilingpic_angle;
 		ss->tag = spawnss->tag;
-		ss->firsttag = spawnss->firsttag;
-		ss->nexttag  = spawnss->nexttag;
+		ss->firsttag = ss->nexttag = -1;

 		if (ss->ffloors)
 		{
@@ -3557,8 +3556,7 @@ static void P_ReloadSaveLevelData(void)
 		li->callcount = 0;

 		li->tag = spawnli->tag;
-		li->firsttag = spawnli->firsttag;
-		li->nexttag  = spawnli->nexttag;
+		li->firsttag = li->nexttag = -1;

 		if (li->sidenum[0] != 0xffff)
 		{
@@ -3582,6 +3580,8 @@ static void P_ReloadSaveLevelData(void)
 			si->midtexture = spawnsi->midtexture;
 		}
 	}
+
+	P_InitTagLists();
 }

 FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading)
@@ -544,7 +544,18 @@ static void P_LoadSegs(UINT8 *data)
 	{
 		li->v1 = &vertexes[SHORT(ml->v1)];
 		li->v2 = &vertexes[SHORT(ml->v2)];
+#ifdef HWRENDER
+		if (rendermode == render_opengl)
+		{
+			li->fv1.x = FixedToFloat(li->v1->x);
+			li->fv1.y = FixedToFloat(li->v1->y);
+			//li->fv1.z = FixedToFloat(li->v1->z); // z is unused in gl

+			li->fv2.x = FixedToFloat(li->v2->x);
+			li->fv2.y = FixedToFloat(li->v2->y);
+			//li->fv2.z = FixedToFloat(li->v2->z);
+		}
+#endif
 		li->length = P_SegLength(li);
 		li->angle = (SHORT(ml->angle))<<FRACBITS;
 		li->offset = (SHORT(ml->offset))<<FRACBITS;
@@ -1983,12 +1994,11 @@ static void P_LoadMapData(const virtres_t* virt)
 	P_LoadLinedefs(virtlinedefs->data);
 	P_LoadSidedefs(virtsidedefs->data);
 	P_LoadThings(virtthings->data);
-	P_InitTagLists();   // Create xref tables for tags

 	// Copy relevant map data for NetArchive purposes.
-	spawnsectors = Z_Malloc(numsectors * sizeof(*sectors), PU_LEVEL, NULL);
-	spawnlines   = Z_Malloc(numlines * sizeof(*lines), PU_LEVEL, NULL);
-	spawnsides   = Z_Malloc(numsides * sizeof(*sides), PU_LEVEL, NULL);
+	spawnsectors = Z_Calloc(numsectors * sizeof(*sectors), PU_LEVEL, NULL);
+	spawnlines   = Z_Calloc(numlines * sizeof(*lines), PU_LEVEL, NULL);
+	spawnsides   = Z_Calloc(numsides * sizeof(*sides), PU_LEVEL, NULL);

 	memcpy(spawnsectors, sectors, numsectors * sizeof(*sectors));
 	memcpy(spawnlines, lines, numlines * sizeof(*lines));
@@ -324,7 +324,6 @@ void P_InitPicAnims(void)
 			lastanim->speed = LONG(animdefs[i].speed);
 		lastanim++;
 	}
-
 	lastanim->istexture = -1;
 	R_ClearTextureNumCache(false);

@@ -332,7 +331,6 @@ void P_InitPicAnims(void)
 	// We'll only be using anims from now on.
 	if (animdefs != harddefs)
 		Z_Free(animdefs);
-
 	animdefs = NULL;
 }

@@ -363,21 +361,20 @@ void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum)

 	// Now, let's start parsing this thing
 	p = animdefsText;
-
 	animdefsToken = M_GetToken(p);
 	while (animdefsToken != NULL)
 	{
-		if (fasticmp(animdefsToken, "TEXTURE"))
+		if (stricmp(animdefsToken, "TEXTURE") == 0)
 		{
 			Z_Free(animdefsToken);
 			P_ParseAnimationDefintion(1);
 		}
-		else if (fasticmp(animdefsToken, "FLAT"))
+		else if (stricmp(animdefsToken, "FLAT") == 0)
 		{
 			Z_Free(animdefsToken);
 			P_ParseAnimationDefintion(0);
 		}
-		else if (fasticmp(animdefsToken, "OSCILLATE"))
+		else if (stricmp(animdefsToken, "OSCILLATE") == 0)
 		{
 			// This probably came off the tail of an earlier definition. It's technically legal syntax, but we don't support it.
 			I_Error("Error parsing ANIMDEFS lump: Animation definitions utilizing \"OSCILLATE\" (the animation plays in reverse when it reaches the end) are not supported by SRB2");
@@ -386,17 +383,11 @@ void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum)
 		{
 			I_Error("Error parsing ANIMDEFS lump: Expected \"TEXTURE\" or \"FLAT\", got \"%s\"",animdefsToken);
 		}
-
 		// parse next line
-		while (*p != '\0' && *p != '\n')
-			++p;
-
-		if (*p == '\n')
-			++p;
-
+		while (*p != '\0' && *p != '\n') ++p;
+		if (*p == '\n') ++p;
 		animdefsToken = M_GetToken(p);
 	}
-
 	Z_Free(animdefsToken);
 	Z_Free((void *)animdefsText);
 }
@@ -415,8 +406,7 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where start texture/flat name should be");
 	}
-
-	if (fasticmp(animdefsToken, "OPTIONAL"))
+	if (stricmp(animdefsToken, "OPTIONAL") == 0)
 	{
 		// This is meaningful to ZDoom - it tells the program NOT to bomb out
 		// if the textures can't be found - but it's useless in SRB2, so we'll
@@ -428,7 +418,7 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 		{
 			I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where start texture/flat name should be");
 		}
-		else if (fasticmp(animdefsToken, "RANGE"))
+		else if (stricmp(animdefsToken, "RANGE") == 0)
 		{
 			// Oh. Um. Apparently "OPTIONAL" is a texture name. Naughty.
 			// I should probably handle this more gracefully, but right now
@@ -437,17 +427,15 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 			I_Error("Error parsing ANIMDEFS lump: \"OPTIONAL\" is a keyword; you cannot use it as the startname of an animation");
 		}
 	}
-
 	animdefsTokenLength = strlen(animdefsToken);
-	if (animdefsTokenLength > 8)
+	if (animdefsTokenLength>8)
 	{
 		I_Error("Error parsing ANIMDEFS lump: lump name \"%s\" exceeds 8 characters", animdefsToken);
 	}

 	// Search for existing animdef
 	for (i = 0; i < maxanims; i++)
-	{
-		if (fasticmp(animdefsToken, animdefs[i].startname))
+		if (stricmp(animdefsToken, animdefs[i].startname) == 0)
 		{
 			//CONS_Alert(CONS_NOTICE, "Duplicate animation: %s\n", animdefsToken);

@@ -456,7 +444,6 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 			Z_Free(animdefsToken);
 			return;
 		}
-	}

 	// Not found
 	if (i == maxanims)
@@ -480,25 +467,21 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"RANGE\" after \"%s\"'s startname should be", animdefs[i].startname);
 	}
-
-	if (fasticmp(animdefsToken, "ALLOWDECALS"))
+	if (stricmp(animdefsToken, "ALLOWDECALS") == 0)
 	{
 		// Another ZDoom keyword, ho-hum. Skip it, move on to the next token.
 		Z_Free(animdefsToken);
 		animdefsToken = M_GetToken(NULL);
 	}
-
-	if (fasticmp(animdefsToken, "PIC"))
+	if (stricmp(animdefsToken, "PIC") == 0)
 	{
 		// This is technically legitimate ANIMDEFS syntax, but SRB2 doesn't support it.
 		I_Error("Error parsing ANIMDEFS lump: Animation definitions utilizing \"PIC\" (specific frames instead of a consecutive range) are not supported by SRB2");
 	}
-
-	if (!fasticmp(animdefsToken, "RANGE"))
+	if (stricmp(animdefsToken, "RANGE") != 0)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Expected \"RANGE\" after \"%s\"'s startname, got \"%s\"", animdefs[i].startname, animdefsToken);
 	}
-
 	Z_Free(animdefsToken);

 	// Endname
@@ -507,13 +490,11 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s end texture/flat name should be", animdefs[i].startname);
 	}
-
 	animdefsTokenLength = strlen(animdefsToken);
 	if (animdefsTokenLength>8)
 	{
 		I_Error("Error parsing ANIMDEFS lump: lump name \"%s\" exceeds 8 characters", animdefsToken);
 	}
-
 	strncpy(animdefs[i].endname, animdefsToken, 9);
 	Z_Free(animdefsToken);

@@ -523,18 +504,15 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s \"TICS\" should be", animdefs[i].startname);
 	}
-
-	if (fasticmp(animdefsToken, "RAND"))
+	if (stricmp(animdefsToken, "RAND") == 0)
 	{
 		// This is technically legitimate ANIMDEFS syntax, but SRB2 doesn't support it.
 		I_Error("Error parsing ANIMDEFS lump: Animation definitions utilizing \"RAND\" (random duration per frame) are not supported by SRB2");
 	}
-
-	if (!fasticmp(animdefsToken, "TICS"))
+	if (stricmp(animdefsToken, "TICS") != 0)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Expected \"TICS\" in animation definition for \"%s\", got \"%s\"", animdefs[i].startname, animdefsToken);
 	}
-
 	Z_Free(animdefsToken);

 	// Speed
@@ -543,7 +521,6 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s animation speed should be", animdefs[i].startname);
 	}
-
 	endPos = NULL;
 #ifndef AVOID_ERRNO
 	errno = 0;
@@ -558,7 +535,6 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Expected a positive integer for \"%s\"'s animation speed, got \"%s\"", animdefs[i].startname, animdefsToken);
 	}
-
 	animdefs[i].speed = animSpeed;
 	Z_Free(animdefsToken);
 }
@@ -2115,7 +2091,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 				// Change the music and apply position/fade operations
 				else
 				{
-					strlcpy(mapmusic.name, sides[line->sidenum[0]].text, sizeof(mapmusic.name));
+					strncpy(mapmusic.name, sides[line->sidenum[0]].text, 7);
+					mapmusic.name[6] = 0;

 					mapmusic.flags = tracknum & MUSIC_TRACKMASK;
 					if (!(line->flags & ML_BLOCKMONSTERS))
@@ -5410,6 +5387,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 	// set current weather
 	curWeather = mapheaderinfo[gamemap-1]->weather;

+	P_InitTagLists();   // Create xref tables for tags
 	P_SearchForDisableLinedefs(); // Disable linedefs are now allowed to disable *any* line

 	P_SpawnScrollers(); // Add generalized scrollers
@@ -3315,7 +3315,7 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num)
 		cmd->sidemove = (SINT8)(cmd->sidemove + side);
 	}

-	lang += (cmd->angleturn << 16);
+	lang += (cmd->angleturn<<16);

 	cam->localangle = lang;
 	if (!cam->reset_aiming)
@@ -3821,13 +3821,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall

 	if (demo.playback)
 	{
-		// Hack-adjacent.
-		// Sometimes stale ticcmds send a weird angle at the start of the race.
-		// P_UpdatePlayerAngle knows to ignore cmd angle when you literally can't turn, so we do the same here.
-		if (cv_demoangturn.value && leveltime > starttime)
-			focusangle = player->cmd.angleturn << 16;
-		else
-			focusangle = mo->angle; // Just use something known sane.
+		focusangle = mo->angle;
 		focusaiming = 0;
 	}
 	else if (P_IsLocalPlayer(player))
@@ -4315,19 +4309,17 @@ static void P_CalcPostImg(player_t *player, camera_t *thiscam)
 {
 	sector_t *sector = NULL;
 	UINT8 postimgtype = 0;
+	//INT32 *param;
 	fixed_t pviewheight = 0;
-#ifdef MOTIONBLUR
-	INT32 *param;

-	for (i = 0; i <= splitscreen; i++)
+	/*for (i = 0; i <= splitscreen; i++)
 	{
 		if (player == &players[displayplayers[i]])
 		{
 			param = &postimgparam[i];
 			break;
 		}
-	}
-#endif
+	}*/

 	if (encoremode) // srb2kart
 		postimgtype |= POSTIMG_MIRROR;
@@ -4363,18 +4355,16 @@ static void P_CalcPostImg(player_t *player, camera_t *thiscam)
 	else if (P_CameraCheckHeatFirstperson(player, sector, pviewheight))
 		postimgtype |= POSTIMG_HEAT;

-#ifdef MOTIONBLUR
 	// Motion blur
 	// unused
-	if (player->speed > (35<<FRACBITS))
+	/*if (player->speed > (35<<FRACBITS))
 	{
 		postimgtype |= POSTIMG_MOTION;
 		*param = (player->speed - 32)/4;

 		if (*param > 5)
 			*param = 5;
-	}
-#endif
+	}*/

 	thiscam->postimg = postimgtype;
 }
@@ -18,6 +18,7 @@
 #include <stdint.h>

 #include "qs22j.h"
+#include "doomdef.h"

 #define INSORTTHRESH	5			// if n < this use insertion sort
 									// MUST be >= 2
@@ -88,7 +89,7 @@ static inline char *med3(char *a, char *b, char *c, int (*compar)(const void *,
 void qs22j(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *))
 {
 	// we have nothing to sort
-	if (__builtin_expect(!!(nmemb <= 1), 0) ) //UNLIKELY - thx windoze
+	if (UNLIKELY(nmemb <= 1))
 	{
 		return;
 	}
@@ -77,7 +77,7 @@ void R_ClearDrawSegs(void)
 // CPhipps -
 // Instead of clipsegs, let's try using an array with one entry for each column,
 // indicating whether it's blocked by a solid wall yet or not.
-UINT8 *solidcol = NULL;
+UINT8 *solidcol;

 void R_AllocClipSegMemory(void)
 {
@@ -90,21 +90,21 @@ INT32 numtextures = 0; // total number of textures found,
 // size of following tables

 texture_t **textures = NULL;
-static UINT32 **texturecolumnofs = NULL; // column offset lookup table for each texture
-UINT8 **texturecache = NULL; // graphics data for each generated full-size texture
+static UINT32 **texturecolumnofs; // column offset lookup table for each texture
+UINT8 **texturecache; // graphics data for each generated full-size texture

 // texture width is a power of 2, so it can easily repeat along sidedefs using a simple mask
-static INT32 *texturewidth = NULL;
+static INT32 *texturewidthmask;

-fixed_t *textureheight = NULL; // needed for texture pegging
+fixed_t *textureheight; // needed for texture pegging

-INT32 *texturetranslation = NULL;
+INT32 *texturetranslation;

 // needed for pre rendering
-sprcache_t *spritecachedinfo = NULL;
+sprcache_t *spritecachedinfo;

-lighttable_t *colormaps = NULL;
-UINT8 *encoremap = NULL;
+lighttable_t *colormaps;
+UINT8 *encoremap;
 #ifdef HASINVERT
 UINT8 invertmap[256];
 #endif
@@ -241,12 +241,11 @@ static INT32 tidcachelen = 0;
 // R_DrawColumnInCache
 // Clip and draw a column from a patch into a cached post.
 //
-static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, texpatch_t *originPatch, INT32 cacheheight)
+static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, INT32 originy, INT32 cacheheight)
 {
 	INT32 count, position;
 	UINT8 *source;
 	INT32 topdelta, prevdelta = -1;
-	INT32 originy = originPatch->originy;

 	while (patch->topdelta != 0xff)
 	{
@@ -261,7 +260,6 @@ static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, texpatch_t
 		if (position < 0)
 		{
 			count += position;
-			source -= position; // start further down the column
 			position = 0;
 		}

@@ -275,50 +273,6 @@ static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, texpatch_t
 	}
 }

-static UINT8 *R_AllocateTextureBlock(size_t blocksize, UINT8 **user)
-{
-	texturememory += blocksize;
-
-	return Z_Malloc(blocksize, PU_LEVEL, user);
-}
-
-static UINT8 *R_AllocateDummyTextureBlock(size_t width, UINT8 **user)
-{
-	// Allocate dummy data. Keep 4-bytes aligned.
-	// Column offsets will be initialized to 0, which points to the 0xff byte (empty column flag).
-	size_t blocksize = 4 + (width * 4);
-	UINT8 *block = R_AllocateTextureBlock(blocksize, user);
-
-	memset(block, 0, blocksize);
-	block[0] = 0xff;
-
-	return block;
-}
-
-static boolean R_CheckTextureLumpLength(texture_t *texture, size_t patch)
-{
-	UINT16 wadnum = texture->patches[patch].wad;
-	UINT16 lumpnum = texture->patches[patch].lump;
-	size_t lumplength = W_LumpLengthPwad(wadnum, lumpnum);
-
-	// The header does not exist
-	if (lumplength < offsetof(softwarepatch_t, columnofs))
-	{
-		CONS_Alert(
-			CONS_ERROR,
-			 "%.8s: texture lump data is too small. Expected %s bytes, got %s. (%s)\n",
-				   texture->name,
-			 sizeu1(offsetof(softwarepatch_t, columnofs)),
-				   sizeu2(lumplength),
-				   wadfiles[wadnum]->lumpinfo[lumpnum].fullname
-		);
-
-		return false;
-	}
-
-	return true;
-}
-
 //
 // R_GenerateTexture
 //
@@ -343,10 +297,6 @@ UINT8 *R_GenerateTexture(size_t texnum)
 	column_t *patchcol;
 	UINT8 *colofs;

-	UINT16 wadnum;
-	lumpnum_t lumpnum;
-	size_t lumplength;
-
 	I_Assert(texnum <= (size_t)numtextures);
 	texture = textures[texnum];
 	I_Assert(texture != NULL);
@@ -361,57 +311,45 @@ UINT8 *R_GenerateTexture(size_t texnum)
 	{
 		boolean holey = false;
 		patch = texture->patches;
-
-		wadnum = patch->wad;
-		lumpnum = patch->lump;
-		lumplength = W_LumpLengthPwad(wadnum, lumpnum);
-
-		// The header does not exist
-		if (R_CheckTextureLumpLength(texture, 0) == false)
-		{
-			block = R_AllocateDummyTextureBlock(texture->width, &texturecache[texnum]);
-			texturecolumnofs[texnum] = (UINT32*)&block[4];
-			textures[texnum]->holes = true;
-			return block;
-		}
-
-		pdata = (UINT8*)W_CacheLumpNumPwad(wadnum, lumpnum, PU_LEVEL);
+		pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
 		realpatch = (softwarepatch_t *)pdata;

 		// Check the patch for holes.
 		if (texture->width > SHORT(realpatch->width) || texture->height > SHORT(realpatch->height))
 			holey = true;
-
-		colofs = (UINT8 *)realpatch->columnofs;
-
-		for (x = 0; x < texture->width && !holey; x++)
+		else
 		{
-			column_t *col = (column_t *)((UINT8 *)realpatch + LONG(*(UINT32 *)&colofs[x<<2]));
+			colofs = (UINT8 *)realpatch->columnofs;

-			INT32 topdelta, prevdelta = -1, y = 0;
-
-			while (col->topdelta != 0xff)
+			for (x = 0; x < texture->width; x++)
 			{
-				topdelta = col->topdelta;
-				if (topdelta <= prevdelta)
-					topdelta += prevdelta;
-				prevdelta = topdelta;
-				if (topdelta > y)
-					break;
-				y = topdelta + col->length + 1;
-				col = (column_t *)((UINT8 *)col + col->length + 4);
-			}
+				column_t *col = (column_t *)((UINT8 *)realpatch + LONG(*(UINT32 *)&colofs[x<<2]));

-			if (y < texture->height)
-				holey = true; // this texture is HOLEy! D:
+				INT32 topdelta, prevdelta = -1, y = 0;
+
+				while (col->topdelta != 0xff)
+				{
+					topdelta = col->topdelta;
+					if (topdelta <= prevdelta)
+						topdelta += prevdelta;
+					prevdelta = topdelta;
+					if (topdelta > y)
+						break;
+					y = topdelta + col->length + 1;
+					col = (column_t *)((UINT8 *)col + col->length + 4);
+				}
+
+				if (y < texture->height)
+					holey = true; // this texture is HOLEy! D:
+			}
 		}

 		// If the patch uses transparency, we have to save it this way.
 		if (holey)
 		{
 			texture->holes = true;
-			blocksize = lumplength;
-			block = Z_Calloc(blocksize, PU_LEVEL, &texturecache[texnum]); // will change tag at end of this function
+			blocksize = W_LumpLengthPwad(patch->wad, patch->lump);
+			block = Z_Calloc(blocksize, PU_LEVEL, &texturecache[texnum]);
 			M_Memcpy(block, realpatch, blocksize);
 			texturememory += blocksize;

@@ -427,6 +365,7 @@ UINT8 *R_GenerateTexture(size_t texnum)

 			goto done;
 		}
+
 		// Otherwise, do multipatch format.
 	}

@@ -445,18 +384,10 @@ UINT8 *R_GenerateTexture(size_t texnum)
 	// texture data after the lookup table
 	blocktex = block + (texture->width*4);

-	for (x = 0; x < texture->width; ++x)
-	{
-		// generate column ofset lookup
-		*(UINT32 *)&colofs[x<<2] = LONG((x * texture->height) + (texture->width*4));
-	}
-
 	// Composite the columns together.
 	for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
 	{
-		wadnum = patch->wad;
-		lumpnum = patch->lump;
-		pdata = (UINT8*)W_CacheLumpNumPwad(wadnum, lumpnum, PU_LEVEL);
+		pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
 		realpatch = (softwarepatch_t *)pdata;

 		x1 = patch->originx;
@@ -487,7 +418,9 @@ UINT8 *R_GenerateTexture(size_t texnum)
 		{
 			patchcol = (column_t *)((UINT8 *)realpatch + LONG(realpatch->columnofs[x-x1]));

-			R_DrawColumnInCache(patchcol, block + LONG(*(UINT32 *)&colofs[x<<2]), patch, texture->height);
+			// generate column ofset lookup
+			*(UINT32 *)&colofs[x<<2] = LONG((x * texture->height) + (texture->width*4));
+			R_DrawColumnInCache(patchcol, block + LONG(*(UINT32 *)&colofs[x<<2]), patch->originy, texture->height);
 		}
 	}

@@ -506,7 +439,6 @@ INT32 R_GetTextureNum(INT32 texnum)
 {
 	if (texnum < 0 || texnum >= numtextures)
 		return 0;
-
 	return texturetranslation[texnum];
 }

@@ -524,12 +456,17 @@ void R_CheckTextureCache(INT32 tex)

 static inline INT32 wrap_column(fixed_t tex, INT32 col)
 {
-	INT32 width = texturewidth[tex];
-
-	if (width & (width - 1))
-		col = (UINT32)col % width;
+	if (texturewidthmask[tex])
+		col &= texturewidthmask[tex];  // set by load textures
 	else
-		col &= (width - 1);
+	{
+		const INT16 texwidth = textures[tex]->width;
+
+		// Odd width texture, cannot just mask.
+		// Sometime gets colnum = -1 or = width, even without tiling.
+		// Test LostCiv, Map 20, crates.
+		col = ((col % texwidth) + texwidth) % texwidth;
+	}

 	return col;
 }
@@ -539,6 +476,13 @@ static inline INT32 wrap_column(fixed_t tex, INT32 col)
 //
 UINT8 *R_GetColumn(fixed_t tex, INT32 col)
 {
+	if (!texturecache[tex])
+	{
+		// This must be here because cache can be freed by other operations.
+		// To prevent must lock individual texture cache on every draw.
+		R_GenerateTexture(tex);
+	}
+
 	return texturecache[tex] + LONG(texturecolumnofs[tex][wrap_column(tex, col)]);
 }

@@ -572,10 +516,11 @@ static INT32
 Rloadtextures (INT32 i, INT32 w)
 {
 	UINT16 j, numlumps = 0;
+	INT32 k;
 	UINT16 texstart, texend, texturesLumpPos;
+	softwarepatch_t *patchlump;
 	texpatch_t *patch;
 	texture_t *texture;
-	softwarepatch_t patchlump;

 	// Get the lump numbers for the markers in the WAD, if they exist.
 	if (W_FileHasFolders(wadfiles[w]))
@@ -615,7 +560,7 @@ Rloadtextures (INT32 i, INT32 w)
 				continue; // If it is then SKIP IT
 		}

-		W_ReadLumpHeaderPwad(wadnum, lumpnum, &patchlump, PNG_HEADER_SIZE, 0);
+		patchlump = (softwarepatch_t *)W_CacheLumpNumPwad(wadnum, lumpnum, PU_STATIC);

 		//CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad((wadnum, lumpnum), patchlump->width, patchlump->height);
 		texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
@@ -623,10 +568,8 @@ Rloadtextures (INT32 i, INT32 w)
 		// Set texture properties.
 		M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
 		texture->hash = quickncasehash(texture->name, 8);
-
-		texture->width = SHORT(patchlump.width);
-		texture->height = SHORT(patchlump.height);
-
+		texture->width = SHORT(patchlump->width);
+		texture->height = SHORT(patchlump->height);
 		texture->type = TEXTURETYPE_SINGLEPATCH;
 		texture->patchcount = 1;
 		texture->holes = false;
@@ -638,7 +581,27 @@ Rloadtextures (INT32 i, INT32 w)
 		patch->wad = wadnum;
 		patch->lump = texstart + j;

-		texturewidth[i] = texture->width;
+		Z_Free(patchlump);
+
+		// determine width power of 2
+#if 1
+        // [WDJ] only need to determine if exact power of 2.
+        k = 1;
+        while (k < texture->width)
+            k<<=1;
+#else
+		// Largest power of 2 that fits within width.
+		k = 1;
+		while (k << 1 <= texture->width)
+			k <<= 1;
+#endif
+		if (k != texture->width)
+		{
+			// Odd width
+			k = 1;  // make texturewidthmask = 0
+		}
+
+		texturewidthmask[i] = k - 1;
 		textureheight[i] = texture->height << FRACBITS;
 		i++;
 	}
@@ -746,7 +709,7 @@ static void R_AllocateTextures(INT32 add)
 	// Allocate texture referencing cache.
 	recallocuser(&texturecache, oldsize, newsize);
 	// Allocate texture width table.
-	recallocuser(&texturewidth, oldsize, newsize);
+	recallocuser(&texturewidthmask, oldsize, newsize);
 	// Allocate texture height table.
 	recallocuser(&textureheight, oldsize, newsize);
 	// Create translation table for global animation.
@@ -867,7 +830,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after \"%s\"'s patch name should be",patchName);
 	}

-	if (!fastcmp(texturesToken,","))
+	if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after %s's patch name, got \"%s\"",patchName,texturesToken);
 	}
@@ -907,7 +870,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after patch \"%s\"'s x coordinate should be",patchName);
 	}

-	if (!fastcmp(texturesToken,","))
+	if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after patch \"%s\"'s x coordinate, got \"%s\"",patchName,texturesToken);
 	}
@@ -976,9 +939,8 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where texture name should be");
 	}
-
 	texturesTokenLength = strlen(texturesToken);
-	if (texturesTokenLength > 8)
+	if (texturesTokenLength>8)
 	{
 		I_Error("Error parsing TEXTURES lump: Texture name \"%s\" exceeds 8 characters",texturesToken);
 	}
@@ -989,7 +951,6 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 		// ^^ we've confirmed that the token is <= 8 characters so it will never overflow a 9 byte char buffer
 		strupr(newTextureName); // Just do this now so we don't have to worry about it
 	}
-
 	Z_Free(texturesToken);

 	// Comma 1
@@ -998,11 +959,10 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after texture \"%s\"'s name should be",newTextureName);
 	}
-	else if (!fastcmp(texturesToken, ","))
+	else if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after texture \"%s\"'s name, got \"%s\"",newTextureName,texturesToken);
 	}
-
 	Z_Free(texturesToken);

 	// Width
@@ -1033,12 +993,10 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after texture \"%s\"'s width should be",newTextureName);
 	}
-
-	if (!fastcmp(texturesToken, ","))
+	if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after texture \"%s\"'s width, got \"%s\"",newTextureName,texturesToken);
 	}
-
 	Z_Free(texturesToken);

 	// Height
@@ -1071,7 +1029,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where open curly brace for texture \"%s\" should be",newTextureName);
 	}

-	if (fastcmp(texturesToken, "{"))
+	if (strcmp(texturesToken,"{")==0)
 	{
 		if (actuallyLoadTexture)
 		{
@@ -1083,18 +1041,15 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 			resultTexture->height = newTextureHeight;
 			resultTexture->type = TEXTURETYPE_COMPOSITE;
 		}
-
 		Z_Free(texturesToken);
-
 		texturesToken = M_GetToken(NULL);
 		if (texturesToken == NULL)
 		{
 			I_Error("Error parsing TEXTURES lump: Unexpected end of file where patch definition for texture \"%s\" should be",newTextureName);
 		}
-
-		while (!fastcmp(texturesToken, "}"))
+		while (strcmp(texturesToken,"}")!=0)
 		{
-			if (fasticmp(texturesToken, "PATCH"))
+			if (stricmp(texturesToken, "PATCH")==0)
 			{
 				Z_Free(texturesToken);
 				if (resultTexture)
@@ -1126,7 +1081,6 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 				I_Error("Error parsing TEXTURES lump: Unexpected end of file where patch declaration or right curly brace for texture \"%s\" should be",newTextureName);
 			}
 		}
-
 		if (resultTexture && resultTexture->patchcount == 0)
 		{
 			I_Error("Error parsing TEXTURES lump: Texture \"%s\" must have at least one patch",newTextureName);
@@ -1136,13 +1090,10 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \"{\" for texture \"%s\", got \"%s\"",newTextureName,texturesToken);
 	}
-
 	Z_Free(texturesToken);

-	if (actuallyLoadTexture)
-		return resultTexture;
-
-	return NULL;
+	if (actuallyLoadTexture) return resultTexture;
+	else return NULL;
 }

 // Parses the TEXTURES lump... but just to count the number of textures.
@@ -1174,7 +1125,7 @@ int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum)
 	texturesToken = M_GetToken(texturesText);
 	while (texturesToken != NULL)
 	{
-		if (fasticmp(texturesToken, "WALLTEXTURE"))
+		if (stricmp(texturesToken, "WALLTEXTURE")==0)
 		{
 			numTexturesInLump++;
 			Z_Free(texturesToken);
@@ -1184,10 +1135,8 @@ int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum)
 		{
 			I_Error("Error parsing TEXTURES lump: Expected \"WALLTEXTURE\", got \"%s\"",texturesToken);
 		}
-
 		texturesToken = M_GetToken(NULL);
 	}
-
 	Z_Free(texturesToken);
 	Z_Free((void *)texturesText);

@@ -1225,14 +1174,14 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex)
 	texturesToken = M_GetToken(texturesText);
 	while (texturesToken != NULL)
 	{
-		if (fasticmp(texturesToken, "WALLTEXTURE"))
+		if (stricmp(texturesToken, "WALLTEXTURE")==0)
 		{
 			Z_Free(texturesToken);
 			// Get the new texture
 			newTexture = R_ParseTexture(true);
 			// Store the new texture
 			textures[*texindex] = newTexture;
-			texturewidth[*texindex] = newTexture->width;
+			texturewidthmask[*texindex] = newTexture->width - 1;
 			textureheight[*texindex] = newTexture->height << FRACBITS;
 			// Increment i back in R_LoadTextures()
 			(*texindex)++;
@@ -1241,10 +1190,8 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex)
 		{
 			I_Error("Error parsing TEXTURES lump: Expected \"WALLTEXTURE\", got \"%s\"",texturesToken);
 		}
-
 		texturesToken = M_GetToken(NULL);
 	}
-
 	Z_Free(texturesToken);
 	Z_Free((void *)texturesText);
 }
@@ -1350,9 +1297,8 @@ lumpnum_t R_GetFlatNumForName(const char *name)

 	if (lump == LUMPERROR)
 	{
-		if (!fastcmp(name, SKYFLATNAME))
+		if (strcmp(name, SKYFLATNAME))
 			CONS_Debug(DBG_SETUP, "R_GetFlatNumForName: Could not find flat %.8s\n", name);
-
 		lump = W_CheckNumForName("REDFLR");
 	}

@@ -1408,7 +1354,6 @@ void R_ReInitColormaps(UINT16 num, lumpnum_t newencoremap)

 	// Load in the light tables, now 64k aligned for smokie...
 	lump = W_GetNumForName(colormap);
-
 	if (lump == LUMPERROR)
 		lump = basecolormaplump;
 	else
@@ -114,6 +114,11 @@ typedef struct
 	fixed_t x, y, z;
 } vertex_t;

+typedef struct
+{
+	float x, y/*, z*/;
+} floatvertex_t;
+
 // Forward of linedefs, for sectors.
 struct line_s;

@@ -543,12 +548,11 @@ typedef struct seg_s
 	sector_t *frontsector;
 	sector_t *backsector;

-	fixed_t length;	// precalculated seg length
+	fixed_t length; // precalculated seg length

 #ifdef HWRENDER
-	// new pointers so that AdjustSegs doesn't mess with v1/v2
-	polyvertex_t *pv1;
-	polyvertex_t *pv2;
+	floatvertex_t fv1;
+	floatvertex_t fv2;
 #endif

 	polyobj_t *polyseg;
@@ -615,12 +619,12 @@ typedef struct drawseg_s
 	// Pointers to lists for sprite clipping, all three adjusted so [x1] is first value.
 	INT16 *sprtopclip;
 	INT16 *sprbottomclip;
-	fixed_t *maskedtexturecol;
+	INT16 *maskedtexturecol;

 	struct visplane_s *ffloorplanes[MAXFFLOORS];
 	INT32 numffloorplanes;
 	struct ffloor_s *thicksides[MAXFFLOORS];
-	fixed_t *thicksidecol;
+	INT16 *thicksidecol;
 	INT32 numthicksides;
 	fixed_t *frontscale;

@@ -41,7 +41,8 @@

 /**	\brief view info
 */
-INT32 viewwidth, viewheight, viewwindowx, viewwindowy;
+INT32 linesize, viewwidth, viewheight, viewwindowx, viewwindowy;
+UINT8 *renderscreen;            // haleyjd

 // =========================================================================
 //                      COLUMN DRAWING CODE STUFF
@@ -488,92 +489,6 @@ void R_FlushTranslationColormapCache(void)
 // in reality, the few routines that can work for either mode, are
 // put here

-enum columncontext_e columncontext = COLUMNCONTEXT_DIRECT;
-
-enum ColumnFlushType
-{
-	FLUSH_NONE				= 0x0000,
-	FLUSH_OPAQUE			= 0x0001,
-	FLUSH_TRANS				= 0x0002,
-	FLUSH_COLORMAP			= 0x0004,
-	FLUSH_COLORMAP_TRANS	= 0x0008,
-};
-
-typedef struct drawcolumndata_temp_s
-{
-	INT32    x;
-	INT32    yl[8], yh[8];
-
-	// e6y: resolution limitation is removed
-	UINT8 *buf;
-
-	INT32    startx;
-	ColumnFlushType    type;
-	INT32   commontop, commonbot;
-	UINT8 *transmap;
-	// SoM 7-28-04: Fix the fuzz problem.
-	UINT8 *translation;
-} drawcolumndata_temp_t;
-
-drawcolumndata_temp_t temp_dc = {};
-
-//
-// Error functions that will abort if R_FlushColumns tries to flush
-// columns without a column type.
-//
-FUNCNORETURN static ATTRNORETURN void R_FlushWholeError(void)
-{
-	I_Error("R_FlushWholeColumns called without being initialized.\n");
-}
-
-FUNCNORETURN static ATTRNORETURN void R_FlushHTError(void)
-{
-	I_Error("R_FlushHTColumns called without being initialized.\n");
-}
-
-FUNCNORETURN static ATTRNORETURN void R_QuadFlushError(void)
-{
-	I_Error("R_FlushQuadColumn called without being initialized.\n");
-}
-
-static void (*R_FlushWholeColumns)(void) = R_FlushWholeError;
-static void (*R_FlushHTColumns)(void) = R_FlushHTError;
-static void (*R_FlushQuadColumn)(void) = R_QuadFlushError;
-
-static void R_FlushColumns(void)
-{
-	if (temp_dc.x != 8 || temp_dc.commontop >= temp_dc.commonbot)
-		R_FlushWholeColumns();
-	else
-	{
-		R_FlushHTColumns();
-		R_FlushQuadColumn();
-	}
-
-	temp_dc.x = 0;
-}
-
-//
-// R_ResetColumnBuffer
-//
-// haleyjd 09/13/04: new function to call from main rendering loop
-// which gets rid of the unnecessary reset of various variables during
-// column drawing.
-//
-void R_ResetColumnBuffer(void)
-{
-	// haleyjd 10/06/05: this must not be done if x == 0!
-	if (temp_dc.x)
-	{
-		R_FlushColumns();
-	}
-
-	temp_dc.type = FLUSH_NONE;
-	R_FlushWholeColumns = R_FlushWholeError;
-	R_FlushHTColumns = R_FlushHTError;
-	R_FlushQuadColumn = R_QuadFlushError;
-}
-
 /**	\brief	The R_InitViewBuffer function

 	Creates lookup tables for getting the framebuffer address
@@ -606,35 +521,40 @@ static void R_AllocViewMemory(void)
 	R_AllocVisSpriteMemory();
 }

-void R_InitViewBuffer(void)
+
+void R_InitViewBuffer(INT32 width, INT32 height)
 {
+	if (width > MAXVIDWIDTH)
+		width = MAXVIDWIDTH;
+	if (height > MAXVIDHEIGHT)
+		height = MAXVIDHEIGHT;
+
 	R_AllocViewMemory();

 	viewwindowx = 0;
 	viewwindowy = 0;

-	INT32 bufsize = (vid.width * 8) * sizeof(*temp_dc.buf);
+	linesize     = vid.width;      // killough 11/98
+	renderscreen = vid.screens[0]; // haleyjd 07/02/14
+}

-	if (temp_dc.buf)
-	{
-#if defined(__SSE__)
-		aligned_free(temp_dc.buf);
-#else
-		Z_Free(temp_dc.buf);
-#endif
-	}
+/**	\brief viewborder patches lump numbers
+*/
+lumpnum_t viewborderlump[8];

-	memset(&temp_dc, 0, sizeof(temp_dc));
+/**	\brief Store the lumpnumber of the viewborder patches
+*/

-#if defined(__SSE__)
-	while (bufsize & 15)
-		bufsize++;
-	temp_dc.buf = static_cast<UINT8*>(aligned_alloc(16, bufsize));
-#else
-	temp_dc.buf = static_cast<UINT8*>(Z_Malloc(bufsize, PU_STATIC, NULL));
-#endif
-
-	memset(temp_dc.buf, 0, bufsize);
+void R_InitViewBorder(void)
+{
+	viewborderlump[BRDR_T] = W_GetNumForName("brdr_t");
+	viewborderlump[BRDR_B] = W_GetNumForName("brdr_b");
+	viewborderlump[BRDR_L] = W_GetNumForName("brdr_l");
+	viewborderlump[BRDR_R] = W_GetNumForName("brdr_r");
+	viewborderlump[BRDR_TL] = W_GetNumForName("brdr_tl");
+	viewborderlump[BRDR_BL] = W_GetNumForName("brdr_bl");
+	viewborderlump[BRDR_TR] = W_GetNumForName("brdr_tr");
+	viewborderlump[BRDR_BR] = W_GetNumForName("brdr_br");
 }

 /**	\brief	The R_VideoErase function
@@ -658,6 +578,129 @@ void R_VideoErase(size_t ofs, INT32 count)
 	M_Memcpy(vid.screens[0] + ofs, vid.screens[1] + ofs, count);
 }

+
+#if 0
+/**	\brief R_FillBackScreen
+
+	Fills the back screen with a pattern for variable screen sizes
+	Also draws a beveled edge.
+*/
+void R_FillBackScreen(void)
+{
+	UINT8 *src, *dest;
+	patch_t *patch;
+	INT32 x, y, step, boff;
+
+	// quickfix, don't cache lumps in both modes
+	if (rendermode != render_soft)
+		return;
+
+	// draw pattern around the status bar too (when hires),
+	// so return only when in full-screen without status bar.
+	if (scaledviewwidth == vid.width && viewheight == vid.height)
+		return;
+
+	src = scr_borderpatch;
+	dest = vid.screens[1];
+
+	for (y = 0; y < vid.height; y++)
+	{
+		for (x = 0; x < vid.width/128; x++)
+		{
+			M_Memcpy (dest, src+((y&127)<<7), 128);
+			dest += 128;
+		}
+
+		if (vid.width&127)
+		{
+			M_Memcpy(dest, src+((y&127)<<7), vid.width&127);
+			dest += (vid.width&127);
+		}
+	}
+
+	// don't draw the borders when viewwidth is full vid.width.
+	if (scaledviewwidth == vid.width)
+		return;
+
+	step = 8;
+	boff = 8;
+
+	patch = W_CacheLumpNum(viewborderlump[BRDR_T], PU_CACHE);
+	for (x = 0; x < scaledviewwidth; x += step)
+		V_DrawPatch(viewwindowx + x, viewwindowy - boff, 1, patch);
+
+	patch = W_CacheLumpNum(viewborderlump[BRDR_B], PU_CACHE);
+	for (x = 0; x < scaledviewwidth; x += step)
+		V_DrawPatch(viewwindowx + x, viewwindowy + viewheight, 1, patch);
+
+	patch = W_CacheLumpNum(viewborderlump[BRDR_L], PU_CACHE);
+	for (y = 0; y < viewheight; y += step)
+		V_DrawPatch(viewwindowx - boff, viewwindowy + y, 1, patch);
+
+	patch = W_CacheLumpNum(viewborderlump[BRDR_R],PU_CACHE);
+	for (y = 0; y < viewheight; y += step)
+		V_DrawPatch(viewwindowx + scaledviewwidth, viewwindowy + y, 1,
+			patch);
+
+	// Draw beveled corners.
+	V_DrawPatch(viewwindowx - boff, viewwindowy - boff, 1,
+		W_CacheLumpNum(viewborderlump[BRDR_TL], PU_CACHE));
+	V_DrawPatch(viewwindowx + scaledviewwidth, viewwindowy - boff, 1,
+		W_CacheLumpNum(viewborderlump[BRDR_TR], PU_CACHE));
+	V_DrawPatch(viewwindowx - boff, viewwindowy + viewheight, 1,
+		W_CacheLumpNum(viewborderlump[BRDR_BL], PU_CACHE));
+	V_DrawPatch(viewwindowx + scaledviewwidth, viewwindowy + viewheight, 1,
+		W_CacheLumpNum(viewborderlump[BRDR_BR], PU_CACHE));
+}
+
+/**	\brief The R_DrawViewBorder
+
+  Draws the border around the view
+	for different size windows?
+*/
+void R_DrawViewBorder(void)
+{
+	INT32 top, side, ofs;
+
+	if (rendermode == render_none)
+		return;
+#ifdef HWRENDER
+	if (rendermode != render_soft)
+	{
+		HWR_DrawViewBorder(0);
+		return;
+	}
+	else
+#endif
+
+#ifdef DEBUG
+	fprintf(stderr,"RDVB: vidwidth %d vidheight %d scaledviewwidth %d viewheight %d\n",
+		vid.width, vid.height, scaledviewwidth, viewheight);
+#endif
+
+	if (scaledviewwidth == vid.width)
+		return;
+
+	top = (vid.height - viewheight)>>1;
+	side = (vid.width - scaledviewwidth)>>1;
+
+	// copy top and one line of left side
+	R_VideoErase(0, top*vid.width+side);
+
+	// copy one line of right side and bottom
+	ofs = (viewheight+top)*vid.width - side;
+	R_VideoErase(ofs, top*vid.width + side);
+
+	// copy sides using wraparound
+	ofs = top*vid.width + vid.width-side;
+	side <<= 1;
+
+    // simpler using our VID_Blit routine
+	VID_BlitLinearScreen(vid.screens[1] + ofs, vid.screens[0] + ofs, side, viewheight - 1,
+		vid.width, vid.width);
+}
+#endif
+
 // ==========================================================================
 //                   INCLUDE DRAWING CODE HERE
 // ==========================================================================
@@ -25,12 +25,15 @@ extern "C" {
 // -------------------------------
 // COMMON STUFF FOR 8bpp AND 16bpp
 // -------------------------------
+extern UINT8 *renderscreen;
+extern INT32 linesize;

 FUNCINLINE static ATTRINLINE UINT8 *R_Address(INT32 px, INT32 py)
 {
-	return vid.screens[0] + (py + viewwindowy) * vid.width + (viewwindowx + px);
+	return renderscreen + (py + viewwindowy) * linesize + (viewwindowx + px);
 }

+
 typedef struct {
 	float x, y, z;
 } floatv3_t;
@@ -99,16 +102,6 @@ extern floatv3_t *ds_su, *ds_sv, *ds_sz;

 extern float focallengthf;

-enum columncontext_e
-{
-	COLUMNCONTEXT_DIRECT = 0,
-	COLUMNCONTEXT_FLUSH,
-};
-
-extern enum columncontext_e columncontext;
-void R_SetColumnContext(enum columncontext_e _columncontext);
-
-void R_ResetColumnBuffer(void);

 typedef void (coldrawfunc_t)(drawcolumndata_t*);
 typedef void (spandrawfunc_t)(drawspandata_t*);
@@ -159,11 +152,28 @@ extern spandrawfunc_t *spanfuncs[SPANDRAWFUNC_MAX];

 void R_DrawMaskedColumn(drawcolumndata_t* dc, column_t *column);

-// ------------------------------------------------
-// r_draw.c
-// ------------------------------------------------
+/// \brief Top border
+#define BRDR_T 0
+/// \brief Bottom border
+#define BRDR_B 1
+/// \brief Left border
+#define BRDR_L 2
+/// \brief Right border
+#define BRDR_R 3
+/// \brief Topleft border
+#define BRDR_TL 4
+/// \brief Topright border
+#define BRDR_TR 5
+/// \brief Bottomleft border
+#define BRDR_BL 6
+/// \brief Bottomright border
+#define BRDR_BR 7

-// Custom player skin translation
+extern lumpnum_t viewborderlump[8];
+
+// ------------------------------------------------
+// r_draw.c COMMON ROUTINES FOR BOTH 8bpp and 16bpp
+// ------------------------------------------------

 #define GTC_CACHE 1
 #define GTC_MENUCACHE GTC_CACHE
@@ -209,9 +219,19 @@ UINT8 *R_GetBlendTable(int style, INT32 alphalevel);

 boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel);

-void R_InitViewBuffer(void);
+// Custom player skin translation
+void R_InitViewBuffer(INT32 width, INT32 height);
+void R_InitViewBorder(void);
 void R_VideoErase(size_t ofs, INT32 count);

+// Rendering function.
+#if 0
+void R_FillBackScreen(void);
+
+// If the view size is not full screen, draws a border around it.
+void R_DrawViewBorder(void);
+#endif
+
 #define TRANSPARENTPIXEL 247

 // -----------------
@@ -230,15 +250,6 @@ void R_DrawTranslatedTranslucentColumn(drawcolumndata_t* dc);
 void R_Draw2sMultiPatchColumn(drawcolumndata_t* dc);
 void R_Draw2sMultiPatchTranslucentColumn(drawcolumndata_t* dc);

-// column drawers which use buffered drawing with flush
-void R_DrawColumn_Flush(drawcolumndata_t* dc);
-void R_DrawTranslucentColumn_Flush(drawcolumndata_t* dc);
-void R_DrawTranslatedColumn_Flush(drawcolumndata_t* dc);
-void R_DrawColumnShadowed_Flush(drawcolumndata_t* dc);
-void R_DrawTranslatedTranslucentColumn_Flush(drawcolumndata_t* dc);
-void R_Draw2sMultiPatchColumn_Flush(drawcolumndata_t* dc);
-void R_Draw2sMultiPatchTranslucentColumn_Flush(drawcolumndata_t* dc);
-
 void R_DrawFogColumn(drawcolumndata_t* dc);

 // span drawers
@@ -21,8 +21,6 @@
 // a has a constant z depth from top to bottom.
 //

-#include "r_draw_flush.cpp"
-
 enum DrawColumnType
 {
 	DC_BASIC			= 0x0000,
@@ -30,12 +28,10 @@ enum DrawColumnType
 	DC_TRANSMAP			= 0x0002,
 	DC_HOLES			= 0x0004,
 	DC_LIGHTLIST		= 0x0008,
-	DC_DIRECT			= 0x0010, // draw our columns directly to screen!
 };

 template<DrawColumnType Type>
-FUNCINLINE static ATTRINLINE constexpr UINT8
-R_GetColumnTranslated(const drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap)
+static constexpr UINT8 R_GetColumnTranslated(drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap)
 {
 	if constexpr (Type & DrawColumnType::DC_COLORMAP)
 	{
@@ -45,10 +41,8 @@ R_GetColumnTranslated(const drawcolumndata_t* dc, UINT8 col, const UINT8 * restr
 	return colormap[col];
 }

-// translucency is handled on flush side now!
 template<DrawColumnType Type>
-FUNCINLINE static ATTRINLINE constexpr UINT8
-R_GetColumnTranslucent(const drawcolumndata_t* dc, UINT8 * restrict dest, UINT8 col, const UINT8 * restrict colormap)
+static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 * restrict dest, UINT8 col, const UINT8 * restrict colormap)
 {
 	col = R_GetColumnTranslated<Type>(dc, col, colormap);

@@ -63,8 +57,7 @@ R_GetColumnTranslucent(const drawcolumndata_t* dc, UINT8 * restrict dest, UINT8
 }

 template<DrawColumnType Type>
-FUNCINLINE static ATTRINLINE constexpr UINT8
-R_DrawColumnPixel(const drawcolumndata_t* dc, UINT8 * restrict dest, UINT32 bit, const UINT8 * restrict source, const UINT8 * restrict colormap)
+static constexpr UINT8 R_DrawColumnPixel(drawcolumndata_t* dc, UINT8 * restrict dest, UINT32 bit, const UINT8 * restrict source, const UINT8 * restrict colormap)
 {
 	UINT8 col = source[bit];

@@ -76,7 +69,6 @@ R_DrawColumnPixel(const drawcolumndata_t* dc, UINT8 * restrict dest, UINT32 bit,
 		}
 	}

-	// if we dont buffer our columns, we need to handle translucency again
 	return R_GetColumnTranslucent<Type>(dc, dest, col, colormap);
 }

@@ -88,18 +80,8 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 {
 	INT32 count;

-	// leban 1/17/99:
-	// removed the + 1 here, adjusted the if test, and added an increment
-	// later.  this helps a compiler pipeline a bit better.  the x86
-	// assembler also does this.
 	count = dc->yh - dc->yl;

-	// leban 1/17/99:
-	// this case isn't executed too often.  depending on how many instructions
-	// there are between here and the second if test below, this case could
-	// be moved down and might save instructions overall.  since there are
-	// probably different wads that favor one way or the other, i'll leave
-	// this alone for now.
 	if (count < 0) // Zero length, column does not exceed a pixel.
 	{
 		return;
@@ -168,7 +150,6 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 			}

 			R_DrawColumnTemplate<NewType>(&dc_copy);
-
 			if (solid)
 			{
 				dc_copy.yl = bheight;
@@ -202,37 +183,19 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 		// killough 2/1/98: more performance tuning

 		intptr_t frac;
-		// Looks familiar.
 		const intptr_t fracstep = dc->iscale;
-		const intptr_t heightmask = dc->sourcelength-1; // CPhipps - specify type
+		const intptr_t heightmask = dc->sourcelength-1;
 		constexpr INT32 npow2min = -1;
 		const INT32 npow2max = dc->sourcelength;
+		const INT32 stride = vid.width;

 		const UINT8 * restrict source = dc->source;
 		const lighttable_t * restrict colormap = dc->colormap;

 		// Framebuffer destination address.
-		// SoM: MAGIC
-		UINT8 * restrict dest;
+		UINT8 * restrict dest = R_Address(dc->x, dc->yl);

-		if constexpr (Type & DrawColumnType::DC_DIRECT)
-			dest = R_Address(dc->x, dc->yl);
-		else if constexpr ((Type & (DrawColumnType::DC_COLORMAP | DrawColumnType::DC_TRANSMAP))
-								== (DrawColumnType::DC_COLORMAP | DrawColumnType::DC_TRANSMAP))
-			dest = R_GetBufferColormapTrans(dc);
-		else if constexpr (Type & DrawColumnType::DC_TRANSMAP)
-			dest = R_GetBufferTrans(dc);
-		else if constexpr (Type & DrawColumnType::DC_COLORMAP)
-			dest = R_GetBufferColormap(dc);
-		else
-			dest = R_GetBufferOpaque(dc);
-
-		INT32 stride = 8; //SoM: Oh, Oh it's MAGIC! You know...
-
-		if constexpr (Type & DrawColumnType::DC_DIRECT)
-			stride = vid.width;
-
-		count++; // killough 1/99: minor tuning
+		count++;

 		// Determine scaling, which is the only mapping to be done.
 		frac = (dc->texturemid + FixedMul((dc->yl << FRACBITS) - centeryfrac, fracstep));
@@ -242,16 +205,15 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 			case 255:
 			case 127:
 				{
-					while (count--)
+					while(count--)
 					{
 						*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
-
 						dest += stride;
 						frac += fracstep;
 					}
 				}
 				break;
-			case npow2min:
+			case -1:
 				{
 					if (frac < 0)
 						// adjust in case we underread
@@ -260,8 +222,7 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 					// texture has no height, so just go
 					while (--count >= 0)
 					{
-						*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS), source, colormap);
-
+						*dest = R_DrawColumnPixel<Type>(dc, dest, frac>>FRACBITS, source, colormap);
 						dest += stride;
 						frac += fracstep;
 					}
@@ -274,12 +235,10 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 						while ((count -= 2) >= 0) // texture height is a power of 2 -- killough
 						{
 							*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
-
 							dest += stride;
 							frac += fracstep;

 							*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
-
 							dest += stride;
 							frac += fracstep;
 						}
@@ -312,7 +271,7 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 						{
 							// Re-map color indices from wall texture column
 							//  using a lighting/special effects LUT.
-							// heightmask is the Tutti-Frutti fix -- killough
+							// heightmask is the Tutti-Frutti fix

 							// -1 is the lower clamp bound because column posts have a "safe" byte before the real data
 							// and a few bytes after as well
@@ -352,18 +311,13 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 		R_DrawColumnTemplate<opt>(dc); \
 	}

-#define DEFINE_COLUMN_COMBO(name, flags) \
-	DEFINE_COLUMN_FUNC(name, flags|DC_DIRECT) \
-	DEFINE_COLUMN_FUNC(name ## _Flush, flags)
-
-DEFINE_COLUMN_COMBO(R_DrawColumn, DC_BASIC)
-DEFINE_COLUMN_COMBO(R_DrawTranslucentColumn, DC_TRANSMAP)
-DEFINE_COLUMN_COMBO(R_DrawTranslatedColumn, DC_COLORMAP)
-DEFINE_COLUMN_COMBO(R_DrawColumnShadowed, DC_LIGHTLIST)
-DEFINE_COLUMN_COMBO(R_DrawTranslatedTranslucentColumn, DC_COLORMAP|DC_TRANSMAP)
-DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchColumn, DC_HOLES)
-DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchTranslucentColumn, DC_HOLES|DC_TRANSMAP)
-
+DEFINE_COLUMN_FUNC(R_DrawColumn, DC_BASIC)
+DEFINE_COLUMN_FUNC(R_DrawTranslucentColumn, DC_TRANSMAP)
+DEFINE_COLUMN_FUNC(R_DrawTranslatedColumn, DC_COLORMAP)
+DEFINE_COLUMN_FUNC(R_DrawColumnShadowed, DC_LIGHTLIST)
+DEFINE_COLUMN_FUNC(R_DrawTranslatedTranslucentColumn, DC_COLORMAP|DC_TRANSMAP)
+DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchColumn, DC_HOLES)
+DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchTranslucentColumn, DC_HOLES|DC_TRANSMAP)

 /**	\brief The R_DrawFogColumn function
 	Fog wall.
@@ -1,269 +0,0 @@
-// SONIC ROBO BLAST 2 KART
-//-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Kart Krew.
-// Copyright (C) 2020 by Sonic Team Junior.
-// Copyright (C) 2000 by DooM Legacy Team.
-// 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) 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
-// terms of the GNU General Public License, version 2.
-// See the 'LICENSE' file for more details.
-//-----------------------------------------------------------------------------
-/// \file  r_draw_flush.cpp
-/// \brief Optimized quad column buffer code. By SoM.
-/// \note  no includes because this is included as part of r_draw.cpp
-
-template<ColumnFlushType Type>
-FUNCINLINE static ATTRINLINE constexpr UINT8
-R_GetFlushPixelTranslated(const drawcolumndata_temp_t *t_dc, UINT8 col)
-{
-	if constexpr (Type & (ColumnFlushType::FLUSH_COLORMAP | ColumnFlushType::FLUSH_COLORMAP_TRANS))
-	{
-		col = t_dc->translation[col];
-	}
-
-	return col;
-}
-
-template<ColumnFlushType Type>
-FUNCINLINE static ATTRINLINE constexpr UINT8
-R_GetFlushPixelTranslucent(const drawcolumndata_temp_t *t_dc, UINT8 * restrict dest, UINT8 col)
-{
-	col = R_GetFlushPixelTranslated<Type>(t_dc, col);
-
-	if constexpr (Type & (ColumnFlushType::FLUSH_TRANS | ColumnFlushType::FLUSH_COLORMAP_TRANS))
-	{
-		// haleyjd 09/11/04: use temptranmap here
-		return *(t_dc->transmap + (col << 8) + (*dest));
-	}
-	else
-	{
-		return col;
-	}
-}
-
-template<ColumnFlushType Type>
-FUNCINLINE static ATTRINLINE constexpr UINT8
-R_DrawFlushPixel(const drawcolumndata_temp_t *t_dc, UINT8 * restrict dest, const UINT8 * restrict source)
-{
-	UINT8 col = *source;
-	return R_GetFlushPixelTranslucent<Type>(t_dc, dest, col);
-}
-
-//
-// R_FlushWhole
-//
-// Flushes the entire columns in the buffer, one at a time.
-// This is used when a quad flush isn't possible.
-//
-template<ColumnFlushType Type>
-static void R_FlushWhole(void)
-{
-	UINT8 * restrict source;
-	UINT8 * restrict dest;
-	INT32 count, yl;
-	const INT32 stride = vid.width;
-	drawcolumndata_temp_t *t_dc = &temp_dc;
-	UINT8 *restrict buf = t_dc->buf;
-
-	while (--t_dc->x >= 0)
-	{
-		yl = t_dc->yl[t_dc->x];
-		source = &buf[t_dc->x + (yl << 3)];
-		dest = R_Address(t_dc->startx + t_dc->x, yl);
-		count = t_dc->yh[t_dc->x] - yl + 1;
-
-		while (--count >= 0)
-		{
-			*dest = R_DrawFlushPixel<Type>(t_dc, dest, source);
-			source += 8;
-			dest   += stride;
-		}
-	}
-}
-
-//
-// R_FlushHT
-//
-// Flushes the head and tail of columns in the buffer in
-// preparation for a quad flush.
-//
-template<ColumnFlushType Type>
-static void R_FlushHT(void)
-{
-	UINT8 * restrict source;
-	UINT8 * restrict dest;
-	INT32 count, colnum = 0;
-	INT32 yl, yh;
-	const INT32 stride = vid.width;
-	const drawcolumndata_temp_t *t_dc = &temp_dc;
-	UINT8 *restrict buf = t_dc->buf;
-
-	while (colnum < 8)
-	{
-		yl = t_dc->yl[colnum];
-		yh = t_dc->yh[colnum];
-
-		// flush column head
-		if (yl < t_dc->commontop)
-		{
-			source = &buf[colnum + (yl << 3)];
-			dest   = R_Address(t_dc->startx + colnum, yl);
-			count  = t_dc->commontop - yl;
-
-			while (--count >= 0)
-			{
-				*dest = R_DrawFlushPixel<Type>(t_dc, dest, source);
-				source += 8;
-				dest   += stride;
-			}
-		}
-
-		// flush column tail
-		if (yh > t_dc->commonbot)
-		{
-			source = &buf[colnum + ((t_dc->commonbot + 1) << 3)];
-			dest   = R_Address(t_dc->startx + colnum, t_dc->commonbot + 1);
-			count  = yh - t_dc->commonbot;
-
-			while (--count >= 0)
-			{
-				*dest = R_DrawFlushPixel<Type>(t_dc, dest, source);
-				source += 8;
-				dest   += stride;
-			}
-		}
-
-		++colnum;
-	}
-}
-
-// Begin: Quad column flushing functions.
-template<ColumnFlushType Type>
-static void R_FlushQuad(void)
-{
-	const INT32 stride = vid.width;
-	const drawcolumndata_temp_t *t_dc = &temp_dc;
-	INT32 count = t_dc->commonbot - t_dc->commontop + 1;
-	const UINT8 *restrict buf = t_dc->buf;
-
-	const UINT8 * restrict source = buf + (t_dc->commontop << 3);
-	UINT8 * restrict dest = R_Address(t_dc->startx, t_dc->commontop);
-
-	if constexpr (Type & ColumnFlushType::FLUSH_OPAQUE)
-	{
-#if __SIZEOF_POINTER__ >= 8 // does not make much sense on 32bit targets
-		// 8 byte aligned copy -- make sure our dest ptr, source ptr AND stride are a multiple of 8!
-		if ((((uintptr_t)dest | (uintptr_t)source | stride) & 7) == 0)
-		{
-			const INT64 *source64 = reinterpret_cast<const INT64 *>(source);
-			INT64 *dest64 = reinterpret_cast<INT64 *>(dest);
-			const INT32 deststep = stride / 8;
-
-			while (--count >= 0)
-			{
-				*dest64 = *source64++;
-				dest64 += deststep;
-			}
-		}
-		else
-#endif
-		{
-			while (--count >= 0)
-			{
-				dest[0] = source[0];
-				dest[1] = source[1];
-				dest[2] = source[2];
-				dest[3] = source[3];
-				dest[4] = source[4];
-				dest[5] = source[5];
-				dest[6] = source[6];
-				dest[7] = source[7];
-				source += 8;
-				dest   += stride;
-			}
-		}
-	}
-	else
-	{
-		while (--count >= 0)
-		{
-			dest[0] = R_DrawFlushPixel<Type>(t_dc, &dest[0], &source[0]);
-			dest[1] = R_DrawFlushPixel<Type>(t_dc, &dest[1], &source[1]);
-			dest[2] = R_DrawFlushPixel<Type>(t_dc, &dest[2], &source[2]);
-			dest[3] = R_DrawFlushPixel<Type>(t_dc, &dest[3], &source[3]);
-			dest[4] = R_DrawFlushPixel<Type>(t_dc, &dest[4], &source[4]);
-			dest[5] = R_DrawFlushPixel<Type>(t_dc, &dest[5], &source[5]);
-			dest[6] = R_DrawFlushPixel<Type>(t_dc, &dest[6], &source[6]);
-			dest[7] = R_DrawFlushPixel<Type>(t_dc, &dest[7], &source[7]);
-			source += 8;
-			dest   += stride;
-		}
-	}
-}
-
-// haleyjd 09/12/04: split up R_GetBuffer into various different
-// functions to minimize the number of branches and take advantage
-// of as much precalculated information as possible.
-template<ColumnFlushType Type>
-static UINT8 *R_GetBuffer(drawcolumndata_t *dc)
-{
-	drawcolumndata_temp_t *t_dc = &temp_dc;
-
-	// haleyjd: reordered predicates
-	if (t_dc->x == 8 ||
-		(t_dc->x && (t_dc->type != Type || t_dc->x + t_dc->startx != dc->x)))
-		R_FlushColumns();
-
-	if (!t_dc->x)
-	{
-		++t_dc->x;
-		t_dc->startx = dc->x;
-		t_dc->yl[0]  = t_dc->commontop = dc->yl;
-		t_dc->yh[0]  = t_dc->commonbot = dc->yh;
-		t_dc->type   = Type;
-
-		if constexpr (Type & (ColumnFlushType::FLUSH_TRANS | ColumnFlushType::FLUSH_COLORMAP_TRANS))
-		{
-			t_dc->transmap = dc->transmap;
-		}
-
-		if constexpr (Type & (ColumnFlushType::FLUSH_COLORMAP | ColumnFlushType::FLUSH_COLORMAP_TRANS))
-		{
-			t_dc->translation = dc->translation;
-		}
-
-		R_FlushWholeColumns = R_FlushWhole<Type>;
-		R_FlushHTColumns    = R_FlushHT<Type>;
-		R_FlushQuadColumn   = R_FlushQuad<Type>;
-
-		return &t_dc->buf[dc->yl << 3];
-	}
-
-	t_dc->yl[t_dc->x] = dc->yl;
-	t_dc->yh[t_dc->x] = dc->yh;
-
-	if (dc->yl > t_dc->commontop)
-		t_dc->commontop = dc->yl;
-	if (dc->yh < t_dc->commonbot)
-		t_dc->commonbot = dc->yh;
-
-	return &t_dc->buf[(dc->yl << 3) + t_dc->x++];
-}
-
-#define DEFINE_GETBUF_FUNC(name, flags) \
-	FUNCINLINE static ATTRINLINE UINT8 *name(drawcolumndata_t *dc) \
-	{ \
-		constexpr ColumnFlushType opt = static_cast<ColumnFlushType>(flags); \
-		return R_GetBuffer<opt>(dc); \
-	}
-
-DEFINE_GETBUF_FUNC(R_GetBufferOpaque, FLUSH_OPAQUE)
-DEFINE_GETBUF_FUNC(R_GetBufferTrans, FLUSH_TRANS)
-DEFINE_GETBUF_FUNC(R_GetBufferColormap, FLUSH_COLORMAP)
-DEFINE_GETBUF_FUNC(R_GetBufferColormapTrans, FLUSH_COLORMAP_TRANS)
-
Author	SHA1	Message	Date
Alug	21920112ee	a thousand curses upon you polyobjects!	2025-10-02 18:37:18 +02:00
Alug	9b7bf5e7d8	Merge remote-tracking branch 'origin/Saturn-Next' into deletglseg	2025-10-02 18:00:59 +02:00
Alug	524168b20b	experiment: remove opengl adjusted segs in theory this should improve levelload times and reduce memory usage? gotta see if it really does, visually so far there seems to be no difference at all	2025-10-02 17:57:52 +02:00