cache vid.height

saves us some pointless work going through all planes if we dont need to draw the sky

src/Makefile

@@ -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

src/Makefile.d/features.mk

@@ -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

src/Makefile.d/sdl.mk

@@ -10,7 +10,7 @@
 
 makedir:=$(makedir)/SDL
 
-opts+=-DHAVE_SDL
+opts+=-DDIRECTFULLSCREEN -DHAVE_SDL
 sources+=$(call List,sdl/Sourcefile)
 
 NOUPNP=1

src/Makefile.d/win32.mk

@@ -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
 

src/Sourcefile

@@ -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

src/am_map.c

@@ -785,7 +785,7 @@ static void AM_drawPixel(INT32 xx, INT32 yy, INT32 cc)
 {
 	if (xx < 0 || yy < 0 || xx >= f_w || yy >= f_h)
 		return; // off the screen
-	am_buf[(yy*f_w) + xx] = cc;
+	am_buf[(xx*f_h) + yy] = cc;
 }
 
 //

src/blua/lauxlib.c

@@ -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));

src/blua/liolib.c

@@ -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))
 	{

src/command.c

@@ -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)
@@ -1665,7 +1662,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 
 		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");
 				return;
@@ -1799,7 +1796,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 +1913,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 +1967,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 +2004,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 +2051,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 +2135,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));

src/console.c

@@ -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
@@ -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)
 	{

src/console.h

@@ -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;

src/d_clisrv.c

@@ -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();
@@ -4650,22 +4654,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);
 

src/d_main.c

@@ -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:
@@ -603,7 +609,7 @@ static boolean D_Display(void)
 		{
 			if (rendermode == render_soft)
 			{
-				VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
+				VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.height, vid.height);
 			}
 
 			lastdraw = false;
@@ -967,11 +973,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 +983,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 +1002,7 @@ void D_ClearState(void)
 	gameaction = ga_nothing;
 	memset(displayplayers, 0, sizeof(displayplayers));
 	consoleplayer = 0;
+	//demosequence = -1;
 	gametype = GT_RACE; // SRB2kart
 	paused = false;
 
@@ -1024,11 +1025,6 @@ void D_ClearState(void)
 
 	G_SetGamestate(GS_NULL);
 	wipegamestate = GS_NULL;
-
-	M_ClearMenus(true);
-
-	// map palettes affect this
-	D_ResetDeviceLED();
 }
 
 //
@@ -1036,18 +1032,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 +1058,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 +1080,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 +1111,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 +1121,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 +1151,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 +1196,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 +1211,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 +1281,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 +1302,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 +1726,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 +1736,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 +1772,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 +1800,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 +1833,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 +1873,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 +1925,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 +2147,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

src/d_main.h

@@ -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

src/d_net.c

@@ -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;
 	}

src/d_netcmd.c

@@ -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;

src/d_netcmd.h

@@ -209,8 +209,6 @@ extern consvar_t cv_betainterscreen;
 
 extern consvar_t cv_laglesscam;
 
-extern consvar_t cv_demoangturn;
-
 typedef enum
 {
 	SKINMENUTYPE_SCROLL = 0,

src/d_netfil.c

@@ -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;

src/d_protocol.c

@@ -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);

src/dedicated/i_system.c

@@ -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];
@@ -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
 }
 

src/discord.c

@@ -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;

src/discord.h

@@ -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);

src/doomdef.h

@@ -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)
@@ -653,9 +657,7 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 
 #if defined (HAVE_CURL)
 #define MASTERSERVER
-#ifndef NOHOLEPUNCH
 #define HOLEPUNCH
-#endif
 #else
 #undef UPDATE_ALERT
 #endif

src/doomstat.h

@@ -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;

src/doomtype.h

@@ -43,6 +43,7 @@ extern "C" {
 #define UINT64 uint64_t
 
 #ifdef __APPLE_CC__
+#define DIRECTFULLSCREEN 1
 #define DEBUG_LOG
 #define NOIPX
 #endif

src/f_finale.c

@@ -963,7 +963,6 @@ void F_StartTitleScreen(void)
 		finalecount = 0;
 	else
 		wipegamestate = GS_TITLESCREEN;
-
 	G_SetGamestate(GS_TITLESCREEN);
 	CON_ClearHUD();
 

src/f_wipe.c

@@ -249,16 +249,16 @@ static void F_DoWipe(fademask_t *fademask)
 			draw_linestart = scrypos[masky];
 			draw_lineend   = scrypos[masky + 1];
 
-			relativepos = (draw_linestart * vid.width) + draw_rowstart;
-			draw_linestogo = draw_lineend - draw_linestart;
+			relativepos = (draw_rowstart * vid.height) + draw_linestart;
+			draw_linestogo = draw_rowend - draw_rowstart;
 
 			if (*mask == 0)
 			{
 				// shortcut - memcpy source to work
 				while (draw_linestogo--)
 				{
-					M_Memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
-					relativepos += vid.width;
+					M_Memcpy(w_base+relativepos, s_base+relativepos, draw_lineend-draw_linestart);
+					relativepos += vid.height;
 				}
 			}
 			else if (*mask == 10)
@@ -266,8 +266,8 @@ static void F_DoWipe(fademask_t *fademask)
 				// shortcut - memcpy target to work
 				while (draw_linestogo--)
 				{
-					M_Memcpy(w_base+relativepos, e_base+relativepos, draw_rowend-draw_rowstart);
-					relativepos += vid.width;
+					M_Memcpy(w_base+relativepos, e_base+relativepos, draw_lineend-draw_linestart);
+					relativepos += vid.height;
 				}
 			}
 			else
@@ -281,12 +281,12 @@ static void F_DoWipe(fademask_t *fademask)
 					w = w_base + relativepos;
 					s = s_base + relativepos;
 					e = e_base + relativepos;
-					draw_rowstogo = draw_rowend - draw_rowstart;
+					draw_rowstogo = draw_lineend - draw_linestart;
 
 					while (draw_rowstogo--)
 						*w++ = transtbl[ ( *e++ << 8 ) + *s++ ];
 
-					relativepos += vid.width;
+					relativepos += vid.height;
 				}
 				// END DRAWING LOOP
 			}
@@ -314,7 +314,7 @@ void F_WipeStartScreen(void)
 	}
 #endif
 	wipe_scr_start = vid.screens[3];
-	I_ReadScreen(wipe_scr_start, 1);
+	M_Memcpy(wipe_scr_start, vid.screens[0], vid.width*vid.height);
 #endif
 }
 
@@ -331,7 +331,7 @@ void F_WipeEndScreen(void)
 	}
 #endif
 	wipe_scr_end = vid.screens[4];
-	I_ReadScreen(wipe_scr_end, 1);
+	M_Memcpy(wipe_scr_end, vid.screens[0], vid.width*vid.height);
 	V_DrawBlock(0, 0, 0, vid.width, vid.height, wipe_scr_start);
 #endif
 }

src/filesrch.c

@@ -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;
 				}
 

src/filesrch.h

@@ -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;
 

src/g_demo.h

@@ -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

src/g_game.c

@@ -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);
 	}

src/g_game.h

@@ -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);

src/g_input.c

@@ -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);

src/g_input.h

@@ -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];
 

src/hardware/hw_cache.c

@@ -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

src/hardware/hw_draw.c

@@ -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;
 

src/hardware/hw_main.cpp

@@ -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();
 }
 
@@ -3376,9 +3377,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 +3388,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 +3407,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 +3428,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 +4054,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 +4335,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 +5316,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 +5329,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 +5352,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 +5594,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 +5623,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 +5872,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;
 		}

src/hardware/hw_main.h

@@ -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);

src/hardware/hw_md2.c

@@ -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;

src/hardware/hw_model.c

@@ -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;
+			}
+		}
+	}*/
+}

src/hardware/hw_model.h

@@ -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

src/hardware/hw_shaders.c

@@ -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;

src/http-mserv.c

@@ -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);
 

src/hu_stuff.c

@@ -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
 //======================================================================
@@ -2845,8 +2915,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 +2929,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);
 

src/hu_stuff.h

@@ -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);

src/i_addrinfo.c

@@ -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

src/i_addrinfo.h

@@ -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

src/i_tcp.c

@@ -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"

src/i_video.h

@@ -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
 */

src/k_hud.c

@@ -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)

src/k_kart.c

@@ -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;
 }
 

src/lua_consolelib.c

@@ -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)
 		{

src/lua_hooklib.c

@@ -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)

src/lua_mobjlib.c

@@ -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;

src/lua_script.c

@@ -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);

src/m_aatree.c

@@ -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;
 }

src/m_argv.c

@@ -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, '/');

src/m_emotes.cpp

@@ -92,7 +92,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 +112,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 +139,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 +158,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);
 

src/m_menu.c

@@ -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);
 	}
@@ -3113,7 +3107,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 +3220,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 +3713,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 +3824,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 +3958,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 +3978,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 +4335,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 +4408,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 +6952,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 +7175,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...
 	}
 
@@ -8283,12 +8275,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 +8800,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 +9442,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 +9462,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 +9636,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 +10335,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)

src/m_menudefs.c

@@ -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);

src/m_misc.c

@@ -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);
 }
 

src/m_perfstats.c

@@ -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
 		}

src/m_textinput.c

@@ -239,8 +239,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)

src/p_map.c

@@ -708,7 +708,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 +977,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);
 		}
@@ -2189,7 +2189,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 +2198,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 +2220,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 +2232,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 +2249,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 +2281,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 +2394,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 +2409,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 +2463,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 +2489,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 +2568,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 +2575,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 +2587,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 +2928,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;
 	}
 
@@ -3358,12 +3346,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 +3363,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);
 	}
 }
@@ -3755,7 +3740,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]];
@@ -3962,7 +3946,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 +3956,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 +4003,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

src/p_mobj.c

@@ -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;

src/p_saveg.c

@@ -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)

src/p_setup.c

@@ -1983,12 +1983,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));

src/p_spec.c

@@ -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

src/p_user.c

@@ -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;
 }

src/r_bsp.cpp

@@ -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)
 {

src/r_data.c

@@ -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 *texturewidth;
 
-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
@@ -867,7 +867,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 +907,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 +976,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 +988,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 +996,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 +1030,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 +1066,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 +1078,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 +1118,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 +1127,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 +1162,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 +1172,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,7 +1211,7 @@ 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
@@ -1241,10 +1227,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 +1334,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 +1391,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

src/r_draw.cpp

@@ -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
 // ==========================================================================

src/r_draw.h

@@ -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) + (viewwindowx + px) * vid.height;
 }
 
+
 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

src/r_draw_column.cpp

@@ -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,11 @@ 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)
+R_GetColumnTranslated(drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap)
 {
 	if constexpr (Type & DrawColumnType::DC_COLORMAP)
 	{
@@ -45,10 +42,9 @@ 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)
+R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 * restrict dest, UINT8 col, const UINT8 * restrict colormap)
 {
 	col = R_GetColumnTranslated<Type>(dc, col, colormap);
 
@@ -64,7 +60,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)
+R_DrawColumnPixel(drawcolumndata_t* dc, UINT8 * restrict dest, UINT32 bit, const UINT8 * restrict source, const UINT8 * restrict colormap)
 {
 	UINT8 col = source[bit];
 
@@ -76,7 +72,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 +83,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 +153,6 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 			}
 
 			R_DrawColumnTemplate<NewType>(&dc_copy);
-
 			if (solid)
 			{
 				dc_copy.yl = bheight;
@@ -202,9 +186,8 @@ 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;
 
@@ -212,27 +195,9 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 		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,11 +207,10 @@ 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;
+						dest++;
 						frac += fracstep;
 					}
 				}
@@ -260,9 +224,8 @@ 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 += stride;
+						*dest = R_DrawColumnPixel<Type>(dc, dest, frac>>FRACBITS, source, colormap);
+						dest++;
 						frac += fracstep;
 					}
 				}
@@ -274,13 +237,11 @@ 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;
+							dest++;
 							frac += fracstep;
 
 							*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
-
-							dest += stride;
+							dest++;
 							frac += fracstep;
 						}
 
@@ -312,13 +273,13 @@ 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
 							*dest = R_DrawColumnPixel<Type>(dc, dest, CLAMP((frac >> FRACBITS), npow2min, npow2max), source, colormap);
 
-							dest += stride;
+							dest++;
 
 #if __SIZEOF_POINTER__ < 8  // 64-bit systems have large enough numbers for this to be a non-issue
 							// Avoid overflow.
@@ -352,18 +313,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.
@@ -389,7 +345,6 @@ void R_DrawFogColumn(drawcolumndata_t* dc)
 	// Framebuffer destination address.
 	dest = R_Address(dc->x, dc->yl);
 
-	const INT32 stride = vid.width;
 	const lighttable_t * restrict colormap = dc->colormap;
 
 	// Determine scaling, which is the only mapping to be done.
@@ -397,6 +352,6 @@ void R_DrawFogColumn(drawcolumndata_t* dc)
 	{
 		// Simple. Apply the colormap to what's already on the screen.
 		*dest = colormap[*dest];
-		dest += stride;
+		dest++;
 	} while (count--);
 }

src/r_draw_flush.cpp

@@ -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)
-

src/r_draw_span.cpp

@@ -51,7 +51,7 @@ enum DrawSpanType
 
 template<DrawSpanType Type>
 FUNCINLINE static ATTRINLINE constexpr UINT8
-R_GetSpanTranslated(const drawspandata_t* ds, UINT8 col)
+R_GetSpanTranslated(drawspandata_t* ds, UINT8 col)
 {
 	if constexpr (Type & DrawSpanType::DS_COLORMAP)
 	{
@@ -65,7 +65,7 @@ R_GetSpanTranslated(const drawspandata_t* ds, UINT8 col)
 
 template<DrawSpanType Type>
 FUNCINLINE static ATTRINLINE constexpr UINT8
-R_GetSpanTranslucent(const drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT8 col)
+R_GetSpanTranslucent(drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT8 col)
 {
 	col = colormap[R_GetSpanTranslated<Type>(ds, col)];
 
@@ -81,7 +81,7 @@ R_GetSpanTranslucent(const drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colorma
 
 template<DrawSpanType Type>
 FUNCINLINE static ATTRINLINE constexpr UINT8
-R_DrawSpanPixel(const drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT32 bit, const UINT8 *source)
+R_DrawSpanPixel(drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT32 bit, const UINT8 *source)
 {
 	UINT8 col = source[bit];
 
@@ -110,15 +110,17 @@ static void R_DrawSpanTemplate(drawspandata_t* ds)
 	UINT8 * restrict dest = R_Address(ds->x1, ds->y);
 	UINT8 * restrict dsrc;
 
-	const UINT8 * restrict deststop = vid.screens[0] + vid.width * vid.height;
+	const UINT8 * restrict deststop = vid.screens[0] + vid.height *vid.width;
 
-	if (dest+8 > deststop)
+	if (dest > deststop)
 	{
 		return;
 	}
 
 	intptr_t count = (ds->x2 - ds->x1 + 1);
-	size_t i;
+	//size_t i;
+
+	const INT32 stride = vid.height;
 
 	xposition = ds->xfrac; yposition = ds->yfrac;
 	xstep = ds->xstep; ystep = ds->ystep;
@@ -143,14 +145,14 @@ static void R_DrawSpanTemplate(drawspandata_t* ds)
 
 	if constexpr (Type & DS_RIPPLE)
 	{
-		dsrc = vid.screens[1] + (ds->y + ds->bgofs) * vid.width + ds->x1;
+		dsrc = vid.screens[1] + (ds->y + ds->bgofs) + ds->x1 * vid.height;
 	}
 	else
 	{
 		dsrc = dest;
 	}
 
-	while (count >= 8)
+	/*while (count >= 8)
 	{
 		// SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
 		// have the uber complicated math to calculate it now, so that was a memory write we didn't
@@ -160,34 +162,26 @@ static void R_DrawSpanTemplate(drawspandata_t* ds)
 		{
 			bit = ((yposition >> ds->nflatyshift) & ds->nflatmask) | (xposition >> ds->nflatxshift);
 
-			if constexpr (Type & DS_RIPPLE)
-				dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
-			else
-				dest[i] = R_DrawSpanPixel<Type>(ds, &dest[i], colormap, bit, source);
+			dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
 
 			xposition += xstep;
 			yposition += ystep;
 		}
 
 		dest += 8;
-		if constexpr (Type & DS_RIPPLE)
-			dsrc += 8;
+		dsrc += 8;
 
 		count -= 8;
-	}
+	}*/
 
 	while (count-- && dest <= deststop)
 	{
 		bit = ((yposition >> ds->nflatyshift) & ds->nflatmask) | (xposition >> ds->nflatxshift);
 
-		if constexpr (Type & DS_RIPPLE)
-			*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
-		else
-			*dest = R_DrawSpanPixel<Type>(ds, dest, colormap, bit, source);
+		*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
 
-		dest++;
-		if constexpr (Type & DS_RIPPLE)
-			dsrc++;
+		dest += stride;
+		dsrc += stride;
 
 		xposition += xstep;
 		yposition += ystep;
@@ -208,15 +202,15 @@ static void R_CalcTiltedLighting(std::vector<INT32>& lightbuffer, INT32 x1, INT3
 
 	for (i = x1; i <= x2; i++)
 	{
-		const fixed_t light = start >> FRACBITS;
+		fixed_t light = start >> FRACBITS;
 		lightbuffer[i] = CLAMP(light, 0, MAXLIGHTSCALE - 1);
 		start += step;
 	}
 }
 
-static void R_GetTiltedLighting(std::vector<INT32>& tiltlighting, const drawspandata_t* ds, const float iz, const INT32 width, const INT32 stride)
+static void R_GetTiltedLighting(std::vector<INT32>& tiltlighting, const drawspandata_t* ds, const float iz, const int width, const INT32 stride)
 {
-	const float planelightfloat = PLANELIGHTFLOAT;
+	float planelightfloat = PLANELIGHTFLOAT;
 	const fixed_t lightstart = FloatToFixed(iz * planelightfloat);
 	const fixed_t lightend   = FloatToFixed((iz + ds->szp.x * width) * planelightfloat);
 
@@ -232,7 +226,7 @@ static void R_GetTiltedLighting(std::vector<INT32>& tiltlighting, const drawspan
 template<DrawSpanType Type>
 static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 {
-	INT32 width = ds->x2 - ds->x1;
+	int width = ds->x2 - ds->x1;
 	float iz, uz, vz;
 	UINT32 u, v;
 	int i;
@@ -246,30 +240,27 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 	UINT32 stepu, stepv;
 	UINT32 bit;
 
+	//INT32 x1 = ds->x1;
 	const INT32 nflatxshift = ds->nflatxshift;
 	const INT32 nflatyshift = ds->nflatyshift;
 	const INT32 nflatmask = ds->nflatmask;
-	const INT32 stride = vid.width;
+	const INT32 stride = vid.height;
 	local_for_thread std::vector<INT32> tiltlighting;
 
 	iz = ds->szp.z + ds->szp.y*(centery-ds->y) + ds->szp.x*(ds->x1-centerx);
-	uz = ds->sup.z + ds->sup.y*(centery-ds->y) + ds->sup.x*(ds->x1-centerx);
-	vz = ds->svp.z + ds->svp.y*(centery-ds->y) + ds->svp.x*(ds->x1-centerx);
 
 	// Lighting is simple. It's just linear interpolation from start to end
 	R_GetTiltedLighting(tiltlighting, ds, iz, width, stride);
 
-	const UINT8 * restrict source = ds->source;
-	const UINT8 * restrict colormap = ds->colormap;
+	uz = ds->sup.z + ds->sup.y*(centery-ds->y) + ds->sup.x*(ds->x1-centerx);
+	vz = ds->svp.z + ds->svp.y*(centery-ds->y) + ds->svp.x*(ds->x1-centerx);
 
-	const ptrdiff_t colormap_diff = (colormap - colormaps);
-
-	const INT32 * restrict tiltlight = tiltlighting.data();
-	lighttable_t * const * restrict planezlight = ds->planezlight;
+	const UINT8 *source = ds->source;
+	const UINT8 *colormap = ds->colormap;
 
 	if constexpr (Type & DS_RIPPLE)
 	{
-		dsrc = vid.screens[1] + (ds->y + ds->bgofs) * stride + ds->x1;
+		dsrc = vid.screens[1] + (ds->y + ds->bgofs) + ds->x1 * stride;
 	}
 	else
 	{
@@ -304,6 +295,7 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 	izstep = ds->szp.x * SPANSIZE;
 	uzstep = ds->sup.x * SPANSIZE;
 	vzstep = ds->svp.x * SPANSIZE;
+	//x1 = 0;
 	width++;
 
 	while (width >= SPANSIZE)
@@ -320,22 +312,31 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 		u = (INT64)(startu);
 		v = (INT64)(startv);
 
-		const INT32 x1 = ds->x1;
+		//x1 = ds->x1;
 
-		for (i = 0; i < SPANSIZE; i++)
+		// not sure which one does a better job
+
+		for (i = SPANSIZE-1; i >= 0; i--)
+		{
+			bit = ((v >> nflatyshift) & nflatmask) | (u >> nflatxshift);
+			colormap = ds->planezlight[tiltlighting[ds->x1++]] + (ds->colormap - colormaps);
+			*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
+			dest += stride;
+			dsrc += stride;
+			u += stepu;
+			v += stepv;
+		}
+
+		/*for (i = 0; i < SPANSIZE; i++)
 		{
 			bit = (((v + stepv * i) >> nflatyshift) & nflatmask) | ((u + stepu * i) >> nflatxshift);
-			colormap = planezlight[tiltlight[x1 + i]] + colormap_diff;
-			if constexpr (Type & DS_RIPPLE)
-				dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
-			else
-				dest[i] = R_DrawSpanPixel<Type>(ds, &dest[i], colormap, bit, source);
+			colormap = ds->planezlight[tiltlighting[x1 + i]] + (ds->colormap - colormaps);
+			dest[i * stride] = R_DrawSpanPixel<Type>(ds, &dsrc[i * stride], colormap, bit, source);
 		}
 
 		ds->x1 += SPANSIZE;
-		dest += SPANSIZE;
-		if constexpr (Type & DS_RIPPLE)
-			dsrc += SPANSIZE;
+		dest += SPANSIZE * stride;
+		dsrc += SPANSIZE * stride;*/
 		startu = endu;
 		startv = endv;
 		width -= SPANSIZE;
@@ -348,11 +349,8 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 			u = (INT64)(startu);
 			v = (INT64)(startv);
 			bit = ((v >> nflatyshift) & nflatmask) | (u >> nflatxshift);
-			colormap = planezlight[tiltlight[ds->x1]] + colormap_diff;
-			if constexpr (Type & DS_RIPPLE)
-				*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
-			else
-				*dest = R_DrawSpanPixel<Type>(ds, dest, colormap, bit, source);
+			colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps);
+			*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
 			ds->x1++;
 		}
 		else
@@ -374,14 +372,10 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 			for (; width != 0; width--)
 			{
 				bit = ((v >> ds->nflatyshift) & ds->nflatmask) | (u >> ds->nflatxshift);
-				colormap = planezlight[tiltlight[ds->x1]] + colormap_diff;
-				if constexpr (Type & DS_RIPPLE)
-					*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
-				else
-					*dest = R_DrawSpanPixel<Type>(ds, dest, colormap, bit, source);
-				dest++;
-				if constexpr (Type & DS_RIPPLE)
-					dsrc++;
+				colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps);
+				*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
+				dest += stride;
+				dsrc += stride;
 				ds->x1++;
 				u += stepu;
 				v += stepv;
@@ -413,50 +407,49 @@ DEFINE_SPAN_COMBO(R_DrawTranslucentWaterSpan, DS_TRANSMAP|DS_RIPPLE)
 */
 void R_DrawFogSpan(drawspandata_t* ds)
 {
-	intptr_t count = ds->x2 - ds->x1 + 1;
-
 	const UINT8 * restrict colormap = ds->colormap;
 	UINT8 * restrict dest = R_Address(ds->x1, ds->y);
 
-	while (count >= 4)
+	intptr_t count = ds->x2 - ds->x1 + 1;
+
+	const INT32 stride = vid.height;
+
+	/*while (count >= 4)
 	{
 		dest[0] = colormap[dest[0]];
 		dest[1] = colormap[dest[1]];
 		dest[2] = colormap[dest[2]];
 		dest[3] = colormap[dest[3]];
 
-		dest  += 4;
+		dest += 4;
 		count -= 4;
-	}
+	}*/
 
 	while (count--)
 	{
 		*dest = colormap[*dest];
-		dest++;
+		dest += stride;
 	}
 }
 
 void R_DrawFogSpan_Tilted(drawspandata_t* ds)
 {
-	INT32 width = ds->x2 - ds->x1;
-	const INT32 stride = vid.width;
-	const float iz = ds->szp.z + ds->szp.y*(centery-ds->y) + ds->szp.x*(ds->x1-centerx);
-	UINT8 * restrict dest = R_Address(ds->x1, ds->y);
-	const ptrdiff_t colormap_diff = (ds->colormap - colormaps);
-
+	int width = ds->x2 - ds->x1;
+	float iz = ds->szp.z + ds->szp.y*(centery-ds->y) + ds->szp.x*(ds->x1-centerx);
+	UINT8 * restrict dest;
 	local_for_thread std::vector<INT32> tiltlighting;
 
+	dest = R_Address(ds->x1, ds->y);
+	const INT32 stride = vid.width;
+
 	// Lighting is simple. It's just linear interpolation from start to end
 	R_GetTiltedLighting(tiltlighting, ds, iz, width, stride);
 
-	const INT32 * restrict tiltlight = tiltlighting.data();
-	lighttable_t * const * restrict planezlight = ds->planezlight;
-
 	do
 	{
-		UINT8 *colormap = planezlight[tiltlight[ds->x1++]] + colormap_diff;
+		UINT8 *colormap = ds->planezlight[tiltlighting[ds->x1++]] + (ds->colormap - colormaps);
 		*dest = colormap[*dest];
-		dest++;
+		dest += stride;
 	}
 	while (--width >= 0);
 }

src/r_fps.cpp

@@ -172,7 +172,7 @@ static vector3_t *R_LerpVector3(const vector3_t *from, const vector3_t *to, fixe
 // recalc necessary stuff for mouseaiming
 // slopes are already calculated for the full possible view (which is 4*viewheight).
 // 18/08/18: (No it's actually 16*viewheight, thanks Lactozilla for finding this out)
-void R_SetupFreelook(void)
+static void R_SetupFreelook(void)
 {
 	// clip it in the case we are looking a hardware 90 degrees full aiming
 	// (lmps, network and use F12...)

src/r_fps.h

@@ -151,7 +151,6 @@ typedef struct levelinterpolator_s {
 	};
 } levelinterpolator_t;
 
-void R_SetupFreelook(void);
 // Interpolates the current view variables (r_state.h) against the selected view context in R_SetViewContext
 void R_InterpolateView(fixed_t frac, boolean forceinvalid);
 // Special function just for software

src/r_main.cpp

@@ -63,7 +63,7 @@ size_t loopcount;
 
 fixed_t viewx, viewy, viewz;
 angle_t viewangle, aimingangle, viewroll;
-UINT8 viewssnum = 0;
+UINT8 viewssnum;
 fixed_t viewcos, viewsin;
 boolean skyVisible;
 boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible for each splitscreen player
@@ -88,7 +88,7 @@ INT32 viewangletox[FINEANGLES/2];
 // The xtoviewangleangle[] table maps a screen pixel
 // to the lowest viewangle that maps back to x ranges
 // from clipangle to -clipangle.
-angle_t *xtoviewangle = NULL;
+angle_t *xtoviewangle;
 
 lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
 lighttable_t *scalelightfixed[MAXLIGHTSCALE];
@@ -253,7 +253,6 @@ void SplitScreen_OnChange(void)
 			if (playeringame[i] && i != consoleplayer)
 			{
 				UINT8 j;
-
 				for (j = 1; j < MAXSPLITSCREENPLAYERS; j++)
 				{
 					if (displayplayers[j] == consoleplayer)
@@ -269,7 +268,6 @@ void SplitScreen_OnChange(void)
 		}
 	}
 }
-
 static void Fov_OnChange(void)
 {
 	R_SetViewSize();
@@ -945,10 +943,9 @@ void R_ExecuteSetViewSize(void)
 	memset(scalelight, 0xFF, sizeof(scalelight));
 
 	// Calculate the light levels to use for each level/scale combination.
-	for (i = 0; i < LIGHTLEVELS; i++)
+	for (i = 0; i< LIGHTLEVELS; i++)
 	{
 		startmapl = ((LIGHTLEVELS - 1 - i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
-
 		for (j = 0; j < MAXLIGHTSCALE; j++)
 		{
 			level = startmapl - j*vid.width/(viewwidth)/DISTMAP;
@@ -963,8 +960,6 @@ void R_ExecuteSetViewSize(void)
 		}
 	}
 
-	R_SetupFreelook();
-
 	am_recalc = true;
 }
 
@@ -1008,7 +1003,7 @@ static void R_InitViewMapping(void)
 static void R_SetupViewBuffers(void)
 {
 	R_CalcFov(cv_fov.value);
-	R_InitViewBuffer();
+	R_InitViewBuffer(viewwidth, viewheight);
 	R_InitViewMapping();
 }
 
@@ -1028,6 +1023,8 @@ void R_Init(void)
 	//I_OutputMsg("\nR_InitData");
 	R_InitData();
 
+	//I_OutputMsg("\nR_InitViewBorder");
+	R_InitViewBorder();
 	R_SetViewSize(); // setsizeneeded is set true
 
 	// this is now done by SCR_Recalc() at the first mode set
@@ -1407,12 +1404,9 @@ void R_RenderPlayerView(player_t *player)
 		R_ClearPlanes();
 		R_ClearSprites();
 
-		R_SetColumnContext(COLUMNCONTEXT_FLUSH);
 		R_RenderViewpoint(&masks[nummasks - 1], false);
 
 		R_ClipSprites(drawsegs, NULL);
-		R_ResetColumnBuffer();
-		R_SetColumnContext(COLUMNCONTEXT_DIRECT);
 		R_DrawSkyPlanes(); // draw the fucker again to prevent some artifacts
 		R_DrawPlanes();
 		R_DrawMasked(masks, nummasks);
@@ -1447,7 +1441,6 @@ void R_RenderPlayerView(player_t *player)
 	// check for new console commands.
 	NetUpdate();
 
-	R_SetColumnContext(COLUMNCONTEXT_FLUSH);
 	ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0;
 	PS_START_TIMING(ps_bsptime);
 	R_RenderViewpoint(&masks[nummasks - 1], true);
@@ -1455,7 +1448,6 @@ void R_RenderPlayerView(player_t *player)
 	PS_START_TIMING(ps_sw_spritecliptime);
 	R_ClipSprites(drawsegs, NULL);
 	PS_STOP_TIMING(ps_sw_spritecliptime);
-	R_ResetColumnBuffer();
 
 	ps_numsprites.value.i = numvisiblesprites;
 
@@ -1492,14 +1484,12 @@ void R_RenderPlayerView(player_t *player)
 			R_RenderViewpoint(&masks[nummasks - 1], true);
 
 			R_ClipSprites(ds_p - (masks[nummasks - 1].drawsegs[1] - masks[nummasks - 1].drawsegs[0]), portal);
-			R_ResetColumnBuffer();
 
 			Portal_Remove(portal);
 		}
 	}
 	PS_STOP_TIMING(ps_sw_portaltime);
 
-	R_SetColumnContext(COLUMNCONTEXT_DIRECT);
 	PS_START_TIMING(ps_sw_planetime);
 	if (!skybox)
 		R_DrawSkyPlanes();
@@ -1510,6 +1500,7 @@ void R_RenderPlayerView(player_t *player)
 	PS_START_TIMING(ps_sw_maskedtime);
 	R_DrawMasked(masks, nummasks);
 	PS_STOP_TIMING(ps_sw_maskedtime);
+
 	free(masks);
 
 	// Check for new console commands.

src/r_main.h

@@ -97,7 +97,7 @@ FUNCINLINE static ATTRINLINE PUREFUNC INT32 R_PointOnSide(fixed_t x, fixed_t y,
 
 	// Try to quickly decide by looking at sign bits.
 	// also use a mask to avoid branch prediction
-	INT32 mask = (((node->dy ^ node->dx ^ x ^ y) < 0) ? -1 : 0);
+	INT32 mask = (node->dy ^ node->dx ^ x ^ y) >> 31;
 	return (mask & ((node->dy ^ x) < 0)) |  // (left is negative)
 	       (~mask & (FixedMul(y, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, x)));
 }

src/r_patch.c

@@ -19,7 +19,6 @@
 #include "r_skins.h"
 #include "z_zone.h"
 #include "w_wad.h"
-#include <vector>
 
 #ifdef HWRENDER
 #include "hardware/hw_glob.h"
@@ -38,7 +37,7 @@ static void R_ParseSpriteInfoFrame(spriteinfo_t *info)
 	UINT8 frameFrame = 0xFF;
 	INT16 frameXPivot = 0;
 	INT16 frameYPivot = 0;
-	rotaxis_t frameRotAxis = ROTAXIS_X;
+	rotaxis_t frameRotAxis = 0;
 
 	// Sprite identifier
 	sprinfoToken = M_GetToken(NULL);
@@ -46,14 +45,13 @@ static void R_ParseSpriteInfoFrame(spriteinfo_t *info)
 	{
 		I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite frame should be");
 	}
-
 	sprinfoTokenLength = strlen(sprinfoToken);
 	if (sprinfoTokenLength != 1)
 	{
 		I_Error("Error parsing SPRTINFO lump: Invalid frame \"%s\"",sprinfoToken);
 	}
-
-	frameChar = sprinfoToken;
+	else
+		frameChar = sprinfoToken;
 
 	frameFrame = R_Char2Frame(frameChar[0]);
 	Z_Free(sprinfoToken);
@@ -62,53 +60,53 @@ static void R_ParseSpriteInfoFrame(spriteinfo_t *info)
 	sprinfoToken = M_GetToken(NULL);
 	if (sprinfoToken == NULL)
 		I_Error("Error parsing SPRTINFO lump: Missing sprite info");
-
-	if (fastcmp(sprinfoToken, "{"))
+	else
 	{
-		Z_Free(sprinfoToken);
-		sprinfoToken = M_GetToken(NULL);
-		if (sprinfoToken == NULL)
+		if (strcmp(sprinfoToken,"{")==0)
 		{
-			I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite info should be");
-		}
-		while (!fastcmp(sprinfoToken, "}"))
-		{
-			if (fasticmp(sprinfoToken, "XPIVOT"))
-			{
-				Z_Free(sprinfoToken);
-				sprinfoToken = M_GetToken(NULL);
-				frameXPivot = atoi(sprinfoToken);
-			}
-			else if (fasticmp(sprinfoToken, "YPIVOT"))
-			{
-				Z_Free(sprinfoToken);
-				sprinfoToken = M_GetToken(NULL);
-				frameYPivot = atoi(sprinfoToken);
-			}
-			else if (fasticmp(sprinfoToken, "ROTAXIS"))
-			{
-				Z_Free(sprinfoToken);
-				sprinfoToken = M_GetToken(NULL);
-				if (fasticmp(sprinfoToken, "X") || fasticmp(sprinfoToken, "XAXIS") || fasticmp(sprinfoToken, "ROLL"))
-					frameRotAxis = ROTAXIS_X;
-				else if (fasticmp(sprinfoToken, "Y") || fasticmp(sprinfoToken, "YAXIS") || fasticmp(sprinfoToken, "PITCH"))
-					frameRotAxis = ROTAXIS_Y;
-				else if (fasticmp(sprinfoToken, "Z") || fasticmp(sprinfoToken, "ZAXIS") || fasticmp(sprinfoToken, "YAW"))
-					frameRotAxis = ROTAXIS_Z;
-			}
-
 			Z_Free(sprinfoToken);
-
 			sprinfoToken = M_GetToken(NULL);
 			if (sprinfoToken == NULL)
 			{
-				I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite info or right curly brace should be");
+				I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite info should be");
+			}
+			while (strcmp(sprinfoToken,"}")!=0)
+			{
+				if (stricmp(sprinfoToken, "XPIVOT")==0)
+				{
+					Z_Free(sprinfoToken);
+					sprinfoToken = M_GetToken(NULL);
+					frameXPivot = atoi(sprinfoToken);
+				}
+				else if (stricmp(sprinfoToken, "YPIVOT")==0)
+				{
+					Z_Free(sprinfoToken);
+					sprinfoToken = M_GetToken(NULL);
+					frameYPivot = atoi(sprinfoToken);
+				}
+				else if (stricmp(sprinfoToken, "ROTAXIS")==0)
+				{
+					Z_Free(sprinfoToken);
+					sprinfoToken = M_GetToken(NULL);
+					if ((stricmp(sprinfoToken, "X")==0) || (stricmp(sprinfoToken, "XAXIS")==0) || (stricmp(sprinfoToken, "ROLL")==0))
+						frameRotAxis = ROTAXIS_X;
+					else if ((stricmp(sprinfoToken, "Y")==0) || (stricmp(sprinfoToken, "YAXIS")==0) || (stricmp(sprinfoToken, "PITCH")==0))
+						frameRotAxis = ROTAXIS_Y;
+					else if ((stricmp(sprinfoToken, "Z")==0) || (stricmp(sprinfoToken, "ZAXIS")==0) || (stricmp(sprinfoToken, "YAW")==0))
+						frameRotAxis = ROTAXIS_Z;
+				}
+				Z_Free(sprinfoToken);
+
+				sprinfoToken = M_GetToken(NULL);
+				if (sprinfoToken == NULL)
+				{
+					I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite info or right curly brace should be");
+				}
 			}
 		}
+		Z_Free(sprinfoToken);
 	}
 
-	Z_Free(sprinfoToken);
-
 	// set fields
 	info->pivot[frameFrame].x = frameXPivot;
 	info->pivot[frameFrame].y = frameYPivot;
@@ -138,7 +136,6 @@ static void R_ParseSpriteInfo(boolean spr2)
 	{
 		I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite name should be");
 	}
-
 	sprinfoTokenLength = strlen(sprinfoToken);
 	if (sprinfoTokenLength != 4)
 	{
@@ -151,7 +148,6 @@ static void R_ParseSpriteInfo(boolean spr2)
 		// ^^ we've confirmed that the token is == 4 characters so it will never overflow a 5 byte char buffer
 		strupr(newSpriteName); // Just do this now so we don't have to worry about it
 	}
-
 	Z_Free(sprinfoToken);
 
 	if (!spr2)
@@ -160,17 +156,16 @@ static void R_ParseSpriteInfo(boolean spr2)
 		{
 			if (i == NUMSPRITES)
 				I_Error("Error parsing SPRTINFO lump: Unknown sprite name \"%s\"", newSpriteName);
-
-			if (!memcmp(newSpriteName,sprnames[i], 4))
+			if (!memcmp(newSpriteName,sprnames[i],4))
 			{
-				sprnum = static_cast<spritenum_t>(i);
+				sprnum = i;
 				break;
 			}
 		}
 	}
 
 	// allocate a spriteinfo
-	info = static_cast<spriteinfo_t*>(Z_Calloc(sizeof(spriteinfo_t), PU_STATIC, NULL));
+	info = Z_Calloc(sizeof(spriteinfo_t), PU_STATIC, NULL);
 	info->available = true;
 
 	// Left Curly Brace
@@ -179,20 +174,17 @@ static void R_ParseSpriteInfo(boolean spr2)
 	{
 		I_Error("Error parsing SPRTINFO lump: Unexpected end of file where open curly brace for sprite \"%s\" should be",newSpriteName);
 	}
-
-	if (fastcmp(sprinfoToken, "{"))
+	if (strcmp(sprinfoToken,"{")==0)
 	{
 		Z_Free(sprinfoToken);
-
 		sprinfoToken = M_GetToken(NULL);
 		if (sprinfoToken == NULL)
 		{
 			I_Error("Error parsing SPRTINFO lump: Unexpected end of file where definition for sprite \"%s\" should be",newSpriteName);
 		}
-
-		while (!fastcmp(sprinfoToken, "}"))
+		while (strcmp(sprinfoToken,"}")!=0)
 		{
-			if (fasticmp(sprinfoToken, "SKIN"))
+			if (stricmp(sprinfoToken, "SKIN")==0)
 			{
 				INT32 skinnum;
 				char *skinName = NULL;
@@ -223,11 +215,10 @@ static void R_ParseSpriteInfo(boolean spr2)
 				skinnumbers[foundskins] = skinnum;
 				foundskins++;
 			}
-			else if (fasticmp(sprinfoToken, "FRAME"))
+			else if (stricmp(sprinfoToken, "FRAME")==0)
 			{
 				R_ParseSpriteInfoFrame(info);
 				Z_Free(sprinfoToken);
-
 				if (spr2)
 				{
 					if (!foundskins)
@@ -262,7 +253,6 @@ static void R_ParseSpriteInfo(boolean spr2)
 	{
 		I_Error("Error parsing SPRTINFO lump: Expected \"{\" for sprite \"%s\", got \"%s\"",newSpriteName,sprinfoToken);
 	}
-
 	Z_Free(sprinfoToken);
 	Z_Free(info);
 }
@@ -300,18 +290,15 @@ void R_ParseSPRTINFOLump(UINT16 wadNum, UINT16 lumpNum)
 	while (sprinfoToken != NULL)
 	{
 		CONS_Printf("Attempting to parse le SPRTINFO lump for ya..\n");
-
-		if (fasticmp(sprinfoToken, "SPRITE"))
+		if (!stricmp(sprinfoToken, "SPRITE"))
 			R_ParseSpriteInfo(false);
-		else if (fasticmp(sprinfoToken, "SPRITE2"))
+		else if (!stricmp(sprinfoToken, "SPRITE2"))
 			R_ParseSpriteInfo(true);
 		else
 			I_Error("Error parsing SPRTINFO lump: Unknown keyword \"%s\"", sprinfoToken);
-
 		Z_Free(sprinfoToken);
 		sprinfoToken = M_GetToken(NULL);
 	}
-
 	Z_Free((void *)sprinfoText);
 }
 
@@ -342,7 +329,7 @@ void R_LoadSpriteInfoLumps(UINT16 wadnum, UINT16 numlumps)
 
 patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
 {
-	patch_t *patch = static_cast<patch_t*>((dest == NULL) ? Z_Calloc(sizeof(patch_t), PU_PATCH, NULL) : dest);
+	patch_t *patch = (dest == NULL) ? Z_Calloc(sizeof(patch_t), PU_PATCH, NULL) : (patch_t *)(dest);
 
 	if (source)
 	{
@@ -354,7 +341,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
 		patch->height     = SHORT(source->height);
 		patch->leftoffset = SHORT(source->leftoffset);
 		patch->topoffset  = SHORT(source->topoffset);
-		patch->columnofs  = static_cast<INT32*>(Z_Calloc(size, PU_PATCH_DATA, NULL));
+		patch->columnofs  = Z_Calloc(size, PU_PATCH_DATA, NULL);
 
 		for (col = 0; col < source->width; col++)
 		{
@@ -370,7 +357,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
 		if (colsize <= 0)
 			I_Error("Patch_Create: no column data!");
 
-		patch->columns = static_cast<UINT8*>(Z_Calloc(colsize, PU_PATCH_DATA, NULL));
+		patch->columns = Z_Calloc(colsize, PU_PATCH_DATA, NULL);
 		M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize);
 	}
 
@@ -442,8 +429,8 @@ void *Patch_AllocateHardwarePatch(patch_t *patch)
 {
 	if (!patch->hardware)
 	{
-		GLPatch_t *glPatch = static_cast<GLPatch_t*>(Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware));
-		glPatch->mipmap = static_cast<GLMipmap_t*>(Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &glPatch->mipmap));
+		GLPatch_t *glPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware);
+		glPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &glPatch->mipmap);
 	}
 	return (void *)(patch->hardware);
 }
@@ -461,8 +448,7 @@ void *Patch_CreateGL(patch_t *patch)
 }
 #endif // HWRENDER
 
-// 1 MB should be enough for most cases
-static std::vector<UINT8> imgbuf(1024 * 1024);
+static UINT8 *imgbuf = NULL;
 
 //
 // R_MaskedFlatToPatch
@@ -472,27 +458,17 @@ static std::vector<UINT8> imgbuf(1024 * 1024);
 void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, INT16 topoffset, size_t *destsize)
 {
 	INT16 x, y;
-	UINT8 *img, *imgptr;
+	UINT8 *img;
 	UINT8 *colpointers, *startofspan;
 	size_t size = 0;
 
 	if (!raw)
 		return NULL;
 
-	// Allocate a staging buffer with the maximum size needed for a patch of the same size as the input.
+	if (!imgbuf)
+		imgbuf = Z_Malloc(1<<26, PU_STATIC, NULL);
 
-	// round up to nearest multiple of 254-pixel posts, plus 1 more 254-pixel post for paranoia reasons
-	size_t maxcolumnsize = (2 + (height - 1) / 256) * 256;
-	// the patch header, and width columns of the max column size
-	size_t maxoutsize = maxcolumnsize * width + (8 + 4 * width);
-	// so, a 512x512 flat should maximally need 393,760 (384.53 KiB) bytes.
-	// quite a bit smaller than 64 megabytes, and much less annoying to the windows debug allocator!
-	while (imgbuf.size() < maxoutsize)
-	{
-		imgbuf.resize(imgbuf.size() * 2);
-	}
-
-	imgptr = imgbuf.data();
+	UINT8 *imgptr = imgbuf;
 
 	// Write image size and offset
 	WRITEINT16(imgptr, width);
@@ -512,7 +488,7 @@ void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, I
 		startofspan = NULL;
 
 		// Write column pointer
-		WRITEINT32(colpointers, imgptr - imgbuf.data());
+		WRITEINT32(colpointers, imgptr - imgbuf);
 
 		// Write pixels
 		for (y = 0; y < height; y++)
@@ -581,9 +557,9 @@ void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, I
 		WRITEUINT8(imgptr, 0xFF);
 	}
 
-	size = imgptr-imgbuf.data();
-	img = static_cast<UINT8*>(Z_Malloc(size, PU_STATIC, NULL));
-	memcpy(img, imgbuf.data(), size);
+	size = imgptr-imgbuf;
+	img = Z_Malloc(size, PU_STATIC, NULL);
+	memcpy(img, imgbuf, size);
 
 	if (destsize != NULL)
 		*destsize = size;
@@ -606,27 +582,17 @@ void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, I
 void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffset, INT16 topoffset, size_t *destsize)
 {
 	INT16 x, y;
-	UINT8 *img, *imgptr;
+	UINT8 *img;
 	UINT8 *colpointers, *startofspan;
 	size_t size = 0;
 
 	if (!raw)
 		return NULL;
 
-	// Allocate a staging buffer with the maximum size needed for a patch of the same size as the input.
+	if (!imgbuf)
+		imgbuf = Z_Malloc(1<<26, PU_STATIC, NULL);
 
-	// round up to nearest multiple of 254-pixel posts, plus 1 more 254-pixel post for paranoia reasons
-	size_t maxcolumnsize = (2 + (height - 1) / 256) * 256;
-	// the patch header, and width columns of the max column size
-	size_t maxoutsize = maxcolumnsize * width + (8 + 4 * width);
-	// so, a 512x512 flat should maximally need 393,760 (384.53 KiB) bytes.
-	// quite a bit smaller than 64 megabytes, and much less annoying to the windows debug allocator!
-	while (imgbuf.size() < maxoutsize)
-	{
-		imgbuf.resize(imgbuf.size() * 2);
-	}
-
-	imgptr = imgbuf.data();
+	UINT8 *imgptr = imgbuf;
 
 	// Write image size and offset
 	WRITEINT16(imgptr, width);
@@ -646,7 +612,7 @@ void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffs
 		startofspan = NULL;
 
 		// Write column pointer
-		WRITEINT32(colpointers, imgptr - imgbuf.data());
+		WRITEINT32(colpointers, imgptr - imgbuf);
 
 		// Write pixels
 		for (y = 0; y < height; y++)
@@ -716,9 +682,9 @@ void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffs
 		WRITEUINT8(imgptr, 0xFF);
 	}
 
-	size = imgptr-imgbuf.data();
-	img = static_cast<UINT8*>(Z_Malloc(size, PU_STATIC, NULL));
-	memcpy(img, imgbuf.data(), size);
+	size = imgptr-imgbuf;
+	img = Z_Malloc(size, PU_STATIC, NULL);
+	memcpy(img, imgbuf, size);
 
 	if (destsize != NULL)
 		*destsize = size;

src/r_patch.h

@@ -14,10 +14,6 @@
 #ifndef __R_PATCH__
 #define __R_PATCH__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "r_defs.h"
 
 // Structs
@@ -67,8 +63,4 @@ void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, I
 UINT16 R_GetPatchPixel(patch_t *patch, INT32 x, INT32 y, boolean flip);
 void R_PatchToPixels(patch_t *patch, UINT8 *dst); // Important: dst must have enough space for patch->width*patch->height pixels!
 
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
 #endif // __R_PATCH__

src/r_patchrotation.c

@@ -15,7 +15,6 @@
 #include "r_patchrotation.h"
 #include "z_zone.h"
 #include "w_wad.h"
-#include <vector>
 
 #ifdef ROTSPRITE
 //
@@ -90,14 +89,14 @@ patch_t *Patch_GetRotatedSprite(spriteframe_t *sprite, size_t frame, size_t spri
 		RotatedPatch_DoRotation(rotsprite, patch, rotationangle, xpivot, ypivot, flip);
 	}
 
-	return static_cast<patch_t*>(rotsprite->patches[idx]);
+	return rotsprite->patches[idx];
 }
 
 rotsprite_t *RotatedPatch_Create(INT32 numangles)
 {
-	rotsprite_t *rotsprite = static_cast<rotsprite_t*>(Z_Calloc(sizeof(rotsprite_t), PU_STATIC, NULL));
+	rotsprite_t *rotsprite = Z_Calloc(sizeof(rotsprite_t), PU_STATIC, NULL);
 	rotsprite->angles = numangles;
-	rotsprite->patches = static_cast<void**>(Z_Calloc(rotsprite->angles * 2 * sizeof(void *), PU_STATIC, NULL));
+	rotsprite->patches = Z_Calloc(rotsprite->angles * 2 * sizeof(void *), PU_STATIC, NULL);
 	return rotsprite;
 }
 
@@ -119,8 +118,30 @@ static void RotatedPatch_CalculateDimensions(
 	h1 = FixedInt(FixedCeil(h1 + (FRACUNIT/2)));
 	h2 = FixedInt(FixedCeil(h2 + (FRACUNIT/2)));
 
-	*newwidth = std::max(width, std::max(w1, w2));
-	*newheight = std::max(height, std::max(h1, h2));
+	*newwidth = max(width, max(w1, w2));
+	*newheight = max(height, max(h1, h2));
+}
+
+static void RotatedPatch_AllocImgBuf(UINT16 **buf, size_t size, size_t *capacity)
+{
+	if (!*buf)
+	{
+		*buf = Z_Malloc(*capacity, PU_STATIC, NULL);
+	}
+
+	size_t allocsize = size * sizeof(UINT16);
+
+	// make sure our buffer always fits with what we need
+	if (allocsize > *capacity)
+	{
+		while (*capacity < allocsize)
+			*capacity *= 2;
+
+		Z_Free(*buf);
+		*buf = Z_Malloc(*capacity, PU_STATIC, NULL);
+	}
+
+	//CONS_Printf("RotatedPatch_AllocBuf: Allocated %.2f KB\n", *capacity / 1024.0);
 }
 
 void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip)
@@ -128,10 +149,10 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
 	UINT32 i;
 	patch_t *rotated;
 
-	static std::vector<UINT16> rawdst(1024 * 1024), rawconv(1024 * 1024); // 1 MB should be enough for most cases
-
+	static UINT16 *rawdst = NULL, *rawconv = NULL;
 	UINT16 *rawout;
 	size_t size;
+	static size_t dst_capacity = (1024 * 1024), conv_capacity = (1024 * 1024); // 1 MB should be enough for most cases
 	INT32 bflip = (flip != 0x00);
 
 	INT32 width = patch->width;
@@ -185,10 +206,7 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
 	if (!size)
 		size = (width * height);
 
-	while (rawdst.size() < size)
-	{
-		rawdst.resize(rawdst.size() * 2);
-	}
+	RotatedPatch_AllocImgBuf(&rawdst, size, &dst_capacity);
 
 	for (i = 0; i < size; i++)
 		rawdst[i] = 0xFF00;
@@ -232,11 +250,11 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
 
 		size = (width * height);
 
-		rawconv.resize(size);
-		memset(rawconv.data(), 0, size * sizeof(UINT16));
+		RotatedPatch_AllocImgBuf(&rawconv, size, &conv_capacity);
+		memset(rawconv, 0, conv_capacity * sizeof(UINT16));
 
 		src = &rawdst[(miny * newwidth) + minx];
-		dest = rawconv.data();
+		dest = rawconv;
 		dy = height;
 
 		while (dy--)
@@ -249,14 +267,14 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
 		ox -= minx;
 		oy -= miny;
 
-		rawout = rawconv.data();
+		rawout = rawconv;
 	}
 	else
 	{
 		width = newwidth;
 		height = newheight;
 
-		rawout = rawdst.data();
+		rawout = rawdst;
 	}
 
 	// make patch

src/r_plane.cpp

@@ -46,15 +46,15 @@
 // good night sweet prince
 //#define SHITPLANESPARENCY
 
-visplane_t *visplanes[MAXVISPLANES] = {};
+visplane_t *visplanes[MAXVISPLANES];
 static visplane_t *freetail;
 static visplane_t **freehead = &freetail;
 
-visplane_t *floorplane = NULL;
-visplane_t *ceilingplane = NULL;
+visplane_t *floorplane;
+visplane_t *ceilingplane;
 
-visffloor_t visffloor[MAXFFLOORS] = {};
-INT32 numffloors = 0;
+visffloor_t visffloor[MAXFFLOORS];
+INT32 numffloors;
 
 //SoM: 3/23/2000: Boom visplane hashing routine.
 #define visplane_hash(picnum,lightlevel,height) \
@@ -65,8 +65,8 @@ INT32 numffloors = 0;
 //  floorclip starts out SCREENHEIGHT
 //  ceilingclip starts out -1
 //
-INT16 *floorclip = NULL, *ceilingclip = NULL;
-fixed_t *frontscale = NULL;
+INT16 *floorclip, *ceilingclip;
+fixed_t *frontscale;
 
 //
 // spanstart holds the start of a plane span
@@ -81,13 +81,13 @@ static INT32 *spanstart;
 //                (this is to calculate yslopes only when really needed)
 //                (when mouselookin', yslope is moving into yslopetab)
 //                Check R_SetupFrame, R_SetViewSize for more...
-fixed_t *yslopetab = NULL;
-fixed_t *yslope = NULL;
+fixed_t *yslopetab;
+fixed_t *yslope;
 
-fixed_t basexscale = 0, baseyscale = 0;
+fixed_t basexscale, baseyscale;
 
-static INT16 *ffloor_f_clip = NULL;
-static INT16 *ffloor_c_clip = NULL;
+static INT16 *ffloor_f_clip;
+static INT16 *ffloor_c_clip;
 
 static void R_SetTiltedSpan(drawspandata_t* ds, INT32 span);
 static void R_SetSlopePlaneVectors(drawspandata_t* ds, visplane_t *pl, INT32 y, fixed_t xoff, fixed_t yoff);
@@ -616,20 +616,23 @@ void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop)
 //
 static void R_MakeSpans(void (*mapfunc)(drawspandata_t* ds, void(*spanfunc)(drawspandata_t*), INT32, INT32, INT32, boolean), spandrawfunc_t* localspanfunc, drawspandata_t* ds, INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2, boolean allow_parallel)
 {
+	const INT32 vidheight = vid.height;
+
 	//    Alam: from r_splats's R_RenderFloorSplat
-	if (t1 >= viewheight) t1 = viewheight-1;
-	if (b1 >= viewheight) b1 = viewheight-1;
-	if (t2 >= viewheight) t2 = viewheight-1;
-	if (b2 >= viewheight) b2 = viewheight-1;
-	if (x-1 >= viewwidth) x = viewwidth;
+	if (t1 >= vidheight) t1 = vidheight-1;
+	if (b1 >= vidheight) b1 = vidheight-1;
+	if (t2 >= vidheight) t2 = vidheight-1;
+	if (b2 >= vidheight) b2 = vidheight-1;
+	if (x-1 >= vid.width) x = vid.width;
 
 #ifdef HAVE_THREADS
 	// We want to draw N spans per subtask to ensure the work is
 	// coarse enough to not be too slow due to task scheduling overhead.
 	// To safely do this, we need to copy part of spanstart to a local.
 	// This is essentially loop unrolling across threads.
-	constexpr const int kSpanTaskGranularity = 8;
+	constexpr const int kSpanTaskGranularity = 16;
 	drawspandata_t ds_copy = *ds;
+
 	while (t1 < t2 && t1 <= b1)
 	{
 		INT32 spanstartcopy[kSpanTaskGranularity] = {0};
@@ -714,10 +717,13 @@ void R_DrawPlanes(void)
 	visplane_t *pl;
 	INT32 i;
 	drawspandata_t ds = {};
+#ifdef HAVE_THREADS
+	srb2::ThreadPool::Sema tp_sema;
+#endif
+
 	R_UpdatePlaneRipple(&ds);
 
 #ifdef HAVE_THREADS
-	srb2::ThreadPool::Sema tp_sema;
 	srb2::g_main_threadpool->begin_sema();
 #endif
 	for (i = 0; i < MAXVISPLANES; i++, pl++)
@@ -737,7 +743,7 @@ void R_DrawPlanes(void)
 #endif
 }
 
-static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*), boolean allow_parallel);
+static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc2)(drawcolumndata_t*), boolean allow_parallel);
 
 void R_DrawSkyPlanes(void)
 {
@@ -772,7 +778,7 @@ void R_DrawSkyPlanes(void)
 #endif
 }
 
-static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*), boolean allow_parallel)
+static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc2)(drawcolumndata_t*), boolean allow_parallel)
 {
 	INT32 x;
 
@@ -782,7 +788,7 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
 	drawcolumndata_t dc = {};
 	const INT32 texture = texturetranslation[skytexture];
 
-	// Reset column drawer function (note: couldn't we just call colfuncs[BASEDRAWFUNC] directly?)
+	// Reset column drawer function (note: couldn't we just call walldrawerfunc directly?)
 	// (that is, unless we'll need to switch drawers in future for some reason)
 	R_SetColumnFunc(BASEDRAWFUNC);
 
@@ -808,12 +814,12 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
 	R_CheckTextureCache(texture);
 
 #ifdef HAVE_THREADS
+	// Tune concurrency granularity here to maximize throughput
+	// The cheaper colfunc is, the more coarse the task should be
+	constexpr const int kSkyPlaneMacroColumns = 8;
+
 	while (x <= pl->maxx)
 	{
-		// Tune concurrency granularity here to maximize throughput
-		// The cheaper colfunc is, the more coarse the task should be
-		constexpr const int kSkyPlaneMacroColumns = 8;
-
 		auto thunk = [=]() mutable -> void {
 			for (int i = 0; i < kSkyPlaneMacroColumns && i + x <= pl->maxx; i++)
 			{
@@ -832,7 +838,7 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
 				dc.x = x + i;
 				dc.source = R_GetColumn(texture, -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
 
-				skycolfunc(&dc);
+				colfunc2(&dc);
 			}
 		};
 
@@ -866,9 +872,10 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
 		dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x]>>ANGLETOFINESHIFT));
 		dc.x = x;
 		dc.source =
-		R_GetColumn(texturetranslation[skytexture], -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
+		R_GetColumn(texturetranslation[skytexture],
+					-angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
 
-		skycolfunc(&dc);
+		colfunc2(&dc);
 	}
 #endif
 }
@@ -1150,13 +1157,14 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
 						}
 					}
 
-					offset = (scry*vid.width) + scrx;
+					//offset = (scry*vid.width) + scrx;
+					offset = (scrx*vid.height) + scry;
 
 					// No idea if this works
-					VID_BlitLinearScreen(vid.screens[0] + offset,
-										 vid.screens[1] + (top*vid.width), // intentionally not +offset
+					VID_BlitLinearScreen(renderscreen + offset,
+										 vid.screens[1] + top, // intentionally not +offset
 										 viewwidth, bottom-top,
-										 vid.width, vid.width);
+										 vid.height, vid.height);
 				}
 			}
 		}

src/r_segs.cpp

@@ -26,6 +26,7 @@
 #include "p_local.h" // Camera...
 #include "p_setup.h"
 #include "p_slopes.h"
+#include "console.h" // con_clipviewtop
 #include "screen.h"
 
 #include "core/memory.h"
@@ -627,6 +628,8 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 	sector_t        tempsec;
 	INT32           templight;
 	INT32           i, p;
+	fixed_t         bottombounds = viewheight << FRACBITS;
+	fixed_t         topbounds = (con_clipviewtop - 1) << FRACBITS;
 	fixed_t         offsetvalue = 0;
 	lightlist_t     *light;
 	r_lightlist_t   *rlight;
@@ -933,7 +936,7 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 		bottom_frac += bottom_step;
 
 		// SoM: If column is out of range, why bother with it??
-		if (windowbottom < 0 || windowtop > (viewheight << FRACBITS))
+		if (windowbottom < topbounds || windowtop > bottombounds)
 		{
 			if (dc->numlights)
 			{
@@ -2236,7 +2239,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			lowcutslope  = std::max(worldbottomslope, worldlowslope) + viewz;
 			highcutslope = std::min(worldtopslope, worldhighslope) + viewz;
 
-			auto check_fof_offscreen = [&](ffloor_t* rover, INT32 bottom, INT32 bottomslope, INT32 top, INT32 topslope)
+			auto check_fof_offscreen = [&](INT32 bottom, INT32 bottomslope, INT32 top, INT32 topslope)
 			{
 				return ((P_GetFFloorTopZAt    (rover, segleft .x, segleft .y) <= bottom      + viewz
 					&&   P_GetFFloorTopZAt    (rover, segright.x, segright.y) <= bottomslope + viewz)
@@ -2376,7 +2379,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 						continue;
 
 					// Oy vey.
-					if (check_fof_offscreen(rover, worldbottom, worldbottomslope, worldtop, worldtopslope))
+					if (check_fof_offscreen(worldbottom, worldbottomslope, worldtop, worldtopslope))
 						continue;
 
 					ds_p->thicksides[i] = rover;
@@ -2394,10 +2397,10 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 						continue;
 
 					// Oy vey.
-					if (check_fof_offscreen(rover, worldbottom, worldbottomslope, worldtop, worldtopslope))
+					if (check_fof_offscreen(worldbottom, worldbottomslope, worldtop, worldtopslope))
 						continue;
 
-					if (check_fof_offscreen(rover, worldlow, worldlowslope, worldhigh, worldhighslope))
+					if (check_fof_offscreen(worldlow, worldlowslope, worldhigh, worldhighslope))
 						continue;
 
 					ds_p->thicksides[i] = rover;

src/r_skins.c

@@ -33,15 +33,12 @@
 
 #include "qs22j.h"
 
-CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2]; // huehuehuehuehue
-
-#include "discord.h"
+CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2];
 
 INT32 numskins = 0;
 INT32 numallskins = 0;
 INT32 numlocalskins = 0;
 skin_t skins[MAXSKINS];
-
 UINT8 skinstats[9][9][MAXSKINS];
 UINT8 skinstatscount[9][9] = {
 	{0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -54,7 +51,6 @@ UINT8 skinstatscount[9][9] = {
 	{0, 1, 0, 0, 0, 0, 0, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0, 0, 0}
 };
-
 UINT8 skinsorted[MAXSKINS];
 skin_t localskins[MAXLOCALSKINS];
 skin_t allskins[MAXSKINS+MAXLOCALSKINS];
@@ -72,15 +68,14 @@ static void Sk_SetDefaultValue(skin_t *skin, boolean local)
 	//
 	// set default skin values
 	//
-	memset(skin, 0, sizeof(skin_t));
-
+	memset(skin, 0, sizeof (skin_t));
 	snprintf(skin->name, sizeof skin->name, "skin %u", K_GetMobjSkinNum(skin, local));
 	skin->name[sizeof skin->name - 1] = '\0';
-
 	skin->wadnum = INT16_MAX;
-
 	strcpy(skin->sprite, "");
 
+	skin->flags = 0;
+
 	strcpy(skin->realname, "Someone");
 	strcpy(skin->hudname, "???");
 	strncpy(skin->facerank, "PLAYRANK", 9);
@@ -98,12 +93,8 @@ static void Sk_SetDefaultValue(skin_t *skin, boolean local)
 	skin->highresscale = FRACUNIT>>1;
 
 	for (i = 0; i < sfx_skinsoundslot0; i++)
-	{
-		const INT32 skinsound = S_sfx[i].skinsound;
-
-		if (skinsound != -1)
-			skin->soundsid[skinsound] = i;
-	}
+		if (S_sfx[i].skinsound != -1)
+			skin->soundsid[S_sfx[i].skinsound] = i;
 }
 
 //
@@ -131,7 +122,6 @@ void R_InitSkins(void)
 	skin = &skins[0];
 	numskins = 1;
 	Sk_SetDefaultValue(skin, false);
-
 	memset(skinstats, 0, sizeof(skinstats));
 	memset(skinsorted, 0, sizeof(skinsorted));
 
@@ -140,16 +130,13 @@ void R_InitSkins(void)
 #ifdef SKINVALUES
 	skin_cons_t[0].strvalue = skins[0].name;
 #endif
-
+	skin->flags = 0;
 	strcpy(skin->realname,   "Sonic");
 	strcpy(skin->hudname,    "SONIC");
 
 	strncpy(skin->facerank, "PLAYRANK", 9);
 	strncpy(skin->facewant, "PLAYWANT", 9);
 	strncpy(skin->facemmap, "PLAYMMAP", 9);
-
-	skin->flags = 0;
-
 	skin->wadnum = 0; // god what have you brought to this world
 	skin->prefcolor = SKINCOLOR_BLUE;
 	skin->localskin = false;
@@ -188,10 +175,9 @@ INT32 R_SkinAvailable(const char *name)
 
 	for (i = 0; i < numskins; i++)
 	{
-		if (fasticmp(skins[i].name, name))
+		if (stricmp(skins[i].name,name) == 0)
 			return i;
 	}
-
 	return -1;
 }
 
@@ -203,10 +189,9 @@ INT32 R_AnySkinAvailable(const char *name)
 
 	for (i = 0; i < numallskins; i++)
 	{
-		if (fasticmp(allskins[i].name, name))
+		if (stricmp(allskins[i].name,name) == 0)
 			return i;
 	}
-
 	return -1;
 }
 
@@ -218,32 +203,32 @@ INT32 R_LocalSkinAvailable(const char *name, boolean local)
 	{
 		for (i = 0; i < numlocalskins; i++)
 		{
-			if (fasticmp(localskins[i].name, name))
+			if (stricmp(localskins[i].name,name) == 0)
 				return i;
 		}
-
 		return -1;
 	}
-
-	return R_SkinAvailable(name);
+	else
+		return R_SkinAvailable(name);
 }
 
 // network code calls this when a 'skin change' is received
 boolean SetPlayerSkin(INT32 playernum, const char *skinname)
 {
 	INT32 i;
+	player_t *player = &players[playernum];
 
 	for (i = 0; i < numskins; i++)
 	{
 		// search in the skin list
-		if (fasticmp(skins[i].name, skinname))
+		if (stricmp(skins[i].name, skinname) == 0)
 		{
 			SetPlayerSkinByNum(playernum, i);
 			return true;
 		}
 	}
 
-	if (P_IsLocalPlayer(&players[playernum]))
+	if (P_IsLocalPlayer(player))
 		CONS_Alert(CONS_WARNING, M_GetText("Skin '%s' not found.\n"), skinname);
 	else if (server || IsPlayerAdmin(consoleplayer))
 		CONS_Alert(CONS_WARNING, M_GetText("Player %d (%s) skin '%s' not found\n"), playernum, player_names[playernum], skinname);
@@ -257,16 +242,15 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
 	INT32 i;
 	player_t *player = &players[playernum];
 
-	if (!fasticmp(skinname, "none"))
+	if (stricmp(skinname, "none"))
 	{
 		for (i = 0; i < numlocalskins; i++)
 		{
 			// search in the localskin list
-			if (fasticmp(localskins[i].name, skinname))
+			if (stricmp(localskins[i].name, skinname) == 0)
 			{
 				player->localskin = 1 + i;
 				player->skinlocal = true;
-
 				if (player->mo)
 				{
 					player->mo->localskin = &localskins[i];
@@ -280,11 +264,10 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
 		for (i = 0; i < numskins; i++)
 		{
 			// search in the skin list
-			if (fasticmp(skins[i].name, skinname))
+			if (stricmp(skins[i].name, skinname) == 0)
 			{
 				player->localskin = 1 + i;
 				player->skinlocal = false;
-
 				if (player->mo)
 				{
 					player->mo->localskin = &skins[i];
@@ -299,7 +282,6 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
 	{
 		player->localskin = 0;
 		player->skinlocal = false;
-
 		if (player->mo)
 		{
 			player->mo->localskin = 0;
@@ -334,7 +316,6 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
 	if (skinnum >= 0 && skinnum < numskins) // Make sure it exists!
 	{
 		player->skin = skinnum;
-
 		if (player->mo)
 			player->mo->skin = skin;
 
@@ -347,14 +328,8 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
 		if (player->mo)
 			P_SetScale(player->mo, player->mo->scale);
 
-		// for replays: We have changed our skin mid-game; let the game know so it can do the same in the replay!
 		demo_extradata[playernum] |= DXD_SKIN;
 
-#ifdef HAVE_DISCORDRPC
-		if (player - players == consoleplayer)
-			DRPC_UpdatePresence();
-#endif
-
 		return;
 	}
 
@@ -377,97 +352,117 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
 static UINT16 W_CheckForSkinMarkerInPwad(UINT16 wadid, UINT16 startlump)
 {
 	UINT16 i;
+	const char *S_SKIN = "S_SKIN";
 	lumpinfo_t *lump_p;
 
 	// scan forward, start at <startlump>
 	if (startlump < wadfiles[wadid]->numlumps)
 	{
 		lump_p = wadfiles[wadid]->lumpinfo + startlump;
-
 		for (i = startlump; i < wadfiles[wadid]->numlumps; i++, lump_p++)
-		{
-			if (memcmp(lump_p->name, "S_SKIN", 6) == 0)
+			if (memcmp(lump_p->name,S_SKIN,6)==0)
 				return i;
-		}
 	}
-
 	return INT16_MAX; // not found
 }
 
 //sort function for sorting skin names
-static int skinSortFunc(const void *a, const void *b) // tbh i have no clue what the naming conventions for local functions are
+static int skinSortFunc(const void *a, const void *b) //tbh i have no clue what the naming conventions for local functions are
 {
-	int diff = 0;
-	const UINT8 val_a = *(const UINT8 *)a;
-	const UINT8 val_b = *(const UINT8 *)b;
-	const skin_t *in1 = &skins[val_a];
-	const skin_t *in2 = &skins[val_b];
+	const skin_t *in1 = &skins[*(const UINT8 *)a];
+	const skin_t *in2 = &skins[*(const UINT8 *)b];
+	INT32 temp = 0;
+	const UINT8 val_a = *((const UINT8 *)a);
+	const UINT8 val_b = *((const UINT8 *)b);
 
-	// return (strcmp(in1->realname, in2->realname) < 0) || (strcmp(in1->realname, in2->realname) ==);
+	//return (strcmp(in1->realname, in2->realname) < 0) || (strcmp(in1->realname, in2->realname) ==);
 
 	switch (cv_skinselectgridsort.value)
 	{
 		case SKINMENUSORT_REALNAME:
-			// CONS_Printf("Sorting by realname\n");
+			//CONS_Printf("Sorting by realname\n");
 			// check name
-			diff = strcmp(in1->realname, in2->realname);
-			if (diff != 0) return diff;
-
+			if ((temp = strcmp(in1->realname, in2->realname)))
+				return temp;
+			// sort by internal name
+			return strcmp(in1->name, in2->name);
 			break;
-		case SKINMENUSORT_SPEED:
-			// CONS_Printf("Sorting by speed\n");
-			// check speed
-			diff = in1->kartspeed - in2->kartspeed;
-			if (diff != 0) return diff;
 
-			// then check weight
-			diff = in1->kartweight - in2->kartweight;
-			if (diff != 0) return diff;
-
-			// then check name
-			diff = strcmp(in1->realname, in2->realname);
-			if (diff != 0) return diff;
-
-			break;
-		case SKINMENUSORT_WEIGHT:
-			// CONS_Printf("Sorting by weight\n");
-			// check weight
-			diff = in1->kartweight - in2->kartweight;
-			if (diff != 0) return diff;
-
-			// then check speed
-			diff = in1->kartspeed - in2->kartspeed;
-			if (diff != 0) return diff;
-
-			// then check name
-			diff = strcmp(in1->realname, in2->realname);
-			if (diff != 0) return diff;
-
-			break;
-		case SKINMENUSORT_PREFCOLOR:
-			// CONS_Printf("Sorting by prefcolor\n");
-			// check prefcolor
-			diff = in1->prefcolor - in2->prefcolor;
-			if (diff != 0) return diff;
-
-			// then check name
-			diff = strcmp(in1->realname, in2->realname);
-			if (diff != 0) return diff;
-
-			break;
-		case SKINMENUSORT_ID:
-			// CONS_Printf("Sorting by id\n");
-			// how do i do by ID?????
-			// wait why dont i just convert the inputs to UINT32s
-			// please tell me im allowed to define variables in here since its a block
-			return (int)val_a - (int)val_b;
 		case SKINMENUSORT_NAME:
+			//CONS_Printf("Sorting by name\n");
+			return strcmp(in1->name, in2->name);
+			break;
+
+		case SKINMENUSORT_SPEED:
+			//CONS_Printf("Sorting by speed\n");
+			// check speed
+			if (in1->kartspeed < in2->kartspeed)
+				return -1;
+			else if (in2->kartspeed < in1->kartspeed)
+				return 1;
+			// then check weight
+			if (in1->kartweight < in2->kartweight)
+				return -1;
+			else if (in2->kartweight < in1->kartweight)
+				return 1;
+			// then check name
+			if ((temp = strcmp(in1->realname, in2->realname)))
+				return temp;
+			// sort by internal name
+			return strcmp(in1->name, in2->name);
+			break;
+
+		case SKINMENUSORT_WEIGHT:
+			//CONS_Printf("Sorting by weight\n");
+			// check weight
+			if (in1->kartweight < in2->kartweight)
+				return -1;
+			else if (in2->kartweight < in1->kartweight)
+				return 1;
+			// then check speed
+			if (in1->kartspeed < in2->kartspeed)
+				return -1;
+			else if (in2->kartspeed < in1->kartspeed)
+				return 1;
+			// then check name
+			if ((temp = strcmp(in1->realname, in2->realname)))
+				return temp;
+			// sort by internal name
+			return strcmp(in1->name, in2->name);
+			break;
+
+		case SKINMENUSORT_PREFCOLOR:
+			//CONS_Printf("Sorting by prefcolor\n");
+			// check prefcolor
+			if (in1->prefcolor < in2->prefcolor)
+				return -1;
+			else if (in2->prefcolor < in1->prefcolor)
+				return 1;
+			// then check name
+			if ((temp = strcmp(in1->realname, in2->realname)))
+				return temp;
+			// sort by internal name
+			return strcmp(in1->name, in2->name);
+			break;
+
+		case SKINMENUSORT_ID:
+			//CONS_Printf("Sorting by id\n");
+			//how do i do by ID?????
+			//wait why dont i just convert the inputs to UINT32s
+			//please tell me im allowed to define variables in here since its a block
+
+			if (val_a == val_b)
+				return 0;
+			else if (val_a < val_b)
+				return -1;
+			else
+				return 1;
+
 		default:
+			return strcmp(in1->name, in2->name);
 			break;
 	}
-
-	// im scared this somehow will sometimes end up here so im gonna add this here just to be safe
-	// now it will often end up here >:3
+	//im scared this somehow will sometimes end up here so im gonna add this here just to be safe
 	return strcmp(in1->name, in2->name);
 }
 
@@ -528,9 +523,8 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 		Sk_SetDefaultValue(skin, local);
 		skin->wadnum = wadnum;
 		hudname = realname = false;
-
 		// parse
-		stoken = strtok(buf2, "\r\n= ");
+		stoken = strtok (buf2, "\r\n= ");
 		while (stoken)
 		{
 			if ((stoken[0] == '/' && stoken[1] == '/')
@@ -546,7 +540,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 			if (!value)
 				I_Error("R_AddSkins: syntax error in S_SKIN lump# %d(%s) in WAD %s\n", lump, W_CheckNameForNumPwad(wadnum,lump), wadfiles[wadnum]->filename);
 
-			if (fasticmp(stoken, "name"))
+			if (!stricmp(stoken, "name"))
 			{
 				// the skin name must uniquely identify a single skin
 				// I'm lazy so if name is already used I leave the 'skin x'
@@ -560,18 +554,18 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 				// using the default skin name's number set above
 				else
 				{
-					const size_t stringspace = strlen(value) + sizeof lnumskins + 1;
+					const size_t stringspace =
+						strlen(value) + sizeof lnumskins + 1;
 					char *value2 = Z_Malloc(stringspace, PU_STATIC, NULL);
-
-					snprintf(value2, stringspace, "%s%d", value, lnumskins);
+					snprintf(value2, stringspace,
+						"%s%d", value, lnumskins);
 					value2[stringspace - 1] = '\0';
-
 					if (R_LocalSkinAvailable(value2, local) == -1)
 					{
-						STRBUFCPY(skin->name, value2);
+						STRBUFCPY(skin->name,
+							value2);
 						strlwr(skin->name);
 					}
-
 					Z_Free(value2);
 				}
 
@@ -587,134 +581,115 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 				{
 					STRBUFCPY(skin->hudname, skin->name);
 					strupr(skin->hudname);
-
 					for (value = skin->hudname; *value; value++)
 						if (*value == '_') *value = ' '; // turn _ into spaces.
 				}
 			}
-			else if (fasticmp(stoken, "realname"))
+			else if (!stricmp(stoken, "realname"))
 			{ // Display name (eg. "Knuckles")
 				realname = true;
 				STRBUFCPY(skin->realname, value);
-
 				for (value = skin->realname; *value; value++)
 					if (*value == '_') *value = ' '; // turn _ into spaces.
-
 				if (!hudname)
 					STRBUFCPY(skin->hudname, skin->realname);
 			}
-			else if (fasticmp(stoken, "hudname"))
+			else if (!stricmp(stoken, "hudname"))
 			{ // Life icon name (eg. "K.T.E")
 				hudname = true;
 				STRBUFCPY(skin->hudname, value);
-
 				for (value = skin->hudname; *value; value++)
 					if (*value == '_') *value = ' '; // turn _ into spaces.
-
 				if (!realname)
 					STRBUFCPY(skin->realname, skin->hudname);
 			}
-			else if (fasticmp(stoken, "sprite"))
+
+			else if (!stricmp(stoken, "sprite"))
 			{
 				strupr(value);
 				memcpy(skin->sprite, value, sizeof skin->sprite);
 			}
-			else if (fasticmp(stoken, "facerank"))
+			else if (!stricmp(stoken, "facerank"))
 			{
 				strupr(value);
 				memcpy(skin->facerank, value, sizeof(skin->facerank)-1);
 				skin->facerank[sizeof(skin->facerank)-1] = '\0';
 			}
-			else if (fasticmp(stoken, "facewant"))
+			else if (!stricmp(stoken, "facewant"))
 			{
 				strupr(value);
 				memcpy(skin->facewant, value, sizeof(skin->facewant)-1);
 				skin->facewant[sizeof(skin->facewant)-1] = '\0';
 			}
-			else if (fasticmp(stoken, "facemmap"))
+			else if (!stricmp(stoken, "facemmap"))
 			{
 				strupr(value);
 				strncpy(skin->facemmap, value, sizeof(skin->facemmap)-1);
 				skin->facemmap[sizeof(skin->facemmap)-1] = '\0';
 			}
-			else if (fasticmp(stoken, "flags")) // character type identification
+			else if (!stricmp(stoken, "flags")) // character type identification
 			{
 				skin->flags = get_number(value);
 			}
-			else if (fasticmp(stoken, "kartspeed"))
+			else if (!stricmp(stoken, "kartspeed"))
 			{
 				skin->kartspeed = atoi(value);
-
 				if (skin->kartspeed < 1)
 					skin->kartspeed = 1;
 				if (skin->kartspeed > 9)
 					skin->kartspeed = 9;
 			}
-			else if (fasticmp(stoken, "kartweight"))
+			else if (!stricmp(stoken, "kartweight"))
 			{
 				skin->kartweight = atoi(value);
-
 				if (skin->kartweight < 1)
 					skin->kartweight = 1;
 				if (skin->kartweight > 9)
 					skin->kartweight = 9;
 			}
 			// custom translation table
-			else if (fasticmp(stoken, "startcolor"))
-			{
+			else if (!stricmp(stoken, "startcolor"))
 				skin->starttranscolor = atoi(value);
-			}
-			else if (fasticmp(stoken, "prefcolor"))
-			{
+			else if (!stricmp(stoken, "prefcolor"))
 				skin->prefcolor = K_GetKartColorByName(value);
-			}
-			else if (fasticmp(stoken, "highresscale"))
-			{
+			else if (!stricmp(stoken, "highresscale"))
 				skin->highresscale = FLOAT_TO_FIXED(atof(value));
-			}
 			else
 			{
 				INT32 found = false;
 				sfxenum_t i;
-
 				// copy name of sounds that are remapped
 				// for this skin
 				for (i = 0; i < sfx_skinsoundslot0; i++)
 				{
-					const sfxinfo_t *sfx = &S_sfx[i];
-
-					if (!sfx->name)
+					if (!S_sfx[i].name)
 						continue;
-
-					if (sfx->skinsound != -1
-					&& fasticmp(sfx->name, stoken + 2))
+					if (S_sfx[i].skinsound != -1
+						&& !stricmp(S_sfx[i].name,
+							stoken + 2))
 					{
-						skin->soundsid[sfx->skinsound] = S_AddSoundFx(value+2, sfx->singularity, sfx->pitch, true);
+						skin->soundsid[S_sfx[i].skinsound] =
+							S_AddSoundFx(value+2, S_sfx[i].singularity, S_sfx[i].pitch, true);
 						found = true;
 					}
 				}
-
 				if (!found)
 					CONS_Debug(DBG_SETUP, "R_AddSkins: Unknown keyword '%s' in S_SKIN lump# %d (WAD %s)\n", stoken, lump, wadfiles[wadnum]->filename);
 			}
 
 			stoken = strtok(NULL, "\r\n= ");
 		}
-
 		free(buf2);
 
 		lump++; // if no sprite defined use spirte just after this one
-
 		if (skin->sprite[0] == '\0')
 		{
 			const char *csprname = W_CheckNameForNumPwad(wadnum, lump);
 
 			// skip to end of this skin's frames
 			lastlump = lump;
-
 			while (W_CheckNameForNumPwad(wadnum, lastlump) && memcmp(W_CheckNameForNumPwad(wadnum, lastlump), csprname,4)==0)
 				lastlump++;
-
 			// allocate (or replace) sprite frames, and set spritedef
 			R_AddSingleSpriteDef(csprname, &skin->spritedef, wadnum, lump, lastlump);
 		}
@@ -724,15 +699,12 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 			size_t name;
 			boolean found = false;
 			const char *sprname = skin->sprite;
-
-			for (name = 0; sprnames[name][0] != '\0'; name++)
-			{
+			for (name = 0;sprnames[name][0] != '\0';name++)
 				if (strncmp(sprnames[name], sprname, 4) == 0)
 				{
-					skin->spritedef = sprites[name];
 					found = true;
+					skin->spritedef = sprites[name];
 				}
-			}
 
 			// not found so make a new one
 			// go through the entire current wad looking for our sprite
@@ -746,7 +718,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 				while ((lname = W_CheckNameForNumPwad(wadnum, localllump)))
 				{
 					// If this is a valid sprite...
-					if (!memcmp(lname, sprname, 4) && lname[4] && lname[5] && lname[5] >= '0' && lname[5] <= '8')
+					if (!memcmp(lname, sprname,4) && lname[4] && lname[5] && lname[5] >= '0' && lname[5] <= '8')
 					{
 						if (lstart == UINT16_MAX)
 							lstart = localllump;
@@ -761,7 +733,6 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 						}
 						// If not already set do nothing
 					}
-
 					++localllump;
 				}
 
@@ -781,6 +752,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 		(local ? localskin_cons_t : skin_cons_t)[lnumskins].value = lnumskins;
 		(local ? localskin_cons_t : skin_cons_t)[lnumskins].strvalue = skin->name;
 #endif
+
 		if (!local)
 		{
 			// Update the forceskin possiblevalues

src/r_things.cpp

@@ -43,6 +43,13 @@
 #define MINZ (FRACUNIT*16)
 #define BASEYCENTER (BASEVIDHEIGHT/2)
 
+typedef struct
+{
+	INT32 x1, x2;
+	INT32 column;
+	INT32 topclip, bottomclip;
+} maskdraw_t;
+
 //
 // Sprite rotation 0 is facing the viewer,
 //  rotation 1 is one angle turn CLOCKWISE around the axis.
@@ -53,8 +60,8 @@
 static lighttable_t **spritelights;
 
 // constant arrays used for psprite clipping and initializing clipping
-INT16 *negonearray = NULL;
-INT16 *screenheightarray = NULL;
+INT16 *negonearray;
+INT16 *screenheightarray;
 
 //
 // INITIALIZATION FUNCTIONS
@@ -532,8 +539,8 @@ void R_ClearSprites(void)
 	visspritecount = numvisiblesprites = clippedvissprites = 0;
 }
 
-static INT16 *vissprite_clipbot[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {0};
-static INT16 *vissprite_cliptop[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {0};
+static INT16 *vissprite_clipbot[MAXVISSPRITES >> VISSPRITECHUNKBITS];
+static INT16 *vissprite_cliptop[MAXVISSPRITES >> VISSPRITECHUNKBITS];
 
 static void R_AllocVisSpriteChunkMemory(UINT32 chunk)
 {
@@ -567,16 +574,16 @@ static vissprite_t overflowsprite;
 
 static vissprite_t *R_GetVisSprite(UINT32 num)
 {
-	UINT32 chunk = num >> VISSPRITECHUNKBITS;
+		UINT32 chunk = num >> VISSPRITECHUNKBITS;
 
-	// Allocate chunk if necessary
-	if (!visspritechunks[chunk])
-	{
-		Z_Malloc(sizeof(vissprite_t) * VISSPRITESPERCHUNK, PU_LEVEL, &visspritechunks[chunk]);
-		R_AllocVisSpriteChunkMemory(chunk);
-	}
+		// Allocate chunk if necessary
+		if (!visspritechunks[chunk])
+		{
+			Z_Malloc(sizeof(vissprite_t) * VISSPRITESPERCHUNK, PU_LEVEL, &visspritechunks[chunk]);
+			R_AllocVisSpriteChunkMemory(chunk);
+		}
 
-	return visspritechunks[chunk] + (num & VISSPRITEINDEXMASK);
+		return visspritechunks[chunk] + (num & VISSPRITEINDEXMASK);
 }
 
 static vissprite_t *R_NewVisSprite(void)
@@ -593,8 +600,8 @@ static vissprite_t *R_NewVisSprite(void)
 // Masked means: partly transparent, i.e. stored
 //  in posts/runs of opaque pixels.
 //
-INT16 *mfloorclip = NULL;
-INT16 *mceilingclip = NULL;
+INT16 *mfloorclip;
+INT16 *mceilingclip;
 
 fixed_t spryscale = 0, sprtopscreen = 0, sprbotscreen = 0;
 fixed_t windowtop = 0, windowbottom = 0;
@@ -723,6 +730,7 @@ static void R_DrawFlippedMaskedColumn(drawcolumndata_t* dc, column_t *column)
 	dc->texturemid = basetexturemid;
 }
 
+
 // Based off of R_GetLinedefTransTable
 transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap)
 {
@@ -2510,6 +2518,8 @@ void R_InitDrawNodes(void)
 // R_DrawSprite
 //
 //Fab : 26-04-98:
+// NOTE : uses con_clipviewtop, so that when console is on,
+//        don't draw the part of sprites hidden under the console
 static void R_DrawSprite(vissprite_t *spr)
 {
 	mfloorclip = spr->clipbot;
@@ -3056,9 +3066,6 @@ void R_DrawMasked(maskcount_t* masks, INT32 nummasks)
 
 	heads = static_cast<drawnode_t*>(calloc(nummasks, sizeof(drawnode_t)));
 
-	if (!heads)
-		I_Error("R_DrawMasked: No more free memory\n");
-
 	for (i = 0; i < nummasks; i++)
 	{
 		heads[i].next = heads[i].prev = &heads[i];

src/s_sound.c

@@ -1095,12 +1095,9 @@ void S_StartSoundName(void *mo, const char *soundname)
 	// Search existing sounds...
 	for (i = sfx_None + 1; i < NUMSFX; i++)
 	{
-		const sfxinfo_t *sfx = &S_sfx[i];
-
-		if (!sfx->name)
+		if (!S_sfx[i].name)
 			continue;
-
-		if (fasticmp(sfx->name, soundname))
+		if (!stricmp(S_sfx[i].name, soundname))
 		{
 			soundnum = i;
 			break;
@@ -1113,7 +1110,6 @@ void S_StartSoundName(void *mo, const char *soundname)
 		{
 			if (newsounds[i] == 0)
 				break;
-
 			if (!S_IdPlaying(newsounds[i]))
 			{
 				S_RemoveSoundFx(newsounds[i]);
@@ -1270,7 +1266,7 @@ ReadMusicDefFields (UINT16 wadnum, int line, char *stoken, musicdef_t **defp)
 	char *value;
 	char *textline;
 
-	if (fasticmp(stoken, "lump"))
+	if (!stricmp(stoken, "lump"))
 	{
 		value = strtok(NULL, " ");
 
@@ -1345,24 +1341,24 @@ skip_lump:
 	for (textline = def->field; *textline; textline++)\
 		if (*textline == '_') *textline = ' ';
 
-			if (fasticmp(stoken, "usage"))
+			if (!stricmp(stoken, "usage"))
 			{
 				ADDDEF(usage);
 			}
-			else if (fasticmp(stoken, "source"))
+			else if (!stricmp(stoken, "source"))
 			{
 				ADDDEF(source);
 			}
-			else if (fasticmp(stoken, "title"))
+			else if (!stricmp(stoken, "title"))
 			{
 				def->use_info = true;
 				ADDDEF(title);
 			}
-			else if (fasticmp(stoken, "alttitle"))
+			else if (!stricmp(stoken, "alttitle"))
 			{
 				ADDDEF(alttitle);
 			}
-			else if (fasticmp(stoken, "authors"))
+			else if (!stricmp(stoken, "authors"))
 			{
 				ADDDEF(authors);
 			}
@@ -1483,8 +1479,7 @@ musicdef_t *S_FindMusicCredit(const char *musname)
 
 		if (hash != def->hash)
 			continue;
-
-		if (!fasticmp(def->name, musname))
+		if (stricmp(def->name, musname))
 			continue;
 
 		return def;
@@ -1833,7 +1828,7 @@ void S_StopMusic(void)
 		|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
 		return;
 
-	mapmusic.resume = (cv_birdmusic.value && fasticmp(music.name, mapmusic.name)) ? I_GetSongPosition() : 0;
+	mapmusic.resume = (cv_birdmusic.value && (strcasecmp(music.name, mapmusic.name) == 0)) ? I_GetSongPosition() : 0;
 
 	S_SetKeepMusResume();
 
@@ -1939,7 +1934,7 @@ static const char *musicexception_list[] = {
 // check if the current music is smth we dont want to keep (vote music, etc)
 static boolean S_CheckMusicException(void)
 {
-	if (!fasticmp(music.name, mapmusic.name))
+	if (stricmp(music.name, mapmusic.name))
 		return true;
 
 	// dumb hack but dont keepmusic music that is supposed to reset
@@ -1949,7 +1944,7 @@ static boolean S_CheckMusicException(void)
 	// in case somehow the mapmusic was replaced with smth we dont want to keep
 	for (size_t i = 0; i < sizeof(musicexception_list)/sizeof(musicexception_list[0]); i++)
 	{
-		if (fasticmp(music.name, musicexception_list[i]) || fasticmp(checkmusic, musicexception_list[i]))
+		if (!stricmp(music.name, musicexception_list[i]) || !stricmp(checkmusic, musicexception_list[i]))
 		{
 			return true;
 		}
@@ -1969,7 +1964,7 @@ static void S_SetKeepMusResume(void)
 {
 	keepmusic.resume = 0;
 
-	if (fasticmp(music.name, mapmusic.name))
+	if (strcasecmp(music.name, mapmusic.name) == 0)
 	{
 		keepmusic.resume = I_GetSongPosition();
 	}
@@ -2035,12 +2030,12 @@ static boolean S_SkipIntroMusic(void)
 		return false;
 
 	// check if menu music is playing, otherwise it may continue playing
-	if (fasticmp(music.name, "titles"))
+	if (!stricmp(music.name, "titles"))
 		return false;
 
 	char *maptitle = G_BuildMapTitle(gamemap); // Zzz...
 
-	if (maptitle && fasticmp(maptitle, "Wandering Falls")) // wandering balls changes its song when the race starts Zzz...
+	if (maptitle && !stricmp(maptitle, "Wandering Falls")) // wandering balls changes its song when the race starts Zzz...
 	{
 		Z_Free(maptitle);
 		return false;
@@ -2153,19 +2148,19 @@ static void Command_Tunes_f(void)
 	tunenum = (UINT16)atoi(tunearg);
 	track = 0;
 
-	if (fasticmp(tunearg, "-show"))
+	if (!strcasecmp(tunearg, "-show"))
 	{
 		CONS_Printf(M_GetText("The current tune is: %s [track %d]\n"),
 			mapmusic.name, (mapmusic.flags & MUSIC_TRACKMASK));
 		return;
 	}
 
-	if (fasticmp(tunearg, "-none"))
+	if (!strcasecmp(tunearg, "-none"))
 	{
 		S_StopMusic();
 		return;
 	}
-	else if (fasticmp(tunearg, "-default"))
+	else if (!strcasecmp(tunearg, "-default"))
 	{
 		tunearg = mapheaderinfo[gamemap-1]->musname;
 		track = mapheaderinfo[gamemap-1]->mustrack;

src/screen.c

@@ -80,7 +80,11 @@ consvar_t cv_accuratefps = {"fpssampling", "1", CV_SAVE, accuratefps_cons_t, NUL
 //                           SCREEN VARIABLES
 // =========================================================================
 
-static void SCR_SetDrawFuncs(enum columncontext_e _columncontext)
+UINT8 *scr_borderpatch; // flat used to fill the reduced view borders set at ST_Init()
+
+// =========================================================================
+
+static void SCR_SetDrawFuncs(void)
 {
 	//
 	//  setup the right draw routines
@@ -99,27 +103,13 @@ static void SCR_SetDrawFuncs(enum columncontext_e _columncontext)
 	spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan;
 	spanfuncs[SPANDRAWFUNC_TILTEDFOG] = R_DrawFogSpan_Tilted;
 
-	if (_columncontext == COLUMNCONTEXT_FLUSH)
-	{
-		colfuncs[BASEDRAWFUNC] = R_DrawColumn_Flush;
-		colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn_Flush;
-		colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn_Flush;
-		colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed_Flush;
-		colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn_Flush;
-		colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn_Flush;
-		colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn_Flush;
-	}
-	else
-	{
-		colfuncs[BASEDRAWFUNC] = R_DrawColumn;
-		colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn;
-		colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn;
-		colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed;
-		colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn;
-		colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn;
-		colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
-	}
-
+	colfuncs[BASEDRAWFUNC] = R_DrawColumn;
+	colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn;
+	colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn;
+	colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed;
+	colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn;
+	colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn;
+	colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
 	colfuncs[COLDRAWFUNC_FOG] = R_DrawFogColumn;
 
 	R_SetColumnFunc(BASEDRAWFUNC);
@@ -141,23 +131,12 @@ void SCR_SetMode(void)
 
 	V_SetPalette(0);
 
-	SCR_SetDrawFuncs(COLUMNCONTEXT_DIRECT);
+	SCR_SetDrawFuncs();
 
 	// set the apprpriate drawer for the sky (tall or INT16)
 	setmodeneeded = 0;
 }
 
-// used to switch between column buffering and drawing them directly to screen
-// our sky "plane" drawer cannot handle the buffer system due to multithreading
-// (that would require alot of extra complexity for smth with massive diminishing results)
-// Our masked drawing step draws things in a very particular order, which results in alot of flushing to screen
-// effectively adding massive overhead due to excessive flushing, so we draw our masked thing directly to screen instead
-void R_SetColumnContext(enum columncontext_e _columncontext)
-{
-	columncontext = _columncontext;
-	SCR_SetDrawFuncs(_columncontext); // set our column drawers
-}
-
 void R_SetColumnFunc(size_t id)
 {
 	I_Assert(id < COLDRAWFUNC_MAX);
@@ -319,6 +298,7 @@ void SCR_SetDefaultMode(void)
 // Change fullscreen on/off according to cv_fullscreen
 void SCR_ChangeFullscreen(void)
 {
+#ifdef DIRECTFULLSCREEN
 	I_SetBorderlessWindow(); // Running this here so we can have borderless window at startup
 
 	// allow_fullscreen is set by VID_PrepareModeList
@@ -331,8 +311,8 @@ void SCR_ChangeFullscreen(void)
 		VID_PrepareModeList();
 		setmodeneeded = VID_GetModeForSize(vid.width, vid.height) + 1;
 	}
-
 	return;
+#endif
 }
 
 boolean SCR_IsAspectCorrect(INT32 width, INT32 height)

src/screen.h

@@ -84,6 +84,8 @@ enum
 extern viddef_t vid;
 extern INT32 setmodeneeded; // mode number to set if needed, or 0
 
+extern UINT8 *scr_borderpatch; // patch used to fill the view borders
+
 extern consvar_t cv_scr_width, cv_scr_height, cv_renderview, cv_frameskip, cv_fullscreen, cv_vhseffect, cv_shittyscreen;
 extern consvar_t cv_parallelsoftware;
 extern consvar_t cv_paralleldrawmasked;
@@ -94,7 +96,6 @@ extern consvar_t cv_vidwait;
 
 extern consvar_t cv_votebgscaling;
 
-//void R_SetColumnContext(enum columncontext_e _columncontext); // declared in r_draw!
 void R_SetColumnFunc(size_t id);
 void R_SetSpanFunc(size_t id);
 boolean R_CheckColumnFunc(size_t id);

src/sdl/Srb2SDL.dsp

@@ -45,7 +45,7 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "SDLMAIN" /D "NO_STDIO_REDIRECT" /D "USE_WGL_SWAP" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /c
+# ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "SDLMAIN" /D "NO_STDIO_REDIRECT" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 # SUBTRACT RSC /x
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /W4 /WX /Gm /GX /ZI /Od /Op /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "USE_WGL_SWAP" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GZ /c
+# ADD CPP /nologo /G6 /W4 /WX /Gm /GX /ZI /Od /Op /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"

src/sdl/Srb2SDL.props

@@ -6,9 +6,9 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <!-- x86/x64 defines: has specific libraries that ARM does not -->
-      <PreprocessorDefinitions Condition="'$(Platform)' == 'Win32' OR '$(Platform)' == 'x64'">HAVE_ZLIB;HAVE_LIBGME;USE_WGL_SWAP;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)' == 'Win32' OR '$(Platform)' == 'x64'">HAVE_ZLIB;HAVE_LIBGME;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- ARM defines -->
-      <PreprocessorDefinitions Condition="'$(Platform)' != 'Win32' AND '$(Platform)' != 'x64'">USE_WGL_SWAP;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)' != 'Win32' AND '$(Platform)' != 'x64'">USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

src/sdl/hwsym_sdl.c

@@ -35,6 +35,9 @@
 
 #define  _CREATE_DLL_  // necessary for Unix AND Windows
 
+#define GETFUNC(func) \
+	else if (0 == strcmp(#func, funcName)) \
+		funcPointer = &func \
 //
 //
 /**	\brief	The *hwSym function

src/sdl/i_system.cpp

@@ -545,7 +545,7 @@ static inline void I_ShutdownConsole(void){}
 
 
 //
-// I_OutputMsg
+//I_OutputMsg
 //
 void I_OutputMsg(const char *fmt, ...)
 {
@@ -553,9 +553,6 @@ void I_OutputMsg(const char *fmt, ...)
 	char *txt;
 	va_list  argptr;
 
-	if (!fmt)
-		return;
-
 	va_start(argptr,fmt);
 	len = vsnprintf(NULL, 0, fmt, argptr);
 	va_end(argptr);
@@ -563,10 +560,6 @@ void I_OutputMsg(const char *fmt, ...)
 		return;
 
 	txt = static_cast<char*>(malloc(len+1));
-
-	if (!txt)
-		I_Error("I_OutputMsg: Out of memory!\n");
-
 	va_start(argptr,fmt);
 	vsprintf(txt, fmt, argptr);
 	va_end(argptr);
@@ -2288,9 +2281,8 @@ char *I_GetUserName(void)
 	}
 
 
-	if (!fastcmp(username, ""))
+	if (strcmp(username, "") != 0)
 		return username;
-
 	return NULL; // dummy for platform independent version
 }
 

src/sdl/i_video.c

@@ -156,9 +156,9 @@ static       SDL_bool    usesdl2soft = SDL_FALSE;
 static       SDL_bool    borderlesswindow = SDL_FALSE;
 
 // SDL2 vars
-SDL_Window   *window = NULL;
-SDL_Renderer *renderer = NULL;
-static SDL_Texture  *texture = NULL;
+SDL_Window   *window;
+SDL_Renderer *renderer;
+static SDL_Texture  *texture;
 static SDL_bool      havefocus = SDL_TRUE;
 static const char *fallback_resolution_name = "Fallback";
 
@@ -412,10 +412,6 @@ static INT32 GetTypedChar(SDL_Keysym keysym)
 				break;
 		}
 
-		// Special case for console key
-		if (scancode == SDL_SCANCODE_GRAVE)
-			return '`';
-
 		if (SDL_PeepEvents(&next_event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 && next_event.type == SDL_TEXTINPUT)
 		{
 			if (next_event.text.text[1] == '\0') // limit to ASCII
@@ -905,11 +901,10 @@ static void Impl_HandleControllerAddedEvent(SDL_Event evt)
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		if (fastcmp(cv_usejoystick[i].string, "0") || !cv_usejoystick[i].value)
+		if (!strcmp(cv_usejoystick[i].string, "0") || !cv_usejoystick[i].value)
 			cv_usejoystick[i].value = 0;
 		else if (atoi(cv_usejoystick[i].string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
 			&& cv_usejoystick[i].value) // update the cvar ONLY if a device exists
-
 		CV_SetValue(&cv_usejoystick[i], cv_usejoystick[i].value);
 	}
 
@@ -977,7 +972,7 @@ static void Impl_HandleControllerRemovedEvent(void)
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		if (fastcmp(cv_usejoystick[i].string, "0"))
+		if (!strcmp(cv_usejoystick[i].string, "0"))
 		{
 			cv_usejoystick[i].value = 0;
 		}
@@ -1112,11 +1107,9 @@ void I_OsPolling(void)
 	I_GetEvent();
 
 	mod = SDL_GetModState();
-
 	/* Handle here so that our state is always synched with the system. */
 	shiftdown = ctrldown = altdown = 0;
 	capslock = false;
-
 	if (mod & KMOD_LSHIFT) shiftdown |= 1;
 	if (mod & KMOD_RSHIFT) shiftdown |= 2;
 	if (mod & KMOD_LCTRL)   ctrldown |= 1;
@@ -1150,7 +1143,7 @@ static void VID_Command_Mode_f (void)
 {
 	INT32 modenum;
 
-	if (COM_Argc() != 2)
+	if (COM_Argc()!= 2)
 	{
 		CONS_Printf("vid_mode <modenum> : set video mode, current video mode %i\n", vid.modenum);
 		return;
@@ -1295,8 +1288,8 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 #endif
 		OglSdlSurface(vid.width, vid.height);
 	}
-	else
 #endif
+
 	if (rendermode == render_soft)
 	{
 		SDL_RenderClear(renderer);
@@ -1311,7 +1304,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 			SDL_DestroyTexture(texture);
 		}
 
-		texture = SDL_CreateTexture(renderer, sw_texture_format, SDL_TEXTUREACCESS_STREAMING, width, height);
+		texture = SDL_CreateTexture(renderer, sw_texture_format, SDL_TEXTUREACCESS_STREAMING, height, width);
 	}
 }
 
@@ -1346,6 +1339,7 @@ void I_UpdateNoBlit(void)
 // I_FinishUpdate
 //
 static SDL_Rect src_rect = { 0, 0, 0, 0 };
+static SDL_Rect dst_rect = { 0, 0, 0, 0 };
 
 void I_FinishUpdate(void)
 {
@@ -1361,8 +1355,7 @@ void I_FinishUpdate(void)
 
 		const boolean isserverplayer = consoleplayer == serverplayer;
 
-		if (cv_showping.value && ((netgame && !isserverplayer) ||
-		   (simulated_lag != 0 && isserverplayer && Playing())))
+		if (cv_showping.value && ((netgame && !isserverplayer) || (simulated_lag != 0 && isserverplayer && Playing())))
 			SCR_DisplayLocalPing();
 	}
 
@@ -1376,13 +1369,13 @@ void I_FinishUpdate(void)
 		void *pixels;
 		int pitch;
 		SDL_LockTexture(texture, NULL, &pixels, &pitch);
-		int step = pitch / 4 - vid.width;
+		int step = pitch / 4 - vid.height;
 		UINT32 *restrict dst = pixels;
 		UINT8 *restrict src = vid.screens[0];
 		UINT32 *restrict palette = localPalette;
-		for (INT32 y = 0; y < vid.height; y++)
+		for (INT32 y = 0; y < vid.width; y++)
 		{
-			UINT8 *restrict end = src + vid.width;
+			UINT8 *restrict end = src + vid.height;
 			do *dst++ = palette[*src++];
 			while (src < end);
 			dst += step;
@@ -1390,7 +1383,8 @@ void I_FinishUpdate(void)
 		SDL_UnlockTexture(texture);
 
 		SDL_RenderClear(renderer);
-		SDL_RenderCopy(renderer, texture, &src_rect, NULL);
+		//SDL_RenderCopy(renderer, texture, &src_rect, NULL);
+		SDL_RenderCopyEx(renderer, texture, NULL, &dst_rect, 90.0, NULL, SDL_FLIP_VERTICAL);
 		SDL_RenderPresent(renderer);
 	}
 #ifdef HWRENDER
@@ -1421,18 +1415,17 @@ void I_ReadScreen(UINT8 * restrict scr, INT32 scale)
 {
 	if (rendermode != render_soft)
 		I_Error("I_ReadScreen: called while in non-software mode");
-	else if (scale == 1)
-		VID_BlitLinearScreen(vid.screens[0], scr, vid.width, vid.height, vid.width, vid.width);
 	else
 	{
 		UINT8 * restrict source = vid.screens[0];
+
 		uintptr_t w = vid.width/scale*scale, h = vid.height/scale*scale;
 
 		// size_t saves a lea + movsxd over INT32. mind your types!
 		// uintptr_t is even better since it's guaranteed to be the size of a pointer
 		for (uintptr_t y = 0; y < h; y += scale)
 			for (uintptr_t x = 0; x < w; x += scale)
-				*scr++ = source[y*vid.width + x];
+				*scr++ = source[x*vid.height + y];
 	}
 }
 
@@ -1570,8 +1563,15 @@ INT32 VID_SetMode(INT32 modeNum)
 
 	SDLSetMode(vid.width, vid.height, USE_FULLSCREEN);
 
-	src_rect.w = vid.width;
-	src_rect.h = vid.height;
+	src_rect.w = vid.height;
+	src_rect.h = vid.width;
+
+
+	dst_rect.x = (vid.width - vid.height) / 2;
+	dst_rect.y = (vid.height - vid.width) / 2;
+	dst_rect.w = vid.height;
+	dst_rect.h = vid.width;
+
 
 	refresh_rate = VID_GetRefreshRate();
 
@@ -1629,13 +1629,11 @@ static SDL_bool Impl_CreateContext(void)
 
 		if (!renderer)
 			renderer = SDL_CreateRenderer(window, -1, flags);
-
 		if (renderer == NULL)
 		{
 			CONS_Printf(M_GetText("Couldn't create rendering context: %s\n"), SDL_GetError());
 			return SDL_FALSE;
 		}
-
 		SDL_RenderSetLogicalSize(renderer, BASEVIDWIDTH, BASEVIDHEIGHT);
 	}
 
@@ -1738,7 +1736,6 @@ void I_StartupGraphics(void)
 #endif
 	{
 		const char *vd = SDL_GetCurrentVideoDriver();
-
 		//CONS_Printf(M_GetText("Starting up with video driver: %s\n"), vd);
 		if (vd && (strncasecmp(vd, "fbcon", 6) == 0))
 			framebuffer = SDL_TRUE;
@@ -1785,11 +1782,11 @@ void I_StartupGraphics(void)
 
 				if (rendermode == render_none)
 				{
-					if (fasticmp(word, "software"))
+					if (strcasecmp(word, "software") == 0)
 					{
 						rendermode = render_soft;
 					}
-					else if (fasticmp(word, "opengl"))
+					else if (strcasecmp(word, "opengl") == 0)
 					{
 						rendermode = render_opengl;
 					}
@@ -1802,7 +1799,7 @@ void I_StartupGraphics(void)
 
 				if (!msaa_set)
 				{
-					if (fasticmp(word, "msaa"))
+					if (strcasecmp(word, "msaa") == 0)
 					{
 						const char *nextword = strtok(NULL, " \n");
 
@@ -1819,7 +1816,7 @@ void I_StartupGraphics(void)
 
 				if (!a2c_set)
 				{
-					if (fasticmp(word, "a2c"))
+					if (strcasecmp(word, "a2c") == 0)
 					{
 						a2c = true;
 						CONS_Printf("Using a2c because it was specified to be used earlier\n");
@@ -1969,7 +1966,7 @@ static void Impl_SetVsync(void)
 #endif
 #ifdef HWRENDER
 	if (!renderer && rendermode == render_opengl &&
-		 sdlglcontext != NULL && SDL_GL_GetCurrentContext() == sdlglcontext)
+	sdlglcontext != NULL && SDL_GL_GetCurrentContext() == sdlglcontext)
 	{
 		SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0);
 	}

src/sdl/mixer_sound.c

@@ -123,12 +123,13 @@ static int result;
 static void var_cleanup(void)
 {
 	song_length = loop_point = 0.0f;
-	music_bytes = fading_source = fading_target =
-	fading_timer = fading_duration = 0;
+	 music_bytes = fading_source = fading_target =\
+	 fading_timer = fading_duration = 0;
 	music_end_bytes = 0;
 	music_stutter_bytes = 0;
 
-	songpaused = is_looping = is_fading = false;
+	songpaused = is_looping =\
+	 is_fading = false;
 
 	fading_callback = NULL;
 	fading_do_callback = false;
@@ -228,7 +229,6 @@ void I_ShutdownSound(void)
 {
 	if (!sound_started)
 		return; // not an error condition
-
 	sound_started = false;
 
 	Mix_CloseAudio();
@@ -254,7 +254,6 @@ void I_UpdateSound(void)
 	{
 		if (fading_callback)
 			(*fading_callback)();
-
 		fading_callback = NULL;
 		fading_do_callback = false;
 	}
@@ -281,7 +280,6 @@ static Mix_Chunk *ds2chunk(void *stream)
 	ver = READUINT16(stream); // sound version format?
 	if (ver != 3) // It should be 3 if it's a doomsound...
 		return NULL; // onos! it's not a doomsound!
-
 	freq = READUINT16(stream);
 	samples = READUINT32(stream);
 
@@ -289,100 +287,91 @@ static Mix_Chunk *ds2chunk(void *stream)
 		return NULL; // division by zero
 
 	// convert from signed 8bit ???hz to signed 16bit 44100hz.
-	switch (freq)
+	switch(freq)
 	{
-		case 44100:
-			if (samples >= UINT32_MAX>>2)
-				return NULL; // would wrap, can't store.
-
-			newsamples = samples;
-			break;
-		case 22050:
-			if (samples >= UINT32_MAX>>3)
-				return NULL; // would wrap, can't store.
-
-			newsamples = samples<<1;
-			break;
-		case 11025:
-			if (samples >= UINT32_MAX>>4)
-				return NULL; // would wrap, can't store.
-
-			newsamples = samples<<2;
-			break;
-		default:
-			frac = (44100 << FRACBITS) / (UINT32)freq;
-
-			if (!(frac & 0xFFFF)) // other solid multiples (change if FRACBITS != 16)
-				newsamples = samples * (frac >> FRACBITS);
-			else // strange and unusual fractional frequency steps, plus anything higher than 44100hz.
-				newsamples = FixedMul(FixedDiv(samples, freq), 44100) + 1; // add 1 to counter truncation.
-
-			if (newsamples >= UINT32_MAX>>2)
-				return NULL; // would and/or did wrap, can't store.
-
-			break;
+	case 44100:
+		if (samples >= UINT32_MAX>>2)
+			return NULL; // would wrap, can't store.
+		newsamples = samples;
+		break;
+	case 22050:
+		if (samples >= UINT32_MAX>>3)
+			return NULL; // would wrap, can't store.
+		newsamples = samples<<1;
+		break;
+	case 11025:
+		if (samples >= UINT32_MAX>>4)
+			return NULL; // would wrap, can't store.
+		newsamples = samples<<2;
+		break;
+	default:
+		frac = (44100 << FRACBITS) / (UINT32)freq;
+		if (!(frac & 0xFFFF)) // other solid multiples (change if FRACBITS != 16)
+			newsamples = samples * (frac >> FRACBITS);
+		else // strange and unusual fractional frequency steps, plus anything higher than 44100hz.
+			newsamples = FixedMul(FixedDiv(samples, freq), 44100) + 1; // add 1 to counter truncation.
+		if (newsamples >= UINT32_MAX>>2)
+			return NULL; // would and/or did wrap, can't store.
+		break;
 	}
-
 	sound = Z_Malloc(newsamples<<2, PU_SOUND, NULL); // samples * frequency shift * bytes per sample * channels
 
 	s = (SINT8 *)stream;
 	d = (INT16 *)sound;
 
 	i = 0;
-
 	switch(freq)
 	{
-		case 44100: // already at the same rate? well that makes it simple.
-			while(i++ < samples)
+	case 44100: // already at the same rate? well that makes it simple.
+		while(i++ < samples)
+		{
+			o = ((INT16)(*s++)+0x80)<<8; // changed signedness and shift up to 16 bits
+			*d++ = o; // left channel
+			*d++ = o; // right channel
+		}
+		break;
+	case 22050: // unwrap 2x
+		while(i++ < samples)
+		{
+			o = ((INT16)(*s++)+0x80)<<8; // changed signedness and shift up to 16 bits
+			*d++ = o; // left channel
+			*d++ = o; // right channel
+			*d++ = o; // left channel
+			*d++ = o; // right channel
+		}
+		break;
+	case 11025: // unwrap 4x
+		while(i++ < samples)
+		{
+			o = ((INT16)(*s++)+0x80)<<8; // changed signedness and shift up to 16 bits
+			*d++ = o; // left channel
+			*d++ = o; // right channel
+			*d++ = o; // left channel
+			*d++ = o; // right channel
+			*d++ = o; // left channel
+			*d++ = o; // right channel
+			*d++ = o; // left channel
+			*d++ = o; // right channel
+		}
+		break;
+	default: // convert arbitrary hz to 44100.
+		step = 0;
+		frac = ((UINT32)freq << FRACBITS) / 44100 + 1; //Add 1 to counter truncation.
+		while (i < samples)
+		{
+			o = (INT16)(*s+0x80)<<8; // changed signedness and shift up to 16 bits
+			while (step < FRACUNIT) // this is as fast as I can make it.
 			{
-				o = ((INT16)(*s++)+0x80)<<8; // changed signedness and shift up to 16 bits
 				*d++ = o; // left channel
 				*d++ = o; // right channel
+				step += frac;
 			}
-			break;
-		case 22050: // unwrap 2x
-			while(i++ < samples)
-			{
-				o = ((INT16)(*s++)+0x80)<<8; // changed signedness and shift up to 16 bits
-				*d++ = o; // left channel
-				*d++ = o; // right channel
-				*d++ = o; // left channel
-				*d++ = o; // right channel
-			}
-			break;
-		case 11025: // unwrap 4x
-			while(i++ < samples)
-			{
-				o = ((INT16)(*s++)+0x80)<<8; // changed signedness and shift up to 16 bits
-				*d++ = o; // left channel
-				*d++ = o; // right channel
-				*d++ = o; // left channel
-				*d++ = o; // right channel
-				*d++ = o; // left channel
-				*d++ = o; // right channel
-				*d++ = o; // left channel
-				*d++ = o; // right channel
-			}
-			break;
-		default: // convert arbitrary hz to 44100.
-			step = 0;
-			frac = ((UINT32)freq << FRACBITS) / 44100 + 1; //Add 1 to counter truncation.
-
-			while (i < samples)
-			{
-				o = (INT16)(*s+0x80)<<8; // changed signedness and shift up to 16 bits
-				while (step < FRACUNIT) // this is as fast as I can make it.
-				{
-					*d++ = o; // left channel
-					*d++ = o; // right channel
-					step += frac;
-				}
-				do {
-					i++; s++;
-					step -= FRACUNIT;
-				} while (step >= FRACUNIT);
-			}
-			break;
+			do {
+				i++; s++;
+				step -= FRACUNIT;
+			} while (step >= FRACUNIT);
+		}
+		break;
 	}
 
 	// return Mixer Chunk.
@@ -401,14 +390,12 @@ void *I_GetSfx(sfxinfo_t *sfx)
 
 	if (sfx->lumpnum == LUMPERROR)
 		sfx->lumpnum = S_GetSfxLumpNum(sfx);
-
 	sfx->length = W_LumpLength(sfx->lumpnum);
 
 	lump = W_CacheLumpNum(sfx->lumpnum, PU_SOUND);
 
 	// convert from standard DoomSound format.
 	chunk = ds2chunk(lump);
-
 	if (chunk)
 	{
 		Z_Free(lump);
@@ -428,7 +415,6 @@ void *I_GetSfx(sfxinfo_t *sfx)
 		int zErr; // Somewhere to handle any error messages zlib tosses out
 
 		memset(&stream, 0x00, sizeof (z_stream)); // Init zlib stream
-
 		// Begin the inflation process
 		inflatedLen = *(UINT32 *)lump + (sfx->length-4); // Last 4 bytes are the decompressed size, typically
 		inflatedData = (UINT8 *)Z_Malloc(inflatedLen, PU_SOUND, NULL); // Make room for the decompressed data
@@ -438,13 +424,10 @@ void *I_GetSfx(sfxinfo_t *sfx)
 		stream.next_out = inflatedData;
 
 		zErr = inflateInit2(&stream, 32 + MAX_WBITS);
-
 		if (zErr == Z_OK) // We're good to go
 		{
 			zErr = inflate(&stream, Z_FINISH);
-
-			if (zErr == Z_STREAM_END)
-			{
+			if (zErr == Z_STREAM_END) {
 				// Run GME on new data
 				if (!gme_open_data(inflatedData, inflatedLen, &emu, SAMPLERATE))
 				{
@@ -461,7 +444,6 @@ void *I_GetSfx(sfxinfo_t *sfx)
 
 					len = (info->play_length * 441 / 10) << 2;
 					mem = Z_Malloc(len, PU_SOUND, 0);
-
 					gme_play(emu, len >> 1, mem);
 					gme_free_info(info);
 					gme_delete(emu);
@@ -471,14 +453,10 @@ void *I_GetSfx(sfxinfo_t *sfx)
 			}
 			else
 				CONS_Alert(CONS_ERROR,"Encountered %s when running inflate: %s\n", get_zlib_error(zErr), stream.msg);
-
 			(void)inflateEnd(&stream);
 		}
 		else // Hold up, zlib's got a problem
-		{
 			CONS_Alert(CONS_ERROR,"Encountered %s when running inflateInit: %s\n", get_zlib_error(zErr), stream.msg);
-		}
-
 		Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up
 #else
 		return NULL; // No zlib support
@@ -499,7 +477,6 @@ void *I_GetSfx(sfxinfo_t *sfx)
 
 		len = (info->play_length * 441 / 10) << 2;
 		mem = Z_Malloc(len, PU_SOUND, 0);
-
 		gme_play(emu, len >> 1, mem);
 		gme_free_info(info);
 		gme_delete(emu);
@@ -510,7 +487,6 @@ void *I_GetSfx(sfxinfo_t *sfx)
 
 	// Try to load it as a WAVE or OGG using Mixer.
 	rw = SDL_RWFromMem(lump, sfx->length);
-
 	if (rw != NULL)
 	{
 		chunk = Mix_LoadWAV_RW(rw, 1);
@@ -526,23 +502,19 @@ void I_FreeSfx(sfxinfo_t *sfx)
 	{
 		Mix_Chunk *chunk = (Mix_Chunk*)sfx->data;
 		UINT8 *abufdata = NULL;
-
 		if (chunk->allocated == 0)
 		{
 			// We allocated the data in this chunk, so get the abuf from mixer, then let it free the chunk, THEN we free the data
 			// I believe this should ensure the sound is not playing when we free it
 			abufdata = chunk->abuf;
 		}
-
 		Mix_FreeChunk(sfx->data);
-
 		if (abufdata)
 		{
 			// I'm going to assume we used Z_Malloc to allocate this data.
 			Z_Free(abufdata);
 		}
 	}
-
 	sfx->data = NULL;
 	sfx->lumpnum = LUMPERROR;
 }
@@ -600,12 +572,9 @@ static UINT32 get_adjusted_position(UINT32 position)
 {
 	// all in milliseconds
 	UINT32 length = I_GetSongLength();
-
+	UINT32 looppoint = I_GetSongLoopPoint();
 	if (length)
-	{
-		UINT32 looppoint = I_GetSongLoopPoint();
 		return position >= length ? (position % (length-looppoint)) : position;
-	}
 	else
 		return position;
 }
@@ -620,7 +589,8 @@ static void do_fading_callback(void)
 /// Music Hooks
 /// ------------------------
 
-static void Countstutter(int len)
+static void
+Countstutter (int len)
 {
 	UINT32 bytes;
 
@@ -647,7 +617,7 @@ static void Countstutter(int len)
 			else
 				bytes = ( music_bytes - music_stutter_bytes );
 
-			I_SetSongPosition((int)((float)bytes/4/44100.0f*1000));
+			I_SetSongPosition((int)( (float)bytes/4/44100.0f*1000 ));
 		}
 	}
 }
@@ -658,9 +628,7 @@ static void count_music_bytes(int chan, void *stream, int len, void *udata)
 	(void)stream;
 	(void)udata;
 
-	const musictype_t mustype = I_SongType();
-
-	if (!music || mustype == MU_GME || mustype == MU_MOD || mustype == MU_MID)
+	if (!music || I_SongType() == MU_GME || I_SongType() == MU_MOD || I_SongType() == MU_MID)
 		return;
 
 	music_bytes += len;
@@ -694,9 +662,7 @@ static UINT32 music_fade(UINT32 interval, void *param)
 		return 0;
 	}
 	else if (songpaused) // don't decrement timer
-	{
 		return interval;
-	}
 	else if ((fading_timer -= 10) <= 0)
 	{
 		internal_volume = fading_target;
@@ -709,14 +675,11 @@ static UINT32 music_fade(UINT32 interval, void *param)
 	{
 		UINT8 delta = abs(fading_target - fading_source);
 		fixed_t factor = FixedDiv(fading_duration - fading_timer, fading_duration);
-
 		if (fading_target < fading_source)
 			internal_volume = max(min(internal_volume, fading_source - FixedMul(delta, factor)), fading_target);
 		else if (fading_target > fading_source)
 			internal_volume = min(max(internal_volume, fading_source + FixedMul(delta, factor)), fading_target);
-
 		Mix_VolumeMusic(get_real_volume(music_volume));
-
 		return interval;
 	}
 }
@@ -800,22 +763,14 @@ musictype_t I_SongType(void)
 #endif
 	if (!music)
 		return MU_NONE;
-
-	const Mix_MusicType mustype =  Mix_GetMusicType(music);
-
-	switch (mustype)
-	{
-		case MUS_MID:
-			return MU_MID;
-		case MUS_MOD:
-		case MUS_MODPLUG:
-			return MU_MOD;
-		case MUS_MP3:
-		case MUS_MP3_MAD:
-			return MU_MP3;
-		default:
-			return (musictype_t)mustype;
-	}
+	else if (Mix_GetMusicType(music) == MUS_MID)
+		return MU_MID;
+	else if (Mix_GetMusicType(music) == MUS_MOD || Mix_GetMusicType(music) == MUS_MODPLUG)
+		return MU_MOD;
+	else if (Mix_GetMusicType(music) == MUS_MP3 || Mix_GetMusicType(music) == MUS_MP3_MAD)
+		return MU_MP3;
+	else
+		return (musictype_t)Mix_GetMusicType(music);
 }
 
 boolean I_SongPlaying(void)
@@ -844,7 +799,6 @@ boolean I_SetSongSpeed(float speed)
 {
 	if (speed > 250.0f)
 		speed = 250.0f; //limit speed up to 250x
-
 #ifdef HAVE_LIBGME
 	if (gme)
 	{
@@ -903,63 +857,51 @@ UINT32 I_GetSongLength(void)
 			// reconstruct info->play_length, from GME source
 			// we only want intro + 1 loop, not 2
 			length = info->length;
-
 			if (length <= 0)
 			{
 				length = info->intro_length + info->loop_length; // intro + 1 loop
-
 				if (length <= 0)
 					length = 150 * 1000; // 2.5 minutes
 			}
 		}
 
 		gme_free_info(info);
-
 		return max(length, 0);
 	}
 	else
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)
-	{
 		return (UINT32)(openmpt_module_get_duration_seconds(openmpt_mhandle) * 1000.);
-	}
 	else
 #endif
 	if (!music || I_SongType() == MU_MOD || I_SongType() == MU_MID)
-	{
 		return 0;
-	}
 	else
 	{
 		// VERY IMPORTANT to set your LENGTHMS= in your song files, folks!
 		// SDL mixer can't read music length itself.
 		length = (UINT32)(song_length*1000);
-
 		if (!length)
 			CONS_Debug(DBG_DETAILED, "Getting music length: music is missing LENGTHMS= tag. Needed for seeking.\n");
-
 		return length;
 	}
 }
 
 boolean I_SetSongLoopPoint(UINT32 looppoint)
 {
-	if (!music|| !is_looping)
+	if (!music || I_SongType() == MU_GME || I_SongType() == MU_MOD || I_SongType() == MU_MID || !is_looping)
 		return false;
+	else
+	{
+		UINT32 length = I_GetSongLength();
 
-	const musictype_t mustype = I_SongType();
+		if (length > 0)
+			looppoint %= length;
 
-	if (mustype == MU_GME || mustype == MU_MOD || mustype == MU_MID)
-		return false;
-
-	UINT32 length = I_GetSongLength();
-
-	if (length > 0)
-		looppoint %= length;
-
-	loop_point = max((float)(looppoint / 1000.0L), 0);
-	return true;
+		loop_point = max((float)(looppoint / 1000.0L), 0);
+		return true;
+	}
 }
 
 UINT32 I_GetSongLoopPoint(void)
@@ -985,19 +927,14 @@ UINT32 I_GetSongLoopPoint(void)
 	else
 #endif
 	if (!music || I_SongType() == MU_MOD || I_SongType() == MU_MID)
-	{
 		return 0;
-	}
 	else
-	{
 		return (UINT32)(loop_point * 1000);
-	}
 }
 
 boolean I_SetSongPosition(UINT32 position)
 {
 	UINT32 length;
-
 #ifdef HAVE_LIBGME
 	if (gme)
 	{
@@ -1034,13 +971,9 @@ boolean I_SetSongPosition(UINT32 position)
 	else
 #endif
 	if (!music || I_SongType() == MU_MID)
-	{
 		return false;
-	}
 	else if (I_SongType() == MU_MOD)
-	{
 		return Mix_SetMusicPosition(position); // Goes by channels
-	}
 	else
 	{
 		// Because SDL mixer can't identify song length, if you have
@@ -1048,13 +981,11 @@ boolean I_SetSongPosition(UINT32 position)
 		// music_bytes becomes inaccurate.
 
 		length = I_GetSongLength(); // get it in MS
-
 		if (length)
 			position = get_adjusted_position(position);
 
 		Mix_RewindMusic(); // needed for mp3
-
-		if (Mix_SetMusicPosition((float)(position/1000.0L)) == 0)
+		if(Mix_SetMusicPosition((float)(position/1000.0L)) == 0)
 			music_bytes = (UINT32)(position/1000.0L*44100.0L*4); //assume 44.1khz, 4-byte length (see I_GetSongPosition)
 		else
 			// NOTE: This block fires on incorrect song format,
@@ -1094,7 +1025,6 @@ UINT32 I_GetSongPosition(void)
 		}
 
 		gme_free_info(info);
-
 		return max(position, 0);
 	}
 	else
@@ -1108,16 +1038,12 @@ UINT32 I_GetSongPosition(void)
 	else
 #endif
 	if (!music || I_SongType() == MU_MID)
-	{
 		return 0;
-	}
 	else
-	{
 		return (UINT32)(music_bytes/44100.0L*1000.0L/4); //assume 44.1khz
 		// 4 = byte length for 16-bit samples (AUDIO_S16SYS), stereo (2-channel)
 		// This is hardcoded in I_StartupSound. Other formats for factor:
 		// 8M: 1 | 8S: 2 | 16M: 2 | 16S: 4
-	}
 }
 
 void I_UpdateSongLagThreshold(void)
@@ -1131,16 +1057,12 @@ void I_UpdateSongLagThreshold(void)
 
 boolean I_LoadSong(char *data, size_t len)
 {
-	static const char *key1 = "LOOP";
-	static const char *key2 = "POINT=";
-	static const char *key3 = "MS=";
-	static const size_t key1len = sizeof("LOOP")-1;
-	static const size_t key2len = sizeof("POINT=")-1;
-	static const size_t key3len = sizeof("MS=")-1;
-	//const size_t key1len = strlen(key1);
-	//const size_t key2len = strlen(key2);
-	//const size_t key3len = strlen(key3);
-
+	const char *key1 = "LOOP";
+	const char *key2 = "POINT=";
+	const char *key3 = "MS=";
+	const size_t key1len = strlen(key1);
+	const size_t key2len = strlen(key2);
+	const size_t key3len = strlen(key3);
 	char *p = data;
 	SDL_RWops *rw;
 
@@ -1177,7 +1099,6 @@ boolean I_LoadSong(char *data, size_t len)
 		stream.next_out = inflatedData;
 
 		zErr = inflateInit2(&stream, 32 + MAX_WBITS);
-
 		if (zErr == Z_OK) // We're good to go
 		{
 			zErr = inflate(&stream, Z_FINISH);
@@ -1193,12 +1114,10 @@ boolean I_LoadSong(char *data, size_t len)
 			}
 			else
 				CONS_Alert(CONS_ERROR, "Encountered %s when running inflate: %s\n", get_zlib_error(zErr), stream.msg);
-
 			(void)inflateEnd(&stream);
 		}
 		else // Hold up, zlib's got a problem
 			CONS_Alert(CONS_ERROR, "Encountered %s when running inflateInit: %s\n", get_zlib_error(zErr), stream.msg);
-
 		Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up
 		return false;
 #else
@@ -1227,7 +1146,6 @@ boolean I_LoadSong(char *data, size_t len)
 	if (result == OPENMPT_PROBE_FILE_HEADER_RESULT_SUCCESS) // We only cared if it succeeded, continue on if not.
 	{
 		openmpt_mhandle = openmpt_module_create_from_memory2(data, len, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-
 		if (!openmpt_mhandle) // Failed to create module handle? Show error and return!
 		{
 			mod_err = openmpt_module_error_get_last(openmpt_mhandle);
@@ -1242,12 +1160,10 @@ boolean I_LoadSong(char *data, size_t len)
 
 	// Let's see if Mixer is able to load this.
 	rw = SDL_RWFromMem(data, len);
-
 	if (rw != NULL)
 	{
 		music = Mix_LoadMUS_RW(rw, 1);
 	}
-
 	if (!music)
 	{
 		CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());
@@ -1275,7 +1191,7 @@ boolean I_LoadSong(char *data, size_t len)
 			else if (!strncmp(p, key3, key3len)) // is it LOOPMS=?
 			{
 				p += key3len; // skip MS=
-				loop_point = (float)(atof(p) / 1000.0); // LOOPMS works by real time, as miliseconds.
+				loop_point = (float)(atoi(p) / 1000.0L); // LOOPMS works by real time, as miliseconds.
 				// Everything that uses LOOPMS will work perfectly with SDL_Mixer.
 			}
 		}
@@ -1285,7 +1201,6 @@ boolean I_LoadSong(char *data, size_t len)
 		else // continue searching
 			p++;
 	}
-
 	return true;
 }
 
@@ -1328,7 +1243,6 @@ boolean I_PlaySong(boolean looping)
 		gme_start_track(gme, 0);
 		current_track = 0;
 		Mix_HookMusic(mix_gme, gme);
-
 		return true;
 	}
 	else
@@ -1368,17 +1282,15 @@ boolean I_PlaySong(boolean looping)
 	if (!music)
 		return false;
 
-	const musictype_t mustype = I_SongType();
-
-	if (fpclassify(song_length) == FP_ZERO && (mustype == MU_OGG || mustype == MU_MP3 || mustype == MU_FLAC))
+	if (fpclassify(song_length) == FP_ZERO && (I_SongType() == MU_OGG || I_SongType() == MU_MP3 || I_SongType() == MU_FLAC))
 		CONS_Debug(DBG_DETAILED, "This song is missing a LENGTHMS= tag! Required to make seeking work properly.\n");
 
-	if (mustype != MU_MOD && mustype != MU_MID && Mix_PlayMusic(music, 0) == -1)
+	if (I_SongType() != MU_MOD && I_SongType() != MU_MID && Mix_PlayMusic(music, 0) == -1)
 	{
 		CONS_Alert(CONS_ERROR, "Mix_PlayMusic: %s\n", Mix_GetError());
 		return false;
 	}
-	else if ((mustype == MU_MOD || mustype == MU_MID) && Mix_PlayMusic(music, looping ? -1 : 0) == -1) // if MOD, loop forever
+	else if ((I_SongType() == MU_MOD || I_SongType() == MU_MID) && Mix_PlayMusic(music, looping ? -1 : 0) == -1) // if MOD, loop forever
 	{
 		CONS_Alert(CONS_ERROR, "Mix_PlayMusic: %s\n", Mix_GetError());
 		return false;
@@ -1388,10 +1300,10 @@ boolean I_PlaySong(boolean looping)
 
 	I_SetMusicVolume(music_volume);
 
-	if (mustype != MU_MOD && mustype != MU_MID)
+	if (I_SongType() != MU_MOD && I_SongType() != MU_MID)
 		Mix_HookMusicFinished(music_loop); // don't bother counting if MOD
 
-	if (mustype != MU_MOD && mustype != MU_MID && !Mix_RegisterEffect(MIX_CHANNEL_POST, count_music_bytes, NULL, NULL))
+	if(I_SongType() != MU_MOD && I_SongType() != MU_MID && !Mix_RegisterEffect(MIX_CHANNEL_POST, count_music_bytes, NULL, NULL))
 		CONS_Alert(CONS_WARNING, "Error registering SDL music position counter: %s\n", Mix_GetError());
 
 	return true;
@@ -1427,12 +1339,10 @@ void I_StopSong(void)
 
 void I_PauseSong(void)
 {
-	const musictype_t mustype = I_SongType();
-
-	if (mustype == MU_MID) // really, SDL Mixer? why can't you pause MIDI???
+	if(I_SongType() == MU_MID) // really, SDL Mixer? why can't you pause MIDI???
 		return;
 
-	if (mustype != MU_GME && mustype != MU_MOD && mustype != MU_MID)
+	if(I_SongType() != MU_GME && I_SongType() != MU_MOD && I_SongType() != MU_MID)
 		Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes);
 
 	Mix_PauseMusic();
@@ -1441,17 +1351,15 @@ void I_PauseSong(void)
 
 void I_ResumeSong(void)
 {
-	const musictype_t mustype = I_SongType();
-
-	if (mustype == MU_MID)
+	if (I_SongType() == MU_MID)
 		return;
 
-	if (mustype != MU_GME && mustype != MU_MOD && mustype != MU_MID)
+	if (I_SongType() != MU_GME && I_SongType() != MU_MOD && I_SongType() != MU_MID)
 	{
-		while (Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes) != 0) { }
+		while(Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes) != 0) { }
 			// HACK: fixes issue of multiple effect callbacks being registered
 
-		if (music && mustype != MU_MOD && mustype != MU_MID && !Mix_RegisterEffect(MIX_CHANNEL_POST, count_music_bytes, NULL, NULL))
+		if(music && I_SongType() != MU_MOD && I_SongType() != MU_MID && !Mix_RegisterEffect(MIX_CHANNEL_POST, count_music_bytes, NULL, NULL))
 			CONS_Alert(CONS_WARNING, "Error registering SDL music position counter: %s\n", Mix_GetError());
 	}
 
@@ -1484,24 +1392,20 @@ boolean I_SetSongTrack(INT32 track)
 	{
 		if (current_track == track)
 			return false;
-
 		SDL_LockAudio();
 		if (track >= 0 && track < gme_track_count(gme)-1)
 		{
 			gme_err_t gme_e = gme_start_track(gme, track);
-
 			if (gme_e != NULL)
 			{
 				CONS_Alert(CONS_ERROR, "GME error: %s\n", gme_e);
 				return false;
 			}
-
 			current_track = track;
 			SDL_UnlockAudio();
 			return true;
 		}
 		SDL_UnlockAudio();
-
 		return false;
 	}
 	else
@@ -1511,7 +1415,6 @@ boolean I_SetSongTrack(INT32 track)
 	{
 		if (current_subsong == track)
 			return false;
-
 		SDL_LockAudio();
 		if (track >= 0 && track < openmpt_module_get_num_subsongs(openmpt_mhandle))
 		{
@@ -1525,10 +1428,8 @@ boolean I_SetSongTrack(INT32 track)
 		return false;
 	}
 #endif
-
 	if (I_SongType() == MU_MOD)
 		return !Mix_SetMusicPosition(track);
-
 	(void)track;
 	return false;
 }
@@ -1540,10 +1441,8 @@ boolean I_SetSongTrack(INT32 track)
 void I_SetInternalMusicVolume(UINT8 volume)
 {
 	internal_volume = volume;
-
 	if (!I_SongPlaying())
 		return;
-
 	Mix_VolumeMusic(get_real_volume(music_volume));
 }
 
@@ -1551,7 +1450,6 @@ void I_StopFadingSong(void)
 {
 	if (fading_id)
 		SDL_RemoveTimer(fading_id);
-
 	is_fading = false;
 	fading_source = fading_target = fading_timer = fading_duration = fading_id = 0;
 }
@@ -1568,10 +1466,8 @@ boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms
 	if (!ms && volume_delta)
 	{
 		I_SetInternalMusicVolume(target_volume);
-
 		if (callback)
 			(*callback)();
-
 		return true;
 
 	}
@@ -1579,28 +1475,20 @@ boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms
 	{
 		if (callback)
 			(*callback)();
-
 		return true;
 	}
 
 	// Round MS to nearest 10
 	// If n - lower > higher - n, then round up
-	//ms = (ms - ((ms / 10) * 10) > (((ms / 10) * 10) + 10) - ms) ?
-	//	(((ms / 10) * 10) + 10) // higher
-	//	: ((ms / 10) * 10); // lower
-
-	const int lower = (ms / 10) * 10;
-	const int upper = lower + 10;
-	ms = (ms - lower > upper - ms) ? upper : lower;
+	ms = (ms - ((ms / 10) * 10) > (((ms / 10) * 10) + 10) - ms) ?
+		(((ms / 10) * 10) + 10) // higher
+		: ((ms / 10) * 10); // lower
 
 	if (!ms)
-	{
 		I_SetInternalMusicVolume(target_volume);
-	}
 	else if (source_volume != target_volume)
 	{
 		fading_id = SDL_AddTimer(10, music_fade, NULL);
-
 		if (fading_id)
 		{
 			is_fading = true;
@@ -1631,7 +1519,7 @@ boolean I_FadeInPlaySong(UINT32 ms, boolean looping)
 {
 	if (I_PlaySong(looping))
 		return I_FadeSongFromVolume(100, 0, ms, NULL);
-
-	return false;
+	else
+		return false;
 }
 #endif

src/sdl/ogl_sdl.c

@@ -170,8 +170,8 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 			}
 		}
 
-		if (fastcmp((const char*)gl_renderer, "GDI Generic") &&
-			fastcmp((const char*)gl_version, "1.1.0"))
+		if (strcmp((const char*)gl_renderer, "GDI Generic") == 0 &&
+			strcmp((const char*)gl_version, "1.1.0") == 0)
 		{
 			// Oh no... Windows gave us the GDI Generic rasterizer, so something is wrong...
 			// The game will crash later on when unsupported OpenGL commands are encountered.

src/st_stuff.c

@@ -219,6 +219,10 @@ void ST_UnloadGraphics(void)
 
 void ST_LoadGraphics(void)
 {
+	// SRB2 border patch
+	//st_borderpatchnum = W_GetNumForName("GFZFLR01");
+	//scr_borderpatch = W_CacheLumpNum(st_borderpatchnum, PU_HUDGFX);
+
 	// the original Doom uses 'STF' as base name for all face graphics
 	// Graue 04-08-2004: face/name graphics are now indexed by skins
 	//                   but load them in R_AddSkins, that gets called
@@ -790,7 +794,7 @@ void ST_Drawer(void)
 			LUA_HUD_DrawList(luahuddrawlist_game[i]);
 
 		// draw Midnight Channel's overlay ontop
-		if (mapheaderinfo[gamemap-1]->typeoflevel & TOL_TV) // Very specific Midnight Channel stuff.
+		if (mapheaderinfo[gamemap-1]->typeoflevel & TOL_TV)	// Very specific Midnight Channel stuff.
 			ST_MayonakaStatic();
 	}
 
@@ -798,7 +802,7 @@ void ST_Drawer(void)
 	if (timeinmap < 15)
 	{
 		if (timeinmap <= 5)
-			V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120); // Pure white on first few frames, to hide SRB2's awful level load artifacts
+			V_DrawFill(0,0,BASEVIDWIDTH,BASEVIDHEIGHT,120); // Pure white on first few frames, to hide SRB2's awful level load artifacts
 		else
 			V_DrawFadeScreen(120, 15-timeinmap); // Then gradually fade out from there
 	}

src/v_video.c

@@ -23,6 +23,7 @@
 #include "r_main.h"
 #include "r_fps.h"
 #include "console.h"
+
 #include "i_video.h" // rendermode
 #include "z_zone.h"
 #include "m_misc.h"
@@ -133,7 +134,7 @@ static boolean InitCube(void)
 	if (!loaded_config)
 		return false;
 
-#define diffcons(cv) (!fastcmp(cv.string, cv.defaultvalue))
+#define diffcons(cv) (strcmp(cv.string, cv.defaultvalue))
 #define diffconsgamma(cv) (cv.value != 0)
 #define diffconssat(cv) (cv.value != 10)
 
@@ -595,7 +596,7 @@ void V_ResetPaletteCVars(void)
 	if (!loaded_config)
 		return;
 
-#define diffcons(cv) (!fastcmp(cv.string, cv.defaultvalue))
+#define diffcons(cv) (strcmp(cv.string, cv.defaultvalue))
 	if diffcons(cv_palette)
 		CV_StealthSetValue(&cv_palette, atoi(cv_palette.defaultvalue));
 	if diffcons(cv_palettenum)
@@ -613,9 +614,9 @@ static void CV_constextsize_OnChange(void)
 // --------------------------------------------------------------------------
 void VID_BlitLinearScreen(const UINT8 *restrict srcptr, UINT8 *restrict destptr, INT32 width, INT32 height, size_t srcrowbytes, size_t destrowbytes)
 {
-	if (srcrowbytes == destrowbytes && srcrowbytes == (size_t)width)
+	if (srcrowbytes == destrowbytes && srcrowbytes == (size_t)height)
 	{
-		size_t i = srcrowbytes * height;
+		size_t i = srcrowbytes * width;
 #if defined(__SSE__)
 		while (i >= 16)
 		{
@@ -630,9 +631,9 @@ void VID_BlitLinearScreen(const UINT8 *restrict srcptr, UINT8 *restrict destptr,
 	}
 	else
 	{
-		while (height--)
+		while (width--)
 		{
-			M_Memcpy(destptr, srcptr, width);
+			M_Memcpy(destptr, srcptr, height);
 
 			destptr += destrowbytes;
 			srcptr += srcrowbytes;
@@ -640,8 +641,8 @@ void VID_BlitLinearScreen(const UINT8 *restrict srcptr, UINT8 *restrict destptr,
 	}
 }
 
-static const UINT8 hudplusalpha[11]  = { 10,  8,  6,  4,  2,  0,  0,  0,  0,  0,  0};
-static const UINT8 hudminusalpha[11] = { 10,  9,  9,  8,  8,  7,  7,  6,  6,  5,  5};
+static UINT8 hudplusalpha[11]  = { 10,  8,  6,  4,  2,  0,  0,  0,  0,  0,  0};
+static UINT8 hudminusalpha[11] = { 10,  9,  9,  8,  8,  7,  7,  6,  6,  5,  5};
 UINT8 hudtrans = 0;
 
 static const UINT8 *v_colormap = NULL;
@@ -662,7 +663,7 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 	fixed_t col, ofs, colfrac, rowfrac, fdup, vdup;
 	INT32 dup;
 	const column_t *column;
-	UINT8 *desttop, *dest, *deststart, *destend;
+	UINT8 *desttop, *dest/*, *deststart, *destend*/;
 	const UINT8 *source, *deststop;
 	fixed_t pwidth; // patch width
 	fixed_t offx = 0; // x offset
@@ -790,13 +791,10 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 	if (!desttop)
 		return;
 
-	deststop = desttop + vid.width * vid.height;
-
 	if (scrn & V_NOSCALESTART)
 	{
 		x >>= FRACBITS;
 		y >>= FRACBITS;
-		desttop += (y*vid.width) + x;
 	}
 	else
 	{
@@ -842,9 +840,8 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 					y += (vid.height - (BASEVIDHEIGHT * dup)) / 2;
 			}
 		}
-
-		desttop += (y*vid.width) + x;
 	}
+	desttop += (x*vid.height) + y;
 
 	if (pscale != FRACUNIT) // scale width properly
 	{
@@ -856,29 +853,29 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 	else
 		pwidth = patch->width * dup;
 
-	deststart = desttop;
-	destend = desttop + pwidth;
+	//deststart = desttop;
+	//destend = desttop + pwidth*vid.height;
 
-	const INT32 stride = vid.width;
-
-	for (col = 0; (col>>FRACBITS) < patch->width; col += colfrac, ++offx, desttop++)
+	for (col = 0; (col>>FRACBITS) < patch->width; col += colfrac, ++offx, desttop += vid.height)
 	{
 		INT32 topdelta, prevdelta = -1;
 		if (scrn & V_FLIP) // offx is measured from right edge instead of left
 		{
 			if (x+pwidth-offx < 0) // don't draw off the left of the screen (WRAP PREVENTION)
 				break;
-			if (x+pwidth-offx >= stride) // don't draw off the right of the screen (WRAP PREVENTION)
+			if (x+pwidth-offx >= vid.width) // don't draw off the right of the screen (WRAP PREVENTION)
 				continue;
 		}
 		else
 		{
 			if (x+offx < 0) // don't draw off the left of the screen (WRAP PREVENTION)
 				continue;
-			if (x+offx >= stride) // don't draw off the right of the screen (WRAP PREVENTION)
+			if (x+offx >= vid.width) // don't draw off the right of the screen (WRAP PREVENTION)
 				break;
 		}
-		column = (const column_t *)((const UINT8 *)(patch->columns) + (patch->columnofs[col>>FRACBITS]));
+
+		INT32 realcol = (scrn & V_FLIP) ? ((patch->width-(col>>FRACBITS)-1)<<FRACBITS) : col;
+		column = (const column_t *)((const UINT8 *)(patch->columns) + (patch->columnofs[realcol>>FRACBITS]));
 
 		switch (patchdrawtype)
 		{
@@ -891,15 +888,16 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 					prevdelta = topdelta;
 					source = (const UINT8 *)(column) + 3;
 					dest = desttop;
-					if (scrn & V_FLIP)
-						dest = deststart + (destend - desttop);
-					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup))*stride;
+					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup));
 
-					for (ofs = 0; dest < deststop && (ofs>>FRACBITS) < column->length; ofs += rowfrac)
+					UINT8 *col_start = vid.screens[0] + ((x + offx)*vid.height);
+					deststop = col_start + vid.height;
+
+					for (ofs = 0; dest < deststop && (size_t)(ofs>>FRACBITS) < column->length; ofs += rowfrac)
 					{
-						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+						if (dest >= col_start) // don't draw off the top of the screen (CRASH PREVENTION)
 							*dest = source[ofs>>FRACBITS];
-						dest += stride;
+						dest++;
 					}
 					column = (const column_t *)((const UINT8 *)column + column->length + 4);
 				}
@@ -914,15 +912,16 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 					prevdelta = topdelta;
 					source = (const UINT8 *)(column) + 3;
 					dest = desttop;
-					if (scrn & V_FLIP)
-						dest = deststart + (destend - desttop);
-					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup))*stride;
+					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup));
 
-					for (ofs = 0; dest < deststop && (ofs>>FRACBITS) < column->length; ofs += rowfrac)
+					UINT8 *col_start = vid.screens[0] + ((x + offx)*vid.height);
+					deststop = col_start + vid.height;
+
+					for (ofs = 0; dest < deststop && (size_t)(ofs>>FRACBITS) < column->length; ofs += rowfrac)
 					{
-						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+						if (dest >= col_start) // don't draw off the top of the screen (CRASH PREVENTION)
 							*dest = *(v_colormap + source[ofs>>FRACBITS]);
-						dest += stride;
+						dest++;
 					}
 					column = (const column_t *)((const UINT8 *)column + column->length + 4);
 				}
@@ -937,15 +936,16 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 					prevdelta = topdelta;
 					source = (const UINT8 *)(column) + 3;
 					dest = desttop;
-					if (scrn & V_FLIP)
-						dest = deststart + (destend - desttop);
-					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup))*stride;
+					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup));
 
-					for (ofs = 0; dest < deststop && (ofs>>FRACBITS) < column->length; ofs += rowfrac)
+					UINT8 *col_start = vid.screens[0] + ((x + offx)*vid.height);
+					deststop = col_start + vid.height;
+
+					for (ofs = 0; dest < deststop && (size_t)(ofs>>FRACBITS) < column->length; ofs += rowfrac)
 					{
-						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+						if (dest >= col_start) // don't draw off the top of the screen (CRASH PREVENTION)
 							*dest = *(v_translevel + ((source[ofs>>FRACBITS]<<8)&0xff00) + (*dest&0xff));
-						dest += stride;
+						dest++;
 					}
 					column = (const column_t *)((const UINT8 *)column + column->length + 4);
 				}
@@ -960,15 +960,16 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 					prevdelta = topdelta;
 					source = (const UINT8 *)(column) + 3;
 					dest = desttop;
-					if (scrn & V_FLIP)
-						dest = deststart + (destend - desttop);
-					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup))*stride;
+					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup));
 
-					for (ofs = 0; dest < deststop && (ofs>>FRACBITS) < column->length; ofs += rowfrac)
+					UINT8 *col_start = vid.screens[0] + ((x + offx)*vid.height);
+					deststop = col_start + vid.height;
+
+					for (ofs = 0; dest < deststop && (size_t)(ofs>>FRACBITS) < column->length; ofs += rowfrac)
 					{
-						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+						if (dest >= col_start) // don't draw off the top of the screen (CRASH PREVENTION)
 							*dest = *(v_translevel + (((*(v_colormap + source[ofs>>FRACBITS]))<<8)&0xff00) + (*dest&0xff));
-						dest += stride;
+						dest++;
 					}
 					column = (const column_t *)((const UINT8 *)column + column->length + 4);
 				}
@@ -1038,13 +1039,10 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 	if (!desttop)
 		return;
 
-	deststop = desttop + vid.width * vid.height;
-
 	if (scrn & V_NOSCALESTART)
 	{
 		x >>= FRACBITS;
 		y >>= FRACBITS;
-		desttop += (y*vid.width) + x;
 	}
 	else
 	{
@@ -1078,20 +1076,18 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 					y += (vid.height - (BASEVIDHEIGHT * vid.dup)) / 2;
 			}
 		}
-
-		desttop += (y*vid.width) + x;
 	}
 
-	const INT32 stride = vid.width;
+	desttop += (y*vid.width) + x;
 
-	for (col = sx<<FRACBITS; (col>>FRACBITS) < patch->width && ((col>>FRACBITS) - sx) < w; col += colfrac, ++x, desttop++)
+	for (col = sx<<FRACBITS; (col>>FRACBITS) < patch->width && ((col>>FRACBITS) - sx) < w; col += colfrac, ++x, desttop += vid.height)
 	{
 		INT32 topdelta, prevdelta = -1;
 
 		if (x < 0) // don't draw off the left of the screen (WRAP PREVENTION)
 			continue;
 
-		if (x >= stride) // don't draw off the right of the screen (WRAP PREVENTION)
+		if (x >= vid.width) // don't draw off the right of the screen (WRAP PREVENTION)
 			break;
 
 		column = (const column_t *)((const UINT8 *)(patch->columns) + (patch->columnofs[col>>FRACBITS]));
@@ -1109,17 +1105,20 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 					dest = desttop;
 					if (topdelta-sy > 0)
 					{
-						dest += FixedInt(FixedMul((topdelta-sy)<<FRACBITS,fdup))*stride;
+						dest += FixedInt(FixedMul((topdelta-sy)<<FRACBITS,fdup));
 						ofs = 0;
 					}
 					else
 						ofs = (sy-topdelta)<<FRACBITS;
 
-					for (; dest < deststop && (ofs>>FRACBITS) < column->length && (((ofs>>FRACBITS) - sy) + topdelta) < h; ofs += rowfrac)
+					UINT8 *col_start = vid.screens[0] + (x*vid.height);
+					deststop = col_start + vid.height;
+
+					for (; dest < deststop && (size_t)(ofs>>FRACBITS) < column->length && (((ofs>>FRACBITS) - sy) + topdelta) < h; ofs += rowfrac)
 					{
-						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+						if (dest >= col_start) // don't draw off the top of the screen (CRASH PREVENTION)
 							*dest = source[ofs>>FRACBITS];
-						dest += stride;
+						dest++;
 					}
 					column = (const column_t *)((const UINT8 *)column + column->length + 4);
 				}
@@ -1136,17 +1135,20 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 					dest = desttop;
 					if (topdelta-sy > 0)
 					{
-						dest += FixedInt(FixedMul((topdelta-sy)<<FRACBITS,fdup))*stride;
+						dest += FixedInt(FixedMul((topdelta-sy)<<FRACBITS,fdup));
 						ofs = 0;
 					}
 					else
 						ofs = (sy-topdelta)<<FRACBITS;
 
-					for (; dest < deststop && (ofs>>FRACBITS) < column->length && (((ofs>>FRACBITS) - sy) + topdelta) < h; ofs += rowfrac)
+					UINT8 *col_start = vid.screens[0] + (x*vid.height);
+					deststop = col_start + vid.height;
+
+					for (; dest < deststop && (size_t)(ofs>>FRACBITS) < column->length && (((ofs>>FRACBITS) - sy) + topdelta) < h; ofs += rowfrac)
 					{
-						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+						if (dest >= col_start) // don't draw off the top of the screen (CRASH PREVENTION)
 							*dest = *(v_translevel + ((source[ofs>>FRACBITS]<<8)&0xff00) + (*dest&0xff));
-						dest += stride;
+						dest++;
 					}
 					column = (const column_t *)((const UINT8 *)column + column->length + 4);
 				}
@@ -1188,8 +1190,8 @@ void V_DrawBlock(INT32 x, INT32 y, INT32 scrn, INT32 width, INT32 height, const
 		I_Error("Bad V_DrawBlock");
 #endif
 
-	dest = vid.screens[scrn] + y*vid.width + x;
-	deststop = vid.screens[scrn] + vid.width * vid.height;
+	dest = vid.screens[scrn] + x*vid.height + y;
+	deststop = vid.screens[scrn] + vid.height * vid.width;
 
 	while (height--)
 	{
@@ -1208,7 +1210,7 @@ void V_DrawBlock(INT32 x, INT32 y, INT32 scrn, INT32 width, INT32 height, const
 // alug: now with translucency support X)
 void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 {
-	UINT8 *dest;
+	UINT8 *dest, *desttop;
 	const UINT8 *deststop;
 	UINT32 alphalevel = ((c & V_ALPHAMASK) >> V_ALPHASHIFT);
 
@@ -1284,8 +1286,8 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 	if (y + h > vid.height)
 		h = vid.height-y;
 
-	dest = vid.screens[0] + y*vid.width + x;
-	deststop = vid.screens[0] + vid.width * vid.height;
+	dest = desttop = vid.screens[0] + x*vid.height + y;
+	deststop = vid.screens[0] + vid.height * vid.width;
 
 	if (alphalevel)
 	{
@@ -1311,16 +1313,31 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 	if (alphalevel)
 	{
 		const UINT8 *fadetable = ((UINT8 *)transtables + ((alphalevel-1)<<FF_TRANSSHIFT) + (c*256));
-		for (;(--h >= 0) && dest < deststop; dest += vid.width)
+		for (;(--h >= 0) && desttop < deststop; desttop++)
 		{
-			for (x = 0; x < w; x++)
-				dest[x] = fadetable[dest[x]];
+			dest = desttop;
+
+			UINT8 *row_end = dest + (w * vid.height);
+			while (dest < row_end)
+			{
+				*dest = fadetable[*dest];
+				dest += vid.height;
+			}
 		}
 	}
 	else
 	{
-		for (;(--h >= 0) && dest < deststop; dest += vid.width)
-			memset(dest, c, w);
+		for (;(--h >= 0) && desttop < deststop; desttop++)
+		{
+			dest = desttop;
+
+			UINT8 *row_end = dest + (w * vid.height);
+			while (dest < row_end)
+			{
+				*dest = c;
+				dest += vid.height;
+			}
+		}
 	}
 }
 
@@ -1366,8 +1383,8 @@ static UINT32 V_GetHWConsBackColor(void)
 
 void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 {
-	UINT8 *dest;
-	INT32 u, v;
+	UINT8 *dest, *desttop;
+	INT32 v;
 	UINT32 alphalevel = 0;
 
 	if (rendermode == render_none)
@@ -1434,7 +1451,7 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 	if (y + h > vid.height)
 		h = vid.height-y;
 
-	dest = vid.screens[0] + y*vid.width + x;
+	dest = desttop = vid.screens[0] + x*vid.height + y;
 
 	if ((alphalevel = ((c & V_ALPHAMASK) >> V_ALPHASHIFT)))
 	{
@@ -1459,11 +1476,14 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 
 	if (!alphalevel)
 	{
-		for (v = 0; v < h; v++, dest += vid.width)
+		for (v = 0; v < h; v++, desttop++)
 		{
-			for (u = 0; u < w; u++)
+			dest = desttop;
+			UINT8 *row_end = dest + w*vid.height;
+			while (dest < row_end)
 			{
-				dest[u] = consolebgmap[dest[u]];
+				*dest = consolebgmap[*dest];
+				dest += vid.height;
 			}
 		}
 	}
@@ -1474,11 +1494,14 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 		w = clip(w,vid.width);
 		h = clip(h,vid.height);
 #undef clip
-		for (v = 0; v < h; v++, dest += vid.width)
+		for (v = 0; v < h; v++, desttop++)
 		{
-			for (u = 0; u < w; u++)
+			dest = desttop;
+			UINT8 *row_end = dest + w*vid.height;
+			while (dest < row_end)
 			{
-				dest[u] = fadetable[consolebgmap[dest[u]]];
+				*dest = fadetable[consolebgmap[*dest]];
+				dest += vid.height;
 			}
 		}
 	}
@@ -1493,7 +1516,8 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 //
 void V_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 c)
 {
-	UINT8 *dest;
+	UINT8 *dest, *desttop;
+
 	const UINT8 *deststop;
 	INT32 w, h, wait = 0;
 
@@ -1568,19 +1592,28 @@ void V_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 c)
 	if (h > w)
 		h = w;
 
-	dest = vid.screens[0] + y*vid.width + x;
-	deststop = vid.screens[0] + vid.width * vid.height;
+	dest = desttop = vid.screens[0] + x*vid.height + y;
+	deststop = vid.screens[0] + vid.height * vid.width;
 
 	c &= 255;
 
-	for (;(--h >= 0) && dest < deststop; dest += vid.width)
+	for (;(--h >= 0) && desttop < deststop; desttop++)
 	{
-		memset(dest, c, w);
+		dest = desttop;
+
+		UINT8 *row_end = dest + (w * vid.height);
+		while (dest < row_end)
+		{
+			*dest = c;
+			dest += vid.height;
+		}
+
 		if (wait)
 			wait--;
 		else
 			w--;
 	}
+
 }
 
 //
@@ -1591,7 +1624,7 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum)
 	INT32 u, v;
 	fixed_t dx, dy, xfrac, yfrac;
 	const UINT8 *src, *deststop;
-	UINT8 *flat, *dest;
+	UINT8 *flat, *dest, *desttop;
 	size_t size, lflatsize, flatshift;
 
 #ifdef HWRENDER
@@ -1638,7 +1671,7 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum)
 
 	flat = W_CacheLumpNum(flatnum, PU_CACHE);
 
-	dest = vid.screens[0] + y*vid.dup*vid.width + x*vid.dup;
+	dest = desttop = vid.screens[0] + y*vid.dup*vid.width + x*vid.dup;
 	deststop = vid.screens[0] + vid.width * vid.height;
 
 	// from V_DrawScaledPatch
@@ -1662,15 +1695,18 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum)
 	dy = FixedDiv(FRACUNIT, vid.dup<<(FRACBITS-2));
 
 	yfrac = 0;
-	for (v = 0; v < h; v++, dest += vid.width)
+	for (v = 0; v < h; v++, desttop++)
 	{
 		xfrac = 0;
 		src = flat + (((yfrac>>FRACBITS) & (lflatsize - 1)) << flatshift);
+		dest = desttop;
+
 		for (u = 0; u < w; u++)
 		{
-			if (&dest[u] > deststop)
+			if (dest > deststop)
 				return;
-			dest[u] = src[(xfrac>>FRACBITS)&(lflatsize-1)];
+			*dest = src[(xfrac>>FRACBITS)&(lflatsize-1)];
+			dest += vid.height;
 			xfrac += dx;
 		}
 		yfrac += dy;
@@ -1738,80 +1774,78 @@ void V_DrawHorizontallyScaledFullScreenPatch(patch_t *patch)
 
 void V_DrawVhsEffect(boolean rewind)
 {
-	static fixed_t upbary = 100, downbary = 150;
-
-	UINT8 barsize, updistort, downdistort;
+	static fixed_t upbary = 100*FRACUNIT, downbary = 150*FRACUNIT;
 
+	UINT8 *buf = vid.screens[0], *tmp = vid.screens[4];
 	UINT16 y;
-	UINT32 x, pos;
+	INT32 x;
 
-	UINT8 *buf, *tmp;
-	UINT8 *normalmapstart, *thismapstart;
+	UINT8 *normalmapstart = ((UINT8 *)transtables + (8<<FF_TRANSSHIFT|(19<<8)));
 #ifdef HQ_VHS
-	UINT8 *tmapstart;
+	UINT8 *tmapstart = ((UINT8 *)transtables + (6<<FF_TRANSSHIFT));
 #endif
+	UINT8 *thismapstart;
 	SINT8 offs;
 
-	barsize = vid.dup << 5;
-	updistort = vid.dup << (rewind ? 5 : 3);
-	downdistort = updistort >> 1;
+	UINT8 barsize = vid.dup<<5;
+	UINT8 updistort = vid.dup<<(rewind ? 5 : 3);
+	UINT8 downdistort = updistort>>1;
 
 	if (rewind)
 		V_DrawVhsEffect(false); // experimentation
 
-	upbary -= FixedMul(vid.dup * (rewind ? 3 : 1.8f), renderdeltatics);
-	downbary += FixedMul(vid.dup * (rewind ? 2 : 1), renderdeltatics);
+	upbary -= renderdeltatics * (vid.dup * (rewind ? 3 : 1.8f));
+	downbary += renderdeltatics * (vid.dup * (rewind ? 2 : 1));
 
-	if (upbary < -barsize)
-		upbary = vid.height;
+	if (upbary < -barsize*FRACUNIT)
+		upbary = vid.height<<FRACBITS;
+	if (downbary > vid.height<<FRACBITS)
+		downbary = -barsize*FRACUNIT;
 
-	if (downbary > vid.height)
-		downbary = -barsize;
+	fixed_t uby = upbary>>FRACBITS, dby = downbary>>FRACBITS;
 
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
 	{
-		HWR_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
+		HWR_RenderVhsEffect(uby, dby, updistort, downdistort, barsize);
 		return;
 	}
 #endif
 
-	buf = vid.screens[0];
-	tmp = vid.screens[4];
+	// Since we go through columns now instead of rows, we need to keep same random offset values for each row
+	// Don't need a random value for each row, just a bunch of values to cycle through will do
+#define ROWOFFSLEN 128
+	SINT8 rowoffs[ROWOFFSLEN];
+	for (y = 0; y < ROWOFFSLEN; y++)
+		rowoffs[y] = M_RandomKey(vid.dup<<1);
 
-	normalmapstart = ((UINT8 *)transtables + (8<<FF_TRANSSHIFT|(19<<8)));
-#ifdef HQ_VHS
-	tmapstart = ((UINT8 *)transtables + (6<<FF_TRANSSHIFT));
-#endif
-
-	pos = 0;
-
-	for (y = 0; y < vid.height; y+=2)
+	for (x = 0; x < vid.width; ++x)
 	{
-		thismapstart = normalmapstart;
-		offs = 0;
-
-		if (y >= upbary && y < upbary+barsize)
+		for (y = 0; y < vid.height; y++)
 		{
-			thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
-			offs += updistort * 2.0f * min(y-upbary, upbary+barsize-y) / barsize;
-		}
+			offs = rowoffs[y/2 % ROWOFFSLEN];
 
-		if (y >= downbary && y < downbary+barsize)
-		{
-			thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
-			offs -= downdistort * 2.0f * min(y-downbary, downbary+barsize-y) / barsize;
-		}
+			thismapstart = normalmapstart;
 
-		offs += M_RandomKey(vid.dup<<1);
+			if (y >= uby && y < uby+barsize)
+			{
+				thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
+				offs += updistort * 2.0f * min(y-uby, uby+barsize-y) / barsize;
+			}
 
-		// lazy way to avoid crashes
-		if ((y == 0 && offs < 0) || (y >= vid.height-2 && offs > 0))
-			offs = 0;
+			if (y >= dby && y < dby+barsize)
+			{
+				thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
+				offs -= downdistort * 2.0f * min(y-dby, dby+barsize-y) / barsize;
+			}
 
-		for (x = min(pos+(size_t)vid.width*2, (size_t)vid.width*vid.height); pos < x; pos++)
-		{
-			tmp[pos] = thismapstart[buf[pos+offs]];
+			INT32 pos = x*vid.height + y;
+			INT32 offspos = pos + offs*vid.height;
+
+			if (offspos < 0 || offspos > vid.width*vid.height)
+				offspos = pos;
+
+			tmp[pos] = thismapstart[buf[offspos]];
 #ifdef HQ_VHS
 			tmp[pos] = tmapstart[buf[pos]<<8 | tmp[pos]];
 #endif
@@ -1819,6 +1853,7 @@ void V_DrawVhsEffect(boolean rewind)
 	}
 
 	memcpy(buf, tmp, vid.width*vid.height);
+#undef ROWOFFSLEN
 }
 
 //
@@ -1846,7 +1881,7 @@ void V_DrawFadeScreen(UINT16 color, UINT8 strength)
 		: ((color & 0xFF00) // Color is not palette index?
 		? ((UINT8 *)colormaps + strength*256) // Do COLORMAP fade.
 		: ((UINT8 *)transtables + ((9-strength)<<FF_TRANSSHIFT) + color*256)); // Else, do TRANSMAP** fade.
-	const UINT8 *deststop = vid.screens[0] + vid.width * vid.height;
+	const UINT8 *deststop = vid.screens[0] + vid.height * vid.width;
 	UINT8 *buf = vid.screens[0];
 
 	// heavily simplified -- we don't need to know x or y
@@ -1858,7 +1893,7 @@ void V_DrawFadeScreen(UINT16 color, UINT8 strength)
 // Simple translucency with one color, over a set number of lines starting from the top.
 void V_DrawFadeConsBack(INT32 plines)
 {
-	UINT8 *deststop, *buf;
+	UINT8 *deststop, *dest, *desttop;
 
 #ifdef HWRENDER // not win32 only 19990829 by Kin
 	if (rendermode == render_opengl)
@@ -1871,9 +1906,18 @@ void V_DrawFadeConsBack(INT32 plines)
 
 	// heavily simplified -- we don't need to know x or y position,
 	// just the stop position
-	deststop = vid.screens[0] + vid.width * min(plines, vid.height);
-	for (buf = vid.screens[0]; buf < deststop; ++buf)
-		*buf = consolebgmap[*buf];
+	dest = desttop = vid.screens[0];
+	deststop = vid.screens[0] + min(plines, vid.height);
+	for (; desttop < deststop; desttop++)
+	{
+		dest = desttop;
+		UINT8 *row_end = dest + (vid.width * vid.height);
+		while (dest < row_end)
+		{
+			*dest = consolebgmap[*dest];
+			dest += vid.height;
+		}
+	}
 }
 
 // Gets string colormap, used for 0x80 color codes
@@ -1918,10 +1962,8 @@ UINT8 *V_GetStringColormap(INT32 colorflags)
 	}
 #else // optimised
 	colorflags = ((colorflags & V_CHARCOLORMASK) >> V_CHARCOLORSHIFT);
-
 	if (!colorflags || colorflags > 15) // INT32 is signed, but V_CHARCOLORMASK is a very restrictive mask.
 		return NULL;
-
 	return (purplemap+((colorflags-1)<<8));
 #endif
 }
@@ -2011,7 +2053,6 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 	for (i = 0; i < slen; ++i)
 	{
 		c = newstring[i];
-
 		if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
 			continue;
 
@@ -3106,9 +3147,6 @@ INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option)
 	INT32 spacewidth = 4, charwidth = 0;
 	ssize_t i;
 
-	if (!string)
-		return 0;
-
 	if (length < 0)
 		length = strlen(string);
 
@@ -3151,9 +3189,6 @@ INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option)
 	INT32 spacewidth = 2, charwidth = 0;
 	ssize_t i;
 
-	if (!string)
-		return 0;
-
 	if (length < 0)
 		length = strlen(string);
 
@@ -3194,14 +3229,9 @@ INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option)
 {
 	INT32 c, w = 0;
 	INT32 spacewidth = 2, charwidth = 0;
-	boolean lowercase;
+	boolean lowercase = (option & V_ALLOWLOWERCASE);
 	ssize_t i;
 
-	if (!string)
-		return 0;
-
-	lowercase = (option & V_ALLOWLOWERCASE);
-
 	if (length < 0)
 		length = strlen(string);
 
@@ -3256,9 +3286,6 @@ INT32 V_SubStringLengthToFit(const char *string, INT32 width, INT32 option)
 	INT32 spacewidth = 4, charwidth = 0;
 	INT32 i;
 
-	if (!string)
-		return 0;
-
 	switch (option & V_SPACINGMASK)
 	{
 		case V_MONOSPACE:
@@ -3580,9 +3607,6 @@ boolean *heatshifter = NULL;
 INT32 lastheight = 0;
 INT32 heatindex[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0};
 
-// unused motion blur effect, probably non functional
-//#define MOTIONBLUR
-
 //
 // V_DoPostProcessor
 //
@@ -3597,9 +3621,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 	(void)type;
 	(void)param;
 #else
-#ifndef MOTIONBLUR
 	(void)param; // unused motion blur stuff
-#endif
 	INT32 yoffset, xoffset;
 
 #ifdef HWRENDER
@@ -3630,7 +3652,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 
 	if (thiscam->postimg & POSTIMG_WATER)
 	{
-		INT32 y;
+		INT32 y, x;
 		// Set disStart to a range from 0 to FINEANGLE, incrementing by 128 per tic
 		angle_t disStart = (((leveltime-1)*128) + (R_GetTimeFrac(RTF_LEVEL) / (FRACUNIT/128))) & FINEMASK;
 		INT32 newpix;
@@ -3640,7 +3662,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 		for (y = yoffset; y < yoffset+viewheight; y++)
 		{
 			sine = (FINESINE(disStart)*5)>>FRACBITS;
-			newpix = abs(sine);
+			/*newpix = abs(sine);
 
 			if (sine < 0)
 			{
@@ -3663,7 +3685,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 					tmpscr[(y*vid.width)+xoffset+viewwidth-newpix] = srcscr[(y*vid.width)+xoffset+(viewwidth-1)];
 					newpix--;
 				}
-			}
+			}*/
 
 			/*
 			 Unoptimized version
@@ -3679,6 +3701,18 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 			 	tmpscr[y*vid.width + x] = srcscr[y*vid.width+newpix]; // *(transme + (srcscr[y*vid.width+x]<<8) + srcscr[y*vid.width+newpix]);
 			 }*/
 
+			for (x = 0; x < vid.width; x++)
+			{
+				newpix = (x + sine);
+
+				if (newpix < 0)
+					newpix = 0;
+				else if (newpix >= vid.width)
+					newpix = vid.width-1;
+
+				tmpscr[y + x*vid.height] = srcscr[y+newpix*vid.height]; // *(transme + (srcscr[y*vid.width+x]<<8) + srcscr[y*vid.width+newpix]);
+			}
+
 			disStart += 22;//the offset into the displacement map, increment each game loop
 			disStart &= FINEMASK; //clip it to FINEMASK
 		}
@@ -3689,7 +3723,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 	}
 	else if (thiscam->postimg & POSTIMG_HEAT) // Heat wave
 	{
-		INT32 y;
+		INT32 y, x;
 
 		// Make sure table is built
 		if (heatshifter == NULL || lastheight != viewheight)
@@ -3714,11 +3748,12 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 			if (heatshifter[heatindex[view]++])
 			{
 				// Shift this row of pixels to the right by 2
-				tmpscr[(y*vid.width)+xoffset] = srcscr[(y*vid.width)+xoffset];
-				M_Memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset+vid.dup], viewwidth-vid.dup);
+				tmpscr[y] = srcscr[y];
+				for (x = vid.dup; x < vid.width; x++)
+					tmpscr[y+x*vid.height] = srcscr[y+(x-vid.dup)*vid.height];
 			}
-			else
-				M_Memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
+			else for (x = 0; x < vid.width; x++)
+				tmpscr[y+x*vid.height] = srcscr[y+x*vid.height];
 
 			heatindex[view] %= viewheight;
 		}
@@ -3734,8 +3769,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 		srcscr = tmp;
 	}
 
-#ifdef MOTIONBLUR
-	if (thiscam->postimg & POSTIMG_MOTION) // Motion Blur!
+	/*if (thiscam->postimg & POSTIMG_MOTION) // Motion Blur!
 	{
 		INT32 x, y;
 
@@ -3747,15 +3781,15 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 			for (x = xoffset; x < xoffset+viewwidth; x++)
 				tmpscr[y*vid.width + x] =     colormaps[*(transme     + (srcscr   [(y*vid.width)+x ] <<8) + (tmpscr[(y*vid.width)+x]))];
 		}
-	}
-#endif
+	}*/
 
 	if ((thiscam->postimg & POSTIMG_FLIP) && !(thiscam->postimg & POSTIMG_MIRROR)) // Flip the screen upside-down
 	{
-		INT32 y, y2;
+		INT32 x, y, y2;
 
-		for (y = yoffset, y2 = yoffset+viewheight - 1; y < yoffset+viewheight; y++, y2--)
-			M_Memcpy(&tmpscr[(y2*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
+		for (x = xoffset; x < xoffset+viewwidth; x++)
+			for (y = yoffset, y2 = yoffset+(viewheight-1); y < yoffset+viewheight; y++, y2--)
+				tmpscr[x*vid.height + y2] = srcscr[x*vid.height + y];
 
 		UINT8 *tmp = tmpscr;
 		tmpscr = srcscr;
@@ -3763,11 +3797,10 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 	}
 	else if ((thiscam->postimg & POSTIMG_MIRROR) && !(thiscam->postimg & POSTIMG_FLIP)) // Flip the screen on the x axis
 	{
-		INT32 y, x, x2;
+		INT32 x, x2;
 
-		for (y = yoffset; y < yoffset+viewheight; y++)
-			for (x = xoffset, x2 = xoffset+(viewwidth-1); x < xoffset+viewwidth; x++, x2--)
-				tmpscr[y*vid.width + x2] = srcscr[y*vid.width + x];
+		for (x = xoffset, x2 = xoffset+viewwidth - 1; x < xoffset+viewwidth; x++, x2--)
+			M_Memcpy(&tmpscr[(x2*vid.height)+yoffset], &srcscr[(x*vid.height)+yoffset], viewheight);
 
 		UINT8 *tmp = tmpscr;
 		tmpscr = srcscr;
@@ -3787,7 +3820,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 	}
 
 	VID_BlitLinearScreen(srcscr+vid.width*yoffset+xoffset, tmpscr+vid.width*yoffset+xoffset,
-						 viewwidth, viewheight, vid.width, vid.width);
+						 viewwidth, viewheight, vid.height, vid.height);
 #endif
 }
 
@@ -3843,19 +3876,15 @@ UINT8 GetColorLUTDirect(colorlookup_t *lut, UINT8 r, UINT8 g, UINT8 b)
 void V_Init(void)
 {
 	INT32 i;
-	INT32 screensize = vid.width * vid.height;
+	INT32 screensize = vid.height * vid.width;
 
 	for (i = 0; i < NUMSCREENS; i++)
 	{
-		if (vid.screens[i])
-		{
 #if defined(__SSE__)
-			aligned_free(vid.screens[i]);
+		aligned_free(vid.screens[i]);
 #else
-			free(vid.screens[i]);
+		free(vid.screens[i]);
 #endif
-		}
-
 		vid.screens[i] = NULL;
 	}