Merge branch 'Saturn-Next' into controllerfixes

this caused some crashes in blankart, hopefully this is fine though

src/Makefile

@@ -49,6 +49,7 @@
 #                    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).

src/Makefile.d/features.mk

@@ -6,7 +6,8 @@ passthru_opts+=\
 	NOHW NOMD5 NOPOSTPROCESSING\
 	MOBJCONSISTANCY PACKETDROP ZDEBUG\
 	HAVE_MINIUPNPC\
-	HAVE_DISCORDRPC DEVELOP
+	HAVE_DISCORDRPC DEVELOP\
+	NOHOLEPUNCH\
 
 # build with debugging information
 ifdef DEBUGMODE

src/Makefile.d/versions.mk

@@ -144,8 +144,10 @@ ifdef GCC81
  WFLAGS+=-Wno-error=multistatement-macros
 endif
 
-ifeq ($(CC),clang)
- WFLAGS+= -Wno-unknown-pragmas -Wno-cast-align
+ifneq (,$(filter $(CC) $(CXX),clang clang++))
+ WFLAGS+= -Wno-unknown-pragmas
+ WFLAGS+= -Wno-cast-align
+ WFLAGS+= -Wno-cast-qual # not a fan, but clang really hates our read macros
 endif
 
 ifdef NONX86

src/blua/lapi.c

@@ -434,7 +434,7 @@ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
 LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
   lua_lock(L);
   luaC_checkGC(L);
-  setsvalue2s(L, L->top, luaS_newlstr(L, s, len));
+  setsvalue2s(L, L->top, (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len));
   api_incr_top(L);
   lua_unlock(L);
 }

src/blua/lauxlib.c

@@ -24,6 +24,8 @@
 
 #include "lauxlib.h"
 
+#include "../doomdef.h"
+
 
 #define FREELIST_REF	0	/* free list of references */
 
@@ -40,7 +42,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 (strcmp(ar.namewhat, "method") == 0) {
+  if (fastcmp(ar.namewhat, "method")) {
     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)",
@@ -97,7 +99,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 (strcmp(lst[i], name) == 0)
+    if (fastcmp(lst[i], name))
       return i;
   return luaL_argerror(L, narg,
                        lua_pushfstring(L, "invalid option " LUA_QS, name));

src/blua/liolib.c

@@ -161,12 +161,13 @@ 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;
@@ -178,12 +179,13 @@ static int io_open (lua_State *L) {
 
 	for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
 	{
-		if (!stricmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
+		if (fasticmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
 		{
 			pass = 1;
 			break;
 		}
 	}
+
 	if (l_unlikely(strstr(filename, "..") || strchr(filename, ':') || StartsWith(filename, "\\")
 		|| StartsWith(filename, "/") || !pass))
 	{

src/byteptr.h

@@ -1,7 +1,8 @@
-// SONIC ROBO BLAST 2
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2025 by Sonic Team Junior.
+// Copyright (C) 2025 by Kart Krew.
+// Copyright (C) 2020 by Sonic Team Junior.
+// Copyright (C) 2000 by DooM Legacy Team.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -24,8 +25,9 @@ extern "C" {
 //
 // Little-endian machines
 //
+
 #define WRITEUINT8(p,b)     do {   UINT8 *p_tmp = (  UINT8 *)p; const   UINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
-#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (  SINT8 *)p; const   SINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (  SINT8 *)p; const   SINT8 tv = (  SINT8)(b); memcpy(p, &tv, sizeof(  SINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 #define WRITEINT16(p,b)     do {   INT16 *p_tmp = (  INT16 *)p; const   INT16 tv = (  INT16)(b); memcpy(p, &tv, sizeof(  INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 #define WRITEUINT16(p,b)    do {  UINT16 *p_tmp = ( UINT16 *)p; const  UINT16 tv = ( UINT16)(b); memcpy(p, &tv, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 #define WRITEINT32(p,b)     do {   INT32 *p_tmp = (  INT32 *)p; const   INT32 tv = (  INT32)(b); memcpy(p, &tv, sizeof(  INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
@@ -36,25 +38,25 @@ extern "C" {
 
 // what is this?
 #if defined (__GNUC__)
-#define READUINT8(p)        ({   UINT8 *p_tmp = (UINT8   *)p;   UINT8 b; memcpy(&b, p, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READSINT8(p)        ({   SINT8 *p_tmp = (SINT8   *)p;   SINT8 b; memcpy(&b, p, sizeof(  SINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READINT16(p)        ({   INT16 *p_tmp = (INT16   *)p;   INT16 b; memcpy(&b, p, sizeof(  INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READUINT16(p)       ({  UINT16 *p_tmp = (UINT16  *)p;  UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READINT32(p)        ({   INT32 *p_tmp = (INT32   *)p;   INT32 b; memcpy(&b, p, sizeof(  INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READUINT32(p)       ({  UINT32 *p_tmp = (UINT32  *)p;  UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READCHAR(p)         ({    char *p_tmp = (char    *)p;    char b; memcpy(&b, p, sizeof(   char)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READFIXED(p)        ({ fixed_t *p_tmp = (fixed_t *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READANGLE(p)        ({ angle_t *p_tmp = (angle_t *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READUINT8(p)        ({   const UINT8 *p_tmp = (const UINT8   *)p;   UINT8 b; memcpy(&b, p, sizeof(  UINT8)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READSINT8(p)        ({   const SINT8 *p_tmp = (const SINT8   *)p;   SINT8 b; memcpy(&b, p, sizeof(  SINT8)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READINT16(p)        ({   const INT16 *p_tmp = (const INT16   *)p;   INT16 b; memcpy(&b, p, sizeof(  INT16)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READUINT16(p)       ({  const UINT16 *p_tmp = (const UINT16  *)p;  UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READINT32(p)        ({   const INT32 *p_tmp = (const INT32   *)p;   INT32 b; memcpy(&b, p, sizeof(  INT32)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READUINT32(p)       ({  const UINT32 *p_tmp = (const UINT32  *)p;  UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READCHAR(p)         ({    const char *p_tmp = (const char    *)p;    char b; memcpy(&b, p, sizeof(   char)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READFIXED(p)        ({ const fixed_t *p_tmp = (const fixed_t *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READANGLE(p)        ({ const angle_t *p_tmp = (const angle_t *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
 #else
-#define READUINT8(p)        ((UINT8*)(*(void**)(&(p)) = (void*)&((UINT8*)(p))[1]))[-1]
-#define READSINT8(p)        ((SINT8*)(*(void**)(&(p)) = (void*)&((SINT8*)(p))[1]))[-1]
-#define READINT16(p)        ((INT16*)(*(void**)(&(p)) = (void*)&((INT16*)(p))[1]))[-1]
-#define READUINT16(p)       ((UINT16*)(*(void**)(&(p)) = (void*)&((UINT16*)(p))[1]))[-1]
-#define READINT32(p)        ((INT32*)(*(void**)(&(p)) = (void*)&((INT32*)(p))[1]))[-1]
-#define READUINT32(p)       ((UINT32*)(*(void**)(&(p)) = (void*)&((UINT32*)(p))[1]))[-1]
-#define READCHAR(p)         ((char*)(*(void**)(&(p)) = (void*)&((char*)(p))[1]))[-1]
-#define READFIXED(p)        ((fixed_t*)(*(void**)(&(p)) = (void*)&((fixed_t*)(p))[1]))[-1]
-#define READANGLE(p)        ((angle_t*)(*(void**)(&(p)) = (void*)&((angle_t*)(p))[1]))[-1]
+#define READUINT8(p)        ((const UINT8*)  (*(const void**)(&(p)) = (const void*)&((const UINT8*)  (p))[1]))[-1]
+#define READSINT8(p)        ((const SINT8*)  (*(const void**)(&(p)) = (const void*)&((const SINT8*)  (p))[1]))[-1]
+#define READINT16(p)        ((const INT16*)  (*(const void**)(&(p)) = (const void*)&((const INT16*)  (p))[1]))[-1]
+#define READUINT16(p)       ((const UINT16*) (*(const void**)(&(p)) = (const void*)&((const UINT16*) (p))[1]))[-1]
+#define READINT32(p)        ((const INT32*)  (*(const void**)(&(p)) = (const void*)&((const INT32*)  (p))[1]))[-1]
+#define READUINT32(p)       ((const UINT32*) (*(const void**)(&(p)) = (const void*)&((const UINT32*) (p))[1]))[-1]
+#define READCHAR(p)         ((const char*)   (*(const void**)(&(p)) = (const void*)&((const char*)   (p))[1]))[-1]
+#define READFIXED(p)        ((const fixed_t*)(*(const void**)(&(p)) = (const void*)&((const fixed_t*)(p))[1]))[-1]
+#define READANGLE(p)        ((const angle_t*)(*(const void**)(&(p)) = (const void*)&((const angle_t*)(p))[1]))[-1]
 #endif
 
 #else //SRB2_BIG_ENDIAN
@@ -117,15 +119,15 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
 	return (ucp[3] << 24) | (ucp[2] << 16) | (ucp[1] << 8) | ucp[0];
 }
 
-#define READUINT8(p)        ((UINT8*)(p = (void*)&((UINT8*)p)[1]))[-1]
-#define READSINT8(p)        ((SINT8*)(p = (void*)&((SINT8*)p)[1]))[-1]
-#define READINT16(p)        readshort(&((INT16*)(p = (void*)&((INT16*)p)[1]))[-1])
-#define READUINT16(p)       readushort(&((UINT16*)(p = (void*)&((UINT16*)p)[1]))[-1])
-#define READINT32(p)        readlong(&((INT32*)(p = (void*)&((INT32*)p)[1]))[-1])
-#define READUINT32(p)       readulong(&((UINT32*)(p = (void*)&((UINT32*)p)[1]))
-#define READCHAR(p)         ((char*)(p = (void*)&((char*)p)[1]))[-1]
-#define READFIXED(p)        readlong(&((fixed_t*)(p = (void*)&((fixed_t*)p)[1]))[-1])
-#define READANGLE(p)        readulong(&((angle_t*)(p = (void*)&((angle_t*)p)[1]))[-1])
+#define READUINT8(p)        ((const UINT8*)(p = (const void*)&((const UINT8*)p)[1]))[-1]
+#define READSINT8(p)        ((const SINT8*)(p = (const void*)&((const SINT8*)p)[1]))[-1]
+#define READINT16(p)        readshort(&((const INT16*)(p = (const void*)&((const INT16*)p)[1]))[-1])
+#define READUINT16(p)       readushort(&((const UINT16*)(p = (const void*)&((const UINT16*)p)[1]))[-1])
+#define READINT32(p)        readlong(&((const INT32*)(p = (const void*)&((const INT32*)p)[1]))[-1])
+#define READUINT32(p)       readulong(&((const UINT32*)(p = (const void*)&((const UINT32*)p)[1]))[-1])
+#define READCHAR(p)         ((const char*)(p = (const void*)&((const char*)p)[1]))[-1]
+#define READFIXED(p)        readlong(&((const fixed_t*)(p = (const void*)&((const fixed_t*)p)[1]))[-1])
+#define READANGLE(p)        readulong(&((const angle_t*)(p = (const void*)&((const angle_t*)p)[1]))[-1])
 #endif //SRB2_BIG_ENDIAN
 
 #define WRITESTRINGN(p, s, n) do {                          \

src/command.c

@@ -142,7 +142,7 @@ void COM_BufInsertText(const char *ptext)
 	templen = com_text.cursize;
 	if (templen)
 	{
-		temp = M_Memcpy(ZZ_Alloc(templen), com_text.data, templen);
+		temp = memcpy(ZZ_Alloc(templen), com_text.data, templen);
 		VS_Clear(&com_text);
 	}
 
@@ -199,7 +199,7 @@ void COM_BufExecute(void)
 				break;
 		}
 
-		M_Memcpy(line, ptext, i);
+		memcpy(line, ptext, i);
 		line[i] = 0;
 
 		// flush the command text from the command buffer, _BEFORE_
@@ -281,7 +281,7 @@ char *com_argv[MAX_ARGS];
 static const char *com_null_string = "";
 static char *com_args = NULL; // current command args or NULL
 
-static void Got_NetVar(UINT8 **p, INT32 playernum);
+static void Got_NetVar(const UINT8 **p, INT32 playernum);
 
 /** Initializes command buffer and adds basic commands.
   */
@@ -359,7 +359,7 @@ size_t COM_CheckParm(const char *check)
 	size_t i;
 
 	for (i = 1; i < com_argc; i++)
-		if (!strcasecmp(check, com_argv[i]))
+		if (fasticmp(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 (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (fasticmp(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 (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (fasticmp(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 (!stricmp(com_name, cmd->name))
+		if (fasticmp(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 (!stricmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (fasticmp(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 (!stricmp(com_argv[0], a->name))
+		if (fasticmp(com_argv[0], a->name))
 		{
 			if (recursion > MAX_ALIAS_RECURSION)
 				CONS_Alert(CONS_WARNING, M_GetText("Alias recursion cycle detected!\n"));
@@ -700,6 +700,7 @@ static void COM_Echo_f(void)
 
 	for (i = 1; i < COM_Argc(); i++)
 		CONS_Printf("%s ", COM_Argv(i));
+
 	CONS_Printf("\n");
 }
 
@@ -708,11 +709,11 @@ static void COM_Echo_f(void)
 static void COM_CEcho_f(void)
 {
 	size_t i;
-	char cechotext[1024] = "";
+	char cechotext[1024] = {0};
 
 	for (i = 1; i < COM_Argc(); i++)
 	{
-		strlcpy(cechotext, COM_Argv(i), sizeof(cechotext)-1);
+		strlcat(cechotext, COM_Argv(i), sizeof(cechotext)-1);
 		strlcat(cechotext, " ", sizeof(cechotext)-1);
 	}
 
@@ -835,7 +836,7 @@ static void COM_Help_f(void)
 			if (cvar->PossibleValue)
 			{
 				{
-					if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX"))
+					if (fasticmp(cvar->PossibleValue[0].strvalue, "MIN") && fasticmp(cvar->PossibleValue[1].strvalue, "MAX"))
 					{
 						if (floatmode)
 						{
@@ -878,7 +879,7 @@ static void COM_Help_f(void)
 		{
 			for (cmd = com_commands; cmd; cmd = cmd->next)
 			{
-				if (strcmp(cmd->name, help))
+				if (!fastcmp(cmd->name, help))
 					continue;
 
 				CONS_Printf("\x82""Command %s:\n", cmd->name);
@@ -938,6 +939,8 @@ static void COM_Find_f(void)
 	}
 
 	help = COM_Argv(1);
+	if (!help)
+		return;
 	helplen = strlen(help);
 	CONS_Printf("\x82""Variables:\n");
 	matchesany = false;
@@ -1126,7 +1129,7 @@ void *VS_GetSpace(vsbuf_t *buf, size_t length)
   */
 void VS_Write(vsbuf_t *buf, const void *data, size_t length)
 {
-	M_Memcpy(VS_GetSpace(buf, length), data, length);
+	memcpy(VS_GetSpace(buf, length), data, length);
 }
 
 /** Prints text in a variable buffer. Like VS_Write() plus a
@@ -1143,9 +1146,9 @@ void VS_Print(vsbuf_t *buf, const char *data)
 	len = strlen(data) + 1;
 
 	if (buf->data[buf->cursize-1])
-		M_Memcpy((UINT8 *)VS_GetSpace(buf, len), data, len); // no trailing 0
+		memcpy((UINT8 *)VS_GetSpace(buf, len), data, len); // no trailing 0
 	else
-		M_Memcpy((UINT8 *)VS_GetSpace(buf, len-1) - 1, data, len); // write over trailing 0
+		memcpy((UINT8 *)VS_GetSpace(buf, len-1) - 1, data, len); // write over trailing 0
 }
 
 // =========================================================================
@@ -1173,7 +1176,7 @@ consvar_t *CV_FindVar(const char *name)
 	consvar_t *cvar;
 
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if (!stricmp(name,cvar->name))
+		if (fasticmp(name,cvar->name))
 			return cvar;
 
 	return NULL;
@@ -1363,7 +1366,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 				v = INT32_MIN; // Invalid integer trigger
 		}
 
-		if (var->PossibleValue[0].strvalue && !stricmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
+		if (var->PossibleValue[0].strvalue && fasticmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
 		{
 #define MINVAL 0
 #define MAXVAL 1
@@ -1376,21 +1379,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 || !stricmp(var->PossibleValue[i].strvalue, valstr))
+				if (v == var->PossibleValue[i].value || fasticmp(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) || !stricmp(valstr, "MIN"))
+			if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || fasticmp(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) || !stricmp(valstr, "MAX"))
+			else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || fasticmp(valstr, "MAX"))
 			{
 				v = var->PossibleValue[MAXVAL].value;
 				valstr = var->PossibleValue[MAXVAL].strvalue;
@@ -1408,7 +1411,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 
 			// check first strings
 			for (i = 0; var->PossibleValue[i].strvalue; i++)
-				if (!stricmp(var->PossibleValue[i].strvalue, valstr))
+				if (fasticmp(var->PossibleValue[i].strvalue, valstr))
 					goto found;
 			if (v != INT32_MIN)
 			{
@@ -1421,9 +1424,9 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 			if (var->PossibleValue == CV_OnOff || var->PossibleValue == CV_YesNo)
 			{
 				overrideval = -1;
-				if (!stricmp(valstr, "on") || !stricmp(valstr, "yes"))
+				if (fasticmp(valstr, "on") || fasticmp(valstr, "yes"))
 					overrideval = 1;
-				else if (!stricmp(valstr, "off") || !stricmp(valstr, "no"))
+				else if (fasticmp(valstr, "off") || fasticmp(valstr, "no"))
 					overrideval = 0;
 
 				if (overrideval != -1)
@@ -1471,7 +1474,7 @@ finish:
 	var->flags |= CV_MODIFIED;
 
 	// raise 'on change' code
-	LUA_CVarChanged(var->name); // let consolelib know what cvar this is.
+	LUA_CVarChanged(var); // let consolelib know what cvar this is.
 
 	if (var->flags & CV_CALL && !stealth)
 		var->func();
@@ -1497,11 +1500,11 @@ badinput:
 
 static boolean serverloading = false;
 
-static void Got_NetVar(UINT8 **p, INT32 playernum)
+static void Got_NetVar(const UINT8 **p, INT32 playernum)
 {
 	consvar_t *cvar;
 	UINT16 netid;
-	char *svalue;
+	const char *svalue;
 	UINT8 stealth = false;
 
 	if (playernum != serverplayer && !IsPlayerAdmin(playernum) && !serverloading)
@@ -1515,9 +1518,10 @@ static void Got_NetVar(UINT8 **p, INT32 playernum)
 		}
 		return;
 	}
+
 	netid = READUINT16(*p);
 	cvar = CV_FindNetVar(netid);
-	svalue = (char *)*p;
+	svalue = (const char *)*p;
 	SKIPSTRING(*p);
 	stealth = READUINT8(*p);
 
@@ -1573,8 +1577,9 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
 	WRITEUINT16(count_p, count);
 }
 
-void CV_LoadNetVars(UINT8 **p)
+size_t CV_LoadNetVars(const UINT8 *bufstart)
 {
+	const UINT8 *p = bufstart;
 	consvar_t *cvar;
 	UINT16 count;
 
@@ -1585,11 +1590,13 @@ void CV_LoadNetVars(UINT8 **p)
 		if (cvar->flags & CV_NETVAR)
 			Setvalue(cvar, cvar->defaultvalue, true);
 
-	count = READUINT16(*p);
+	count = READUINT16(p);
 	while (count--)
-		Got_NetVar(p, 0);
+		Got_NetVar(&p, 0);
 
 	serverloading = false;
+
+	return p - bufstart;
 }
 
 static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth);
@@ -1607,7 +1614,7 @@ void CV_ResetCheatNetVars(void)
 // Returns true if the variable's current value is its default value
 boolean CV_IsSetToDefault(consvar_t *v)
 {
-	return (!(strcmp(v->defaultvalue, v->string)));
+	return (fastcmp(v->defaultvalue, v->string));
 }
 
 // If any cheats CVars are not at their default settings, return true.
@@ -1619,7 +1626,7 @@ UINT8 CV_CheatsEnabled(void)
 	consvar_t *cvar;
 
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if ((cvar->flags & CV_CHEAT) && strcmp(cvar->defaultvalue, cvar->string))
+		if ((cvar->flags & CV_CHEAT) && !fastcmp(cvar->defaultvalue, cvar->string))
 			return 1;
 	return 0;
 }
@@ -1640,7 +1647,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 || !stricmp(var->string, value))
+	if (!var || !var->string || !value || fasticmp(var->string, value))
 		return; // no changes
 
 	if (var->flags & CV_NETVAR)
@@ -1662,7 +1669,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 
 		if (var == &cv_kartspeed && !M_SecretUnlocked(SECRET_HARDSPEED))
 		{
-			if (!stricmp(value, "Hard") || atoi(value) == 2)
+			if (fasticmp(value, "Hard") || atoi(value) == 2)
 			{
 				CONS_Alert(CONS_NOTICE, "You haven't unlocked this yet!\n");
 				return;
@@ -1796,7 +1803,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 		}
 #define MINVAL 0
 #define MAXVAL 1
-		else if (var->PossibleValue[MINVAL].strvalue && !strcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
+		else if (var->PossibleValue[MINVAL].strvalue && fastcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
 		{ // SRB2Kart
 #ifdef PARANOIA
 			if (!var->PossibleValue[MAXVAL].strvalue)
@@ -1968,12 +1975,12 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 	{
 		if (joyaxis_default[i])
 		{
-			if (!stricmp(v->name, "joyaxis_fire"))
+			if (fasticmp(v->name, "joyaxis_fire"))
 			{
 				if (joyaxis_count[i] > 7) return false;
 				else if (joyaxis_count[i] == 7) return true;
 
-				if (!stricmp(valstr, "None")) joyaxis_count[i]++;
+				if (fasticmp(valstr, "None")) joyaxis_count[i]++;
 				else joyaxis_default[i] = false;
 			}
 			// reset all axis settings to defaults
@@ -2005,37 +2012,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 (!stricmp(v->name, "joyaxis_turn") && !stricmp(valstr, "X-Axis"))
+	if (fasticmp(v->name, "joyaxis_turn") && fasticmp(valstr, "X-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis2_turn") && !stricmp(valstr, "X-Axis"))
+	if (fasticmp(v->name, "joyaxis2_turn") && fasticmp(valstr, "X-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis3_turn") && !stricmp(valstr, "X-Axis"))
+	if (fasticmp(v->name, "joyaxis3_turn") && fasticmp(valstr, "X-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis4_turn") && !stricmp(valstr, "X-Axis"))
+	if (fasticmp(v->name, "joyaxis4_turn") && fasticmp(valstr, "X-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis_aim") && !stricmp(valstr, "Y-Axis"))
+	if (fasticmp(v->name, "joyaxis_aim") && fasticmp(valstr, "Y-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis2_aim") && !stricmp(valstr, "Y-Axis"))
+	if (fasticmp(v->name, "joyaxis2_aim") && fasticmp(valstr, "Y-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis3_aim") && !stricmp(valstr, "Y-Axis"))
+	if (fasticmp(v->name, "joyaxis3_aim") && fasticmp(valstr, "Y-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis4_aim") && !stricmp(valstr, "Y-Axis"))
+	if (fasticmp(v->name, "joyaxis4_aim") && fasticmp(valstr, "Y-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis_fire") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis_fire") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis2_fire") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis2_fire") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis3_fire") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis3_fire") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis4_fire") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis4_fire") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis_drift") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis_drift") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis2_drift") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis2_drift") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis3_drift") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis3_drift") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis4_drift") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis4_drift") && fasticmp(valstr, "None"))
 		return false;
 
 	return true;
@@ -2052,8 +2059,8 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr)
 
 	if (GETMAJOREXECVERSION(cv_execversion.value) < 8) // 8 = 1.4
 	{
-		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.
+		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.
 			return false;
 	}
 
@@ -2136,7 +2143,7 @@ void CV_SaveVariables(FILE *f)
 			char stringtowrite[MAXTEXTCMD+1];
 
 			// Silly hack for Min/Max vars
-			if (!strcmp(cvar->string, "MAX") || !strcmp(cvar->string, "MIN"))
+			if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
 			{
 				if (cvar->flags & CV_FLOAT)
 					sprintf(stringtowrite, "%f", FixedToFloat(cvar->value));

src/command.h

@@ -182,7 +182,7 @@ void CV_SaveVariables(FILE *f);
 
 // load/save gamesate (load and save option and for network join in game)
 void CV_SaveNetVars(UINT8 **p, boolean isdemorecording);
-void CV_LoadNetVars(UINT8 **p);
+size_t CV_LoadNetVars(const UINT8 *p);
 
 // reset cheat netvars after cheats is deactivated
 void CV_ResetCheatNetVars(void);

src/console.c

@@ -521,7 +521,7 @@ static void CON_RecalcSize(void)
 	oldcon_width = con_width;
 	oldnumlines = con_totallines;
 	oldcon_cy = con_cy;
-	M_Memcpy(tmp_buffer, con_buffer, CON_BUFFERSIZE);
+	memcpy(tmp_buffer, con_buffer, CON_BUFFERSIZE);
 
 	if (conw < 1)
 		con_width = (BASEVIDWIDTH>>3) - 2;
@@ -547,7 +547,7 @@ static void CON_RecalcSize(void)
 		{
 			if (tmp_buffer[(i%oldnumlines)*oldcon_width])
 			{
-				M_Memcpy(string, &tmp_buffer[(i%oldnumlines)*oldcon_width], oldcon_width);
+				memcpy(string, &tmp_buffer[(i%oldnumlines)*oldcon_width], oldcon_width);
 				conw = oldcon_width - 1;
 				while (string[conw] == ' ' && conw)
 					conw--;
@@ -1010,7 +1010,7 @@ boolean CON_Responder(event_t *ev)
 		Lock_state();
 
 		// Only add command to history if it differs from previous one
-		if (strcmp(input.buffer, inputlines[(inputline-1) & 31]))
+		if (!fastcmp(input.buffer, inputlines[(inputline-1) & 31]))
 		{
 			inputline = (inputline+1) & 31;
 			M_TextInputInit(&input, inputlines[inputline], CON_MAXPROMPTCHARS);

src/cxxutil.hpp

@@ -147,6 +147,51 @@ public:
 template <class T>
 NotNull(T) -> NotNull<T>;
 
+// does a super safe cast from floating point to interger types
+// this prob could be better since i suck at ceepeepee
+// but atleast we can just template shit to our desired types
+template <typename FloatT, typename IntT>
+static inline IntT floattoint(FloatT val)
+{
+	// :chaosleep:
+	static_assert(std::is_floating_point_v<FloatT>, "Input must be a floating-point type");
+	static_assert(std::is_integral_v<IntT>, "Output must be a integer type");
+
+	if (std::fpclassify(val) == FP_NAN)
+		return 0; // if stuffs not a number we sure screwed up lmao
+
+	// treat inifinity as "int min/max"
+	if (std::fpclassify(val) == FP_INFINITE)
+	{
+		// yes infinity can be signed kek
+		if (std::signbit(val))
+			return std::numeric_limits<IntT>::min(); // negative infinity, so return min
+		else
+			return std::numeric_limits<IntT>::max();
+	}
+
+	// make sure we fit into our targettype uwu
+	if (val > static_cast<FloatT>(std::numeric_limits<IntT>::max()))
+		return std::numeric_limits<IntT>::max();
+	else if (val < static_cast<FloatT>(std::numeric_limits<IntT>::min()))
+		return std::numeric_limits<IntT>::min();
+
+	return static_cast<IntT>(val);
+}
+
+// safe float to fixed
+// which handles nan and inf
+// pretty much the same stuff as the above, but uh, idk how id use the above with this
+template <typename FloatT> // can use both float and doubles yay
+static inline int32_t floattofixed(FloatT val)
+{
+	// :chaosleep:
+	static_assert(std::is_floating_point_v<FloatT>, "Input must be a floating-point type");
+
+	// fixed_t is just an int32_t, i dont wanna include doomtype here if it can be avoided
+	return floattoint<FloatT, int32_t>(val * 65535.);
+}
+
 } // namespace srb2
 
 #endif // __SRB2_CXXUTIL_HPP__

src/d_clisrv.c

@@ -78,14 +78,14 @@
 #define MAX_REASONLENGTH 30
 #define FORCECLOSE 0x8000
 
-static long long unsigned packetstat[NUMPACKETTYPE+1] = {0};
+static long long unsigned packetstat[NUMPACKETTYPE+1] = {};
 
 boolean server = true; // true or false but !server == client
 #define client (!server)
 boolean nodownload = false;
 boolean serverrunning = false;
 INT32 serverplayer = 0;
-char motd[254], server_context[8]; // Message of the Day, Unique Context (even without Mumble support)
+char motd[254] = {}, server_context[8] = {}; // Message of the Day, Unique Context (even without Mumble support)
 
 #define MAP_ICON_REQUEST_FREQUENCY 8
 
@@ -98,14 +98,13 @@ static int map_icon_request_count; // current count of icon requests sent
 static UINT8 *map_icon_data;
 static patch_t *map_icon;
 
-plrinfo playerinfo[MAXPLAYERS];
+plrinfo playerinfo[MAXPLAYERS] = {};
 SINT8 joinnode = 0; // used for CL_VIEWSERVER
 
-boolean player_muted[MAXPLAYERS] = {0};
+boolean player_muted[MAXPLAYERS] = {};
 
 // Server specific vars
-UINT8 playernode[MAXPLAYERS];
-
+UINT8 playernode[MAXPLAYERS] = {};
 
 // Minimum timeout for sending the savegame
 // The actual timeout will be longer depending on the savegame length
@@ -118,15 +117,15 @@ static tic_t savegameresendcooldown[MAXNETNODES]; // How long before we can rese
 static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the server before getting a timeout?
 
 UINT16 pingmeasurecount = 1;
-UINT32 realpingtable[MAXPLAYERS]; //the base table of ping where an average will be sent to everyone.
-UINT32 playerpingtable[MAXPLAYERS]; //table of player latency values.
+UINT32 realpingtable[MAXPLAYERS] = {}; //the base table of ping where an average will be sent to everyone.
+UINT32 playerpingtable[MAXPLAYERS] = {}; //table of player latency values.
 
 #define GENTLEMANSMOOTHING (TICRATE)
 static tic_t reference_lag;
 static UINT8 spike_time;
-tic_t lowest_lag;
-tic_t simulated_lag;
-boolean server_lagless;
+tic_t lowest_lag = 0;
+tic_t simulated_lag = 0;
+boolean server_lagless = true;
 
 static void Lagless_OnChange(void)
 {
@@ -144,12 +143,12 @@ static CV_PossibleValue_t mindelay_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL
 consvar_t cv_mindelay = {"mindelay", "0", CV_SAVE, mindelay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_gentlemens = {"gentlemensdelay", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Lagless_OnChange, 0, NULL, NULL, 0, 0, NULL}; // this should be a netvar Zzz...
 
-SINT8 nodetoplayer[MAXNETNODES];
-SINT8 nodetoplayer2[MAXNETNODES]; // say the numplayer for this node if any (splitscreen)
-SINT8 nodetoplayer3[MAXNETNODES]; // say the numplayer for this node if any (splitscreen == 2)
-SINT8 nodetoplayer4[MAXNETNODES]; // say the numplayer for this node if any (splitscreen == 3)
-UINT8 playerpernode[MAXNETNODES]; // used specialy for splitscreen
-boolean nodeingame[MAXNETNODES]; // set false as nodes leave game
+SINT8 nodetoplayer[MAXNETNODES]  = {};
+SINT8 nodetoplayer2[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen)
+SINT8 nodetoplayer3[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen == 2)
+SINT8 nodetoplayer4[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen == 3)
+UINT8 playerpernode[MAXNETNODES] = {}; // used specialy for splitscreen
+boolean nodeingame[MAXNETNODES]  = {}; // set false as nodes leave game
 
 tic_t servermaxping = 20; // server's max delay, in frames. Defaults to 20
 static tic_t nettics[MAXNETNODES]; // what tic the client have received
@@ -196,7 +195,7 @@ boolean is_client_saturn[MAXNETNODES];
 static UINT8 localtextcmd[MAXSPLITSCREENPLAYERS][MAXTEXTCMD];
 static tic_t neededtic;
 SINT8 servernode = 0; // the number of the server node
-char connectedservername[MAXSERVERNAME+1];
+char connectedservername[MAXSERVERNAME+1] = {};
 /// \brief do we accept new players?
 /// \todo WORK!
 boolean acceptnewnode = true;
@@ -227,7 +226,7 @@ struct textcmdbuf_s
 static textcmdbuf_t *textcmdbuf[MAXSPLITSCREENPLAYERS] = {NULL};
 
 static ticcmd_t playercmds[MAXPLAYERS];
-ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
+ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS] = {};
 static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL};
 
 consvar_t cv_showjoinaddress = {"showjoinaddress", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -285,7 +284,7 @@ static inline void *G_ScpyTiccmd(ticcmd_t* dest, void* src, const size_t n)
 // Some software don't support largest packet
 // (original sersetup, not exactely, but the probability of sending a packet
 // of 512 bytes is like 0.1)
-UINT16 software_MAXPACKETLENGTH;
+UINT16 software_MAXPACKETLENGTH = 0;
 
 /** Guesses the value of a tic from its lowest byte and from maketic
   *
@@ -312,9 +311,9 @@ static inline tic_t ExpandTics(INT32 low, tic_t basetic)
 // Some extra data function for handle textcmd buffer
 // -----------------------------------------------------------------
 
-static void (*listnetxcmd[MAXNETXCMD])(UINT8 **p, INT32 playernum);
+static void (*listnetxcmd[MAXNETXCMD])(const UINT8 **p, INT32 playernum);
 
-void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum))
+void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(const UINT8 **p, INT32 playernum))
 {
 #ifdef PARANOIA
 	if (id >= MAXNETXCMD)
@@ -331,7 +330,7 @@ static void WriteNetXCmd(UINT8 *cmd, netxcmd_t id, const void *param, size_t npa
 	cmd[cmd[0]] = (UINT8)id;
 	if (param && nparam)
 	{
-		M_Memcpy(&cmd[cmd[0]+1], param, nparam);
+		memcpy(&cmd[cmd[0]+1], param, nparam);
 		cmd[0] = (UINT8)(cmd[0] + (UINT8)nparam);
 	}
 }
@@ -460,12 +459,12 @@ static void ExtraDataTicker(void)
 	{
 		if (playeringame[i] || i == 0)
 		{
-			UINT8 *bufferstart = D_GetExistingTextcmd(gametic, i);
+			const UINT8 *bufferstart = D_GetExistingTextcmd(gametic, i);
 
 			if (bufferstart)
 			{
-				UINT8 *curpos = bufferstart;
-				UINT8 *bufferend = &curpos[curpos[0]+1];
+				const UINT8 *curpos = bufferstart;
+				const UINT8 *bufferend = &curpos[curpos[0]+1];
 
 				curpos++;
 				while (curpos < bufferend)
@@ -823,7 +822,7 @@ static void resynch_read_player(resynch_pak *rsp)
 	P_SetThingPosition(players[i].mo);
 }
 
-static inline void resynch_write_ctf(resynchend_pak *rst)
+static void resynch_write_ctf(resynchend_pak *rst)
 {
 	mobj_t *mflag;
 	UINT8 i, j;
@@ -863,7 +862,7 @@ static inline void resynch_write_ctf(resynchend_pak *rst)
 	}
 }
 
-static inline void resynch_read_ctf(resynchend_pak *p)
+static void resynch_read_ctf(resynchend_pak *p)
 {
 	UINT8 i;
 
@@ -1585,7 +1584,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 		MAXSERVERNAME);
 	strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), sizeof(netbuffer->u.serverinfo.mapname)-1);
 
-	M_Memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5));
+	memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5));
 
 	netbuffer->u.serverinfo.iszone = 0;
 
@@ -1656,12 +1655,7 @@ static void SV_SendPlayerInfo(INT32 node)
 
 		netbuffer->u.playerinfo[i].node = i;
 
-		// 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';
+		strlcpy(netbuffer->u.playerinfo[i].name, (const char *)&player_names[i], MAXPLAYERNAME+1);
 
 		//fetch IP address
 		//No, don't do that, you fuckface.
@@ -2179,7 +2173,7 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
 		if (info->subversion != SUBVERSION)
 			return; // Close, but no cigar.
 
-		if (strcmp(info->application, SRB2APPLICATION))
+		if (!fastcmp(info->application, SRB2APPLICATION))
 			return;/* that's a different mod */
 
 		i = serverlistcount++;
@@ -2224,7 +2218,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 (strcmp(version, server_list[i].version) == 0)
+		//if (fastcmp(version, server_list[i].version))
 		{
 			INT32 node = I_NetMakeNodewPort(server_list[i].ip, server_list[i].port);
 			if (node == -1)
@@ -3220,7 +3214,7 @@ static void Command_connect(void)
 
 	server = false;
 
-	if (!stricmp(COM_Argv(1), "self"))
+	if (fasticmp(COM_Argv(1), "self"))
 	{
 		servernode = 0;
 		server = true;
@@ -3230,7 +3224,7 @@ static void Command_connect(void)
 	else
 	{
 		// used in menu to connect to a server in the list
-		if (netgame && !stricmp(COM_Argv(1), "node"))
+		if (netgame && fasticmp(COM_Argv(1), "node"))
 		{
 			servernode = (SINT8)atoi(COM_Argv(2));
 		}
@@ -3245,7 +3239,7 @@ static void Command_connect(void)
 			netgame = true;
 			multiplayer = true;
 
-			if (!stricmp(COM_Argv(1), "any"))
+			if (fasticmp(COM_Argv(1), "any"))
 				servernode = BROADCASTADDR;
 			else if (I_NetMakeNodewPort && COM_Argc() >= 3)
 				servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
@@ -3269,6 +3263,7 @@ static void Command_connect(void)
 		splitscreen = cv_splitplayers.value-1;
 		SplitScreen_OnChange();
 	}
+
 	botingame = false;
 	botskin = 0;
 	CL_ConnectToServer();
@@ -3761,7 +3756,7 @@ static void Command_Kick(void)
 		CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
 }
 
-static void Got_KickCmd(UINT8 **p, INT32 playernum)
+static void Got_KickCmd(const UINT8 **p, INT32 playernum)
 {
 	INT32 pnum, msg;
 	char buf[3 + MAX_REASONLENGTH];
@@ -4151,8 +4146,8 @@ consvar_t cv_connectawaittime = {"connectawaittime", "5", CV_SAVE, connectawaitt
 
 consvar_t cv_serverinfoscreen = {"serverinfoscreen", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-static void Got_AddPlayer(UINT8 **p, INT32 playernum);
-static void Got_RemovePlayer(UINT8 **p, INT32 playernum);
+static void Got_AddPlayer(const UINT8 **p, INT32 playernum);
+static void Got_RemovePlayer(const UINT8 **p, INT32 playernum);
 
 static void Joinable_OnChange(void)
 {
@@ -4404,7 +4399,7 @@ static inline void SV_AddNode(INT32 node)
 }
 
 // Xcmd XD_ADDPLAYER
-static void Got_AddPlayer(UINT8 **p, INT32 playernum)
+static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
 {
 	INT16 node, newplayernum;
 	UINT8 splitscreenplayer = 0;
@@ -4491,7 +4486,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
 }
 
 // Xcmd XD_REMOVEPLAYER
-static void Got_RemovePlayer(UINT8 **p, INT32 playernum)
+static void Got_RemovePlayer(const UINT8 **p, INT32 playernum)
 {
 	SINT8 pnum, reason;
 
@@ -4652,13 +4647,26 @@ void SV_StopServer(void)
 
 	if (gamestate == GS_INTERMISSION)
 		Y_EndIntermission();
-	if (gamestate == GS_VOTING)
+	else if (gamestate == GS_VOTING)
 		Y_EndVote();
-	gamestate = wipegamestate = GS_NULL;
+
+	G_SetGamestate(GS_NULL);
+	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);
+		}
+
+		textcmdbuf[i] = NULL;
+	}
+
 	for (i = firstticstosend; i < firstticstosend + BACKUPTICS; i++)
 		D_Clearticcmd(i);
 
@@ -5220,7 +5228,7 @@ static void PT_ServerCFG(SINT8 node)
 
 	scp = netbuffer->u.servercfg.varlengthinputs;
 	CV_LoadPlayerNames(&scp);
-	CV_LoadNetVars(&scp);
+	scp += CV_LoadNetVars(scp);
 
 	/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
 	///       Shouldn't them be downloaded even at intermission time?
@@ -5680,7 +5688,7 @@ static void PT_TextCmd(INT32 netconsole, SINT8 node)
 		DEBFILE(va("textcmd put in tic %u at position %d (player %d) ftts %u mk %u\n",
 				   tic, textcmd[0]+1, netconsole, firstticstosend, maketic));
 
-		M_Memcpy(&textcmd[textcmd[0]+1], netbuffer->u.textcmd+1, netbuffer->u.textcmd[0]);
+		memcpy(&textcmd[textcmd[0]+1], netbuffer->u.textcmd+1, netbuffer->u.textcmd[0]);
 		textcmd[0] += (UINT8)netbuffer->u.textcmd[0];
 	}
 }
@@ -5787,7 +5795,7 @@ static void PT_ServerTics(SINT8 node)
 				}
 
 				if (i >= gametic) // Don't copy old net commands
-					M_Memcpy(D_GetTextcmd(i, playernum), txtpak, txtsize);
+					memcpy(D_GetTextcmd(i, playernum), txtpak, txtsize);
 				txtpak += txtsize;
 			}
 		}
@@ -6325,7 +6333,7 @@ static void CL_SendClientCmd(void)
 						break;
 				}
 
-				M_Memcpy(netbuffer->u.textcmd, localtextcmd[i], localtextcmd[i][0]+1);
+				memcpy(netbuffer->u.textcmd, localtextcmd[i], localtextcmd[i][0]+1);
 
 				// All extra data have been sent
 				if (HSendPacket(servernode, true, 0, localtextcmd[i][0]+1)) // Send can fail...
@@ -6335,7 +6343,7 @@ static void CL_SendClientCmd(void)
 					if (textcmdbuf[i] != NULL)
 					{
 						textcmdbuf_t *buf = textcmdbuf[i];
-						M_Memcpy(localtextcmd[i], textcmdbuf[i]->cmd, textcmdbuf[i]->cmd[0]+1);
+						memcpy(localtextcmd[i], textcmdbuf[i]->cmd, textcmdbuf[i]->cmd[0]+1);
 						textcmdbuf[i] = textcmdbuf[i]->next;
 						Z_Free(buf);
 					}
@@ -6448,7 +6456,7 @@ static void SV_SendTics(void)
 				{
 					(*ntextcmd)++;
 					WRITEUINT8(bufpos, j);
-					M_Memcpy(bufpos, textcmd, size + 1);
+					memcpy(bufpos, textcmd, size + 1);
 					bufpos += size + 1;
 				}
 			}

src/d_clisrv.h

@@ -604,7 +604,7 @@ extern consvar_t cv_serverinfoscreen;
 void D_ClientServerInit(void);
 
 // Initialise the other field
-void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum));
+void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(const UINT8 **p, INT32 playernum));
 void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_t nparam);
 #define SendNetXCmd(id, param, nparam) SendNetXCmdForPlayer(0, id, param, nparam) // Shortcut for P1
 void SendKick(UINT8 playernum, UINT8 msg);

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];
-boolean autoloading;
-boolean autoloaded;
-boolean postautoloaded = false;
-boolean wasautoloaded = false;
+static size_t autoloadcount = 0;
+static size_t postloadcount = 0;
 //
 
 boolean devparm = false; // started game with -devparm
@@ -113,7 +113,9 @@ 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
@@ -140,8 +142,8 @@ static char addonsdir[MAX_WADPATH];
 // Events can be discarded if no responder claims them
 // referenced from i_system.c for I_GetKey()
 
-event_t events[MAXEVENTS];
-INT32 eventhead, eventtail;
+event_t events[MAXEVENTS] = {};
+INT32 eventhead = 0, eventtail = 0;
 
 boolean dedicated = false;
 
@@ -159,68 +161,17 @@ void D_PostEvent(const event_t *ev)
 
 // modifier keys
 // Now handled in I_OsPolling
-UINT8 shiftdown = 0; // 0x1 left, 0x2 right
-UINT8 ctrldown = 0; // 0x1 left, 0x2 right
-UINT8 altdown = 0; // 0x1 left, 0x2 right
-boolean capslock = 0;	// gee i wonder what this does.
+UINT8 shiftdown = 0;   // 0x1 left, 0x2 right
+UINT8 ctrldown = 0;   // 0x1 left, 0x2 right
+UINT8 altdown = 0;    // 0x1 left, 0x2 right
+boolean capslock = 0; // gee i wonder what this does.
 
-static void D_PadMenuScrollInput(UINT8 input)
-{
-	event_t dpadev;
-	memset(&dpadev, 0, sizeof(event_t));
-	dpadev.type = ev_keydown;
-
-	switch (input)
-	{
-		case DPAD_UP:
-			dpadev.data1 = KEY_UPARROW;
-			break;
-		case DPAD_DOWN:
-			dpadev.data1 = KEY_DOWNARROW;
-			break;
-		case DPAD_LEFT:
-			dpadev.data1 = KEY_LEFTARROW;
-			break;
-		case DPAD_RIGHT:
-			dpadev.data1 = KEY_RIGHTARROW;
-			break;
-	}
-
-	D_PostEvent(&dpadev); // put into eventlist
-}
-
-#define SCROLLDELAY 19
-
-// Check if any dpad button is held
-// and pass it to the eventlist
-static void D_GamePadMenuScrollTicker(void)
-{
-	UINT8 i;
-	static UINT8 menuInputDelayTimer = 0;
-
-	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
-	{
-		if (dpadscrollstate[i])
-		{
-			if (menuInputDelayTimer < SCROLLDELAY)
-				menuInputDelayTimer++;
-			else if (menuInputDelayTimer == SCROLLDELAY)
-				D_PadMenuScrollInput(i);
-
-			return;
-		}
-	}
-
-	menuInputDelayTimer = 0;
-}
-#undef SCROLLDELAY
-
-static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {0};
+static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {};
 
 static void D_DeviceLEDTick(void)
 {
 	UINT8 i;
-	static UINT16 color[MAXSPLITSCREENPLAYERS] = {0};
+	static UINT16 color[MAXSPLITSCREENPLAYERS] = {};
 
 	if (numcontrollers == 0)
 	{
@@ -388,8 +339,7 @@ static void D_Renderview(void)
 			}
 			else if (rendermode == render_soft)
 #endif
-
-			R_RenderPlayerView(&players[displayplayers[i]]);
+				R_RenderPlayerView(&players[displayplayers[i]]);
 		}
 
 		if (rendermode == render_soft)
@@ -397,7 +347,11 @@ static void D_Renderview(void)
 			if (i == 0)
 				R_ApplyViewMorph();
 
+#ifdef MOTIONBLUR
 			V_DoPostProcessor(i, postimgparam[i]);
+#else
+			V_DoPostProcessor(i, 0);
+#endif
 		}
 	}
 
@@ -714,7 +668,7 @@ static boolean D_Display(void)
 // D_SRB2Loop
 // =========================================================================
 
-tic_t rendergametic;
+tic_t rendergametic = 0;
 
 void D_SRB2Loop(void)
 {
@@ -839,11 +793,6 @@ void D_SRB2Loop(void)
 
 			if (!dedicated)
 			{
-				if (menuactive)
-				{
-					D_GamePadMenuScrollTicker();
-				}
-
 				D_DeviceLEDTick();
 			}
 		}
@@ -961,8 +910,11 @@ 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;
@@ -971,7 +923,10 @@ void D_ClearState(void)
 		CL_ClearPlayer(i);
 
 	splitscreen = 0;
-	SplitScreen_OnChange();
+
+	// recompute screen size
+	R_ExecuteSetViewSize();
+
 	botingame = false;
 	botskin = 0;
 	cv_debug = 0;
@@ -990,7 +945,6 @@ void D_ClearState(void)
 	gameaction = ga_nothing;
 	memset(displayplayers, 0, sizeof(displayplayers));
 	consoleplayer = 0;
-	//demosequence = -1;
 	gametype = GT_RACE; // SRB2kart
 	paused = false;
 
@@ -1013,6 +967,11 @@ void D_ClearState(void)
 
 	G_SetGamestate(GS_NULL);
 	wipegamestate = GS_NULL;
+
+	M_ClearMenus(true);
+
+	// map palettes affect this
+	D_ResetDeviceLED();
 }
 
 //
@@ -1020,25 +979,18 @@ void D_ClearState(void)
 //
 void D_StartTitle(void)
 {
-	demo.title = false;
 	D_ClearState();
-	netgame = false; // title menu shouldnt be a netgame lmao
-	M_ClearMenus(true);
+	multiplayer = netgame = false; // title menu shouldnt be a netgame or multiplayer lmao
 	F_StartTitleScreen();
-	D_ResetDeviceLED();
 }
 
 //
 // D_AddFile
 //
-static void D_AddFile(const char *file, char **filearray)
+static void D_AddFile(const char *file, char **filearray, size_t index)
 {
-	size_t pnumwadfiles;
 	char *newfile;
 
-	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
-		;
-
 	newfile = malloc(strlen(file) + 1);
 	if (!newfile)
 	{
@@ -1046,16 +998,17 @@ static void D_AddFile(const char *file, char **filearray)
 	}
 	strcpy(newfile, file);
 
-	filearray[pnumwadfiles] = newfile;
+	filearray[index] = newfile;
 }
 
-static void D_CleanFile(char **filearray)
+static void D_CleanFile(char **filearray, size_t count)
 {
-	size_t pnumwadfiles;
-	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
+	size_t i;
+
+	for (i = 0; i < count; i++)
 	{
-		free(filearray[pnumwadfiles]);
-		filearray[pnumwadfiles] = NULL;
+		free(filearray[i]);
+		filearray[i] = NULL;
 	}
 }
 
@@ -1068,28 +1021,27 @@ static INT32 D_DetectFileType(const char* filename)
 
 	const size_t len = strlen(filename);
 
-	if (!stricmp(&filename[len - 4], ".wad"))
+	if (fasticmp(&filename[len - 4], ".wad"))
 		return 2;
-	else if (!stricmp(&filename[len - 4], ".pk3"))
+	else if (fasticmp(&filename[len - 4], ".pk3"))
 		return 3;
-	else if (!stricmp(&filename[len - 5], ".kart"))
+	else if (fasticmp(&filename[len - 5], ".kart"))
 		return 4;
-	else if (!stricmp(&filename[len - 4], ".lua"))
+	else if (fasticmp(&filename[len - 4], ".lua"))
 		return 5;
-	else if (!stricmp(&filename[len - 4], ".soc"))
+	else if (fasticmp(&filename[len - 4], ".soc"))
 		return 6;
-	else if (!stricmp(&filename[len - 4], ".cfg"))
+	else if (fasticmp(&filename[len - 4], ".cfg"))
 		return 7;
-	else if (!stricmp(&filename[len - 4], ".txt"))
+	else if (fasticmp(&filename[len - 4], ".txt"))
 		return 8;
 
 	return 0;
 }
 
 // autoload that shit
-static void D_AutoloadFile(const char *file, char **filearray)
+static void D_AutoloadFile(const char *file, char **filearray, size_t index)
 {
-	size_t pnumwadfiles;
 	char *newfile;
 	INT32 fileType = D_DetectFileType(file);
 
@@ -1099,9 +1051,6 @@ static void D_AutoloadFile(const char *file, char **filearray)
 		return;
 	}
 
-	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
-		;
-
 	if (fileType <= 6)
 	{
 		newfile = malloc(strlen(file) + 1);
@@ -1109,7 +1058,7 @@ static void D_AutoloadFile(const char *file, char **filearray)
 			I_Error("No more free memory to AutoloadFile %s",file);
 
 		strcpy(newfile, file);
-		filearray[pnumwadfiles] = newfile;
+		filearray[index] = newfile;
 	}
 	else
 	{
@@ -1139,42 +1088,44 @@ 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
 	{
-		wasautoloaded = postautoloaded = true; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
+		autoloadcount = postloadcount = 0; // 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[1] == '\0' || wadsToAutoload[1] == '\n')
-			|| (wadsToAutoload[0] == '#'))
+		if (wadsToAutoload[0] == '\n' ||
+			wadsToAutoload[0] == '#'  ||
+			wadsToAutoload[0] == '\0')
 			continue;
+
 		// this marks it so that it loads after loading server addons
-		else if (fastncmp(wadsToAutoload, "postload ", 9))
+		if (fastncmp(wadsToAutoload, "postload ", 9))
 		{
 			strremove(wadsToAutoload, "postload ");
 			postload = true;
 		}
 
 		// Remove Any Empty or Skipped Lines
-		for (i = 0; wadsToAutoload[i] != '\0'; i++)
-		{
-			if (wadsToAutoload[i] == '\n')
-				wadsToAutoload[i] = '\0';
-		}
+		newline = strchr(wadsToAutoload, '\n');
+		if (newline)
+			*newline = '\0';
 
 		if (!postload && W_CheckPostLoadList(wadsToAutoload))
 		{
@@ -1184,56 +1135,67 @@ static void D_FindAddonsToAutoload(void)
 
 		// LOAD IT
 		if (!postload)
-			D_AutoloadFile(wadsToAutoload, autoloadwadfiles);
+		{
+			D_AutoloadFile(wadsToAutoload, autoloadwadfiles, autoloadcount);
+			autoloadcount++;
+		}
 		else
-			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost);
-
-		// end it here
-		for (i = 0; wadsToAutoload[i] != '\0'; i++)
-			wadsToAutoload[i] = '\0';
+		{
+			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, postloadcount);
+			postloadcount++;
+		}
 	}
 
+	autoloadwadfiles[autoloadcount] = NULL;
+	autoloadwadfilespost[postloadcount] = NULL;
+
 	// we dont want memory leaks around here do we?
 	fclose(autoloadconfigfile);
 }
 
 static void D_AddAutoloadFiles(void)
 {
-	if (wasautoloaded)
+	// nothing to autoload
+	if (autoloadcount == 0)
 		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);
 
-	wasautoloaded = true;
+	D_CleanFile(autoloadwadfiles, autoloadcount);
+
+	autoloadcount = 0;
 }
 
 void D_AddPostloadFiles(void)
 {
-	if (postautoloaded || !netgame)
+	// nothing to postload
+	if (postloadcount == 0 || !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);
 
-	postautoloaded = true;
+	D_CleanFile(autoloadwadfilespost, postloadcount);
+
+	postloadcount = 0;
 }
 
 // ==========================================================================
 // Identify the SRB2 version, and IWAD file to use.
 // ==========================================================================
 
-static boolean AddIWAD(void)
+static boolean AddIWAD(const char * file, const char *dir)
 {
-	char * path = va(pandf, srb2path, "srb2.srb");
+	char * path = va(pandf, dir, file);
 
 	if (FIL_ReadFileOK(path))
 	{
-		D_AddFile(path, startupiwadfiles);
+		D_AddFile(path, startupiwadfiles, startupiwadcount++);
 		return true;
 	}
 
@@ -1269,14 +1231,14 @@ static void IdentifyVersion(void)
 	}
 
 #if (1) // reduce the amount of findfile by only using full cwd in this func
-	if (strcmp(tempsrb2path, srb2waddir))
+	if (!fastcmp(tempsrb2path, srb2waddir))
 #endif
 	{
 		strlcpy(srb2path, srb2waddir, sizeof (srb2path));
 	}
 
 	// Load the IWAD
-	if (!AddIWAD())
+	if (!AddIWAD("srb2.srb", srb2path)) // not sure why this uses srb2path and not srb2waddir?
 	{
 		I_Error("SRB2.SRB not found! Expected in %s\n", srb2waddir);
 	}
@@ -1290,57 +1252,60 @@ static void IdentifyVersion(void)
 
 #ifdef USE_PATCH_DTA
 	// Add our crappy patches to fix our bugs
-	D_AddFile(va(pandf,srb2waddir,"patch.dta"));
+	if (!AddIWAD("patch.dta", srb2waddir))
+	{
+		I_Error("patch.dta not found! Expected in %s\n", srb2waddir);
+	}
 #endif
+	if (!AddIWAD("gfx.kart", srb2waddir))
+	{
+		I_Error("gfx.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);
+	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);
+	}
 #ifdef USE_PATCH_KART
-	D_AddFile(va(pandf,srb2waddir,"patch.kart"), startupiwadfiles);
+	if (!AddIWAD("patch.kart", srb2waddir))
+	{
+		I_Error("patch.kart not found! Expected in %s\n", srb2waddir);
+	}
 #endif
 
-	const char *path = NULL;
-
-	path = va(pandf, srb2waddir, "extra.kart");
-
 	// completely optional
-	if (FIL_ReadFileOK(path))
-	{
-		D_AddFile(path, startupiwadfiles);
+	if (AddIWAD("extra.kart", srb2waddir))
 		found_extra_kart = true;
-	}
-
-	path = va(pandf, srb2waddir, "extra2.kart");
 
 	// completely optional 2: Back with a vengence
-	if (FIL_ReadFileOK(path))
-	{
-		D_AddFile(path, startupiwadfiles);
+	if (AddIWAD("extra2.kart", srb2waddir))
 		found_extra2_kart = true;
-	}
 
-	path = va(pandf, srb2waddir, "extra3.kart");
-
-	if (FIL_ReadFileOK(path))
-	{
-		D_AddFile(path, startupiwadfiles);
+	if (AddIWAD("extra3.kart", srb2waddir))
 		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); \
+			D_AddFile(musicpath, startupiwadfiles, startupiwadcount++); \
 	}
 	{
 		const char *musicpath;
@@ -1714,8 +1679,14 @@ 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);
+				snprintf(srb2home, sizeof srb2home, "%s" PATHSEP DEFAULTDIR, userhome);
+#else // DEFAULTDIR
+				snprintf(srb2home, sizeof srb2home, "%s", userhome);
+#endif // DEFAULTDIR
 			snprintf(downloaddir, sizeof downloaddir, "%s" PATHSEP "DOWNLOAD", srb2home);
 			if (dedicated)
 				snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, srb2home);
@@ -1724,17 +1695,6 @@ 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';
@@ -1760,6 +1720,9 @@ 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);
@@ -1788,7 +1751,7 @@ void D_SRB2Main(void)
 				const char *s = M_GetNextParm();
 
 				if (s) // Check for NULL?
-					D_AddFile(s, startuppwads);
+					D_AddFile(s, startuppwads, startuppwadcount++);
 			}
 		}
 	}
@@ -1821,8 +1784,10 @@ void D_SRB2Main(void)
 	// load wad, including the main wad file
 	CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
 
-	W_InitMultipleFiles(startupiwadfiles, false);
-	D_CleanFile(startupiwadfiles);
+	W_InitMultipleFiles(startupiwadfiles, startupiwadcount, false);
+	//mainwads = startupiwadcount - musicwads;
+	D_CleanFile(startupiwadfiles, startupiwadcount);
+	startupiwadcount = 0;
 	mainwads = 0;
 
 #ifndef DEVELOP
@@ -1861,15 +1826,16 @@ void D_SRB2Main(void)
 
 	D_CheckMaps(false);
 
-	W_InitMultipleFiles(startuppwads, true);
+	W_InitMultipleFiles(startuppwads, startuppwadcount, true);
 
 	// Only search for pwad maps if we actually have a pwad added
-	if (startuppwads[0] != NULL)
+	if (startuppwadcount > 0)
 	{
 		D_CheckMaps(true);
 	}
 
-	D_CleanFile(startuppwads);
+	D_CleanFile(startuppwads, startuppwadcount);
+	startuppwadcount = 0;
 
 	cht_Init();
 
@@ -2133,11 +2099,14 @@ void D_SRB2Main(void)
 			const char *sskill = M_GetNextParm();
 
 			for (j = 0; kartspeed_cons_t[j].strvalue; j++)
-				if (!strcasecmp(kartspeed_cons_t[j].strvalue, sskill))
+			{
+				if (fasticmp(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,9 +61,6 @@ 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

@@ -95,9 +95,9 @@ static INT32 sendackpacket = 0, getackpacket = 0;
 INT32 ticruned = 0, ticmiss = 0;
 
 // globals
-INT32 getbps, sendbps;
-float lostpercent, duppercent, gamelostpercent;
-INT32 packetheaderlength;
+INT32 getbps = 0, sendbps = 0;
+float lostpercent = 0, duppercent = 0, gamelostpercent = 0;
+INT32 packetheaderlength = 0;
 
 boolean Net_GetNetStat(void)
 {
@@ -243,7 +243,7 @@ static boolean GetFreeAcknum(UINT8 *freeack)
 			ackpak[i].length = doomcom->datalength;
 			ackpak[i].senttime = I_GetTime();
 			ackpak[i].resentnum = 0;
-			M_Memcpy(ackpak[i].pak.raw, netbuffer, ackpak[i].length);
+			memcpy(ackpak[i].pak.raw, netbuffer, ackpak[i].length);
 
 			*freeack = ackpak[i].acknum;
 
@@ -412,7 +412,7 @@ void Net_SendAcks(INT32 node)
 {
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_NOTHING;
-	M_Memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
+	memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
 	HSendPacket(node, false, 0, MAXACKTOSEND);
 }
 
@@ -494,7 +494,7 @@ void Net_AckTicker(void)
 			}
 			DEBFILE(va("Resend ack %d, %u<%d at %u\n", ackpak[i].acknum, ackpak[i].senttime,
 				NODETIMEOUT, I_GetTime()));
-			M_Memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
+			memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
 			ackpak[i].senttime = I_GetTime();
 			ackpak[i].resentnum++;
 			ackpak[i].nextacknum = node->nextacknum;
@@ -1021,7 +1021,7 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 			return false;
 		}
 		netbuffer->ack = netbuffer->ackreturn = 0; // don't hold over values from last packet sent/received
-		M_Memcpy(&reboundstore[rebound_head], netbuffer,
+		memcpy(&reboundstore[rebound_head], netbuffer,
 			doomcom->datalength);
 		reboundsize[rebound_head] = doomcom->datalength;
 		rebound_head = (rebound_head+1) % MAXREBOUND;
@@ -1107,7 +1107,7 @@ boolean HGetPacket(void)
 	// Get a packet from self
 	if (rebound_tail != rebound_head)
 	{
-		M_Memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
+		memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
 		doomcom->datalength = reboundsize[rebound_tail];
 		if (netbuffer->packettype == PT_NODETIMEOUT)
 			doomcom->remotenode = netbuffer->u.textcmd[0];
@@ -1127,9 +1127,7 @@ boolean HGetPacket(void)
 
 	while (true)
 	{
-		I_NetGet();
-
-		if (doomcom->remotenode == -1) // No packet received
+		if (!I_NetGet()) // No packets received
 			return false;
 
 		getbytes += packetheaderlength + doomcom->datalength; // For stat
@@ -1165,6 +1163,7 @@ boolean HGetPacket(void)
 			GotAcks();
 			continue;
 		}
+
 		doomcom->datalength -= BASEPACKETSIZE;
 		break;
 	}

src/d_netcmd.c

@@ -68,22 +68,22 @@
 // protos
 // ------
 
-static void Got_NameAndColor(UINT8 **cp, INT32 playernum);
-static void Got_WeaponPref(UINT8 **cp, INT32 playernum);
-static void Got_Mapcmd(UINT8 **cp, INT32 playernum);
-static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum);
-static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum);
-static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum);
-static void Got_PickVotecmd(UINT8 **cp, INT32 playernum);
-static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum);
-static void Got_Addfilecmd(UINT8 **cp, INT32 playernum);
-static void Got_Pause(UINT8 **cp, INT32 playernum);
-static void Got_Respawn(UINT8 **cp, INT32 playernum);
-static void Got_RandomSeed(UINT8 **cp, INT32 playernum);
-static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum);
-static void Got_Teamchange(UINT8 **cp, INT32 playernum);
-static void Got_Clearscores(UINT8 **cp, INT32 playernum);
-static void Got_DiscordInfo(UINT8 **cp, INT32 playernum);
+static void Got_NameAndColor(const UINT8 **cp, INT32 playernum);
+static void Got_WeaponPref(const UINT8 **cp, INT32 playernum);
+static void Got_Mapcmd(const UINT8 **cp, INT32 playernum);
+static void Got_ExitLevelcmd(const UINT8 **cp, INT32 playernum);
+static void Got_SetupVotecmd(const UINT8 **cp, INT32 playernum);
+static void Got_ModifyVotecmd(const UINT8 **cp, INT32 playernum);
+static void Got_PickVotecmd(const UINT8 **cp, INT32 playernum);
+static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum);
+static void Got_Addfilecmd(const UINT8 **cp, INT32 playernum);
+static void Got_Pause(const UINT8 **cp, INT32 playernum);
+static void Got_Respawn(const UINT8 **cp, INT32 playernum);
+static void Got_RandomSeed(const UINT8 **cp, INT32 playernum);
+static void Got_RunSOCcmd(const UINT8 **cp, INT32 playernum);
+static void Got_Teamchange(const UINT8 **cp, INT32 playernum);
+static void Got_Clearscores(const UINT8 **cp, INT32 playernum);
+static void Got_DiscordInfo(const UINT8 **cp, INT32 playernum);
 
 static void PointLimit_OnChange(void);
 static void TimeLimit_OnChange(void);
@@ -178,13 +178,13 @@ static void Command_Clearscores_f(void);
 // Remote Administration
 static void Command_Changepassword_f(void);
 static void Command_Login_f(void);
-static void Got_Login(UINT8 **cp, INT32 playernum);
-static void Got_Verification(UINT8 **cp, INT32 playernum);
-static void Got_Removal(UINT8 **cp, INT32 playernum);
+static void Got_Login(const UINT8 **cp, INT32 playernum);
+static void Got_Verification(const UINT8 **cp, INT32 playernum);
+static void Got_Removal(const UINT8 **cp, INT32 playernum);
 static void Command_Verify_f(void);
 static void Command_RemoveAdmin_f(void);
 static void Command_MotD_f(void);
-static void Got_MotD_f(UINT8 **cp, INT32 playernum);
+static void Got_MotD_f(const UINT8 **cp, INT32 playernum);
 
 static void Command_ShowScores_f(void);
 static void Command_ShowTime_f(void);
@@ -292,6 +292,10 @@ 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},
@@ -1043,6 +1047,7 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_betainterscreen);
 
 	CV_RegisterVar(&cv_laglesscam);
+	CV_RegisterVar(&cv_demoangturn);
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
@@ -1214,7 +1219,7 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
 	for (ix = 0; ix < MAXPLAYERS; ix++)
 	{
 		if (ix != playernum && playeringame[ix]
-			&& strcasecmp(name, player_names[ix]) == 0)
+			&& fasticmp(name, player_names[ix]))
 		{
 			// We shouldn't kick people out just because
 			// they joined the game with the same name
@@ -1331,7 +1336,7 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
 			if (i != playernum && playeringame[i]
-				&& strcasecmp(tmpname, player_names[i]) == 0)
+				&& fasticmp(tmpname, player_names[i]))
 			{
 				break;
 			}
@@ -1381,7 +1386,7 @@ static void SetPlayerName(INT32 playernum, char *newname)
 {
 	if (EnsurePlayerNameIsGood(newname, playernum))
 	{
-		if (strcasecmp(newname, player_names[playernum]) != 0)
+		if (!fasticmp(newname, player_names[playernum]))
 		{
 			if (netgame)
 				HU_AddChatText(va("\x82*%s renamed to %s", player_names[playernum], newname), false);
@@ -1503,9 +1508,9 @@ static void SendNameAndColor(void)
 			CV_StealthSet(&cv_playercolor, cv_playercolor.defaultvalue);
 	}
 
-	if (!strcmp(cv_playername.string, player_names[consoleplayer])
+	if (fastcmp(cv_playername.string, player_names[consoleplayer])
 		&& cv_playercolor.value == players[consoleplayer].skincolor
-		&& !strcmp(cv_skin.string, skins[players[consoleplayer].skin].name))
+		&& fastcmp(cv_skin.string, skins[players[consoleplayer].skin].name))
 		return;
 
 	// We'll handle it later if we're not playing.
@@ -1908,7 +1913,7 @@ static void SendNameAndColor4(void)
 	SendNetXCmdForPlayer(3, XD_NAMEANDCOLOR, buf, p - buf);
 }
 
-static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
+static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
 {
 	player_t *p = &players[playernum];
 	char name[MAXPLAYERNAME+1];
@@ -1940,7 +1945,7 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
 	// set name
 	if (player_name_changes[playernum] < MAXNAMECHANGES)
 	{
-		if (strcasecmp(player_names[playernum], name) != 0)
+		if (!fasticmp(player_names[playernum], name))
 			SetPlayerName(playernum, name);
 	}
 
@@ -2036,15 +2041,17 @@ void SendWeaponPref4(void)
 	SendNetXCmdForPlayer(3, XD_WEAPONPREF, buf, 1);
 }
 
-static void Got_WeaponPref(UINT8 **cp,INT32 playernum)
+static void Got_WeaponPref(const UINT8 **cp, INT32 playernum)
 {
+	player_t *player = &players[playernum];
+
 	UINT8 prefs = READUINT8(*cp);
 
-	players[playernum].pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
+	player->pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
 	if (prefs & 1)
-		players[playernum].pflags |= PF_FLIPCAM;
+		player->pflags |= PF_FLIPCAM;
 	if (prefs & 2)
-		players[playernum].pflags |= PF_ANALOGMODE;
+		player->pflags |= PF_ANALOGMODE;
 }
 
 void D_SendPlayerConfig(void)
@@ -2317,8 +2324,8 @@ static void Command_Playdemo_f(void)
 
 	CONS_Printf(M_GetText("Playing back demo '%s'.\n"), name);
 
-	demo.loadfiles = strcmp(COM_Argv(2), "-addfiles") == 0;
-	demo.ignorefiles = strcmp(COM_Argv(2), "-force") == 0;
+	demo.loadfiles = fastcmp(COM_Argv(2), "-addfiles");
+	demo.ignorefiles = fastcmp(COM_Argv(2), "-force");
 
 	// Internal if no extension, external if one exists
 	// If external, convert the file name to a path in SRB2's home directory
@@ -2487,15 +2494,18 @@ 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
-	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 (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);
+	}
 
 	if (cv_kartencore.value && gt == GT_RACE)
 		WRITEUINT8(p, (gt|0x80));
@@ -2596,14 +2606,18 @@ ConcatCommandArgv (int start, int end)
 		size += strlen(COM_Argv(i)) + 1;
 	}
 
-	final = ZZ_Alloc(size);
-	p = final;
+	p = final = ZZ_Alloc(size);
+
+	if (!p)
+		I_Error("ConcatCommandArgv: Out of memory!\n");
 
 	--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));
 
@@ -2836,7 +2850,7 @@ static void Command_Map_f(void)
   *                  ::serverplayer or ::adminplayer.
   * \sa D_MapChange
   */
-static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
+static void Got_Mapcmd(const UINT8 **cp, INT32 playernum)
 {
 	char mapname[MAX_WADPATH+1];
 	UINT8 flags;
@@ -2955,7 +2969,7 @@ static void Command_Pause(void)
 		CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
 }
 
-static void Got_Pause(UINT8 **cp, INT32 playernum)
+static void Got_Pause(const UINT8 **cp, INT32 playernum)
 {
 	UINT8 dedicatedpause = false;
 	const char *playername;
@@ -3067,7 +3081,7 @@ static void Command_Respawn(void)
 	SendNetXCmd(XD_RESPAWN, &buf, 4);
 }
 
-static void Got_Respawn(UINT8 **cp, INT32 playernum)
+static void Got_Respawn(const UINT8 **cp, INT32 playernum)
 {
 	INT32 respawnplayer = READINT32(*cp);
 
@@ -3102,7 +3116,7 @@ static void Got_Respawn(UINT8 **cp, INT32 playernum)
   * \param playernum Player responsible for the message. Must be ::serverplayer.
   * \author Graue <graue@oceanbase.org>
   */
-static void Got_RandomSeed(UINT8 **cp, INT32 playernum)
+static void Got_RandomSeed(const UINT8 **cp, INT32 playernum)
 {
 	UINT32 seed;
 
@@ -3137,7 +3151,7 @@ static void Command_Clearscores_f(void)
   * \sa XD_CLEARSCORES, Command_Clearscores_f
   * \author SSNTails <http://www.ssntails.org>
   */
-static void Got_Clearscores(UINT8 **cp, INT32 playernum)
+static void Got_Clearscores(const UINT8 **cp, INT32 playernum)
 {
 	INT32 i;
 
@@ -3182,20 +3196,20 @@ static void Command_Teamchange_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
+		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
+		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
+		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
+		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
+		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3272,20 +3286,20 @@ static void Command_Teamchange2_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
+		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
+		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
+		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
+		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
+		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3363,20 +3377,20 @@ static void Command_Teamchange3_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
+		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
+		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
+		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
+		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
+		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3454,20 +3468,20 @@ static void Command_Teamchange4_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
+		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
+		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
+		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
+		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
+		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3553,33 +3567,33 @@ static void Command_ServerTeamChange_f(void)
 
 	if (G_TagGametype())
 	{
-		if (!strcasecmp(COM_Argv(2), "it") || !strcasecmp(COM_Argv(2), "1"))
+		if (fasticmp(COM_Argv(2), "it") || fasticmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (!strcasecmp(COM_Argv(2), "notit") || !strcasecmp(COM_Argv(2), "2"))
+		else if (fasticmp(COM_Argv(2), "notit") || fasticmp(COM_Argv(2), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (!strcasecmp(COM_Argv(2), "playing") || !strcasecmp(COM_Argv(2), "3"))
+		else if (fasticmp(COM_Argv(2), "playing") || fasticmp(COM_Argv(2), "3"))
 			NetPacket.packet.newteam = 3;
-		else if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
+		else if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasTeams())
 	{
-		if (!strcasecmp(COM_Argv(2), "red") || !strcasecmp(COM_Argv(2), "1"))
+		if (fasticmp(COM_Argv(2), "red") || fasticmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (!strcasecmp(COM_Argv(2), "blue") || !strcasecmp(COM_Argv(2), "2"))
+		else if (fasticmp(COM_Argv(2), "blue") || fasticmp(COM_Argv(2), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
+		else if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
+		if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (!strcasecmp(COM_Argv(2), "playing") || !strcasecmp(COM_Argv(2), "1"))
+		else if (fasticmp(COM_Argv(2), "playing") || fasticmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3654,7 +3668,7 @@ static void Command_ServerTeamChange_f(void)
 }
 
 //todo: This and the other teamchange functions are getting too long and messy. Needs cleaning.
-static void Got_Teamchange(UINT8 **cp, INT32 playernum)
+static void Got_Teamchange(const UINT8 **cp, INT32 playernum)
 {
 	changeteam_union NetPacket;
 	boolean error = false, wasspectator = false;
@@ -4011,7 +4025,7 @@ static void Command_Login_f(void)
 #endif
 }
 
-static void Got_Login(UINT8 **cp, INT32 playernum)
+static void Got_Login(const UINT8 **cp, INT32 playernum)
 {
 #ifdef NOMD5
 	// If we have no MD5 support then completely disable XD_LOGIN responses for security.
@@ -4121,7 +4135,7 @@ static void Command_Verify_f(void)
 		SendNetXCmd(XD_VERIFIED, buf, 1);
 }
 
-static void Got_Verification(UINT8 **cp, INT32 playernum)
+static void Got_Verification(const UINT8 **cp, INT32 playernum)
 {
 	INT16 num = READUINT8(*cp);
 
@@ -4173,7 +4187,7 @@ static void Command_RemoveAdmin_f(void)
 		SendNetXCmd(XD_DEMOTED, buf, 1);
 }
 
-static void Got_Removal(UINT8 **cp, INT32 playernum)
+static void Got_Removal(const UINT8 **cp, INT32 playernum)
 {
 	INT16 num = READUINT8(*cp);
 
@@ -4214,23 +4228,32 @@ static void Command_MotD_f(void)
 
 	mymotd = Z_Malloc(sizeof(motd), PU_STATIC, NULL);
 
-	strlcpy(mymotd, COM_Argv(1), sizeof motd);
+	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));
+
 	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);
@@ -4240,7 +4263,7 @@ static void Command_MotD_f(void)
 	Z_Free(mymotd);
 }
 
-static void Got_MotD_f(UINT8 **cp, INT32 playernum)
+static void Got_MotD_f(const UINT8 **cp, INT32 playernum)
 {
 	char *mymotd = Z_Malloc(sizeof(motd), PU_STATIC, NULL);
 	INT32 i;
@@ -4307,7 +4330,7 @@ static void Command_RunSOC(void)
 	SendNetXCmd(XD_RUNSOC, buf, length);
 }
 
-static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum)
+static void Got_RunSOCcmd(const UINT8 **cp, INT32 playernum)
 {
 	char filename[256];
 	filestatus_t ncs = FS_NOTCHECKED;
@@ -4429,7 +4452,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 || multiplayer) || musiconly)
+	if (!netgame || musiconly)
 	{
 		P_AddWadFile(fn, false);
 		return;
@@ -4472,7 +4495,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.
@@ -4585,7 +4608,7 @@ static void Command_GLocalSkin (void)
 	}
 }
 
-static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
+static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
 {
 	char filename[241];
 	filestatus_t ncs = FS_NOTCHECKED;
@@ -4644,7 +4667,7 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
 	COM_BufAddText(va("addfile %s\n", filename));
 }
 
-static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
+static void Got_Addfilecmd(const UINT8 **cp, INT32 playernum)
 {
 	char filename[241];
 	filestatus_t ncs = FS_NOTCHECKED;
@@ -5188,14 +5211,14 @@ static void Ringslinger_OnChange(void)
 static void Gravity_OnChange(void)
 {
 	if (!M_SecretUnlocked(SECRET_PANDORA) && !netgame && !cv_debug
-		&& strcmp(cv_gravity.string, cv_gravity.defaultvalue))
+		&& !fastcmp(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;
@@ -5444,7 +5467,7 @@ static void Command_ExitLevel_f(void)
 		SendNetXCmd(XD_EXITLEVEL, NULL, 0);
 }
 
-static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum)
+static void Got_ExitLevelcmd(const UINT8 **cp, INT32 playernum)
 {
 	(void)cp;
 
@@ -5465,7 +5488,7 @@ static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum)
 	G_ExitLevel();
 }
 
-static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum)
+static void Got_SetupVotecmd(const UINT8 **cp, INT32 playernum)
 {
 	INT32 i;
 	UINT8 gt, secondgt;
@@ -5517,7 +5540,7 @@ static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum)
 	Y_StartVote();
 }
 
-static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum)
+static void Got_ModifyVotecmd(const UINT8 **cp, INT32 playernum)
 {
 	SINT8 voted = READSINT8(*cp);
 	UINT8 p = READUINT8(*cp);
@@ -5526,7 +5549,7 @@ static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum)
 	votes[p] = voted;
 }
 
-static void Got_PickVotecmd(UINT8 **cp, INT32 playernum)
+static void Got_PickVotecmd(const UINT8 **cp, INT32 playernum)
 {
 	SINT8 pick = READSINT8(*cp);
 	SINT8 level = READSINT8(*cp);
@@ -6166,7 +6189,7 @@ static void KartEliminateLast_OnChange(void)
 		P_CheckRacers();
 }
 
-void Got_DiscordInfo(UINT8 **p, INT32 playernum)
+void Got_DiscordInfo(const UINT8 **p, INT32 playernum)
 {
 	if (playernum != serverplayer /*&& !IsPlayerAdmin(playernum)*/)
 	{

src/d_netcmd.h

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

src/d_netfil.c

@@ -110,14 +110,14 @@ static fileused_t transferFiles[UINT8_MAX + 1];
 // Write time of file: utime
 
 // Receiver structure
-INT32 fileneedednum; // Number of files needed to join the server
-fileneeded_t fileneeded[MAX_WADFILES]; // List of needed files
+INT32 fileneedednum = 0; // Number of files needed to join the server
+fileneeded_t fileneeded[MAX_WADFILES] = {}; // List of needed files
 #ifdef HAVE_THREADS
 static I_mutex downloadmutex;
 #endif
 char downloaddir[512] = "DOWNLOAD";
 
-file_download_t filedownload;
+file_download_t filedownload = {};
 
 #ifdef HAVE_CURL
 static CURL *http_handle;
@@ -131,7 +131,7 @@ static UINT32 curl_origfilesize;
 static UINT32 curl_origtotalfilesize;
 static char *curl_realname = NULL;
 fileneeded_t *curl_curfile = NULL;
-HTTP_login *curl_logins;
+HTTP_login *curl_logins = NULL;
 #endif
 
 /** Fills a serverinfo packet with information about wad files loaded.
@@ -550,7 +550,8 @@ INT32 CL_CheckFiles(void)
 		for (j = mainwads+1; j < numwadfiles; j++)
 		{
 			nameonly(strcpy(wadfilename, wadfiles[j]->filename));
-			if (!stricmp(wadfilename, fileneeded[i].filename) &&
+
+			if (fasticmp(wadfilename, fileneeded[i].filename) &&
 				!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
 			{
 				CONS_Debug(DBG_NETPLAY, "already loaded\n");
@@ -665,7 +666,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 		strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
 		nameonly(wadfilename);
 
-		if (!stricmp(wadfilename, p->id.filename))
+		if (fasticmp(wadfilename, p->id.filename))
 		{
 			// Copy file name with full path
 			strlcpy(p->id.filename, wadfiles[wadnum]->filename, MAX_WADPATH);
@@ -901,7 +902,7 @@ void SV_FileSendTicker(void)
 
 		if (ram)
 		{
-			M_Memcpy(p->data, &f->id.ram[transfer[i].position], size);
+			memcpy(p->data, &f->id.ram[transfer[i].position], size);
 		}
 		else if (fread(p->data, 1, size, transferFiles[f->fileid].file) != size)
 		{
@@ -946,17 +947,17 @@ void Got_Filetxpak(void)
 	char *filename = file->filename;
 	static INT32 filetime = 0;
 
-	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")
+	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")
 		))
 		I_Error("Tried to download \"%s\"", filename);
 
@@ -1103,7 +1104,7 @@ void nameonly(char *s)
 			ns = &(s[j+1]);
 			len = strlen(ns);
 #if 0
-				M_Memcpy(s, ns, len+1);
+				memcpy(s, ns, len+1);
 #else
 				memmove(s, ns, len+1);
 #endif
@@ -1197,7 +1198,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}
 
 	// next, check SRB2's "home" directory (if non-'.')
-	if (strcmp(srb2home, "."))
+	if (!fastcmp(srb2home, "."))
 	{
 		homecheck = filesearch(filename, srb2home, wantedmd5sum, completepath, 10);
 
@@ -1209,7 +1210,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}
 
 	// next, check SRB2's "path" directory (also if non-'.')
-	if (strcmp(srb2path, "."))
+	if (!fastcmp(srb2path, "."))
 	{
 		homecheck = filesearch(filename, srb2path, wantedmd5sum, completepath, 10);
 
@@ -1554,7 +1555,7 @@ CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
 			( login = (*prev_next));
 			prev_next = &login->next
 	){
-		if (strcmp(login->url, url) == 0)
+		if (fastcmp(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 (strcmp(buffer, "no") == 0)
+		if (!fastcmp(buffer, "no"))
 		{
 			fclose(fp);
 			return;
 		}
-		else if (strcmp(buffer, exe_path) != 0)
+		else if (fastcmp(buffer, exe_path))
 		{
 			// overwrite
 			fclose(fp);

src/dedicated/i_system.c

@@ -1442,7 +1442,7 @@ static INT32 errorcount = 0;
 */
 static boolean shutdowning = false;
 
-void I_Error(const char *error, ...)
+FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 {
 	va_list argptr;
 	char buffer[8192];
@@ -1709,9 +1709,9 @@ char *I_GetUserName(void)
 		strncpy(username, p, MAXPLAYERNAME);
 	}
 
-
-	if (strcmp(username, "") != 0)
+	if (!fastcmp(username, ""))
 		return username;
+
 	return NULL; // dummy for platform independent version
 }
 

src/discord.c

@@ -277,7 +277,7 @@ static void DRPC_HandleJoinRequest(const DiscordUser *requestUser)
 		while (append != NULL)
 		{
 			// CHECK FOR DUPES!! Ignore any that already exist from the same user.
-			if (!strcmp(newRequest->userID, append->userID))
+			if (fastcmp(newRequest->userID, append->userID))
 			{
 				Discord_Respond(newRequest->userID, DISCORD_REPLY_IGNORE);
 				DRPC_RemoveRequest(newRequest);
@@ -419,7 +419,7 @@ static const char *DRPC_GetServerIP(void)
 	// If you're connected
 	if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL)
 	{
-		if (strcmp(address, "self"))
+		if (!fastcmp(address, "self"))
 		{
 			// We're not the server, so we could successfully get the IP!
 			// No need to do anything else :)
@@ -684,7 +684,7 @@ void DRPC_UpdatePresence(void)
 		// Character image
 		while (supportedSkins[checkSkin] != NULL)
 		{
-			if (!strcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
+			if (fastcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
 			{
 				snprintf(charimg, 21, "char%s", supportedSkins[checkSkin]);
 				discordPresence.smallImageKey = charimg;

src/doomdef.h

@@ -69,6 +69,8 @@ extern "C" {
 #include <sys/stat.h>
 #include <ctype.h>
 
+#include "fastcmp.h"
+
 #ifdef _WIN32
 #include <io.h>
 #endif
@@ -451,11 +453,6 @@ extern char savegamename[256];
 //TODO: delet this
 #define M_GetText(x) (x)
 
-FUNCINLINE static ATTRINLINE void *M_Memcpy(void *dest, const void *src, size_t n)
-{
-	return memcpy(dest, src, n);
-}
-
 char *va(const char *format, ...) FUNCPRINTF;
 char *M_GetToken(const char *inputString);
 char *sizeu1(size_t num);
@@ -651,7 +648,9 @@ 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,7 +116,10 @@ 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/f_finale.c

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

src/f_wipe.c

@@ -257,7 +257,7 @@ static void F_DoWipe(fademask_t *fademask)
 				// shortcut - memcpy source to work
 				while (draw_linestogo--)
 				{
-					M_Memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
+					memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
 					relativepos += vid.width;
 				}
 			}
@@ -266,7 +266,7 @@ 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);
+					memcpy(w_base+relativepos, e_base+relativepos, draw_rowend-draw_rowstart);
 					relativepos += vid.width;
 				}
 			}

src/filesrch.c

@@ -198,7 +198,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 
 				for (; *path != NULL; path++)
 				{
-					if (strcasecmp(*path, dent->d_name) == 0)
+					if (fasticmp(*path, dent->d_name))
 					{
 						skipfolder = true;
 						break;
@@ -212,7 +212,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 				}
 			}
 
-			if (strcasecmp(".git", dent->d_name) // sanity if you're weird like me
+			if (!fasticmp(".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 (strcasecmp(searchname, dent->d_name))
+		if (!fasticmp(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 (!strcmp(dirmenu[i]+DIR_STRING, tempname))
+				if (fastcmp(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 && !strcmp(coredirmenu[i]+DIR_STRING, tempname))
+			if (tempname && fastcmp(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 (strcasecmp(".lmp", dent->d_name+len-5))
+					if (!fasticmp(".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 (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (fasticmp(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 (strcasecmp(".lmp", dent->d_name+len-5))
+					if (!fasticmp(".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 (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (fasticmp(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 (strcmp(dent->d_name, filenamebuf[i]))
+							if (!fastcmp(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) || !strcmp(dent->d_name, "errorlog.txt"))
+						if (!strncmp(dent->d_name, "log-", 4) || fastcmp(dent->d_name, "errorlog.txt"))
 							ext |= EXT_LOADED;
 					}
 
-					if (!strcmp(dent->d_name, configfile))
+					if (fastcmp(dent->d_name, configfile))
 						ext |= EXT_LOADED;
 				}
 

src/g_game.c

@@ -59,15 +59,15 @@
 #include "discord.h"
 #endif
 
-gameaction_t gameaction;
+gameaction_t gameaction = 0;
 gamestate_t gamestate = GS_NULL;
 UINT8 ultimatemode = false;
 
-boolean botingame;
-UINT8 botskin;
-UINT8 botcolor;
+boolean botingame = false;
+UINT8 botskin = 0;
+UINT8 botcolor = 0;
 
-JoyType_t Joystick[MAXSPLITSCREENPLAYERS];
+JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
 
 // 1024 bytes is plenty for a savegame
 #define SAVEGAMESIZE (1024)
@@ -83,10 +83,10 @@ static void G_DoContinued(void);
 static void G_DoWorldDone(void);
 static void G_DoStartVote(void);
 
-music_t mapmusic;
+music_t mapmusic = {};
 
 INT16 gamemap = 1;
-INT16 maptol;
+INT16 maptol = 0;
 UINT8 globalweather = 0;
 INT32 curWeather = PRECIP_NONE;
 INT32 cursaveslot = -1; // Auto-save 1p savegame slot
@@ -97,29 +97,29 @@ UINT16 mainwads = 0;
 boolean modifiedgame = false; // Set if homebrew PWAD stuff has been added.
 boolean majormods = false; // Set if Lua/Gameplay SOC/replacement map has been added.
 boolean savemoddata = false;
-UINT8 paused;
+UINT8 paused = 0;
 UINT8 modeattacking = ATTACKING_NONE;
 boolean imcontinuing = false;
 boolean runemeraldmanager = false;
 
-boolean netgame; // only true if packets are broadcast
-boolean multiplayer;
-boolean playeringame[MAXPLAYERS];
-boolean addedtogame;
-player_t players[MAXPLAYERS];
+boolean netgame = false; // only true if packets are broadcast
+boolean multiplayer = false;
+boolean playeringame[MAXPLAYERS] = {};
+boolean addedtogame = false;
+player_t players[MAXPLAYERS] = {};
 
-INT32 consoleplayer; // player taking events and displaying
-INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {0}; // view being displayed
+INT32 consoleplayer = 0; // player taking events and displaying
+INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {}; // view being displayed
 
-tic_t gametic;
-tic_t levelstarttic; // gametic at level start
-UINT32 totalrings; // for intermission
-INT16 lastmap; // last level you were at (returning from special stages)
-tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
+tic_t gametic = 0;
+tic_t levelstarttic = 0; // gametic at level start
+UINT32 totalrings = 0; // for intermission
+INT16 lastmap = 0; // last level you were at (returning from special stages)
+tic_t timeinmap = 0; // Ticker for time spent in level (used for levelcard display)
 
-INT16 spstage_start;
-INT16 sstage_start;
-INT16 sstage_end;
+INT16 spstage_start = 0;
+INT16 sstage_start = 0;
+INT16 sstage_end = 0;
 
 boolean looptitle = true;
 boolean useNightsSS = false;
@@ -134,42 +134,42 @@ boolean countdowntimeup = false;
 
 cutscene_t *cutscenes[128];
 
-INT16 nextmapoverride;
-boolean skipstats;
+INT16 nextmapoverride = 0;
+boolean skipstats = false;
 
 // Pointers to each CTF flag
-mobj_t *redflag;
-mobj_t *blueflag;
+mobj_t *redflag = NULL;
+mobj_t *blueflag = NULL;
 // Pointers to CTF spawn location
-mapthing_t *rflagpoint;
-mapthing_t *bflagpoint;
+mapthing_t *rflagpoint = NULL;
+mapthing_t *bflagpoint = NULL;
 
 struct quake quake;
 
 // Map Header Information
-mapheader_t* mapheaderinfo[NUMMAPS] = {NULL};
+mapheader_t* mapheaderinfo[NUMMAPS] = {};
 
 static boolean exitgame = false;
 static boolean retrying = false;
 
-UINT8 stagefailed; // Used for GEMS BONUS? Also to see if you beat the stage.
+UINT8 stagefailed = 0; // Used for GEMS BONUS? Also to see if you beat the stage.
 
-UINT16 emeralds;
-UINT32 token; // Number of tokens collected in a level
-UINT32 tokenlist; // List of tokens collected
-INT32 tokenbits; // Used for setting token bits
+UINT16 emeralds = 0;
+UINT32 token = 0; // Number of tokens collected in a level
+UINT32 tokenlist = 0; // List of tokens collected
+INT32 tokenbits = 0; // Used for setting token bits
 
 // Old Special Stage
-INT32 sstimer; // Time allotted in the special stage
+INT32 sstimer = 0; // Time allotted in the special stage
 
 boolean gamedataloaded = false;
 
 // Time attack data for levels
 // These are dynamically allocated for space reasons now
-recorddata_t *mainrecords[NUMMAPS]   = {NULL};
-UINT8 mapvisited[NUMMAPS];
+recorddata_t *mainrecords[NUMMAPS] = {};
+UINT8 mapvisited[NUMMAPS] = {};
 
-UINT32 bluescore, redscore; // CTF and Team Match team scores
+UINT32 bluescore = 0, redscore = 0; // CTF and Team Match team scores
 
 // ring count... for PERFECT!
 INT32 nummaprings = 0;
@@ -179,12 +179,12 @@ INT32 nummapboxes = 0;
 INT32 numgotboxes = 0;
 
 // Elminates unnecessary searching.
-boolean CheckForBustableBlocks;
-boolean CheckForBouncySector;
-boolean CheckForQuicksand;
-boolean CheckForMarioBlocks;
-boolean CheckForFloatBob;
-boolean CheckForReverseGravity;
+boolean CheckForBustableBlocks = false;
+boolean CheckForBouncySector = false;
+boolean CheckForQuicksand = false;
+boolean CheckForMarioBlocks = false;
+boolean CheckForFloatBob = false;
+boolean CheckForReverseGravity = false;
 
 // Powerup durations
 UINT16 invulntics = 20*TICRATE;
@@ -215,67 +215,66 @@ INT32 gameovertics = 15*TICRATE;
 UINT8 use1upSound = 0;
 UINT8 maxXtraLife = 2; // Max extra lives from rings
 
-UINT8 introtoplay;
-UINT8 creditscutscene;
+UINT8 introtoplay = 0;
+UINT8 creditscutscene = 0;
 
 // Emerald locations
-mobj_t *hunt1;
-mobj_t *hunt2;
-mobj_t *hunt3;
+mobj_t *hunt1 = NULL;
+mobj_t *hunt2 = NULL;
+mobj_t *hunt3 = NULL;
 
-tic_t racecountdown, exitcountdown; // for racing
+tic_t racecountdown = 0, exitcountdown = 0; // for racing
 
-fixed_t gravity;
-fixed_t mapobjectscale;
+fixed_t gravity = 0;
+fixed_t mapobjectscale = FRACUNIT;
 
 struct maplighting maplighting;
 
-INT16 autobalance; //for CTF team balance
-INT16 teamscramble; //for CTF team scramble
-INT16 scrambleplayers[MAXPLAYERS]; //for CTF team scramble
-INT16 scrambleteams[MAXPLAYERS]; //for CTF team scramble
-INT16 scrambletotal; //for CTF team scramble
-INT16 scramblecount; //for CTF team scramble
+INT16 autobalance = 0; //for CTF team balance
+INT16 teamscramble = 0; //for CTF team scramble
+INT16 scrambleplayers[MAXPLAYERS] = {}; //for CTF team scramble
+INT16 scrambleteams[MAXPLAYERS] = {}; //for CTF team scramble
+INT16 scrambletotal = 0; //for CTF team scramble
+INT16 scramblecount = 0; //for CTF team scramble
 
-INT32 cheats; //for multiplayer cheat commands
+INT32 cheats = 0; //for multiplayer cheat commands
 
 // SRB2Kart
 // Cvars that we don't want changed mid-game
-UINT8 gamespeed; // Game's current speed (or difficulty, or cc, or etc); 0 for easy, 1 for normal, 2 for hard
+UINT8 gamespeed = 0; // Game's current speed (or difficulty, or cc, or etc); 0 for easy, 1 for normal, 2 for hard
 boolean encoremode = false; // Encore Mode currently enabled?
-boolean prevencoremode;
-boolean franticitems; // Frantic items currently enabled?
-boolean comeback; // Battle Mode's karma comeback is on/off
+boolean prevencoremode = 0;
+boolean franticitems = 0; // Frantic items currently enabled?
+boolean comeback = 0; // Battle Mode's karma comeback is on/off
 
 // Voting system
-INT16 votelevels[4][2]; // Levels that were rolled by the host
-SINT8 votes[MAXPLAYERS]; // Each player's vote
-SINT8 pickedvote; // What vote the host rolls
+INT16 votelevels[4][2] = {}; // Levels that were rolled by the host
+SINT8 votes[MAXPLAYERS] = {}; // Each player's vote
+SINT8 pickedvote = 0; // What vote the host rolls
 
 // Server-sided, synched variables
-SINT8 battlewanted[4]; // WANTED players in battle, worth x2 points
-tic_t wantedcalcdelay; // Time before it recalculates WANTED
-tic_t indirectitemcooldown; // Cooldown before any more Shrink, SPB, or any other item that works indirectly is awarded
-tic_t hyubgone; // Cooldown before hyudoro is allowed to be rerolled
-tic_t mapreset; // Map reset delay when enough players have joined an empty game
-UINT8 nospectategrief; // How many players need to be in-game to eliminate last; for preventing spectate griefing
-boolean thwompsactive; // Thwomps activate on lap 2
-SINT8 spbplace; // SPB exists, give the person behind better items
-boolean startedInFreePlay; // Map was started in free play
+SINT8 battlewanted[4] = {}; // WANTED players in battle, worth x2 points
+tic_t wantedcalcdelay = 0; // Time before it recalculates WANTED
+tic_t indirectitemcooldown = 0; // Cooldown before any more Shrink, SPB, or any other item that works indirectly is awarded
+tic_t hyubgone = 0; // Cooldown before hyudoro is allowed to be rerolled
+tic_t mapreset = 0; // Map reset delay when enough players have joined an empty game
+UINT8 nospectategrief = 0; // How many players need to be in-game to eliminate last; for preventing spectate griefing
+boolean thwompsactive = 0; // Thwomps activate on lap 2
+SINT8 spbplace = 0; // SPB exists, give the person behind better items
+boolean startedInFreePlay = false; // Map was started in free play
 
 // Client-sided, unsynched variables (NEVER use in anything that needs to be synced with other players)
-boolean legitimateexit; // Did this client actually finish the match?
-boolean comebackshowninfo; // Have you already seen the "ATTACK OR PROTECT" message?
-static INT16 randmapbuffer[NUMMAPS+1]; // Buffer for maps RandMap is allowed to roll
+boolean legitimateexit = 0; // Did this client actually finish the match?
+boolean comebackshowninfo = 0; // Have you already seen the "ATTACK OR PROTECT" message?
+static INT16 randmapbuffer[NUMMAPS+1] = {}; // Buffer for maps RandMap is allowed to roll
 
-tic_t hidetime;
+tic_t hidetime = 0;
 
 // Grading
-UINT32 timesBeaten;
-UINT32 timesBeatenWithEmeralds;
-//UINT32 timesBeatenUltimate;
+UINT32 timesBeaten = 0;
+UINT32 timesBeatenWithEmeralds = 0;
 
-INT16 prevmap, nextmap;
+INT16 prevmap = 0, nextmap = 0;
 
 // Analog Control
 void SendWeaponPref(void);
@@ -470,7 +469,7 @@ consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0,
 #endif
 
 #ifdef SEENAMES
-player_t *seenplayer; // player we're aiming at right now
+player_t *seenplayer = NULL; // player we're aiming at right now
 #endif
 
 char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
@@ -493,7 +492,7 @@ char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
 	"Player 16"
 }; // SRB2kart - removed Players 17 through 32
 
-INT32 player_name_changes[MAXPLAYERS];
+INT32 player_name_changes[MAXPLAYERS] = {};
 
 INT16 rw_maximums[NUM_WEAPONS] =
 {
@@ -570,6 +569,7 @@ static void G_SetSaveGameModified(void)
 	{
 		if (!unlockables[i].conditionset)
 			continue;
+
 		if (!unlockables[i].unlocked)
 		{
 			unlockables[i].unlocked = true;
@@ -595,7 +595,7 @@ void G_SetGameModified(boolean silent, boolean major)
 	G_SetSaveGameModified();
 
 	if (!silent)
-		CONS_Alert(CONS_NOTICE, M_GetText("Record Attack data will be saved to a seperate save file.\n"));
+		CONS_Alert(CONS_NOTICE, "Record Attack data will be saved to a seperate save file.\n");
 
 	// If in record attack recording, cancel it.
 	if (modeattacking)
@@ -634,6 +634,7 @@ const char *G_BuildMapName(INT32 map)
 			map = gamemap-1;
 		else
 			map = prevmap;
+
 		map = G_RandMap(G_TOLFlag(cv_newgametype.value), map, false, 0, false, NULL)+1;
 	}
 
@@ -687,11 +688,12 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
 {
 	INT32 retaxis;
 	INT32 axisval;
+	INT32 deadzone;
 	boolean flp = false;
 
 	UINT8 pnum = player-1;
 
-	//find what axis to get
+	// find what axis to get
 	switch (axissel)
 	{
 		case AXISTURN:
@@ -750,45 +752,33 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
 	{
 		axisval /= 2;
 		retaxis = joyxmove[pnum][axisval];
-
-		if (retaxis < (-JOYAXISRANGE))
-			retaxis = -JOYAXISRANGE;
-		if (retaxis > (+JOYAXISRANGE))
-			retaxis = +JOYAXISRANGE;
-		if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
-		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[pnum].value) >> FRACBITS;
-			if (abs(retaxis) <= jdeadzone)
-				return 0;
-		}
-
-		if (flp)
-			retaxis = -retaxis; // flip it around
-
-		return retaxis;
+		deadzone = cv_xdeadzone[pnum].value;
 	}
 	else
 	{
 		axisval--;
 		axisval /= 2;
 		retaxis = joyymove[pnum][axisval];
-
-		if (retaxis < (-JOYAXISRANGE))
-			retaxis = -JOYAXISRANGE;
-		if (retaxis > (+JOYAXISRANGE))
-			retaxis = +JOYAXISRANGE;
-		if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
-		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[pnum].value) >> FRACBITS;
-			if (abs(retaxis) <= jdeadzone)
-				return 0;
-		}
-
-		if (flp)
-			retaxis = -retaxis; // flip it around
-
-		return retaxis;
+		deadzone = cv_ydeadzone[pnum].value;
 	}
+
+	if (retaxis < (-JOYAXISRANGE))
+		retaxis = -JOYAXISRANGE;
+	if (retaxis > (+JOYAXISRANGE))
+		retaxis = +JOYAXISRANGE;
+
+	if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
+	{
+		const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;
+
+		if (abs(retaxis) <= jdeadzone)
+			return 0;
+	}
+
+	if (flp)
+		retaxis = -retaxis; // flip it around
+
+	return retaxis;
 }
 
 boolean InputDown(INT32 gc, UINT8 p)
@@ -806,9 +796,9 @@ boolean InputDown(INT32 gc, UINT8 p)
 	}
 }
 
-INT32 localaiming[MAXSPLITSCREENPLAYERS];
-angle_t localangle[MAXSPLITSCREENPLAYERS];
-boolean camspin[MAXSPLITSCREENPLAYERS];
+INT32 localaiming[MAXSPLITSCREENPLAYERS] = {};
+angle_t localangle[MAXSPLITSCREENPLAYERS] = {};
+boolean camspin[MAXSPLITSCREENPLAYERS] = {};
 
 static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
 static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
@@ -1210,7 +1200,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	if (gamestate == GS_LEVEL)
 		LUA_HookTiccmd(player, cmd, HOOK(PlayerCmd));
 
-	//Reset away view if a command is given.
+	// Reset away view if a command is given.
 	if (displayplayers[0] != consoleplayer && ssplayer == 1
 	&& (cmd->forwardmove || cmd->sidemove || cmd->buttons))
 	{
@@ -1219,12 +1209,12 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	}
 }
 
-ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
+ticcmd_t *G_CopyTiccmd(ticcmd_t* restrict dest, const ticcmd_t* restrict src, const size_t n)
 {
-	return M_Memcpy(dest, src, n*sizeof(*src));
+	return memcpy(dest, src, n*sizeof(*src));
 }
 
-ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
+ticcmd_t *G_MoveTiccmd(ticcmd_t* restrict dest, const ticcmd_t* restrict src, const size_t n)
 {
 	size_t i;
 	for (i = 0; i < n; i++)
@@ -1261,7 +1251,7 @@ static void G_DoLoadLevel(boolean resetplayer)
 
 	if (gamestate == GS_INTERMISSION)
 		Y_EndIntermission();
-	if (gamestate == GS_VOTING)
+	else if (gamestate == GS_VOTING)
 		Y_EndVote();
 
 	G_SetGamestate(GS_LEVEL);
@@ -2329,12 +2319,6 @@ void G_PlayerReborn(INT32 player)
 
 	if (gametype == GT_COOP)
 		P_FindEmerald(); // scan for emeralds to hunt for
-
-	// Reset Nights score and max link to 0 on death
-	p->maxlink = 0;
-
-	// If NiGHTS, find lowest mare to start with.
-	p->mare = 0;
 }
 
 //
@@ -2353,22 +2337,25 @@ static boolean G_CheckSpot(INT32 playernum, mapthing_t *mthing)
 	if (!mthing)
 		return false;
 
+	x = mthing->x << FRACBITS;
+	y = mthing->y << FRACBITS;
+
 	if (!players[playernum].mo)
 	{
 		// first spawn of level
 		for (i = 0; i < playernum; i++)
+		{
 			if (playeringame[i] && players[i].mo
-				&& players[i].mo->x == mthing->x << FRACBITS
-				&& players[i].mo->y == mthing->y << FRACBITS)
+				&& players[i].mo->x == x
+				&& players[i].mo->y == y)
 			{
 				return false;
 			}
+		}
+
 		return true;
 	}
 
-	x = mthing->x << FRACBITS;
-	y = mthing->y << FRACBITS;
-
 	if (!K_CheckPlayersRespawnColliding(playernum, x, y))
 		return false;
 
@@ -2768,7 +2755,7 @@ INT32 G_GetGametypeByName(const char *gametypestr)
 	INT32 i;
 
 	for (i = 0; i < NUMGAMETYPES; i++)
-		if (!stricmp(gametypestr, Gametype_Names[i]))
+		if (fasticmp(gametypestr, Gametype_Names[i]))
 			return i;
 
 	return -1; // unknown gametype
@@ -2870,17 +2857,23 @@ UINT8 G_GetGametypeColor(INT16 gt)
   */
 INT16 G_TOLFlag(INT32 pgametype)
 {
-	if (!multiplayer)                 return TOL_SP;
-	if (pgametype == GT_COOP)         return TOL_RACE; // SRB2kart
-	if (pgametype == GT_COMPETITION)  return TOL_COMPETITION;
-	if (pgametype == GT_RACE)         return TOL_RACE;
-	if (pgametype == GT_MATCH)        return TOL_MATCH;
-	if (pgametype == GT_TEAMMATCH)    return TOL_MATCH;
-	if (pgametype == GT_TAG)          return TOL_TAG;
-	if (pgametype == GT_HIDEANDSEEK)  return TOL_TAG;
-	if (pgametype == GT_CTF)          return TOL_CTF;
+	if (!multiplayer)         return TOL_SP;
+
+	switch (pgametype)
+	{
+		case GT_COOP:         return TOL_RACE; // SRB2kart
+		case GT_COMPETITION:  return TOL_COMPETITION;
+		case GT_RACE:         return TOL_RACE;
+		case GT_MATCH:        return TOL_MATCH;
+		case GT_TEAMMATCH:    return TOL_MATCH;
+		case GT_TAG:          return TOL_TAG;
+		case GT_HIDEANDSEEK:  return TOL_TAG;
+		case GT_CTF:          return TOL_CTF;
+		default:
+			CONS_Alert(CONS_ERROR, "Unknown gametype! %d\n", pgametype);
+			break;
+	}
 
-	CONS_Alert(CONS_ERROR, M_GetText("Unknown gametype! %d\n"), pgametype);
 	return INT16_MAX;
 }
 
@@ -3063,6 +3056,7 @@ static void G_DoCompleted(void)
 	K_StatRound();
 
 	for (i = 0; i < MAXPLAYERS; i++)
+	{
 		if (playeringame[i])
 		{
 			// SRB2Kart: exitlevel shouldn't get you the points
@@ -3072,8 +3066,10 @@ static void G_DoCompleted(void)
 				if (P_IsLocalPlayer(&players[i]))
 					j++;
 			}
+
 			G_PlayerFinishLevel(i); // take away cards and stuff
 		}
+	}
 
 	// play some generic music if there's no win/cool/lose music going on (for exitlevel commands)
 	if (G_RaceGametype() && ((multiplayer && demo.playback) || j == splitscreen+1) && (cv_inttime.value > 0))
@@ -3217,10 +3213,14 @@ void G_AfterIntermission(void)
 
 		return;
 	}
-	else if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
-		G_SaveDemo();
-	else if (demo.recording)
-		G_ResetDemoRecording();
+
+	if (demo.recording)
+	{
+		if (modeattacking || demo.savemode != DSM_NOTSAVING)
+			G_SaveDemo();
+		else
+			G_ResetDemoRecording();
+	}
 
 	if (modeattacking) // End the run.
 	{
@@ -3229,7 +3229,9 @@ void G_AfterIntermission(void)
 	}
 
 	if (mapheaderinfo[gamemap-1]->cutscenenum) // Start a custom cutscene.
+	{
 		F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false);
+	}
 	else
 	{
 		if (nextmap < 1100-1)
@@ -3366,10 +3368,13 @@ static void G_DoContinued(void)
 // when something new is added.
 void G_EndGame(void)
 {
-	if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
-		G_SaveDemo();
-	else if (demo.recording)
-		G_ResetDemoRecording();
+	if (demo.recording)
+	{
+		if (modeattacking || demo.savemode != DSM_NOTSAVING)
+			G_SaveDemo();
+		else
+			G_ResetDemoRecording();
+	}
 
 	// Only do evaluation and credits in coop games.
 	if (gametype == GT_COOP)
@@ -3379,6 +3384,7 @@ void G_EndGame(void)
 			F_StartCredits();
 			return;
 		}
+
 		if (nextmap == 1101-1) // end game with evaluation
 		{
 			F_StartGameEvaluation();
@@ -3463,7 +3469,8 @@ void G_LoadGameData(void)
 	if (READUINT32(save.p) != 0xFCAFE211)
 	{
 		const char *gdfolder = "the SRB2Kart folder";
-		if (strcmp(srb2home,"."))
+
+		if (!fastcmp(srb2home,"."))
 			gdfolder = srb2home;
 
 		Z_Free(save.buffer);
@@ -3477,9 +3484,8 @@ void G_LoadGameData(void)
 	modded = READUINT8(save.p);
 
 	// Aha! Someone's been screwing with the save file!
-	if ((modded && !savemoddata))
-		goto datacorrupt;
-	else if (modded != true && modded != false)
+	if ((modded && !savemoddata) ||
+		(modded != true && modded != false))
 		goto datacorrupt;
 
 	// TODO put another cipher on these things? meh, I don't care...
@@ -3544,10 +3550,11 @@ void G_LoadGameData(void)
 	return;
 
 	// Landing point for corrupt gamedata
-	datacorrupt:
+datacorrupt:
 	{
 		const char *gdfolder = "the SRB2Kart folder";
-		if (strcmp(srb2home,"."))
+
+		if (!fastcmp(srb2home,"."))
 			gdfolder = srb2home;
 
 		Z_Free(save.buffer);
@@ -3758,7 +3765,8 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 
 	memset(vcheck, 0, sizeof (vcheck));
 	sprintf(vcheck, "version %d", VERSION);
-	if (strcmp((const char *)save.p, (const char *)vcheck))
+
+	if (!fastcmp((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"),
@@ -4036,7 +4044,7 @@ char *G_BuildMapTitle(INT32 mapnum)
 	if (!mapheaderinfo[mapnum-1])
 		P_AllocMapHeader(mapnum-1);
 
-	if (strcmp(mapheaderinfo[mapnum-1]->lvlttl, ""))
+	if (!fastcmp(mapheaderinfo[mapnum-1]->lvlttl, ""))
 	{
 		size_t len = 1;
 		const char *zonetext = NULL;
@@ -4061,7 +4069,11 @@ 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);
 	}
@@ -4259,18 +4271,21 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
 	{
 		if (mapname[0] == '*') // current map
 			return gamemap;
-		else if (mapname[0] == '?' && mapheaderinfo[gamemap-1])
+
+		if (mapname[0] == '?' && mapheaderinfo[gamemap-1])
 			return G_RandMap(G_TOLFlag(gametype), gamemap-1, false, 0, false, NULL)+1;
-		else if (mapname[0] == '+' && mapheaderinfo[gamemap-1]) // next map
+
+		if (mapname[0] == '+' && mapheaderinfo[gamemap-1]) // next map
 		{
 			newmapnum = mapheaderinfo[gamemap-1]->nextlevel;
+
 			if (newmapnum < 1 || newmapnum > NUMMAPS)
 			{
-				CONS_Alert(CONS_ERROR, M_GetText("NextLevel (%d) is not a valid map.\n"), newmapnum);
+				CONS_Alert(CONS_ERROR, "NextLevel (%d) is not a valid map.\n", newmapnum);
 				return 0;
 			}
-			else
-				return newmapnum;
+
+			return newmapnum;
 		}
 	}
 	else if (mapnamelen == 2)/* maybe two digit code */

src/g_input.c

@@ -262,9 +262,6 @@ void G_ResetControls(void)
 
 	memset(joyxmove, 0, sizeof(joyxmove));
 	memset(joyymove, 0, sizeof(joyymove));
-
-	// reset those just in case the game missed the keyup event
-	memset(dpadscrollstate, false, sizeof(dpadscrollstate));
 }
 
 //
@@ -1033,7 +1030,7 @@ INT32 G_KeyStringtoNum(const char *keystr)
 		return atoi(&keystr[3]);
 
 	for (j = 0; j < NUMKEYNAMES; j++)
-		if (!stricmp(keynames[j].name, keystr))
+		if (fasticmp(keynames[j].name, keystr))
 			return keynames[j].keynum;
 
 	return 0;
@@ -1333,14 +1330,15 @@ static void setcontrol(INT32 (*gc)[2])
 		player = 0;
 
 	namectrl = COM_Argv(1);
-	for (numctrl = 0; numctrl < num_gamecontrols && stricmp(namectrl, gamecontrolname[numctrl]);
-		numctrl++)
+	for (numctrl = 0; numctrl < num_gamecontrols && !fasticmp(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

@@ -37,7 +37,7 @@ typedef enum
 	KEY_JOY1 = KEY_MOUSE1 + MOUSEBUTTONS,
 	KEY_HAT1 = KEY_JOY1 + JOYBUTTONS,
 
-	KEY_DBLMOUSE1 =KEY_HAT1 + JOYHATS*4, // double clicks
+	KEY_DBLMOUSE1 = KEY_HAT1 + JOYHATS*4, // double clicks
 	KEY_DBLJOY1 = KEY_DBLMOUSE1 + MOUSEBUTTONS,
 	KEY_DBLHAT1 = KEY_DBLJOY1 + JOYBUTTONS,
 

src/hardware/hw_bsp.c

@@ -80,14 +80,6 @@ static poly_t *HWR_AllocPoly(INT32 numpts)
 	return p;
 }
 
-static polyvertex_t *HWR_AllocVertex(void)
-{
-	polyvertex_t *p;
-	size_t size = sizeof(polyvertex_t);
-	p = Z_Malloc(size, PU_HWRPLANE, NULL);
-	return p;
-}
-
 /// \todo polygons should be freed in reverse order for efficiency,
 /// for now don't free because it doesn't free in reverse order
 static void HWR_FreePoly(poly_t *poly)
@@ -637,7 +629,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 		WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
 
 		// copy child bbox
-		M_Memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
+		memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
 	}
 	else
 		I_Error("WalkBSPNode: no front poly?");
@@ -855,100 +847,6 @@ static INT32 SolveTProblem(void)
 	return numsplitpoly;
 }
 
-#define NEARDIST (0.75f)
-#define MYMAX    (10000000000000.0f)
-
-/* Adjust true segs (from the segs lump) to be exactely the same as
- * plane polygone segs
- * This also convert fixed_t point of segs in float (in moste case
- * it share the same vertice
- */
-static void AdjustSegs(void)
-{
-	size_t i, count;
-	INT32 j;
-	seg_t *lseg;
-	poly_t *p;
-	INT32 v1found = 0, v2found = 0;
-	float nearv1, nearv2;
-
-	for (i = 0; i < numsubsectors; i++)
-	{
-		count = subsectors[i].numlines;
-		lseg = &segs[subsectors[i].firstline];
-		p = extrasubsectors[i].planepoly;
-
-		if (!p)
-			continue;
-
-		for (; count--; lseg++)
-		{
-			float distv1,distv2,tmp;
-			nearv1 = nearv2 = MYMAX;
-
-			// Don't touch polyobject segs. We'll compensate
-			// for this when we go about drawing them.
-			if (lseg->polyseg)
-				continue;
-
-			for (j = 0; j < p->numpts; j++)
-			{
-				distv1 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v1->x);
-				tmp    = p->pts[j].y - FIXED_TO_FLOAT(lseg->v1->y);
-				distv1 = distv1*distv1+tmp*tmp;
-
-				if (distv1 <= nearv1)
-				{
-					v1found = j;
-					nearv1 = distv1;
-				}
-
-				// the same with v2
-				distv2 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v2->x);
-				tmp    = p->pts[j].y - FIXED_TO_FLOAT(lseg->v2->y);
-				distv2 = distv2*distv2+tmp*tmp;
-
-				if (distv2 <= nearv2)
-				{
-					v2found = j;
-					nearv2 = distv2;
-				}
-			}
-
-			if (nearv1 <= NEARDIST*NEARDIST)
-				// share vertice with segs
-				lseg->pv1 = &(p->pts[v1found]);
-			else
-			{
-				// BP: here we can do better, using PointInSeg and compute
-				// the right point position also split a polygone side to
-				// solve a T-intersection, but too mush work
-
-				// convert fixed vertex to float vertex
-				polyvertex_t *pv = HWR_AllocVertex();
-				pv->x = FIXED_TO_FLOAT(lseg->v1->x);
-				pv->y = FIXED_TO_FLOAT(lseg->v1->y);
-				lseg->pv1 = pv;
-			}
-
-			if (nearv2 <= NEARDIST*NEARDIST)
-				lseg->pv2 = &(p->pts[v2found]);
-			else
-			{
-				polyvertex_t *pv = HWR_AllocVertex();
-				pv->x = FIXED_TO_FLOAT(lseg->v2->x);
-				pv->y = FIXED_TO_FLOAT(lseg->v2->y);
-				lseg->pv2 = pv;
-			}
-
-			lseg->pv1->x2 = FloatToFixed(lseg->pv1->x);
-			lseg->pv1->y2 = FloatToFixed(lseg->pv1->y);
-			lseg->pv2->x2 = FloatToFixed(lseg->pv2->x);
-			lseg->pv2->y2 = FloatToFixed(lseg->pv2->y);
-		}
-	}
-}
-
 
 // call this routine after the BSP of a Doom wad file is loaded,
 // and it will generate all the convex polys for the hardware renderer
@@ -1017,7 +915,6 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 #else
 	SolveTProblem();
 #endif
-	AdjustSegs();
 
 #ifdef DEBUG_HWBSP
 	//debug debug..

src/hardware/hw_cache.c

@@ -346,7 +346,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
 
 	gltex->mipmap.colormap = Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL);
 	gltex->mipmap.colormap->source = colormap;
-	M_Memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
+	memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
 
 	blockwidth = texture->width;
 	blockheight = texture->height;
@@ -437,8 +437,16 @@ 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 GLMapTexture_t *gl_textures; // For all textures
+static GLMapTextureSet_t *gl_textures; // For all textures
 
 static void HWR_FreeTextureData(patch_t *patch)
 {
@@ -578,13 +586,12 @@ void HWR_FreeMapTextures(void)
 {
 	size_t i;
 
-#ifdef GLENCORE
-	for (i = 0; i < gl_numtextures*2; i++)
-#else
 	for (i = 0; i < gl_numtextures; i++)
-#endif
 	{
-		FreeMapTexture(&gl_textures[i]);
+		FreeMapTexture(&gl_textures[i].normal);
+#ifdef GLENCORE
+		FreeMapTexture(&gl_textures[i].encore);
+#endif
 	}
 
 	// now the heap don't have any 'user' pointing to our
@@ -603,7 +610,7 @@ static void HWR_PrecacheLevelFlats(void)
 
 	// special case for encore
 #ifdef GLENCORE
-	if (encoremode)
+	if (encoremap)
 	{
 		// go through all sectors to determine if it should be remapped for encore
 		for (i = 0; i < numsectors; i++)
@@ -678,8 +685,6 @@ 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++)
@@ -695,11 +700,14 @@ 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)
@@ -737,7 +745,7 @@ static void HWR_PrecacheLevelTextures(void)
 	free(texturepresent);
 }
 
-static void HWR_PrecacheLevelSprites(void)
+/*static void HWR_PrecacheLevelSprites(void)
 {
 	patch_t *spritepatch;
 	char *spritepresent;
@@ -800,21 +808,30 @@ static void HWR_PrecacheLevelSprites(void)
 		}
 	}
 	free(spritepresent);
-}
+}*/
 
 void HWR_PrecacheLevel(void)
 {
-	if (gamestate != GS_LEVEL)
+	if (gamestate != GS_LEVEL || !cv_precachetextures.value)
 		return;
 
 	// Precache flats.
 	HWR_PrecacheLevelFlats();
 
+	// prevent timeouts
+	NetKeepAlive();
+
 	// Precache textures.
 	HWR_PrecacheLevelTextures();
 
+	// prevent timeouts
+	NetKeepAlive();
+
 	// Precache sprites.
-	HWR_PrecacheLevelSprites();
+	//HWR_PrecacheLevelSprites();
+
+	// prevent timeouts
+	//NetKeepAlive();
 }
 
 void HWR_LoadMapTextures(size_t pnumtextures)
@@ -823,11 +840,8 @@ void HWR_LoadMapTextures(size_t pnumtextures)
 	HWR_FreeMapTextures();
 
 	gl_numtextures = pnumtextures;
-#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
+	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
+
 	if (gl_textures == NULL)
 		I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
 }
@@ -851,7 +865,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 = &gl_textures[tex*2 + (encoremap && !noencore ? 0 : 1)];
+	gltex = (encoremap && !noencore) ? &gl_textures[tex].encore : &gl_textures[tex].normal;
 #else
 	gltex = &gl_textures[tex];
 #endif
@@ -965,7 +979,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
 #endif
 		glMipmap->colormap = Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
 		glMipmap->colormap->source = colormap;
-		M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+		memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 	}
 
 	if (!glMipmap->downloaded)
@@ -1063,7 +1077,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 		{
 			if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
 			{
-				M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+				memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 				HWR_UpdatePatchMipmap(patch, glMipmap);
 			}
 			else
@@ -1086,7 +1100,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 
 	newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
 	newMipmap->colormap->source = colormap;
-	M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+	memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 
 	HWR_LoadPatchMipmap(patch, newMipmap);
 }

src/hardware/hw_clip.c

@@ -80,14 +80,13 @@
 
 
 typedef struct clipnode_s
-	{
-		struct clipnode_s *prev, *next;
-		angle_t start, end;
-	} clipnode_t;
+{
+	struct clipnode_s *prev, *next;
+	angle_t start, end;
+} clipnode_t;
 
-clipnode_t *freelist;
-clipnode_t *clipnodes;
-clipnode_t *cliphead;
+static clipnode_t *freelist;
+static clipnode_t *cliphead;
 
 static clipnode_t * gld_clipnode_GetNew(void);
 static clipnode_t * gld_clipnode_NewRange(angle_t start, angle_t end);

src/hardware/hw_defs.h

@@ -117,7 +117,7 @@ typedef struct
 
 typedef struct
 {
-	FLOAT       x,y,z;           // position
+	FLOAT       x, y, z;           // position
 	FLOAT       anglex, angley, anglez;   // aimingangle / viewangle
 	FLOAT       scalex, scaley, scalez;
 	FLOAT       fovangle;

src/hardware/hw_draw.c

@@ -46,9 +46,9 @@ typedef struct
 	UINT8 image_descriptor; //18
 } ATTRPACK TGAHeader; // sizeof is 18
 
-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 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 const float FLOATBASEVIDWIDTH  = (float)BASEVIDWIDTH;
 static const float FLOATBASEVIDHEIGHT = (float)BASEVIDHEIGHT;
@@ -87,15 +87,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 +269,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 +506,7 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 
 	if (color & 0xFF00) // Do COLORMAP fade.
 	{
-		if (HWR_ShouldUsePaletteRendering() && cv_glscreentextures.value)
+		if (cv_glscreentextures.value && HWR_ShouldUsePaletteRendering())
 		{
 			const hwdscreentexture_t scr_tex = HWD_SCREENTEXTURE_GENERIC2;
 
@@ -518,12 +518,10 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 			GL_UnSetShader();
 			return;
 		}
-		else
-		{
-			Surf.PolyColor.rgba = UINT2RGBA(0x01010160);
-			Surf.PolyColor.s.alpha = (strength*8);
-			poly_flags |= PF_Translucent;
-		}
+
+		Surf.PolyColor.rgba = UINT2RGBA(0x01010160);
+		Surf.PolyColor.s.alpha = (strength*8);
+		poly_flags |= PF_Translucent;
 	}
 	else // Do TRANSMAP** fade.
 	{
@@ -890,11 +888,13 @@ 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,6 +906,7 @@ 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;
 

src/hardware/hw_main.cpp

@@ -75,19 +75,19 @@ boolean gl_drawing_stencil = false;
 
 static INT32 current_bsp_culling_distance = 0;
 
-FTransform atransform;
+FTransform atransform = {};
 
 // Float variants of viewx, viewy, viewz, etc.
 static float gl_viewx, gl_viewy, gl_viewz;
-float gl_viewsin, gl_viewcos;
+float gl_viewsin = 0.0f, gl_viewcos = 0.0f;
 static float gl_viewludsin, gl_viewludcos;
 static angle_t gl_aimingangle;
 
-seg_t *gl_curline;
-side_t *gl_sidedef;
-line_t *gl_linedef;
-sector_t *gl_frontsector;
-sector_t *gl_backsector;
+seg_t    *gl_curline = NULL;
+side_t   *gl_sidedef = NULL;
+line_t   *gl_linedef = NULL;
+sector_t *gl_frontsector = NULL;
+sector_t *gl_backsector = NULL;
 
 // values for the far clipping plane
 static constexpr float clipping_distances[] = {1024.0f, 2048.0f, 4096.0f, 6144.0f, 8192.0f, 12288.0f, 16384.0f};
@@ -458,8 +458,8 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
 	// in palette rendering mode, this is not needed since it properly takes the changes to the palette itself
 	if (!HWR_ShouldUsePaletteRendering())
 	{
-		V_CubeApply(&tint_color.s.red, &tint_color.s.green, &tint_color.s.blue);
-		V_CubeApply(&fade_color.s.red, &fade_color.s.green, &fade_color.s.blue);
+		V_CubeApply(&tint_color);
+		V_CubeApply(&fade_color);
 	}
 
 	Surface->PolyColor.rgba = poly_color.rgba;
@@ -728,6 +728,9 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 
 		for (i = 0; i < subsector->numlines; i++, line++)
 		{
+			if (line->polyseg)
+				continue;
+
 			line_t* ld = line->linedef;
 
 			// this check sucks and is a hotspot lel
@@ -740,27 +743,11 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 			P_ClosestPointOnLine(viewx, viewy, ld, &v);
 			dist = FixedToFloat(R_PointToDist(v.x, v.y));
 
-			if (line->pv1)
-			{
-				x1 = line->pv1->x;
-				y1 = line->pv1->y;
-			}
-			else
-			{
-				x1 = FixedToFloat(line->v1->x);
-				y1 = FixedToFloat(line->v1->y);
-			}
+			x1 = (line->fv1.x);
+			y1 = (line->fv1.y);
 
-			if (line->pv2)
-			{
-				xd = line->pv2->x - x1;
-				yd = line->pv2->y - y1;
-			}
-			else
-			{
-				xd = FixedToFloat(line->v2->x) - x1;
-				yd = FixedToFloat(line->v2->y) - y1;
-			}
+			xd = (line->fv2.x) - x1;
+			yd = (line->fv2.y) - y1;
 
 			// Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion
 			dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f;
@@ -824,11 +811,11 @@ static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
 
 	M_ClearBox(segbbox);
 	M_AddToBox(segbbox,
-		FloatToFixed(gl_curline->pv1->x),
-		FloatToFixed(gl_curline->pv1->y));
+		FloatToFixed(gl_curline->fv1.x),
+		FloatToFixed(gl_curline->fv1.y));
 	M_AddToBox(segbbox,
-		FloatToFixed(gl_curline->pv2->x),
-		FloatToFixed(gl_curline->pv2->y));
+		FloatToFixed(gl_curline->fv2.x),
+		FloatToFixed(gl_curline->fv2.y));
 
 	splat = (wallsplat_t *)gl_curline->linedef->splats;
 	for (; splat; splat = splat->next)
@@ -1237,7 +1224,7 @@ static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf)
 // Returns true if the midtexture is visible, and false if... it isn't...
 static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
 {
-	FUINT blendmode = PF_Masked;
+	FUINT blendmode = PF_Masked | PF_Translucent;
 
 	pSurf->PolyColor.s.alpha = 0xFF;
 
@@ -1259,8 +1246,6 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
 			case 256:
 				if (gl_linedef->blendmode)
 					blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
-				else
-					blendmode = PF_Translucent;
 				break;
 			default:
 				if (gl_linedef->blendmode)
@@ -1272,8 +1257,6 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
 				}
 				else if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
 					blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
-				else
-					blendmode = PF_Masked;
 				break;
 		}
 	}
@@ -1323,34 +1306,24 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 
 	const boolean noencore = (gl_linedef->flags & ML_TFERLINE);
 
-	if (LIKELY(gl_curline->pv1))
-	{
-		vs.x = gl_curline->pv1->x;
-		vs.y = gl_curline->pv1->y;
-		v1x = gl_curline->pv1->x2;
-		v1y = gl_curline->pv1->y2;
-	}
-	else
-	{
-		vs.x = FixedToFloat(gl_curline->v1->x);
-		vs.y = FixedToFloat(gl_curline->v1->y);
-		v1x = gl_curline->v1->x;
-		v1y = gl_curline->v1->y;
-	}
+	v1x = gl_curline->v1->x;
+	v1y = gl_curline->v1->y;
+	v2x = gl_curline->v2->x;
+	v2y = gl_curline->v2->y;
 
-	if (LIKELY(gl_curline->pv2))
+	if (gl_curline->polyseg)
 	{
-		ve.x = gl_curline->pv2->x;
-		ve.y = gl_curline->pv2->y;
-		v2x = gl_curline->pv2->x2;
-		v2y = gl_curline->pv2->y2;
+		vs.x = FixedToFloat(v1x);
+		vs.y = FixedToFloat(v1y);
+		ve.x = FixedToFloat(v2x);
+		ve.y = FixedToFloat(v2y);
 	}
 	else
 	{
-		ve.x = FixedToFloat(gl_curline->v2->x);
-		ve.y = FixedToFloat(gl_curline->v2->y);
-		v2x = gl_curline->v2->x;
-		v2y = gl_curline->v2->y;
+		vs.x = gl_curline->fv1.x;
+		vs.y = gl_curline->fv1.y;
+		ve.x = gl_curline->fv2.x;
+		ve.y = gl_curline->fv2.y;
 	}
 
 #define SLOPEPARAMS(slope, end1, end2, normalheight) \
@@ -2202,27 +2175,11 @@ static boolean CheckClip(sector_t * afrontsector, sector_t * abacksector)
 	{
 		fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
 
-		if (LIKELY(gl_curline->pv1))
-		{
-			v1x = gl_curline->pv1->x2;
-			v1y = gl_curline->pv1->y2;
-		}
-		else
-		{
-			v1x = gl_curline->v1->x;
-			v1y = gl_curline->v1->y;
-		}
+		v1x = gl_curline->v1->x;
+		v1y = gl_curline->v1->y;
 
-		if (LIKELY(gl_curline->pv2))
-		{
-			v2x = gl_curline->pv2->x2;
-			v2y = gl_curline->pv2->y2;
-		}
-		else
-		{
-			v2x = gl_curline->v2->x;
-			v2y = gl_curline->v2->y;
-		}
+		v2x = gl_curline->v2->x;
+		v2y = gl_curline->v2->y;
 
 #define SLOPEPARAMS(slope, end1, end2, normalheight) \
 		end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
@@ -2427,27 +2384,11 @@ static void HWR_AddLine(seg_t *line)
 
 	gl_curline = line;
 
-	if (LIKELY(gl_curline->pv1))
-	{
-		v1x = gl_curline->pv1->x2;
-		v1y = gl_curline->pv1->y2;
-	}
-	else
-	{
-		v1x = gl_curline->v1->x;
-		v1y = gl_curline->v1->y;
-	}
+	v1x = gl_curline->v1->x;
+	v1y = gl_curline->v1->y;
 
-	if (LIKELY(gl_curline->pv2))
-	{
-		v2x = gl_curline->pv2->x2;
-		v2y = gl_curline->pv2->y2;
-	}
-	else
-	{
-		v2x = gl_curline->v2->x;
-		v2y = gl_curline->v2->y;
-	}
+	v2x = gl_curline->v2->x;
+	v2y = gl_curline->v2->y;
 
 	// OPTIMIZE: quickly reject orthogonal back sides.
 	angle1 = R_PointToAngle64(v1x, v1y);
@@ -3533,7 +3474,7 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
 // This is expecting a pointer to an array containing 4 wallVerts for a sprite
 static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean precip, const boolean papersprite)
 {
-	if (!cv_glspritebillboarding.value || papersprite)
+	if (!cv_glspritebillboarding.value || cv_glshearing.value || papersprite)
 	{
 		return;
 	}
@@ -4280,8 +4221,8 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I
 {
 	wallinfo_t *wallinfo = static_cast<wallinfo_t*>(HWR_CreateDrawNode(DRAWNODE_WALL));
 
-	M_Memcpy(wallinfo->wallVerts, wallVerts, sizeof (wallinfo->wallVerts));
-	M_Memcpy(&wallinfo->Surf, pSurf, sizeof (FSurfaceInfo));
+	memcpy(wallinfo->wallVerts, wallVerts, sizeof (wallinfo->wallVerts));
+	memcpy(&wallinfo->Surf, pSurf, sizeof (FSurfaceInfo));
 	wallinfo->texnum = texnum;
 	wallinfo->noencore = noencore;
 	wallinfo->blend = blend;
@@ -5369,8 +5310,12 @@ void HWR_SetTransform(float fpov)
 	HWR_SetTransformAiming(&atransform);
 	atransform.angley = (float)(viewangle>>ANGLETOFINESHIFT)*(FINEDEGREE);
 
-	gl_viewludsin = FixedToFloat(FINECOSINE(gl_aimingangle>>ANGLETOFINESHIFT));
-	gl_viewludcos = FixedToFloat(-FINESINE(gl_aimingangle>>ANGLETOFINESHIFT));
+	// only needed for sprite billboarding
+	if (cv_glspritebillboarding.value && !cv_glshearing.value)
+	{
+		gl_viewludsin = FixedToFloat(FINECOSINE(gl_aimingangle>>ANGLETOFINESHIFT));
+		gl_viewludcos = FixedToFloat(-FINESINE(gl_aimingangle>>ANGLETOFINESHIFT));
+	}
 
 	atransform.fovangle = fpov; // Tails
 	HWR_RollTransform(&atransform, viewroll);
@@ -5386,7 +5331,9 @@ void HWR_SetTransform(float fpov)
 			atransform.fliptype = TRANSFORM_FLIP;
 	}
 	else if (postimg & POSTIMG_MIRROR)
+	{
 		atransform.fliptype = TRANSFORM_MIRROR;
+	}
 
 	// Set transform.
 	GL_SetTransform(&atransform);
@@ -5840,7 +5787,7 @@ static void COM_HWR_glinfo(void)
 	{
 		argv = COM_Argv(i);
 
-		if (strcmp(argv, "--list-extensions") == 0 || strcmp(argv, "-l") == 0)
+		if (fastcmp(argv, "--list-extensions")|| fastcmp(argv, "-l"))
 		{
 			list_extensions = 1;
 		}
@@ -5962,7 +5909,7 @@ static void HWR_DoPostProcessor(player_t *player)
 
 		Surf.PolyColor.s.alpha = 0xc0; // match software mode
 
-		V_CubeApply(&Surf.PolyColor.s.red, &Surf.PolyColor.s.green, &Surf.PolyColor.s.blue);
+		V_CubeApply(&Surf.PolyColor);
 
 		GL_DrawPolygon(&Surf, v, 4, PF_Modulated|PF_Translucent|PF_NoTexture|PF_NoDepthTest);
 	}

src/hardware/hw_md2.c

@@ -72,10 +72,9 @@
 #include <errno.h>
 #endif
 
-md2_t md2_models[NUMSPRITES];
-md2_t md2_playermodels[MAXSKINS];
-md2_t md2_localplayermodels[MAXLOCALSKINS];
-
+md2_t md2_models[NUMSPRITES] = {};
+md2_t md2_playermodels[MAXSKINS] = {};
+md2_t md2_localplayermodels[MAXLOCALSKINS] = {};
 
 /*
  * free model
@@ -417,7 +416,7 @@ static void md2_loadTexture(md2_t *model)
 			size = w*h;
 			while (size--)
 			{
-				V_CubeApply(&image->s.red, &image->s.green, &image->s.blue);
+				V_CubeApply(image);
 				image++;
 			}
 		}
@@ -549,7 +548,7 @@ void HWR_InitMD2(void)
 	{
 		for (i = 0; i < NUMSPRITES; i++)
 		{
-			if (stricmp(name, sprnames[i]) == 0)
+			if (fasticmp(name, sprnames[i]))
 			{
 				md2_models[i].scale = scale;
 				md2_models[i].offset = offset;
@@ -561,7 +560,7 @@ void HWR_InitMD2(void)
 
 		for (s = 0; s < MAXSKINS; s++)
 		{
-			if (stricmp(name, skins[s].name) == 0)
+			if (fasticmp(name, skins[s].name))
 			{
 				md2_playermodels[s].skin = s;
 				md2_playermodels[s].scale = scale;
@@ -607,11 +606,12 @@ 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 (stricmp(name, K_GetSkinArray(local)[skin].name) == 0)
+		if (fasticmp(name, K_GetSkinArray(local)[skin].name))
 		{
 			md2s[skin].skin = skin;
 			md2s[skin].scale = scale;
@@ -650,6 +650,7 @@ 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));
@@ -661,7 +662,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 (stricmp(name, sprnames[spritenum]) == 0)
+		if (fasticmp(name, sprnames[spritenum]))
 		{
 			md2_models[spritenum].scale = scale;
 			md2_models[spritenum].offset = offset;
@@ -1056,7 +1057,7 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
 			{
 				if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
 				{
-					M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+					memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 					HWR_CreateBlendedTexture(patch, blendgpatch, glMipmap, skinnum, color);
 					GL_UpdateTexture(glMipmap);
 				}
@@ -1083,7 +1084,7 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
 
 	newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
 	newMipmap->colormap->source = colormap;
-	M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+	memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 
 	HWR_CreateBlendedTexture(patch, blendgpatch, newMipmap, skinnum, color);
 

src/hardware/hw_model.c

@@ -126,7 +126,7 @@ tag_t *GetTagByName(model_t *model, char *name, int frame)
 		int i;
 		for (i = 0; i < model->numTags; i++)
 		{
-			if (!stricmp(iterator[i].name, name))
+			if (fasticmp(iterator[i].name, name))
 				return &iterator[i];
 		}
 	}
@@ -163,22 +163,22 @@ model_t *LoadModel(const char *filename, int ztag)
 		return NULL;
 	}
 
-	if (!strcmp(extension, ".md3"))
+	if (fastcmp(extension, ".md3"))
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (!strcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
+	else if (fastcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, true)))
 			return NULL;
 	}
-	else if (!strcmp(extension, ".md2"))
+	else if (fastcmp(extension, ".md2"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (!strcmp(extension, ".md2s"))
+	else if (fastcmp(extension, ".md2s"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, true)))
 			return NULL;
@@ -242,7 +242,7 @@ void GenerateVertexNormals(model_t *model)
 			float *vertPtr = frame->vertices;
 			float *oldNormals;
 
-			M_Memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);
+			memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);
 
 			for (k = 0; k < mesh->numVertices; k++)
 			{
@@ -402,7 +402,7 @@ void Optimize(model_t *model)
 				char *destByte;
 				char *srcByte;
 
-				M_Memcpy(&newMesh->uvs[uvCount],
+				memcpy(&newMesh->uvs[uvCount],
 					curMesh->uvs,
 					sizeof(float)*2*curMesh->numTriangles*3);
 
@@ -410,13 +410,13 @@ void Optimize(model_t *model)
 
 				dest = (float*)newMesh->frames[0].vertices;
 				src = (float*)curMesh->frames[0].vertices;
-				M_Memcpy(&dest[vertCount],
+				memcpy(&dest[vertCount],
 					src,
 					sizeof(float)*3*curMesh->numTriangles*3);
 
 				dest = (float*)newMesh->frames[0].normals;
 				src = (float*)curMesh->frames[0].normals;
-				M_Memcpy(&dest[vertCount],
+				memcpy(&dest[vertCount],
 					src,
 					sizeof(float)*3*curMesh->numTriangles*3);
 
@@ -427,7 +427,7 @@ void Optimize(model_t *model)
 
 				if (srcByte)
 				{
-					M_Memcpy(&destByte[colorCount],
+					memcpy(&destByte[colorCount],
 						srcByte,
 						sizeof(char)*4*curMesh->numTriangles*3);
 				}

src/hardware/hw_portal.c

@@ -30,7 +30,7 @@
 
 SINT8 gl_portal_state = GLPORTAL_OFF;
 
-gl_portallist_t *currentportallist;
+gl_portallist_t *currentportallist = NULL;
 
 // clip the area outside the portal destination window
 void HWR_PortalClipping(gl_portal_t *portal)
@@ -168,8 +168,10 @@ void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float
 
 	// go to portal frame lmao
 	HWR_PortalFrame(portal);
+
 	// call HWR_RenderViewpoint
 	HWR_RenderPortalViewpoint(portal, player, stencil_level + 1, true);
+
 	// return to current frame
 	if (rootportal)
 		HWR_PortalFrame(rootportal);

src/hardware/hw_shaders.c

@@ -201,7 +201,7 @@ static char *HWR_PreprocessShader(char *original)
 				CONS_Alert(CONS_ERROR, "HWR_PreprocessShader: Syntax error in #version. Expected version with 3 digits, but got %d digits.\n", version_number_len);
 				return NULL;
 			}
-			M_Memcpy(shader_glsl_version, read_pos, 3);
+			memcpy(shader_glsl_version, read_pos, 3);
 			ADVANCE(version_number_len)
 			version_len = (read_pos - original) - version_pos;
 			whitespace_len = strspn(read_pos, WHITESPACE_CHARS);
@@ -304,7 +304,7 @@ static char *HWR_PreprocessShader(char *original)
 	{
 		strcpy(write_pos, VERSION_PART);
 		write_pos += sizeof(VERSION_PART) - 1;
-		M_Memcpy(write_pos, shader_glsl_version, 3);
+		memcpy(write_pos, shader_glsl_version, 3);
 		write_pos += 3;
 		strcpy(write_pos, line_ending);
 		write_pos += line_ending_len;
@@ -344,7 +344,7 @@ static char *HWR_PreprocessShader(char *original)
 	}
 
 	// Copy the original shader.
-	M_Memcpy(write_pos, read_pos, original_len);
+	memcpy(write_pos, read_pos, original_len);
 
 	// Erase the original #version directive, if it exists and was copied.
 	if (new_len != original_len && version_pos != -1)
@@ -573,7 +573,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 	size = W_LumpLengthPwad(wadnum, lump);
 
 	line = Z_Malloc(size+1, PU_STATIC, NULL);
-	M_Memcpy(line, shaderdef, size);
+	memcpy(line, shaderdef, size);
 	line[size] = '\0';
 
 	stoken = strtok(line, "\r\n ");
@@ -586,7 +586,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 			goto skip_field;
 		}
 
-		if (!stricmp(stoken, "GLSL"))
+		if (fasticmp(stoken, "GLSL"))
 		{
 			value = strtok(NULL, "\r\n ");
 			if (!value)
@@ -596,9 +596,9 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 				goto skip_lump;
 			}
 
-			if (!stricmp(value, "VERTEX"))
+			if (fasticmp(value, "VERTEX"))
 				shadertype = 1;
-			else if (!stricmp(value, "FRAGMENT"))
+			else if (fasticmp(value, "FRAGMENT"))
 				shadertype = 2;
 
 skip_lump:
@@ -624,7 +624,7 @@ skip_lump:
 
 			for (i = 0; shaderxlat[i].type; i++)
 			{
-				if (!stricmp(shaderxlat[i].type, stoken))
+				if (fasticmp(shaderxlat[i].type, stoken))
 				{
 					size_t shader_string_length;
 					char *shader_source;

src/hardware/r_opengl/r_opengl.c

@@ -110,6 +110,7 @@ GLint   screen_texsizew  = 512; // Power-of-two screen texture render resolution
 GLint   screen_texsizeh  = 512; // Power-of-two screen texture render resolution
 GLbyte  screen_depth     = 0;
 GLint maximumAnisotropy  = 0;
+boolean supportNPO2tex   = false;
 static GLboolean MipMap  = GL_FALSE;
 static GLint min_filter  = GL_LINEAR;
 static GLint mag_filter  = GL_LINEAR;
@@ -1176,12 +1177,20 @@ void GL_SetModelView(GLint w, GLint h)
 
 	screen_texsizew = screen_texsizeh = 512;
 
-	// look for power of two that is large enough for the screen
-	while (screen_texsizew < w)
-		screen_texsizew <<= 1;
+	if (supportNPO2tex)
+	{
+		screen_texsizew = screen_width;
+		screen_texsizeh = screen_height;
+	}
+	else
+	{
+		// look for power of two that is large enough for the screen
+		while (screen_texsizew < w)
+			screen_texsizew <<= 1;
 
-	while (screen_texsizeh < h)
-		screen_texsizeh <<= 1;
+		while (screen_texsizeh < h)
+			screen_texsizeh <<= 1;
+	}
 
 	pglGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsize); // Get the maximum supported texture size
 	if ((screen_texsizew > maxtexsize || screen_texsizeh > maxtexsize) && maxtexsize > 0)
@@ -1814,47 +1823,72 @@ static void GL_AllocTextureBuffer(GLMipmap_t *pTexInfo)
 	}
 }
 
-#define PADDING_CHECK(offset, alphaCheck) { from = to + (offset); if ((alphaCheck)) from = NULL; else goto foundFrom; }
-
-static void PadRGBABitmap(RGBA_t *tex, UINT16 w, UINT16 h)
+static void PadRGBABitmap(RGBA_t *tex, UINT16 w, UINT16 h, UINT32 flags)
 {
-	INT32 i;
-	boolean notLeft, notRight, notTop, notBottom;
-	RGBA_t *to = tex - 1, *from;
+	INT32 i, c1, c2, idxAdd;
+	UINT16 c1size, c2size;
+	RGBA_t *current, *prev, *next, *first;
+	boolean ignorePrev, wrap;
 
-	for (i = 0; i < w * h; i++)
+	for (i = 0; i < 2; i++)
 	{
-		to++;
-		if (to->rgba != 0)
-			continue;
-		from = NULL;
+		c1size = i ? h : w;
+		c2size = i ? w : h;
+		idxAdd = i ? 1 : w;
+		wrap = i ? flags & TF_WRAPX : flags & TF_WRAPY;
 
-		notLeft = i % w != 0;
-		notRight = i % w != w - 1;
-		notTop = i / w != 0;
-		notBottom = i / w != h - 1;
-
-		if (notRight) PADDING_CHECK(1, from->s.alpha == 0) // Check +X
-		if (notBottom) PADDING_CHECK(w, from->s.alpha == 0) // Check +Y
-		if (notLeft) PADDING_CHECK(-1, from->s.alpha == 0) // Check -X
-		if (notTop) PADDING_CHECK(-w, from->s.alpha == 0) // Check -Y
-		if (notRight && notBottom) PADDING_CHECK(1 + w, from->s.alpha == 0) // Check +X+Y
-		if (notLeft && notBottom) PADDING_CHECK(-1 + w, from->s.alpha == 0) // Check -X+Y
-		if (notLeft && notTop) PADDING_CHECK(-1 - w, from->s.alpha == 0) // Check -X-Y
-		if (notRight && notTop) PADDING_CHECK(1 - w, from->s.alpha == 0) // Check +X-Y
-
-foundFrom:
-		if (from != NULL)
+		for (c1 = 0; c1 < c1size; c1++)
 		{
-			*to = *from;
-			to->s.alpha = 0;
+			if (i)
+			{
+				first = current = tex + (c1 * w);
+				prev = wrap ? tex + (w - 1 + c1 * w) : current;
+				next = tex + (1 + c1 * w);
+			}
+			else
+			{
+				first = current = tex + c1;
+				prev = wrap ? tex + (c1 + (h - 1) * w) : current;
+				next = tex + (c1 + w);
+			}
+
+			ignorePrev = false;
+
+			for (c2 = 0; c2 < c2size; c2++)
+			{
+				if (c2 == c2size - 1)
+					next = wrap ? first : current;
+
+				if (current->rgba)
+				{
+					ignorePrev = false;
+				}
+				else if (prev->rgba && !ignorePrev)
+				{
+					*current = *prev;
+					current->s.alpha = 0;
+					ignorePrev = true;
+				}
+				else if (next->rgba)
+				{
+					*current = *next;
+					current->s.alpha = 0;
+					ignorePrev = false;
+				}
+				else
+				{
+					ignorePrev = false;
+				}
+
+				prev = current;
+				current = next;
+				next += idxAdd;
+			}
 		}
 	}
 }
 
-#undef PADDING_CHECK
-
-static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD)
+static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD, UINT32 flags)
 {
 	if (tex == NULL)
 	{
@@ -1916,7 +1950,7 @@ static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD)
 		h /= 2;
 
 		if (padTexture)
-			PadRGBABitmap(tex, w, h);
+			PadRGBABitmap(tex, w, h, flags);
 
 		pglTexSubImage2D(GL_TEXTURE_2D, m + 1, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, tex);
 	}
@@ -1991,7 +2025,7 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 			}
 
 			if (applyPadding)
-				PadRGBABitmap(tex, w, h);
+				PadRGBABitmap(tex, w, h, pTexInfo->flags);
 
 			break;
 		case GL_TEXFMT_RGBA:
@@ -2007,7 +2041,7 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 				ptex = tex;
 
 				if (applyPadding)
-					PadRGBABitmap(tex, w, h);
+					PadRGBABitmap(tex, w, h, pTexInfo->flags);
 			}
 
 			break;
@@ -2052,21 +2086,10 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 	pglBindTexture(GL_TEXTURE_2D, num);
 	tex_downloaded = num;
 
-	const int transparent = (pTexInfo->flags & TF_TRANSPARENT);
+	pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
+	pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
 
-	// disable texture filtering on any texture that has holes so there's no dumb borders or blending issues
-	if (transparent)
-	{
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	}
-	else
-	{
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
-	}
-
-	if (MipMap && !transparent) // No mipmaps on transparent stuff
+	if (MipMap)
 	{
 		pglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
 
@@ -2077,8 +2100,16 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 
 		// Control the mipmap level of detail
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0);
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 5);
-		GenerateMipmaps(w, h, tex, 5);
+
+		if (pTexInfo->flags & TF_TRANSPARENT)
+		{
+			pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 0); // No mipmaps on transparent stuff
+		}
+		else
+		{
+			pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4);
+			GenerateMipmaps(w, h, tex, 4, pTexInfo->flags);
+		}
 	}
 	else
 	{
@@ -2459,12 +2490,10 @@ void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT i
 	// the DrawPolygon variant of this has some code about polyflags and wrapping here but havent noticed any problems from omitting it?
 }
 
-static const boolean gl_ext_arb_vertex_buffer_object = true;
-
-#define NULL_VBO_VERTEX ((gl_skyvertex_t*)NULL)
-#define sky_vbo_x (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->x : &sky->data[0].x)
-#define sky_vbo_u (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->u : &sky->data[0].u)
-#define sky_vbo_r (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->r : &sky->data[0].r)
+//#define NULL_VBO_VERTEX ((gl_skyvertex_t*)NULL)
+#define sky_vbo_x ((void*)offsetof(gl_skyvertex_t, x))
+#define sky_vbo_u ((void*)offsetof(gl_skyvertex_t, u))
+#define sky_vbo_r ((void*)offsetof(gl_skyvertex_t, r))
 
 void GL_RenderSkyDome(gl_sky_t *sky)
 {
@@ -2476,30 +2505,23 @@ void GL_RenderSkyDome(gl_sky_t *sky)
 	if (sky->rebuild)
 	{
 		// delete VBO when already exists
-		if (gl_ext_arb_vertex_buffer_object)
-		{
-			if (sky->vbo)
-				pglDeleteBuffers(1, &sky->vbo);
-		}
+		if (sky->vbo)
+			pglDeleteBuffers(1, &sky->vbo);
 
-		if (gl_ext_arb_vertex_buffer_object)
-		{
-			// generate a new VBO and get the associated ID
-			pglGenBuffers(1, &sky->vbo);
+		// generate a new VBO and get the associated ID
+		pglGenBuffers(1, &sky->vbo);
 
-			// bind VBO in order to use
-			pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
+		// bind VBO in order to use
+		pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
 
-			// upload data to VBO
-			pglBufferData(GL_ARRAY_BUFFER, sky->vertex_count * sizeof(sky->data[0]), sky->data, GL_STATIC_DRAW);
-		}
+		// upload data to VBO
+		pglBufferData(GL_ARRAY_BUFFER, sky->vertex_count * sizeof(sky->data[0]), sky->data, GL_STATIC_DRAW);
 
 		sky->rebuild = false;
 	}
 
 	// bind VBO in order to use
-	if (gl_ext_arb_vertex_buffer_object)
-		pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
+	pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
 
 	// activate and specify pointers to arrays
 	pglVertexPointer(3, GL_FLOAT, sizeof(sky->data[0]), sky_vbo_x);
@@ -2543,8 +2565,7 @@ void GL_RenderSkyDome(gl_sky_t *sky)
 	pglColor4ubv(white);
 
 	// bind with 0, so, switch back to normal pointer operation
-	if (gl_ext_arb_vertex_buffer_object)
-		pglBindBuffer(GL_ARRAY_BUFFER, 0);
+	pglBindBuffer(GL_ARRAY_BUFFER, 0);
 
 	// deactivate color array
 	pglDisableClientState(GL_COLOR_ARRAY);
@@ -3692,7 +3713,6 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 	float xfix, yfix;
 	float origaspect, newaspect;
 	float xoff = 1, yoff = 1; // xoffset and yoffset for the polygon to have black bars around the screen
-	FRGBAFloat clearColour;
 
 	static float off[12];
 	static float fix[8];
@@ -3743,8 +3763,7 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 
 	pglViewport(0, 0, width, height);
 
-	clearColour.red = clearColour.green = clearColour.blue = 0;
-	clearColour.alpha = 1;
+	FRGBAFloat clearColour = {0, 0, 0, 1};
 	GL_ClearBuffer(true, false, false, &clearColour);
 	GL_SetBlend(PF_NoDepthTest);
 

src/hardware/r_opengl/r_opengl.h

@@ -124,6 +124,7 @@ extern GLint			screen_width;
 extern GLint			screen_height;
 extern GLbyte			screen_depth;
 extern GLint			maximumAnisotropy;
+extern boolean			supportNPO2tex;
 extern boolean 			supportMipMap;
 
 /**	\brief OpenGL flags for video driver

src/hu_stuff.c

@@ -280,7 +280,7 @@ static void Command_Say_f(void);
 static void Command_Sayto_f(void);
 static void Command_Sayteam_f(void);
 static void Command_CSay_f(void);
-static void Got_Saycmd(UINT8 **p, INT32 playernum);
+static void Got_Saycmd(const UINT8 **p, INT32 playernum);
 
 void HU_LoadGraphics(void)
 {
@@ -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
-	size_t i;
-	for(i=0;i<chat_nummsg_min-1;i++) {
+	for (size_t 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]);
-	size_t i;
-	for(i=0;i<chat_nummsg_log-1;i++)
+
+	for (size_t i = 0; i < chat_nummsg_log - 1;i++)
 	{
 		chat_log[i] = chat_log[i+1];
 	}
@@ -879,11 +879,12 @@ const char *HU_SkinColorToConsoleColor(skincolors_t color)
   * \sa DoSayCommand
   * \author Graue <graue@oceanbase.org>
   */
-static void Got_Saycmd(UINT8 **p, INT32 playernum)
+static void Got_Saycmd(const UINT8 **p, INT32 playernum)
 {
 	SINT8 target;
 	UINT8 flags;
 	const char *dispname;
+	char buf[HU_MAXMSGLEN + 1];
 	char *msg;
 	boolean action = false;
 	char *ptr;
@@ -893,8 +894,8 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 
 	target = READSINT8(*p);
 	flags = READUINT8(*p);
-	msg = (char *)*p;
-	SKIPSTRINGL(*p, HU_MAXMSGLEN + 1);
+	msg = buf;
+	READSTRINGL(*p, msg, HU_MAXMSGLEN + 1);
 
 	if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
 	{
@@ -1101,14 +1102,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 +1232,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 +1500,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 +1573,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,7 +1750,6 @@ 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
@@ -2284,6 +2284,7 @@ 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);
@@ -2845,12 +2846,8 @@ void HU_SetCEchoFlags(INT32 flags)
 
 void HU_DoCEcho(const char *msg)
 {
-#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';
+	strlcpy(cechotext, msg, sizeof(cechotext));
+	strlcat(cechotext, "\\", sizeof(cechotext));
 
 	// just print it to console
 	if (cv_cechotoggle.value == 2)
@@ -2859,8 +2856,20 @@ 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/i_system.h

@@ -221,10 +221,6 @@ INT32 I_mkdir(const char *dirname, INT32 unixright);
 */
 const char *I_LocateWad(void);
 
-/**	\brief Joystick events
-*/
-void I_GetJoystickEvents(UINT8 index);
-
 char *I_GetEnv(const char *name);
 
 INT32 I_PutEnv(char *variable);

src/i_tcp.c

@@ -28,14 +28,14 @@
 #endif
 
 #ifdef _WIN32
-#define USE_WINSOCK
+	#define USE_WINSOCK
 #endif //WIN32 OS
 
 #ifdef USE_WINSOCK
-#include <ws2tcpip.h>
-#define addrinfo_t ADDRINFOA
+	#include <ws2tcpip.h>
+	#define addrinfo_t ADDRINFOA
 #else
-#define addrinfo_t struct addrinfo
+	#define addrinfo_t struct addrinfo
 #endif
 
 #include "doomdef.h"
@@ -148,16 +148,16 @@ static UINT8 UPNP_support = TRUE;
 
 #define DEFAULTPORT "5029"
 
-#if defined (USE_WINSOCK)
-typedef SOCKET SOCKET_TYPE;
-#define ERRSOCKET (SOCKET_ERROR)
+#ifdef 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"
@@ -345,17 +345,15 @@ 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_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)
@@ -364,9 +362,11 @@ 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,7 +381,7 @@ 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)));
 
 	return s;
@@ -481,7 +481,6 @@ 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.
@@ -636,7 +635,7 @@ static boolean SOCK_Get(void)
 		c = recvfrom(mysockets[n], (char *)&doomcom->data, MAXPACKETLENGTH, 0,
 			(void *)&fromaddress, &fromlen);
 
-		if (c > 0)
+		if (c != ERRSOCKET)
 		{
 #ifdef USE_STUN
 			if (STUN_got_response(doomcom->data, c))
@@ -652,25 +651,26 @@ 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 false;
+					return true;
 				}
 			}
 			// not found
 
 			// find a free slot
 			j = getfreenode();
+
 			if (j > 0)
 			{
 				const time_t curTime = time(NULL);
 
-				M_Memcpy(&clientaddress[j], &fromaddress, fromlen);
+				memcpy(&clientaddress[j], &fromaddress, fromlen);
 				nodesocket[j] = mysockets[n];
 				DEBFILE(va("New node detected: node:%d address:%s\n", j,
 						SOCK_GetNodeAddress(j)));
@@ -752,7 +752,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 (!nodeconnected[doomcom->remotenode])
+	if (doomcom->remotenode < 0 || !nodeconnected[doomcom->remotenode])
 		return;
 
 	if (doomcom->remotenode == BROADCASTADDR)
@@ -970,7 +970,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 system buffer: %dKb\n"), opt>>10);
+	CONS_Printf(M_GetText("Network receive buffer: %dKb\n"), opt>>10);
 
 	if (opt < 64<<10) // 64k
 	{
@@ -991,9 +991,44 @@ 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 buffer length to 64k, file transfer will be bad\n"));
+			CONS_Alert(CONS_WARNING, M_GetText("Can't set receive buffer length to 64k, file transfer will be bad\n"));
 		else
-			CONS_Printf(M_GetText("Network system buffer set to: %dKb\n"), opt>>10);
+			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);
 	}
 
 	rc = getsockname(s, &straddr.any, &len);
@@ -1269,9 +1304,9 @@ void I_ShutdownTcpDriver(void)
 	init_tcp_driver = false;
 }
 
-static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const char *port, boolean test)
+static boolean SOCK_GetAddr(mysockaddr_t *sin, const char *address, const char *port, boolean test)
 {
-	addrinfo_t *ai = NULL, *runp, hints;
+	addrinfo_t *ai, *runp, hints;
 	int gaie;
 	size_t i;
 
@@ -1287,10 +1322,7 @@ static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const
 	gaie = getaddrinfo(address, port, &hints, &ai);
 
 	if (gaie != 0)
-	{
-		freeaddrinfo(ai);
 		return false;
-	}
 
 	runp = ai;
 
@@ -1330,7 +1362,7 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port)
 
 	if (newnode != -1)
 	{
-		if (!SOCK_GetAddr(&clientaddress[newnode].ip4, address, port, true))
+		if (!SOCK_GetAddr(&clientaddress[newnode], address, port, true))
 		{
 			nodeconnected[newnode] = false;
 			return -1;
@@ -1358,7 +1390,7 @@ static void rendezvous(int size)
 
 	if (tic != refreshtic)
 	{
-		if (SOCK_GetAddr(&rzv.ip4, host, (port ? port : "7777"), false))
+		if (SOCK_GetAddr(&rzv, host, (port ? port : "7777"), false))
 		{
 			refreshtic = tic;
 		}
@@ -1453,7 +1485,7 @@ static boolean SOCK_Ban(INT32 node)
 	ban = numbans;
 	AddBannedIndex();
 
-	M_Memcpy(&banned[ban].address, &clientaddress[node], sizeof (mysockaddr_t));
+	memcpy(&banned[ban].address, &clientaddress[node], sizeof (mysockaddr_t));
 
 	if (banned[ban].address.any.sa_family == AF_INET)
 	{

src/i_video.h

@@ -143,6 +143,8 @@ boolean I_CheckNativeRes(void);
 
 void I_SetBorderlessWindow(void);
 
+void I_HandleControllerHatRepeat(void);
+
 #ifdef USE_FBO_OGL
 
 void RefreshOGLSDLSurface(void);

src/k_kart.c

@@ -608,9 +608,6 @@ 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)
@@ -640,11 +637,14 @@ 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 (!stricmp(KartColor_Names[color], name))
+		if (fasticmp(KartColor_Names[color], name))
 			return color;
+
 	return 0;
 }
 
@@ -2860,9 +2860,9 @@ void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32
 		v[3] = FRACUNIT;
 
 		res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 		res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 
 		finalx = x + v[0];
 		finaly = y + v[1];

src/lua_baselib.c

@@ -45,27 +45,33 @@ boolean luaL_checkboolean(lua_State *L, int narg) {
 // String concatination
 static int lib_concat(lua_State *L)
 {
-  int n = lua_gettop(L);  /* number of arguments */
-  int i;
-  char *r = NULL;
-  size_t rl = 0,sl;
-  lua_getglobal(L, "tostring");
-  for (i=1; i<=n; i++) {
-    const char *s;
-    lua_pushvalue(L, -1);  /* function to be called */
-    lua_pushvalue(L, i);   /* value to print */
-    lua_call(L, 1, 1);
-    s = lua_tolstring(L, -1, &sl);  /* get result */
-    if (s == NULL)
-      return luaL_error(L, LUA_QL("tostring") " must return a string to "
-													 LUA_QL("__add"));
+	int n = lua_gettop(L);  /* number of arguments */
+	int i;
+	char *r = NULL;
+	size_t rl = 0, sl;
+	lua_getglobal(L, "tostring");
+	for (i=1; i<=n; i++) {
+		const char *s;
+		lua_pushvalue(L, -1);  /* function to be called */
+		lua_pushvalue(L, i);   /* value to print */
+		lua_call(L, 1, 1);
+		s = lua_tolstring(L, -1, &sl);  /* get result */
+
+		if (sl == 0) {
+			lua_pop(L, 1);  /* pop result */
+			continue;
+		}
+
+		if (s == NULL)
+			return luaL_error(L, LUA_QL("tostring") " must return a string to "
+															LUA_QL("__add"));
 		r = Z_Realloc(r, rl+sl, PU_STATIC, NULL);
-		M_Memcpy(r+rl, s, sl);
+		memcpy(r+rl, s, sl);
 		rl += sl;
-    lua_pop(L, 1);  /* pop result */
-  }
-  lua_pushlstring(L, r, rl);
-  Z_Free(r);
+		lua_pop(L, 1);  /* pop result */
+	}
+	lua_pushlstring(L, r, rl);
+	Z_Free(r);
 	return 1;
 }
 
@@ -73,23 +79,24 @@ static int lib_concat(lua_State *L)
 // Copied from base Lua code
 static int lib_print(lua_State *L)
 {
-  int n = lua_gettop(L);  /* number of arguments */
-  int i;
-  //HUDSAFE
-  lua_getglobal(L, "tostring");
-  for (i=1; i<=n; i++) {
-    const char *s;
-    lua_pushvalue(L, -1);  /* function to be called */
-    lua_pushvalue(L, i);   /* value to print */
-    lua_call(L, 1, 1);
-    s = lua_tostring(L, -1);  /* get result */
-    if (s == NULL)
-      return luaL_error(L, LUA_QL("tostring") " must return a string to "
-													 LUA_QL("print"));
-    if (i>1) CONS_Printf("\n");
-    CONS_Printf("%s", s);
-    lua_pop(L, 1);  /* pop result */
-  }
+	int n = lua_gettop(L);  /* number of arguments */
+	int i;
+	//HUDSAFE
+	lua_getglobal(L, "tostring");
+	for (i=1; i<=n; i++) {
+		const char *s;
+		lua_pushvalue(L, -1);  /* function to be called */
+		lua_pushvalue(L, i);   /* value to print */
+		lua_call(L, 1, 1);
+		s = lua_tostring(L, -1);  /* get result */
+
+		if (s == NULL)
+			return luaL_error(L, LUA_QL("tostring") " must return a string to "
+															LUA_QL("print"));
+		if (i>1) CONS_Printf("\n");
+		CONS_Printf("%s", s);
+		lua_pop(L, 1);  /* pop result */
+	}
 	CONS_Printf("\n");
 	return 0;
 }

src/lua_consolelib.c

@@ -28,13 +28,29 @@
 
 #define NOHUD if (hud_running) return luaL_error(L, "HUD rendering code should not call this function!");
 
-static const char *cvname = NULL;
+static consvar_t *this_cvar;
 
-void Got_Luacmd(UINT8 **cp, INT32 playernum)
+static void clear_lua_stack(void)
+{
+	if (gL) // check if Lua is actually turned on first, you dummmy -- Monster Iestyn 04/07/18
+		lua_settop(gL, 0); // clear stack
+}
+
+void Got_Luacmd(const UINT8 **cp, INT32 playernum)
 {
 	UINT8 i, argc, flags;
+	const char *argv[256];
 	char buf[256];
 
+	argc = READUINT8(*cp);
+	argv[0] = (const char*)*cp;
+	SKIPSTRINGN(*cp, 255);
+	for (i = 1; i < argc; i++)
+	{
+		argv[i] = (const char*)*cp;
+		SKIPSTRINGN(*cp, 255);
+	}
+
 	// don't use I_Assert here, goto the deny code below
 	// to clean up and kick people who try nefarious exploits
 	// like sending random junk lua commands to crash the server
@@ -47,8 +63,7 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
 	lua_getfield(gL, LUA_REGISTRYINDEX, "COM_Command"); // push COM_Command
 	if (!lua_istable(gL, -1)) goto deny;
 
-	argc = READUINT8(*cp);
-	READSTRINGN(*cp, buf, 255);
+	strlcpy(buf, argv[0], 255);
 	strlwr(buf); // must lowercase buffer
 	lua_getfield(gL, -1, buf); // push command info table
 	if (!lua_istable(gL, -1)) goto deny;
@@ -74,10 +89,17 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
 
 	lua_remove(gL, -2); // pop command info table
 
+	if (!lua_checkstack(gL, argc)) // player + command arguments
+	{
+		clear_lua_stack();
+		CONS_Alert(CONS_WARNING, "lua command stack overflow from %s (%d, need %d more)\n", player_names[playernum], lua_gettop(gL), argc);
+		return;
+	}
+
 	LUA_PushUserdata(gL, &players[playernum], META_PLAYER);
 	for (i = 1; i < argc; i++)
 	{
-		READSTRINGN(*cp, buf, 255);
+		strlcpy(buf, argv[i], 255);
 		lua_pushstring(gL, buf);
 	}
 	LUA_Call(gL, (int)argc, 0, 1); // argc is 1-based, so this will cover the player we passed too.
@@ -88,8 +110,7 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
 
 deny:
 	//must be hacked/buggy client
-	if (gL) // check if Lua is actually turned on first, you dummmy -- Monster Iestyn 04/07/18
-		lua_settop(gL, 0); // clear stack
+	clear_lua_stack();
 
 	CONS_Alert(CONS_WARNING, M_GetText("Illegal lua command received from %s\n"), player_names[playernum]);
 	if (server)
@@ -133,7 +154,7 @@ void COM_Lua_f(void)
 	{
 		if (!splitscreen)
 		{
-			lua_pop(gL, 1); // pop command info table
+			lua_pop(gL, 2); // pop command info table and LUA_GetErrorMessage
 			return; // can't execute splitscreen command without player 2!
 		}
 
@@ -178,6 +199,13 @@ void COM_Lua_f(void)
 	I_Assert(lua_isfunction(gL, -1));
 	lua_remove(gL, -2); // pop command info table
 
+	if (!lua_checkstack(gL, COM_Argc() + 1))
+	{
+		CONS_Alert(CONS_WARNING, "lua command stack overflow (%d, need %s more)\n", lua_gettop(gL), sizeu1(COM_Argc() + 1));
+		lua_pop(gL, 2); // pop function and LUA_GetErrorMessage
+		return;
+	}
+
 	LUA_PushUserdata(gL, &players[playernum], META_PLAYER);
 	for (i = 1; i < COM_Argc(); i++)
 		lua_pushstring(gL, COM_Argv(i));
@@ -284,16 +312,13 @@ static int lib_comBufInsertText(lua_State *L)
 	return 0;
 }
 
-void LUA_CVarChanged(const char *name)
+void LUA_CVarChanged(void *cvar)
 {
-	cvname = name;
+	this_cvar = cvar;
 }
 
 static void Lua_OnChange(void)
 {
-	I_Assert(gL != NULL);
-	I_Assert(cvname != NULL);
-
 	/// \todo Network this! XD_LUAVAR
 
     // Why?..
@@ -305,13 +330,10 @@ static void Lua_OnChange(void)
 	// From CV_OnChange registry field, get the function for this cvar by name.
 	lua_getfield(gL, LUA_REGISTRYINDEX, "CV_OnChange");
 	I_Assert(lua_istable(gL, -1));
-	lua_getfield(gL, -1, cvname); // get function
+	lua_pushlightuserdata(gL, this_cvar);
+	lua_rawget(gL, -2); // get function
 
-	// From the CV_Vars registry field, get the cvar's userdata by name.
-	lua_getfield(gL, LUA_REGISTRYINDEX, "CV_Vars");
-	I_Assert(lua_istable(gL, -1));
-	lua_getfield(gL, -1, cvname); // get consvar_t* userdata.
-	lua_remove(gL, -2); // pop the CV_Vars table.
+	LUA_RawPushUserdata(gL, this_cvar);
 
 	LUA_Call(gL, 1, 0, error_handler_i); // call function(cvar)
 	lua_pop(gL, 2); // pop CV_OnChange table and error handler
@@ -329,9 +351,8 @@ static int lib_cvRegisterVar(lua_State *L)
 	luaL_checktype(L, 1, LUA_TTABLE);
 	lua_settop(L, 1); // Clear out all other possible arguments, leaving only the first one.
 	NOHUD
-	cvar = lua_newuserdata(L, sizeof(consvar_t));
-	luaL_getmetatable(L, META_CVAR);
-	lua_setmetatable(L, -2);
+	cvar = ZZ_Calloc(sizeof(consvar_t));
+	LUA_PushUserdata(L, cvar, META_CVAR);
 
 #define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to " LUA_QL("CV_RegisterVar") " (%s)", e);
 #define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
@@ -384,7 +405,7 @@ static int lib_cvRegisterVar(lua_State *L)
 
 				lua_getfield(L, LUA_REGISTRYINDEX, "CV_PossibleValue");
 				I_Assert(lua_istable(L, 5));
-				lua_pushvalue(L, 2); // cvar userdata
+				lua_pushlightuserdata(L, cvar);
 				cvpv = lua_newuserdata(L, sizeof(CV_PossibleValue_t) * (count+1));
 				lua_rawset(L, 5);
 				lua_pop(L, 1); // pop CV_PossibleValue registry table
@@ -412,13 +433,14 @@ static int lib_cvRegisterVar(lua_State *L)
 				TYPEERROR("func", LUA_TFUNCTION)
 			lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange");
 			I_Assert(lua_istable(L, 5));
+			lua_pushlightuserdata(L, cvar);
 			lua_pushvalue(L, 4);
-			lua_setfield(L, 5, cvar->name);
+			lua_rawset(L, 5);
 			lua_pop(L, 1);
 			cvar->func = Lua_OnChange;
 		}
 		else if (((i == 5 && !(cvar->flags & CV_CALL))
-				|| (cvar->flags & CV_CALL && i == 6)) 
+				|| (cvar->flags & CV_CALL && i == 6))
 				|| (k && fasticmp(k, "category")))
 		{
 			category = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
@@ -434,18 +456,12 @@ static int lib_cvRegisterVar(lua_State *L)
 #undef FIELDERROR
 #undef TYPEERROR
 
-	// stack: cvar table, cvar userdata
-	lua_getfield(L, LUA_REGISTRYINDEX, "CV_Vars");
-	I_Assert(lua_istable(L, 3));
-
-	lua_getfield(L, 3, cvar->name);
-	if (lua_type(L, -1) != LUA_TNIL)
-		return luaL_error(L, M_GetText("Variable %s is already defined\n"), cvar->name);
-	lua_pop(L, 1);
-
-	lua_pushvalue(L, 2);
-	lua_setfield(L, 3, cvar->name);
-	lua_pop(L, 1);
+	if (!cvar->name)
+		return luaL_error(L, M_GetText("Variable has no name!\n"));
+	if ((cvar->flags & CV_NOINIT) && !(cvar->flags & CV_CALL))
+		return luaL_error(L, M_GetText("Variable %s has CV_NOINIT without CV_CALL\n"), cvar->name);
+	if ((cvar->flags & CV_CALL) && !cvar->func)
+		return luaL_error(L, M_GetText("Variable %s has CV_CALL without a function\n"), cvar->name);
 
 	// actually time to register it to the console now! Finally!
 	cvar->flags |= CV_MODIFIED;
@@ -453,7 +469,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 && stricmp(cvar->string, "0"))))
+	if (!(((cvar->flags & CV_HIDEN)) || (cvar->flags & CV_NOSHOWHELP)) && (cvar->PossibleValue || !(cvar->value == 0 && !fasticmp(cvar->string, "0"))))
 	{
 		if (!category)
 		{
@@ -477,22 +493,9 @@ static int lib_cvRegisterVar(lua_State *L)
 
 static int lib_cvFindVar(lua_State *L)
 {
-	consvar_t *cv;
-	if (( cv = CV_FindVar(luaL_checkstring(L,1)) ))
-	{
-		lua_settop(L,1);/* We only want one argument in the stack. */
-		lua_pushlightuserdata(L, cv);/* Now the second value on stack. */
-		luaL_getmetatable(L, META_CVAR);
-		/*
-		The metatable is the last value on the stack, so this
-		applies it to the second value, which is the cvar.
-		*/
-		lua_setmetatable(L,2);
-		lua_pushvalue(L,2);
-		return 1;
-	}
-	else
-		return 0;
+	const char *name = luaL_checkstring(L, 1);
+	LUA_PushUserdata(L, CV_FindVar(name), META_CVAR);
+	return 1;
 }
 
 static int CVarSetFunction
@@ -501,7 +504,7 @@ static int CVarSetFunction
 		void (*Set)(consvar_t *, const char *),
 		void (*SetValue)(consvar_t *, INT32)
 ){
-	consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
+	consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
 
 	switch (lua_type(L, 2))
 	{
@@ -530,7 +533,8 @@ static int lib_cvStealthSet(lua_State *L)
 
 static int lib_cvAddValue(lua_State *L)
 {
-	consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
+	consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
+
 	CV_AddValue(cvar, (INT32)luaL_checknumber(L, 2));
 	return 0;
 }
@@ -545,6 +549,7 @@ static int lib_consPrintf(lua_State *L)
 	if (n < 2)
 		return luaL_error(L, "CONS_Printf requires at least two arguments: player and text.");
 	//HUDSAFE
+
 	plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
 	if (!plr)
 		return LUA_ErrInvalid(L, "player_t");
@@ -605,7 +610,7 @@ static int cvar_fields_ref = LUA_NOREF;
 
 static int cvar_get(lua_State *L)
 {
-	consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
+	consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
 	enum cvar_e field = Lua_optoption(L, 2, -1, cvar_fields_ref);
 
 	switch (field)

src/lua_hooklib.c

@@ -83,7 +83,7 @@ FUNCINLINE static ATTRINLINE unsigned hook_in_list
 
 	for (type = 0; list[type] != NULL; ++type)
 	{
-		if (strcmp(name, list[type]) == 0)
+		if (fastcmp(name, list[type]))
 			break;
 	}
 
@@ -240,7 +240,7 @@ static int lib_addHook(lua_State *L)
 	{
 		add_hook(&hookIds[type]);
 	}
-	/*else if (strcmp(name, "HUD") == 0) // ehh this is cool and all, but i dont want modders potentially breaking vanilla clients lol
+	/*else if (fastcmp(name, "HUD")) // 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) && strcmp(lua_tostring(gL, -2), field) == 0;
+	return lua_toboolean(gL, -1) && fastcmp(lua_tostring(gL, -2), field);
 }
 
 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 (stricmp(skin, "none"))
+		if (!fasticmp(skin, "none"))
 		{
 			// Try localskins
 			for (i = 0; i < numlocalskins; i++)
 			{
-				if (stricmp(localskins[i].name, skin) == 0)
+				if (fasticmp(localskins[i].name, skin))
 				{
 					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 (stricmp(skins[i].name, skin) == 0)
+				if (fasticmp(skins[i].name, skin))
 				{
 					mo->localskin = &skins[i];
 					mo->skinlocal = false;

src/lua_script.c

@@ -288,6 +288,10 @@ 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';
 	}
@@ -488,25 +492,37 @@ void LUA_InvalidateMathlibCache(const char *name)
 // Pushes it to the stack and stores it in the registry.
 void LUA_PushUserdata(lua_State *L, void *data, const char *meta)
 {
+	if (LUA_RawPushUserdata(L, data) == LPUSHED_NEW)
+	{
+		luaL_getmetatable(L, meta);
+		lua_setmetatable(L, -2);
+	}
+}
+
+// Same as LUA_PushUserdata but don't set a metatable yet.
+lpushed_t LUA_RawPushUserdata(lua_State *L, void *data)
+{
+	lpushed_t status = LPUSHED_NIL;
+
 	void **userdata;
 
 	if (!data) { // push a NULL
 		lua_pushnil(L);
-		return;
+		return status;
 	}
 
 	lua_getfield(L, LUA_REGISTRYINDEX, LREG_VALID);
 	I_Assert(lua_istable(L, -1));
+
 	lua_pushlightuserdata(L, data);
 	lua_rawget(L, -2);
+
 	if (lua_isnil(L, -1)) { // no userdata? deary me, we'll have to make one.
 		lua_pop(L, 1); // pop the nil
 
 		// create the userdata
 		userdata = lua_newuserdata(L, sizeof(void *));
 		*userdata = data;
-		luaL_getmetatable(L, meta);
-		lua_setmetatable(L, -2);
 
 		// Set it in the registry so we can find it again
 		lua_pushlightuserdata(L, data); // k (store the userdata via the data's pointer)
@@ -514,8 +530,15 @@ void LUA_PushUserdata(lua_State *L, void *data, const char *meta)
 		lua_rawset(L, -4);
 
 		// stack is left with the userdata on top, as if getting it had originally succeeded.
+
+		status = LPUSHED_NEW;
 	}
+	else
+		status = LPUSHED_EXISTING;
+
 	lua_remove(L, -2); // remove LREG_VALID
+
+	return status;
 }
 
 // When userdata is freed, use this function to remove it from Lua.

src/lua_script.h

@@ -59,7 +59,15 @@ fixed_t LUA_GetConstant(const char *word);
 // Need better name for this ;-;
 void LUA_InvalidateMathlibCache(const char *name);
 
+typedef enum {
+	LPUSHED_NIL,
+	LPUSHED_NEW,
+	LPUSHED_EXISTING,
+} lpushed_t;
+
 void LUA_PushUserdata(lua_State *L, void *data, const char *meta);
+lpushed_t LUA_RawPushUserdata(lua_State *L, void *data);
+
 void LUA_InvalidateUserdata(void *data);
 void LUA_InvalidateLevel(void);
 void LUA_InvalidateMapthings(void);
@@ -68,8 +76,8 @@ void LUA_InvalidatePlayer(player_t *player);
 void LUA_Archive(savebuffer_t *save, boolean network);
 void LUA_UnArchive(savebuffer_t *save, boolean network);
 
-void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c
-void LUA_CVarChanged(const char *name); // lua_consolelib.c
+void Got_Luacmd(const UINT8 **cp, INT32 playernum); // lua_consolelib.c
+void LUA_CVarChanged(void *cvar); // lua_consolelib.c
 int Lua_optoption(lua_State *L, int narg, int def, int list_ref);
 int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
 void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save);

src/lzf.c

@@ -192,7 +192,7 @@ lzf_decompress (const void *const in_data,  size_t in_len,
 #endif
 
 #if USE_MEMCPY
-			M_Memcpy (op, ip, ctrl);
+			memcpy(op, ip, ctrl);
 			op += ctrl;
 			ip += ctrl;
 #else
@@ -435,7 +435,7 @@ lzf_compress (const void *const in_data,size_t in_len,
 
 			*op++ = MAX_LIT - 1;
 #if USE_MEMCPY
-			M_Memcpy (op, ip - MAX_LIT, MAX_LIT);
+			memcpy(op, ip - MAX_LIT, MAX_LIT);
 			op += MAX_LIT;
 			lit = 0;
 #else

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 && strcmp(entry->key, key) != 0)
+			if (entry != NULL && !fastcmp(entry->key, key))
 				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 && strcmp(entry->key, key) != 0)
+	while (entry != NULL && !fastcmp(entry->key, key))
 		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 (!strcasecmp(check, myargv[i]))
+		if (fasticmp(check, myargv[i]))
 		{
 			found = i;
 			return i;
@@ -69,16 +69,18 @@ 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;
 }
 
@@ -93,7 +95,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

@@ -112,7 +112,7 @@ void M_LoadEmotes(UINT16 wadnum)
 			trim(field);
 			trim(value);
 
-			if (stricmp(field.c_str(), "frames") == 0)
+			if (fasticmp(field.c_str(), "frames"))
 			{
 				UINT8 numframes = 0;
 
@@ -158,7 +158,7 @@ void M_LoadEmotes(UINT16 wadnum)
 
 				emote->numframes = numframes;
 			}
-			else if (stricmp(field.c_str(), "timeperframe") == 0)
+			else if (fasticmp(field.c_str(), "timeperframe"))
 			{
 				emote->timeperframe = std::stoi(value);
 

src/m_fixed.c

@@ -101,7 +101,7 @@ vector2_t *FV2_UnLoad(vector2_t *vec, fixed_t *x, fixed_t *y)
 
 vector2_t *FV2_Copy(vector2_t *a_o, const vector2_t *a_i)
 {
-	return M_Memcpy(a_o, a_i, sizeof(vector2_t));
+	return memcpy(a_o, a_i, sizeof(vector2_t));
 }
 
 vector2_t *FV2_AddEx(const vector2_t *a_i, const vector2_t *a_c, vector2_t *a_o)
@@ -250,7 +250,7 @@ vector3_t *FV3_UnLoad(vector3_t *vec, fixed_t *x, fixed_t *y, fixed_t *z)
 
 vector3_t *FV3_Copy(vector3_t *a_o, const vector3_t *a_i)
 {
-	return M_Memcpy(a_o, a_i, sizeof(vector3_t));
+	return memcpy(a_o, a_i, sizeof(vector3_t));
 }
 
 vector3_t *FV3_AddEx(const vector3_t *a_i, const vector3_t *a_c, vector3_t *a_o)
@@ -813,7 +813,7 @@ void FM_MultMatrix(matrix_t *dest, const matrix_t *multme)
 			R(i, j) = FixedMul(D(i, 0), M(0, j)) + FixedMul(D(i, 1), M(1, j)) + FixedMul(D(i, 2), M(2, j)) + FixedMul(D(i, 3), M(3, j));
 	}
 
-	M_Memcpy(dest, &result, sizeof(matrix_t));
+	memcpy(dest, &result, sizeof(matrix_t));
 
 #undef R
 #undef D

src/m_menu.c

@@ -759,8 +759,6 @@ static void Command_Manual_f(void)
 	itemOn = 0;
 }
 
-boolean dpadscrollstate[4] = {false, false, false, false};
-
 //
 // M_Responder
 //
@@ -807,19 +805,15 @@ boolean M_Responder(event_t *ev)
 				break;
 			case KEY_HAT1:
 				ch = KEY_UPARROW;
-				dpadscrollstate[DPAD_UP] = true;
 				break;
 			case KEY_HAT1 + 1:
 				ch = KEY_DOWNARROW;
-				dpadscrollstate[DPAD_DOWN] = true;
 				break;
 			case KEY_HAT1 + 2:
 				ch = KEY_LEFTARROW;
-				dpadscrollstate[DPAD_LEFT] = true;
 				break;
 			case KEY_HAT1 + 3:
 				ch = KEY_RIGHTARROW;
-				dpadscrollstate[DPAD_RIGHT] = true;
 				break;
 		}
 
@@ -835,24 +829,6 @@ boolean M_Responder(event_t *ev)
 			}
 		}
 	}
-	else if (ev->type == ev_keyup)
-	{
-		switch (ev->data1) // if you let go of those set those to false
-		{
-			case KEY_HAT1:
-				dpadscrollstate[DPAD_UP] = false;
-				break;
-			case KEY_HAT1 + 1:
-				dpadscrollstate[DPAD_DOWN] = false;
-				break;
-			case KEY_HAT1 + 2:
-				dpadscrollstate[DPAD_LEFT] = false;
-				break;
-			case KEY_HAT1 + 3:
-				dpadscrollstate[DPAD_RIGHT] = false;
-				break;
-		}
-	}
 	else if (menuactive)
 	{
 		tic_t thistime = I_GetTime();
@@ -1731,6 +1707,9 @@ void M_Ticker(void)
 	if (dedicated)
 		return;
 
+	if (menuactive)
+		I_HandleControllerHatRepeat();
+
 	if (--skullAnimCounter <= 0)
 		skullAnimCounter = 8;
 
@@ -3719,10 +3698,10 @@ static void M_HandleAddons(INT32 choice)
 							break;
 						case EXT_TXT:
 						case EXT_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))
+							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"))
 							{
 								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 +3809,7 @@ static void ReplayNamesLoadThread(void* userdata)
 
 	Lock_search_state();
 
-	if (strcmp(menupath, replaydirpath) == 0)
+	if (fastcmp(menupath, replaydirpath))
 	{
 		memcpy(demolist_all, demolist_all_local, sizeof(menudemo_t)*sizedirmenu);
 		replaynamesloaded = true;
@@ -6956,9 +6935,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 || autoloaded)
+	if (modifiedgame)
 	{
-		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);
+		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);
 		return;
 	}
 
@@ -7179,17 +7158,21 @@ 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));
+			strncpy(namescrollbuf, addonname, sizeof(namescrollbuf) - 1);
+
 		V_DrawThinString(x+w+5, y+i-8, V_TRANSLUCENT|MENUCAPS, namescrollbuf); // variable reuse...
 	}
 
@@ -8279,12 +8262,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 ((sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]) && (speenframe > 4))
+	// 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]))
 		flags = V_FLIP; // This sprite is left/right flipped!
 
 	patch = (patch_t *)W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
@@ -8804,7 +8787,7 @@ static boolean M_QuitMultiPlayerMenu(void)
 	size_t l;
 
 	// send name if changed
-	if (strcmp(setupm_name, setupm_cvname->string))
+	if (!fastcmp(setupm_name, setupm_cvname->string))
 	{
 		// remove trailing whitespaces
 		for (l= strlen(setupm_name)-1;
@@ -9465,7 +9448,7 @@ static void M_VideoModeMenu(INT32 choice)
 			// VESA mode, which is always a higher modenum
 			for (j = 0; j < vidm_nummodes; j++)
 			{
-				if (!strcmp(modedescs[j].desc, desc))
+				if (fastcmp(modedescs[j].desc, desc))
 				{
 					// mode(0): 320x200 is always standard VGA, not vesa
 					if (modedescs[j].modenum)
@@ -9639,7 +9622,7 @@ static void M_DrawLocalSkinMenu(void)
 
 	//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))
+	if ((speenframe > 4) && (sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]))
 	{
 		flags = V_FLIP; // This sprite is left/right flipped!
 	}

src/m_menu.h

@@ -38,16 +38,6 @@ extern boolean forceshowhud;
 // Does all the real work of the menu interaction.
 boolean M_Responder(event_t *ev);
 
-// for scrolling through menus with controllers
-extern boolean dpadscrollstate[4];
-enum
-{
-	DPAD_UP,
-	DPAD_DOWN,
-	DPAD_LEFT,
-	DPAD_RIGHT
-};
-
 // Called by main loop, runs for demo playback. If this returns true, nullify any further user input.
 boolean M_DemoResponder(event_t *ev);
 

src/m_menudefs.c

@@ -818,26 +818,31 @@ static menuitem_t OP_VideoOptionsMenu[] =
 #if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
 	{IT_STRING|IT_CVAR,		NULL,	"Fullscreen",				  &cv_fullscreen,		  20},
 #endif
+#ifdef BACKWARDSCOMPATCORRECTION
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
-							NULL,	"Brightness",				  &cv_globalgamma,		  30},
-
-	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
-	                        NULL, 	"Saturation",      			  &cv_globalsaturation ,  40},
-
-	{IT_SUBMENU|IT_STRING, NULL, 	"Advanced Color Settings...", &OP_ColorOptionsDef,    50},
-
-	{IT_STRING | IT_CVAR,	NULL,	"Draw Distance",			  &cv_drawdist,			  65},
-	{IT_STRING | IT_CVAR,	NULL,	"Weather Draw Distance",	  &cv_drawdist_precip,	  75},
-
-	{IT_STRING | IT_CVAR,	NULL,	"Show FPS",					  &cv_ticrate,			  95},
-	{IT_STRING | IT_CVAR,	NULL,	"Vertical Sync",			  &cv_vidwait,			 105},
-	{IT_STRING | IT_CVAR,   NULL,   "FPS Cap",              	  &cv_fpscap,            115},
-	{IT_STRING | IT_CVAR,   NULL,   "Drift spark pulse size",	  &cv_driftsparkpulse,   125},
-	{IT_STRING | IT_CVAR, 	NULL, 	"VHS effect", 				  &cv_vhseffect, 		 135},
-#ifdef HWRENDER
-	{IT_SUBMENU|IT_STRING,	NULL,	"OpenGL Options...",		  &OP_OpenGLOptionsDef,	 145},
+							NULL,	"Gamma",				  	  &cv_globalgamma,		  30},
 #endif
-	{IT_SUBMENU|IT_STRING,  NULL,   "Advanced Video Options...",  &OP_ExpOptionsDef,     155},
+
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
+							NULL,	"Brightness",				  &cv_globalbrightness,	  40},
+
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
+	                        NULL, 	"Saturation",      			  &cv_globalsaturation ,  50},
+
+	{IT_SUBMENU|IT_STRING, NULL, 	"Advanced Color Settings...", &OP_ColorOptionsDef,    60},
+
+	{IT_STRING | IT_CVAR,	NULL,	"Draw Distance",			  &cv_drawdist,			  75},
+	{IT_STRING | IT_CVAR,	NULL,	"Weather Draw Distance",	  &cv_drawdist_precip,	  85},
+
+	{IT_STRING | IT_CVAR,	NULL,	"Show FPS",					  &cv_ticrate,			 105},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Sync",			  &cv_vidwait,			 115},
+	{IT_STRING | IT_CVAR,   NULL,   "FPS Cap",              	  &cv_fpscap,            125},
+	{IT_STRING | IT_CVAR,   NULL,   "Drift spark pulse size",	  &cv_driftsparkpulse,   135},
+	{IT_STRING | IT_CVAR, 	NULL, 	"VHS effect", 				  &cv_vhseffect, 		 145},
+#ifdef HWRENDER
+	{IT_SUBMENU|IT_STRING,	NULL,	"OpenGL Options...",		  &OP_OpenGLOptionsDef,	 155},
+#endif
+	{IT_SUBMENU|IT_STRING,  NULL,   "Advanced Video Options...",  &OP_ExpOptionsDef,     165},
 };
 
 static const char* OP_VideoTooltips[] =
@@ -846,11 +851,12 @@ static const char* OP_VideoTooltips[] =
 #if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
 	"Enable fullscreen.",
 #endif
-	"Gamma (brightness) of the game.",
-	"Saturation of the game.",
+	"Increase the gamma of the displayed image.",
+	"Increase or decrease the brightness of the displayed image.",
+	"Reduce the saturation of the displayed image.",
 	"Advanced color settings of the game.",
-	"How far away objects are drawn.",
-	"How far away weather is drawn.",
+	"How far objects can be drawn.",
+	"Affects how far weather visuals can be drawn.",
 	"Show current game framerate and select the style.",
 	"Sync game framerate to refresh rate of monitor.",
 	"Set manual framerate cap.",
@@ -869,7 +875,10 @@ enum
 #if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
 	op_video_fullscreen,
 #endif
+#ifdef BACKWARDSCOMPATCORRECTION
 	op_video_gamma,
+#endif
+	op_video_bright,
 	op_video_sat,
 	op_video_color,
 	op_video_dd,
@@ -898,37 +907,37 @@ static menuitem_t OP_ColorOptionsMenu[] =
 	{IT_DISABLED, NULL, NULL, NULL, 35},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_rhue,         15},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_rsaturation,  20},
-	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_rgamma,       25},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_rbrightness,       25},
 
 	{IT_HEADER, NULL, "Yellow", NULL, 34},
 	{IT_DISABLED, NULL, NULL, NULL, 73},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_yhue,         40},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_ysaturation,  45},
-	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_ygamma,       50},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_ybrightness,       50},
 
 	{IT_HEADER, NULL, "Green", NULL, 59},
 	{IT_DISABLED, NULL, NULL, NULL, 112},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_ghue,         65},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_gsaturation,  70},
-	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_ggamma,       75},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_gbrightness,       75},
 
 	{IT_HEADER, NULL, "Cyan", NULL, 84},
 	{IT_DISABLED, NULL, NULL, NULL, 255},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_chue,         90},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_csaturation,  95},
-	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_cgamma,      100},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_cbrightness,      100},
 
 	{IT_HEADER, NULL, "Blue", NULL, 109},
 	{IT_DISABLED, NULL, NULL, NULL, 152},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_bhue,        115},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_bsaturation, 120},
-	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_bgamma,      125},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_bbrightness,      125},
 
 	{IT_HEADER, NULL, "Magenta", NULL, 134},
 	{IT_DISABLED, NULL, NULL, NULL, 181},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_mhue,        140},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_msaturation, 145},
-	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_mgamma,      150},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_mbrightness,      150},
 };
 
 static menuitem_t OP_ExpOptionsMenu[] =
@@ -944,21 +953,23 @@ static menuitem_t OP_ExpOptionsMenu[] =
 
 	{IT_STRING | IT_CVAR,	NULL, "Skyboxes",						&cv_skybox,				 	 40},
 
-	{IT_STRING | IT_CVAR,	NULL, "FPS counter sampling",			&cv_accuratefps,			 50},
+	{IT_STRING | IT_CVAR,	NULL, "Precache Level Textures",		&cv_precachetextures,		 50},
 
-	{IT_STRING | IT_CVAR,	NULL, "Frameskip",						&cv_frameskip,			 	 60},
+	{IT_STRING | IT_CVAR,	NULL, "FPS counter sampling",			&cv_accuratefps,			 60},
 
-	{IT_STRING | IT_CVAR,	NULL, "Votescreen Scaling",				&cv_votebgscaling,			 70},
+	{IT_STRING | IT_CVAR,	NULL, "Frameskip",						&cv_frameskip,			 	 70},
+
+	{IT_STRING | IT_CVAR,	NULL, "Votescreen Scaling",				&cv_votebgscaling,			 80},
 
 #ifdef HWRENDER
-	{IT_STRING | IT_CVAR, 	NULL, "Screen Textures", 				&cv_glscreentextures, 		 80},
+	{IT_STRING | IT_CVAR, 	NULL, "Screen Textures", 				&cv_glscreentextures, 		 90},
 #ifdef USE_FBO_OGL
-	{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
+	{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
 #else
-	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		 90},
-	{IT_DISABLED, 			NULL, "", 								NULL,     			 		100}, // dummy text
+	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		100},
+	{IT_DISABLED, 			NULL, "", 								NULL,     			 		110}, // dummy text
 #endif
 #endif
 };
@@ -968,16 +979,17 @@ 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.",
-	"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
+	"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
 	"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 than your display\nin OpenGL renderer mode. Requires a GPU with atleast OpenGL 3.0 support.",
+	"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.",
 #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
@@ -991,6 +1003,7 @@ enum
 	op_exp_secbright,
 	//op_exp_dirlight,
 	op_exp_skybox,
+	op_exp_texcache,
 	op_exp_accuratefps,
 	op_exp_frameskip,
 	op_exp_votescrn,
@@ -1149,8 +1162,10 @@ static menuitem_t OP_SoundAdvancedMenu[] =
 	{IT_STRING | IT_CVAR, 	NULL, "Keep Map Music", 			&cv_keepmusic, 		 80},
 	{IT_STRING | IT_CVAR, 	NULL, "Skip Intro Music", 			&cv_skipintromusic,  85},
 
-	{IT_STRING | IT_CVAR, 	NULL, "Audio Buffer Size", 			&cv_audbuffersize,   90},
-	{IT_DISABLED, 			NULL, "", 							NULL,     			100},	// dummy text
+	{IT_STRING | IT_CVAR, 	NULL, "Cache Sound", 				&cv_cachesound,   90},
+
+	{IT_STRING | IT_CVAR, 	NULL, "Audio Buffer Size", 			&cv_audbuffersize,   95},
+	{IT_DISABLED, 			NULL, "", 							NULL,     			105},	// dummy text
 };
 
 static const char* OP_SoundAdvancedTooltips[] =
@@ -1171,7 +1186,10 @@ static const char* OP_SoundAdvancedTooltips[] =
 	"Should the Invulnerability music be on or off?",
 	"Should music be kept when restarting the map?",
 	"Should the Intro fanfare be skipped\nand map music be played on map start?",
+	"Controls Sound effects caching.\nKeep will retain previously played sound effects in cache." // man idk how to describe this in a non awful way lmao
+	"\nOn will preload all sound effects.\nEliminates sound-related lag and stutters but increases memory usage.",
 	"Size of the Audio Buffer\nreducing it will result in less sound latency\nbut may cause issues such as crackling or distorted Sound.",
+	NULL,
 };
 
 static menuitem_t OP_FocusOptionsMenu[] =
@@ -1375,15 +1393,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
@@ -1763,7 +1781,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.",

src/m_misc.c

@@ -423,7 +423,7 @@ void Command_SaveConfig_f(void)
 	FIL_ForceExtension(tmpstr, ".cfg");
 
 	M_SaveConfig(tmpstr);
-	if (stricmp(COM_Argv(2), "-silent"))
+	if (!fasticmp(COM_Argv(2), "-silent"))
 		CONS_Printf(M_GetText("config saved as %s\n"), configfile);
 }
 
@@ -1686,7 +1686,7 @@ char *M_GetToken(const char *inputString)
 	// Assign the memory. Don't forget an extra byte for the end of the string!
 	texturesToken = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
 	// Copy the string.
-	M_Memcpy(texturesToken, stringToUse+startPos, (size_t)texturesTokenLength);
+	memcpy(texturesToken, stringToUse+startPos, (size_t)texturesTokenLength);
 	// Make the final character NUL.
 	texturesToken[texturesTokenLength] = '\0';
 	return texturesToken;

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 (strcmp(".lua", str + len - 4) == 0)
+		if (fastcmp(".lua", str + len - 4))
 		{
 			str[len-4] = '\0'; // remove .lua at end
 		}

src/p_enemy.c

@@ -28,8 +28,8 @@
 
 boolean LUA_CallAction(enum actionnum actionnum, void *thing);
 
-INT32 var1;
-INT32 var2;
+INT32 var1 = 0;
+INT32 var2 = 0;
 
 //
 // P_NewChaseDir related LUT.
@@ -945,9 +945,9 @@ void A_PointyThink(void *thing)
 		v[3] = FRACUNIT;
 
 		res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(actor->lastlook+i)));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 		res = VectorMatrixMultiply(v, *RotateZMatrix(actor->angle+ANGLE_180));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 
 		P_UnsetThingPosition(ball);
 		ball->x = actor->x + v[0];
@@ -4929,9 +4929,9 @@ void A_MaceRotate(void *thing)
 
 		// Calculate the angle matrixes for the link.
 		res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(actor->threshold)));
-		M_Memcpy(&v, res, sizeof(v));
+		memcpy(&v, res, sizeof(v));
 		res = VectorMatrixMultiply(v, *RotateZMatrix(actor->target->health << ANGLETOFINESHIFT));
-		M_Memcpy(&v, res, sizeof(v));
+		memcpy(&v, res, sizeof(v));
 	}
 	// Rotating Chain.
 	else
@@ -4950,9 +4950,9 @@ void A_MaceRotate(void *thing)
 
 		// Calculate the angle matrixes for the link.
 		res = VectorMatrixMultiply(v, *RotateXMatrix(actor->target->threshold << ANGLETOFINESHIFT));
-		M_Memcpy(&v, res, sizeof(v));
+		memcpy(&v, res, sizeof(v));
 		res = VectorMatrixMultiply(v, *RotateZMatrix(actor->target->health << ANGLETOFINESHIFT));
-		M_Memcpy(&v, res, sizeof(v));
+		memcpy(&v, res, sizeof(v));
 	}
 
 	// Add on the appropriate distances to the actor's co-ordinates.

src/p_map.c

@@ -41,32 +41,32 @@
 
 #include "m_perfstats.h" // ps_checkposition_calls
 
-fixed_t tmbbox[4];
-mobj_t *tmthing;
+fixed_t tmbbox[4] = {};
+mobj_t *tmthing = NULL;
 static INT32 tmflags;
-fixed_t tmx;
-fixed_t tmy;
+fixed_t tmx = 0;
+fixed_t tmy = 0;
 
 // If "floatok" true, move would be ok
 // if within "tmfloorz - tmceilingz".
-boolean floatok;
+boolean floatok = false;
 
-fixed_t tmfloorz, tmceilingz;
-static fixed_t tmdropoffz, tmdrpoffceilz; // drop-off floor/ceiling heights
-mobj_t *tmfloorthing; // the thing corresponding to tmfloorz or NULL if tmfloorz is from a sector
-mobj_t *tmhitthing; // the solid thing you bumped into (for collisions)
-pslope_t *tmfloorslope, *tmceilingslope;
+fixed_t tmfloorz = 0, tmceilingz = 0;
+static fixed_t tmdropoffz = 0, tmdrpoffceilz = 0; // drop-off floor/ceiling heights
+mobj_t *tmfloorthing = NULL; // the thing corresponding to tmfloorz or NULL if tmfloorz is from a sector
+mobj_t *tmhitthing = NULL; // the solid thing you bumped into (for collisions)
+pslope_t *tmfloorslope = NULL, *tmceilingslope = NULL;
 
 // keep track of the line that lowers the ceiling,
 // so missiles don't explode against sky hack walls
-line_t *ceilingline;
+line_t *ceilingline = NULL;
 
 // set by PIT_CheckLine() for any line that stopped the PIT_CheckLine()
 // that is, for any line which is 'solid'
-line_t *blockingline;
+line_t *blockingline = NULL;
 
 msecnode_t *sector_list = NULL;
-camera_t *mapcampointer;
+camera_t *mapcampointer = NULL;
 
 //
 // TELEPORT MOVE
@@ -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 *s;
+	subsector_t *subsec;
 	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)
-		s = R_PointInSubsectorFast(x, y);
+		subsec = R_PointInSubsectorFast(x, y);
 	else
-		s = thiscam->subsector;
+		subsec = 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 = s;
+				thiscam->subsector = subsec;
 				return true;
 			}
 		}
@@ -2232,6 +2232,7 @@ 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)
@@ -2249,14 +2250,14 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 
 			if (tmceilingz - thiscam->z < thiscam->height)
 			{
-				if (s == thiscam->subsector && tmceilingz >= thiscam->z)
+				if (subsec == thiscam->subsector && tmceilingz >= thiscam->z)
 				{
 					floatok = true;
 					thiscam->floorz = tmfloorz;
 					thiscam->ceilingz = tmfloorz + thiscam->height;
 					thiscam->x = x;
 					thiscam->y = y;
-					thiscam->subsector = s;
+					thiscam->subsector = subsec;
 					return true;
 				}
 				else
@@ -2281,7 +2282,7 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 	thiscam->ceilingz = tmceilingz;
 	thiscam->x = x;
 	thiscam->y = y;
-	thiscam->subsector = s;
+	thiscam->subsector = subsec;
 
 	return true;
 }
@@ -2394,6 +2395,7 @@ 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)
@@ -2409,28 +2411,34 @@ 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)
 			{
-				const INT32 special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1);
+				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
 			}
 
@@ -2463,11 +2471,8 @@ 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)
-				|| GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 14)
-				)) // Step down
+			else if (maxstep > 0 && !(thing->player &&
+					(P_PlayerTouchingSectorSpecial(thing->player, 1, 14) || special == 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.
@@ -2489,10 +2494,14 @@ 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);
@@ -2568,6 +2577,7 @@ 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;
@@ -2575,6 +2585,7 @@ 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)
@@ -2587,14 +2598,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
 		}
@@ -2928,6 +2939,7 @@ 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;
 	}
 
@@ -3346,10 +3358,12 @@ 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);
@@ -3363,7 +3377,8 @@ 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);
 	}
 }
@@ -3740,6 +3755,7 @@ 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]];
@@ -3946,6 +3962,7 @@ 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)
@@ -3956,6 +3973,7 @@ 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
@@ -4003,7 +4021,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

@@ -43,7 +43,7 @@
 consvar_t cv_splats = {"splats", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 #endif
 
-actioncache_t actioncachehead;
+actioncache_t actioncachehead = {};
 
 static mobj_t *overlaycap = NULL;
 static mobj_t *shadowcap = NULL;
@@ -5459,9 +5459,9 @@ static void P_MoveHoop(mobj_t *mobj)
 	v[3] = FRACUNIT;
 
 	res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(mobj->target->movedir*FRACUNIT)));
-	M_Memcpy(&v, res, sizeof (v));
+	memcpy(&v, res, sizeof (v));
 	res = VectorMatrixMultiply(v, *RotateZMatrix(FixedAngle(mobj->target->movecount*FRACUNIT)));
-	M_Memcpy(&v, res, sizeof (v));
+	memcpy(&v, res, sizeof (v));
 
 	finalx = x + v[0];
 	finaly = y + v[1];
@@ -5527,9 +5527,9 @@ void P_SpawnHoopOfSomething(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT
 		v[3] = FRACUNIT;
 
 		res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 		res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 
 		finalx = x + v[0];
 		finaly = y + v[1];
@@ -5566,9 +5566,9 @@ void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 numb
 		v[3] = FRACUNIT;
 
 		res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 		res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 
 		finalx = x + v[0];
 		finaly = y + v[1];
@@ -11815,9 +11815,9 @@ static void P_SpawnNiGHTSHoop(fixed_t x, fixed_t y, fixed_t z, fixed_t hoopsize,
 		v[3] = FRACUNIT;
 
 		res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(spewangle)));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 		res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
-		M_Memcpy(&v, res, sizeof (v));
+		memcpy(&v, res, sizeof (v));
 
 		mobj = P_SpawnMobj(x + v[0], y + v[1], z + v[2], type);
 

src/p_saveg.c

@@ -35,7 +35,7 @@
 #include "lua_script.h"
 #include "p_slopes.h"
 
-savedata_t savedata;
+savedata_t savedata = {};
 
 // Block UINT32s to attempt to ensure that the correct data is
 // being sent and received
@@ -1203,7 +1203,7 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
 	if (diff & MD_MORE)
 		WRITEUINT16(save->p, diff2);
 
-	// save pointer, at load time we will search this pointer to reinitilize pointers
+	// keep here for vanilla compat
 	WRITEUINT32(save->p, (size_t)mobj);
 
 	WRITEFIXED(save->p, mobj->z); // Force this so 3dfloor problems don't arise.
@@ -1982,7 +1982,6 @@ static void CalculateDoomednumToMobjtype(void)
 
 static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 {
-	thinker_t *next;
 	mobj_t *mobj;
 	UINT32 diff;
 	UINT16 diff2;
@@ -1995,7 +1994,8 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 	else
 		diff2 = 0;
 
-	next = (void *)(size_t)READUINT32(save->p);
+	// here for vanilla compat
+	save->p += sizeof(UINT32);
 
 	z = READFIXED(save->p); // Force this so 3dfloor problems don't arise.
 	floorz = READFIXED(save->p);
@@ -2234,8 +2234,6 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 	if (diff2 & MD2_WAYPOINTCAP)
 		P_SetTarget(&waypointcap, mobj);
 
-	mobj->info = (mobjinfo_t *)next; // temporarily, set when leave this function
-
 	R_AddMobjInterpolator(mobj);
 }
 
@@ -3200,25 +3198,6 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePolyObjects(savebuffer_t *save)
 	for (i = 0; i < numSavedPolys; ++i)
 		P_UnArchivePolyObj(save, &PolyObjects[i]);
 }
-//
-// P_FinishMobjs
-//
-FUNCINLINE static ATTRINLINE void P_FinishMobjs(void)
-{
-	thinker_t *currentthinker;
-	mobj_t *mobj;
-
-	// put info field there real value
-	for (currentthinker = thinkercap.next; currentthinker != &thinkercap;
-		currentthinker = currentthinker->next)
-	{
-		if (currentthinker->function != (actionf_p1)P_MobjThinker)
-			continue;
-
-		mobj = (mobj_t *)currentthinker;
-		mobj->info = &mobjinfo[mobj->type];
-	}
-}
 
 FUNCINLINE static ATTRINLINE mobj_t *RelinkMobj(mobj_t **ptr)
 {
@@ -3391,7 +3370,7 @@ FUNCINLINE static ATTRINLINE void P_UnArchiveSPGame(savebuffer_t *save, INT16 ma
 
 	READSTRINGN(save->p, testname, sizeof(testname));
 
-	if (strcmp(testname, timeattackfolder))
+	if (!fastcmp(testname, timeattackfolder))
 	{
 		if (modifiedgame)
 			I_Error("Save game not for this modification.");
@@ -3793,7 +3772,7 @@ boolean P_LoadGame(savebuffer_t *save, INT16 mapoverride)
 
 boolean P_LoadNetGame(savebuffer_t *save, boolean reloading)
 {
-	CV_LoadNetVars(&save->p);
+	save->p += CV_LoadNetVars(save->p);
 
 	if (!P_NetUnArchiveMisc(save, reloading))
 		return false;
@@ -3807,7 +3786,6 @@ boolean P_LoadNetGame(savebuffer_t *save, boolean reloading)
 		P_NetUnArchiveThinkers(save);
 		P_NetUnArchiveSpecials(save);
 		P_RelinkPointers();
-		P_FinishMobjs();
 	}
 
 	LUA_UnArchive(save, true);

src/p_setup.c

@@ -92,7 +92,7 @@
 // Map MD5, calculated on level load.
 // Sent to clients in PT_SERVERINFO.
 //
-unsigned char mapmd5[16];
+unsigned char mapmd5[16] = {};
 
 // true when level was loaded from netsave
 boolean midgamejoin = false;
@@ -102,22 +102,22 @@ boolean midgamejoin = false;
 // Store VERTEXES, LINEDEFS, SIDEDEFS, etc.
 //
 
-size_t numvertexes, numsegs, numsectors, numsubsectors, numnodes, numlines, numsides, nummapthings;
-vertex_t *vertexes;
-seg_t *segs;
-sector_t *sectors;
-subsector_t *subsectors;
-node_t *nodes;
-line_t *lines;
-side_t *sides;
-mapthing_t *mapthings;
-sector_t *spawnsectors;
-line_t *spawnlines;
-side_t *spawnsides;
-INT32 numstarposts;
-boolean levelloading;
+size_t numvertexes = 0, numsegs = 0, numsectors = 0, numsubsectors = 0, numnodes = 0, numlines = 0, numsides = 0, nummapthings = 0;
+vertex_t *vertexes = NULL;
+seg_t *segs = NULL;
+sector_t *sectors = NULL;
+subsector_t *subsectors = NULL;
+node_t *nodes = NULL;
+line_t *lines = NULL;
+side_t *sides = NULL;
+mapthing_t *mapthings = NULL;
+sector_t *spawnsectors = NULL;
+line_t *spawnlines = NULL;
+side_t *spawnsides = NULL;
+INT32 numstarposts = 0;
+boolean levelloading = false;
 
-virtres_t *curmapvirt;
+virtres_t *curmapvirt = NULL;
 
 // BLOCKMAP
 // Created from axis aligned bounding box
@@ -127,32 +127,32 @@ virtres_t *curmapvirt;
 // by spatial subdivision in 2D.
 //
 // Blockmap size.
-INT32 bmapwidth, bmapheight; // size in mapblocks
+INT32 bmapwidth = 0, bmapheight = 0; // size in mapblocks
 
-INT32 *blockmap; // INT32 for large maps
+INT32 *blockmap = NULL; // INT32 for large maps
 // offsets in blockmap are from here
-INT32 *blockmaplump; // Big blockmap
+INT32 *blockmaplump = NULL; // Big blockmap
 
 // origin of block map
-fixed_t bmaporgx, bmaporgy;
+fixed_t bmaporgx = 0, bmaporgy = 0;
 // for thing chains
-mobj_t **blocklinks;
-precipmobj_t **precipblocklinks;
+mobj_t **blocklinks = NULL;
+precipmobj_t **precipblocklinks = NULL;
 
 // REJECT
 // For fast sight rejection.
 // Speeds up enemy AI by skipping detailed LineOf Sight calculation.
 // Without special effect, this could be used as a PVS lookup as well.
 //
-UINT8 *rejectmatrix;
+UINT8 *rejectmatrix = NULL;
 
 // Maintain single and multi player starting spots.
-INT32 numdmstarts, numcoopstarts, numredctfstarts, numbluectfstarts;
+INT32 numdmstarts = 0, numcoopstarts = 0, numredctfstarts = 0, numbluectfstarts = 0;
 
-mapthing_t *deathmatchstarts[MAX_DM_STARTS];
-mapthing_t *playerstarts[MAXPLAYERS];
-mapthing_t *bluectfstarts[MAXPLAYERS];
-mapthing_t *redctfstarts[MAXPLAYERS];
+mapthing_t *deathmatchstarts[MAX_DM_STARTS] = {};
+mapthing_t *playerstarts[MAXPLAYERS] = {};
+mapthing_t *bluectfstarts[MAXPLAYERS] = {};
+mapthing_t *redctfstarts[MAXPLAYERS] = {};
 
 // Global state for PartialAddWadFile/MultiSetupWadFiles
 // Might be replacable with parameters, but non-trivial when the functions are called on separate tics
@@ -544,7 +544,18 @@ static void P_LoadSegs(UINT8 *data)
 	{
 		li->v1 = &vertexes[SHORT(ml->v1)];
 		li->v2 = &vertexes[SHORT(ml->v2)];
+#ifdef HWRENDER
+		if (rendermode == render_opengl)
+		{
+			li->fv1.x = FixedToFloat(li->v1->x);
+			li->fv1.y = FixedToFloat(li->v1->y);
+			//li->fv1.z = FixedToFloat(li->v1->z); // z is unused in gl
 
+			li->fv2.x = FixedToFloat(li->v2->x);
+			li->fv2.y = FixedToFloat(li->v2->y);
+			//li->fv2.z = FixedToFloat(li->v2->z);
+		}
+#endif
 		li->length = P_SegLength(li);
 		li->angle = (SHORT(ml->angle))<<FRACBITS;
 		li->offset = (SHORT(ml->offset))<<FRACBITS;
@@ -806,7 +817,7 @@ static void P_LoadSectors(UINT8 *data)
 	skyflatnum = P_AddLevelFlat(SKYFLATNAME, foundflats);
 
 	// copy table for global usage
-	levelflats = M_Memcpy(Z_Calloc(numlevelflats * sizeof (*levelflats), PU_LEVEL, NULL), foundflats, numlevelflats * sizeof (levelflat_t));
+	levelflats = memcpy(Z_Calloc(numlevelflats * sizeof (*levelflats), PU_LEVEL, NULL), foundflats, numlevelflats * sizeof (levelflat_t));
 	free(foundflats);
 
 	// search for animated flats and set up
@@ -1177,10 +1188,10 @@ static void P_LoadLineDefs2(void)
 						len += strlen(sides[ld->sidenum[1]].text);
 
 					ld->text = Z_Malloc(len, PU_LEVEL, NULL);
-					M_Memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text)+1);
+					memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text)+1);
 
 					if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
-						M_Memcpy(ld->text+strlen(ld->text)+1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text)+1);
+						memcpy(ld->text+strlen(ld->text)+1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text)+1);
 				}
 				break;
 
@@ -1309,14 +1320,14 @@ static void P_LoadSideChangeMusic(boolean firstside, mapsidedef_t *msd, side_t *
 
 	if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
 	{
-		M_Memcpy(process,msd->bottomtexture,8);
+		memcpy(process,msd->bottomtexture,8);
 		process[8] = '\0';
 		sd->bottomtexture = get_number(process);
 	}
 
 	if (!(msd->midtexture[0] == '-' && msd->midtexture[1] == '\0') || msd->midtexture[1] != '\0')
 	{
-		M_Memcpy(process,msd->midtexture,8);
+		memcpy(process,msd->midtexture,8);
 		process[8] = '\0';
 		sd->midtexture = get_number(process);
 	}
@@ -1326,15 +1337,15 @@ static void P_LoadSideChangeMusic(boolean firstside, mapsidedef_t *msd, side_t *
 
 	if (firstside || msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
 	{
-		M_Memcpy(process,msd->toptexture,8);
+		memcpy(process,msd->toptexture,8);
 		process[8] = '\0';
 
 		// If they type in O_ or D_ and their music name, just shrug,
 		// then copy the rest instead.
 		if ((process[0] == 'O' || process[0] == 'D') && process[7])
-			M_Memcpy(sd->text, process+2, 6);
+			memcpy(sd->text, process+2, 6);
 		else // Assume it's a proper music name.
-			M_Memcpy(sd->text, process, 6);
+			memcpy(sd->text, process, 6);
 		sd->text[6] = 0;
 	}
 	else
@@ -1382,7 +1393,7 @@ static void P_LoadSidedefs(void *data)
 				if (msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
 				{
 					char process[8+1];
-					M_Memcpy(process,msd->toptexture,8);
+					memcpy(process,msd->toptexture,8);
 					process[8] = '\0';
 					sd->toptexture = get_number(process);
 				}
@@ -1401,11 +1412,11 @@ static void P_LoadSidedefs(void *data)
 				if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')
 					break;
 				else
-					M_Memcpy(process,msd->toptexture,8);
+					memcpy(process,msd->toptexture,8);
 				if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0')
-					M_Memcpy(process+strlen(process), msd->midtexture, 8);
+					memcpy(process+strlen(process), msd->midtexture, 8);
 				if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
-					M_Memcpy(process+strlen(process), msd->bottomtexture, 8);
+					memcpy(process+strlen(process), msd->bottomtexture, 8);
 				sd->toptexture = get_number(process);
 
 				break;
@@ -1418,13 +1429,13 @@ static void P_LoadSidedefs(void *data)
 				if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')
 					break;
 				else
-					M_Memcpy(process,msd->toptexture,8);
+					memcpy(process,msd->toptexture,8);
 				if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0')
-					M_Memcpy(process+strlen(process), msd->midtexture, 8);
+					memcpy(process+strlen(process), msd->midtexture, 8);
 				if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
-					M_Memcpy(process+strlen(process), msd->bottomtexture, 8);
+					memcpy(process+strlen(process), msd->bottomtexture, 8);
 				sd->text = Z_Malloc(strlen(process)+1, PU_LEVEL, NULL);
-				M_Memcpy(sd->text, process, strlen(process)+1);
+				memcpy(sd->text, process, strlen(process)+1);
 
 				break;
 			}
@@ -1887,7 +1898,7 @@ static void P_LoadReject(UINT8 *data, size_t count)
 	else
 	{
 		rejectmatrix = Z_Malloc(count, PU_LEVEL, NULL); // allocate memory for the reject matrix
-		M_Memcpy(rejectmatrix, data, count); // copy the data into it
+		memcpy(rejectmatrix, data, count); // copy the data into it
 	}
 }
 
@@ -2201,7 +2212,7 @@ static void P_MakeMapMD5(virtres_t *virt, void *dest)
 	for (i = 0; i < 16; i++)
 		resmd5[i] = (linemd5[i] + sectormd5[i] + thingmd5[i] + sidedefmd5[i]) & 0xFF;
 
-	M_Memcpy(dest, &resmd5, 16);
+	memcpy(dest, &resmd5, 16);
 }
 
 static void P_LoadMapFromFile(void)
@@ -2766,7 +2777,8 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
 	// Make sure all sounds are stopped before Z_FreeTags.
 	S_StopSounds();
 
-	if (!S_PrecacheSound())
+	// if we dont intend to cache our sound effects, wipe them
+	if (S_CacheSound() == SOUNDCACHE_OFF)
 		S_ClearSfx();
 
 	// As oddly named as this is, this handles music only.
@@ -3034,7 +3046,7 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
 					I_FreeSfx(&S_sfx[j]);
 
 					// Re-cache it
-					if (S_PrecacheSound())
+					if (S_CacheSound() == SOUNDCACHE_PRECACHE)
 						S_sfx[j].data = I_GetSfx(&S_sfx[j]);
 
 					sreplaces++;

src/p_spec.c

@@ -44,7 +44,7 @@
 // Not sure if this is necessary, but it was in w_wad.c, so I'm putting it here too -Shadow Hog
 #include <errno.h>
 
-mobj_t *skyboxmo[2];
+mobj_t *skyboxmo[2] = {};
 
 // Amount (dx, dy) vector linedef is shifted right to get scroll amount
 #define SCROLL_SHIFT 5
@@ -93,7 +93,7 @@ static void P_AddSpikeThinker(sector_t *sec, INT32 referrer);
 
 
 //SoM: 3/7/2000: New sturcture without limits.
-anim_t *lastanim;
+anim_t *lastanim = NULL;
 anim_t *anims = NULL; /// \todo free leak
 static size_t maxanims;
 
@@ -252,10 +252,10 @@ void P_InitPicAnims(void)
 				// Populate the new array
 				for (currentPos = animatedLump; *currentPos != UINT8_MAX; i++, currentPos+=23)
 				{
-					M_Memcpy(&(animdefs[i].istexture), currentPos, 1); // istexture, 1 byte
-					M_Memcpy(animdefs[i].endname, (currentPos + 1), 9); // endname, 9 bytes
-					M_Memcpy(animdefs[i].startname, (currentPos + 10), 9); // startname, 9 bytes
-					M_Memcpy(&(animdefs[i].speed), (currentPos + 19), 4); // speed, 4 bytes
+					memcpy(&(animdefs[i].istexture), currentPos, 1); // istexture, 1 byte
+					memcpy(animdefs[i].endname, (currentPos + 1), 9); // endname, 9 bytes
+					memcpy(animdefs[i].startname, (currentPos + 10), 9); // startname, 9 bytes
+					memcpy(&(animdefs[i].speed), (currentPos + 19), 4); // speed, 4 bytes
 				}
 
 				Z_Free(animatedLump);
@@ -324,6 +324,7 @@ void P_InitPicAnims(void)
 			lastanim->speed = LONG(animdefs[i].speed);
 		lastanim++;
 	}
+
 	lastanim->istexture = -1;
 	R_ClearTextureNumCache(false);
 
@@ -331,6 +332,7 @@ void P_InitPicAnims(void)
 	// We'll only be using anims from now on.
 	if (animdefs != harddefs)
 		Z_Free(animdefs);
+
 	animdefs = NULL;
 }
 
@@ -361,20 +363,21 @@ void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum)
 
 	// Now, let's start parsing this thing
 	p = animdefsText;
+
 	animdefsToken = M_GetToken(p);
 	while (animdefsToken != NULL)
 	{
-		if (stricmp(animdefsToken, "TEXTURE") == 0)
+		if (fasticmp(animdefsToken, "TEXTURE"))
 		{
 			Z_Free(animdefsToken);
 			P_ParseAnimationDefintion(1);
 		}
-		else if (stricmp(animdefsToken, "FLAT") == 0)
+		else if (fasticmp(animdefsToken, "FLAT"))
 		{
 			Z_Free(animdefsToken);
 			P_ParseAnimationDefintion(0);
 		}
-		else if (stricmp(animdefsToken, "OSCILLATE") == 0)
+		else if (fasticmp(animdefsToken, "OSCILLATE"))
 		{
 			// 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");
@@ -383,11 +386,17 @@ 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);
 }
@@ -406,7 +415,8 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where start texture/flat name should be");
 	}
-	if (stricmp(animdefsToken, "OPTIONAL") == 0)
+
+	if (fasticmp(animdefsToken, "OPTIONAL"))
 	{
 		// 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
@@ -418,7 +428,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 (stricmp(animdefsToken, "RANGE") == 0)
+		else if (fasticmp(animdefsToken, "RANGE"))
 		{
 			// Oh. Um. Apparently "OPTIONAL" is a texture name. Naughty.
 			// I should probably handle this more gracefully, but right now
@@ -427,15 +437,17 @@ 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 (stricmp(animdefsToken, animdefs[i].startname) == 0)
+	{
+		if (fasticmp(animdefsToken, animdefs[i].startname))
 		{
 			//CONS_Alert(CONS_NOTICE, "Duplicate animation: %s\n", animdefsToken);
 
@@ -444,6 +456,7 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 			Z_Free(animdefsToken);
 			return;
 		}
+	}
 
 	// Not found
 	if (i == maxanims)
@@ -467,21 +480,25 @@ 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 (stricmp(animdefsToken, "ALLOWDECALS") == 0)
+
+	if (fasticmp(animdefsToken, "ALLOWDECALS"))
 	{
 		// Another ZDoom keyword, ho-hum. Skip it, move on to the next token.
 		Z_Free(animdefsToken);
 		animdefsToken = M_GetToken(NULL);
 	}
-	if (stricmp(animdefsToken, "PIC") == 0)
+
+	if (fasticmp(animdefsToken, "PIC"))
 	{
 		// 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 (stricmp(animdefsToken, "RANGE") != 0)
+
+	if (!fasticmp(animdefsToken, "RANGE"))
 	{
 		I_Error("Error parsing ANIMDEFS lump: Expected \"RANGE\" after \"%s\"'s startname, got \"%s\"", animdefs[i].startname, animdefsToken);
 	}
+
 	Z_Free(animdefsToken);
 
 	// Endname
@@ -490,11 +507,13 @@ 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);
 
@@ -504,15 +523,18 @@ 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 (stricmp(animdefsToken, "RAND") == 0)
+
+	if (fasticmp(animdefsToken, "RAND"))
 	{
 		// 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 (stricmp(animdefsToken, "TICS") != 0)
+
+	if (!fasticmp(animdefsToken, "TICS"))
 	{
 		I_Error("Error parsing ANIMDEFS lump: Expected \"TICS\" in animation definition for \"%s\", got \"%s\"", animdefs[i].startname, animdefsToken);
 	}
+
 	Z_Free(animdefsToken);
 
 	// Speed
@@ -521,6 +543,7 @@ 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;
@@ -535,6 +558,7 @@ 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);
 }
@@ -2091,8 +2115,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 				// Change the music and apply position/fade operations
 				else
 				{
-					strncpy(mapmusic.name, sides[line->sidenum[0]].text, 7);
-					mapmusic.name[6] = 0;
+					strlcpy(mapmusic.name, sides[line->sidenum[0]].text, sizeof(mapmusic.name));
 
 					mapmusic.flags = tracknum & MUSIC_TRACKMASK;
 					if (!(line->flags & ML_BLOCKMONSTERS))

src/p_tick.c

@@ -44,7 +44,7 @@
 // Dynamic slopes
 #include "p_slopes.h"
 
-tic_t leveltime;
+tic_t leveltime = 0;
 
 //
 // THINKERS
@@ -55,8 +55,8 @@ tic_t leveltime;
 //
 
 // Both the head and tail of the thinker list.
-thinker_t thinkercap;
-thinker_t precipcap;
+thinker_t thinkercap = {};
+thinker_t precipcap = {};
 
 void Command_Numthinkers_f(void)
 {

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,7 +3821,13 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 
 	if (demo.playback)
 	{
-		focusangle = mo->angle;
+		// 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.
 		focusaiming = 0;
 	}
 	else if (P_IsLocalPlayer(player))
@@ -4309,17 +4315,19 @@ 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;
@@ -4355,16 +4363,18 @@ 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

@@ -26,11 +26,11 @@
 
 #include "qs22j.h"
 
-seg_t *curline;
-side_t *sidedef;
-line_t *linedef;
-sector_t *frontsector;
-sector_t *backsector;
+seg_t  *curline = NULL;
+side_t *sidedef = NULL;
+line_t *linedef = NULL;
+sector_t *frontsector = NULL;
+sector_t *backsector = NULL;
 
 // very ugly realloc() of drawsegs at run-time, I upped it to 512
 // instead of 256.. and someone managed to send me a level with
@@ -40,29 +40,38 @@ drawseg_t *drawsegs = NULL;
 drawseg_t *ds_p = NULL;
 
 // indicates doors closed wrt automap bugfix:
-INT32 doorclosed;
+INT32 doorclosed = 0;
 
 // A wall was drawn covering the whole screen, which means we
 // can block off the BSP across that seg.
-boolean g_walloffscreen;
+boolean g_walloffscreen = false;
 
 boolean R_NoEncore(sector_t *sector, boolean ceiling)
 {
-	boolean invertencore = (GETSECSPECIAL(sector->special, 2) == 12 || GETSECSPECIAL(sector->special, 2) == 15); // keeping this incase its used
+	const INT32 invspecial = GETSECSPECIAL(sector->special, 2);
+	boolean invertencore = (invspecial == 12 || invspecial == 15); // keeping this incase its used
+
 #if 0 // perfect implementation
-	INT32 val = GETSECSPECIAL(sector->special, 3);
-	if (val != 1 && val != 3 // spring panel
+	const INT32 sprnspecial = GETSECSPECIAL(sector->special, 3);
+	if (sprnspecial != 1 && sprnspecial != 3 // spring panel
 #else // optimised, see #define GETSECSPECIAL(i,j) ((i >> ((j-1)*4))&15)
 	if ((!(sector->special & (1<<8)) || (sector->special & ((4|8)<<8))) // spring panel
 #endif
 		&& GETSECSPECIAL(sector->special, 4) != 6) // sneaker panel
-			return invertencore;
+	{
+		return invertencore;
+	}
 
 	if (invertencore)
+	{
 		return false;
+	}
 
 	if (ceiling)
+	{
 		return ((boolean)(sector->flags & SF_FLIPSPECIAL_CEILING));
+	}
+
 	return ((boolean)(sector->flags & SF_FLIPSPECIAL_FLOOR));
 }
 

src/r_data.c

@@ -83,7 +83,7 @@ typedef struct
 // a patch or sprite is composed of zero or more columns.
 //
 
-size_t numspritelumps, max_spritelumps;
+size_t numspritelumps = 0, max_spritelumps = 0;
 
 // textures
 INT32 numtextures = 0; // total number of textures found,
@@ -110,7 +110,7 @@ UINT8 invertmap[256];
 #endif
 
 // for debugging/info purposes
-size_t flatmemory, spritememory, texturememory; // gotta play by 2.2 rules to get this to work
+static size_t flatmemory = 0, spritememory = 0, texturememory = 0; // gotta play by 2.2 rules to get this to work
 
 // Blends two pixels together, using the equation
 // that matches the specified alpha style.
@@ -269,7 +269,7 @@ static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, texpatch_t
 			count = cacheheight - position;
 
 		if (count > 0)
-			M_Memcpy(cache + position, source, count);
+			memcpy(cache + position, source, count);
 
 		patch = (column_t *)((UINT8 *)patch + patch->length + 4);
 	}
@@ -412,7 +412,7 @@ UINT8 *R_GenerateTexture(size_t texnum)
 			texture->holes = true;
 			blocksize = lumplength;
 			block = Z_Calloc(blocksize, PU_LEVEL, &texturecache[texnum]); // will change tag at end of this function
-			M_Memcpy(block, realpatch, blocksize);
+			memcpy(block, realpatch, blocksize);
 			texturememory += blocksize;
 
 			// use the patch's column lookup
@@ -621,7 +621,7 @@ Rloadtextures (INT32 i, INT32 w)
 		texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
 
 		// Set texture properties.
-		M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
+		memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
 		texture->hash = quickncasehash(texture->name, 8);
 
 		texture->width = SHORT(patchlump.width);
@@ -854,7 +854,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 			Z_Free(patchName);
 		}
 		patchName = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
-		M_Memcpy(patchName,texturesToken,texturesTokenLength*sizeof(char));
+		memcpy(patchName,texturesToken,texturesTokenLength*sizeof(char));
 		patchName[texturesTokenLength] = '\0';
 	}
 
@@ -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 (strcmp(texturesToken,",")!=0)
+	if (!fastcmp(texturesToken,","))
 	{
 		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 (strcmp(texturesToken,",")!=0)
+	if (!fastcmp(texturesToken,","))
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after patch \"%s\"'s x coordinate, got \"%s\"",patchName,texturesToken);
 	}
@@ -976,18 +976,20 @@ 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);
 	}
 	else
 	{
 		memset(&newTextureName, 0, 9);
-		M_Memcpy(newTextureName, texturesToken, texturesTokenLength);
+		memcpy(newTextureName, texturesToken, texturesTokenLength);
 		// ^^ 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
@@ -996,10 +998,11 @@ 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 (strcmp(texturesToken,",")!=0)
+	else if (!fastcmp(texturesToken, ","))
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after texture \"%s\"'s name, got \"%s\"",newTextureName,texturesToken);
 	}
+
 	Z_Free(texturesToken);
 
 	// Width
@@ -1030,10 +1033,12 @@ 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 (strcmp(texturesToken,",")!=0)
+
+	if (!fastcmp(texturesToken, ","))
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after texture \"%s\"'s width, got \"%s\"",newTextureName,texturesToken);
 	}
+
 	Z_Free(texturesToken);
 
 	// Height
@@ -1066,27 +1071,30 @@ 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 (strcmp(texturesToken,"{")==0)
+	if (fastcmp(texturesToken, "{"))
 	{
 		if (actuallyLoadTexture)
 		{
 			// Allocate memory for a zero-patch texture. Obviously, we'll be adding patches momentarily.
 			resultTexture = (texture_t *)Z_Calloc(sizeof(texture_t), PU_STATIC, NULL);
-			M_Memcpy(resultTexture->name, newTextureName, 8);
+			memcpy(resultTexture->name, newTextureName, 8);
 			resultTexture->hash = quickncasehash(newTextureName, 8);
 			resultTexture->width = newTextureWidth;
 			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 (strcmp(texturesToken,"}")!=0)
+
+		while (!fastcmp(texturesToken, "}"))
 		{
-			if (stricmp(texturesToken, "PATCH")==0)
+			if (fasticmp(texturesToken, "PATCH"))
 			{
 				Z_Free(texturesToken);
 				if (resultTexture)
@@ -1096,7 +1104,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 					// Make room for the new patch
 					resultTexture = Z_Realloc(resultTexture, sizeof(texture_t) + (resultTexture->patchcount+1)*sizeof(texpatch_t), PU_STATIC, NULL);
 					// Populate the uninitialized values in the new patch entry of our array
-					M_Memcpy(&resultTexture->patches[resultTexture->patchcount], newPatch, sizeof(texpatch_t));
+					memcpy(&resultTexture->patches[resultTexture->patchcount], newPatch, sizeof(texpatch_t));
 					// Account for the new number of patches in the texture
 					resultTexture->patchcount++;
 					// Then free up the memory assigned to R_ParsePatch, as it's unneeded now
@@ -1118,6 +1126,7 @@ 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);
@@ -1127,10 +1136,13 @@ 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;
-	else return NULL;
+	if (actuallyLoadTexture)
+		return resultTexture;
+
+	return NULL;
 }
 
 // Parses the TEXTURES lump... but just to count the number of textures.
@@ -1162,7 +1174,7 @@ int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum)
 	texturesToken = M_GetToken(texturesText);
 	while (texturesToken != NULL)
 	{
-		if (stricmp(texturesToken, "WALLTEXTURE")==0)
+		if (fasticmp(texturesToken, "WALLTEXTURE"))
 		{
 			numTexturesInLump++;
 			Z_Free(texturesToken);
@@ -1172,8 +1184,10 @@ 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);
 
@@ -1211,7 +1225,7 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex)
 	texturesToken = M_GetToken(texturesText);
 	while (texturesToken != NULL)
 	{
-		if (stricmp(texturesToken, "WALLTEXTURE")==0)
+		if (fasticmp(texturesToken, "WALLTEXTURE"))
 		{
 			Z_Free(texturesToken);
 			// Get the new texture
@@ -1227,8 +1241,10 @@ 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);
 }
@@ -1334,8 +1350,9 @@ lumpnum_t R_GetFlatNumForName(const char *name)
 
 	if (lump == LUMPERROR)
 	{
-		if (strcmp(name, SKYFLATNAME))
+		if (!fastcmp(name, SKYFLATNAME))
 			CONS_Debug(DBG_SETUP, "R_GetFlatNumForName: Could not find flat %.8s\n", name);
+
 		lump = W_CheckNumForName("REDFLR");
 	}
 
@@ -1391,6 +1408,7 @@ 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_data.h

@@ -91,8 +91,6 @@ UINT8 *R_GetFlat(lumpnum_t flatnum);
 void R_InitData(void);
 void R_PrecacheLevel(void);
 
-extern size_t flatmemory, spritememory, texturememory;
-
 // Retrieval.
 // Floor/ceiling opaque texture tiles,
 // lookup by name. For animation?

src/r_defs.h

@@ -114,6 +114,11 @@ typedef struct
 	fixed_t x, y, z;
 } vertex_t;
 
+typedef struct
+{
+	float x, y/*, z*/;
+} floatvertex_t;
+
 // Forward of linedefs, for sectors.
 struct line_s;
 
@@ -543,12 +548,11 @@ typedef struct seg_s
 	sector_t *frontsector;
 	sector_t *backsector;
 
-	fixed_t length;	// precalculated seg length
+	fixed_t length; // precalculated seg length
 
 #ifdef HWRENDER
-	// new pointers so that AdjustSegs doesn't mess with v1/v2
-	polyvertex_t *pv1;
-	polyvertex_t *pv2;
+	floatvertex_t fv1;
+	floatvertex_t fv2;
 #endif
 
 	polyobj_t *polyseg;

src/r_draw.cpp

@@ -41,40 +41,40 @@
 
 /**	\brief view info
 */
-INT32 viewwidth, viewheight, viewwindowx, viewwindowy;
+INT32 viewwidth = 0, viewheight = 0, viewwindowx = 0, viewwindowy = 0;
 
 // =========================================================================
 //                      COLUMN DRAWING CODE STUFF
 // =========================================================================
 
-drawcolumndata_t g_dc;
+drawcolumndata_t g_dc = {};
 
 // -----------------------
 // translucency stuff here
 // -----------------------
 #define NUMTRANSTABLES 9 // how many translucency tables are used
 
-UINT8 *transtables; // translucency tables
-UINT8 *blendtables[NUMBLENDMAPS];
+UINT8 *transtables = NULL; // translucency tables
+UINT8 *blendtables[NUMBLENDMAPS] = {};
 
 // --------------------------------------------
 // c drawer routines
 // --------------------------------------------
 
-coldrawfunc_t *colfunc;
-coldrawfunc_t *colfuncs[COLDRAWFUNC_MAX];
-int colfunctype;
+coldrawfunc_t *colfunc = NULL;
+coldrawfunc_t *colfuncs[COLDRAWFUNC_MAX] = {};
+int colfunctype = 0;
 
 // =========================================================================
 //                      SPAN DRAWING CODE STUFF
 // =========================================================================
 
-drawspandata_t g_ds;
+drawspandata_t g_ds = {};
 
 // Vectors for Software's tilted slope drawers
-floatv3_t *ds_su, *ds_sv, *ds_sz;
+floatv3_t *ds_su = NULL, *ds_sv = NULL, *ds_sz = NULL;
 
-float focallengthf;
+float focallengthf = 0.0f;
 
 // For, uh, tilted lighting, duh.
 //static INT32 *tiltlighting;
@@ -83,8 +83,8 @@ float focallengthf;
 // c drawer routines
 // --------------------------------------------
 
-spandrawfunc_t *spanfunc;
-spandrawfunc_t *spanfuncs[SPANDRAWFUNC_MAX];
+spandrawfunc_t *spanfunc = NULL;
+spandrawfunc_t *spanfuncs[SPANDRAWFUNC_MAX] = {};
 
 // ==========================================================================
 //                        OLD DOOM FUZZY EFFECT
@@ -105,14 +105,15 @@ spandrawfunc_t *spanfuncs[SPANDRAWFUNC_MAX];
 #define DEFAULT_STARTTRANSCOLOR 160
 #define NUM_PALETTE_ENTRIES 256
 
-static UINT8 **translationtablecache[TT_CACHE_SIZE] = {NULL};
-static UINT8 **localtranslationtablecache[MAXLOCALSKINS] = {NULL};
+static UINT8 **translationtablecache[TT_CACHE_SIZE] = {};
+static UINT8 **localtranslationtablecache[MAXLOCALSKINS] = {};
 
-CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
+CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1] = {};
 
 struct GenerateBlendTables_State
 {
 	RGBA_t *LocalPalette;
+	RGBA_t *gammaCorrectedPalette;
 };
 
 static void R_GenerateBlendTables_Core(struct GenerateBlendTables_State *state);
@@ -126,6 +127,7 @@ static void R_GenerateBlendTables_Thread(void *userdata)
 	R_GenerateBlendTables_Core(state);
 
 	free(state->LocalPalette);
+	free(state->gammaCorrectedPalette);
 	free(state);
 }
 #endif
@@ -154,26 +156,33 @@ void R_InitTranslucencyTables(void)
 }
 
 static colorlookup_t transtab_lut;
+static colorlookup_t transtab_lut_corrected;
 
 static void BlendTab_Translucent(UINT8 *table, int style, UINT8 blendamt)
 {
 	INT16 bg, fg;
+	RGBA_t backrgba, frontrgba, result;
 
 	if (table == NULL)
 		I_Error("BlendTab_Translucent: input table was NULL!");
 
 	for (bg = 0; bg < 0x100; bg++)
 	{
+		backrgba = pGammaCorrectedPalette[bg];
+
 		for (fg = 0; fg < 0x100; fg++)
 		{
-			RGBA_t backrgba = V_GetColor(bg);
-			RGBA_t frontrgba = V_GetColor(fg);
-			RGBA_t result;
+			frontrgba = pGammaCorrectedPalette[fg];
 
+#if 0 // perfect implementation
 			result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
 			result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
-
 			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+#else // performance scrabbler
+			result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
+			result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
+			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut_corrected, result.s.red, result.s.green, result.s.blue); // pGammaCorrectedPalette
+#endif
 		}
 	}
 }
@@ -224,7 +233,7 @@ static void BlendTab_Modulative(UINT8 *table)
 			RGBA_t frontrgba = V_GetColor(fg);
 			RGBA_t result;
 			result.rgba = ASTBlendPixel(backrgba, frontrgba, AST_MODULATE, 0);
-			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut_corrected, result.s.red, result.s.green, result.s.blue);
 		}
 	}
 }
@@ -278,11 +287,12 @@ void R_GenerateBlendTables(void)
 	size_t palsize = 256 * sizeof(RGBA_t);
 
 	state->LocalPalette = static_cast<RGBA_t *>(memcpy(malloc(palsize), pLocalPalette, palsize));
+	state->gammaCorrectedPalette = static_cast<RGBA_t *>(memcpy(malloc(palsize), pGammaCorrectedPalette, palsize));
 
 	I_spawn_thread("blend-tables",
 			R_GenerateBlendTables_Thread, state);
 #else
-	struct GenerateBlendTables_State state = {pLocalPalette};
+	struct GenerateBlendTables_State state = {pLocalPalette, pGammaCorrectedPalette};
 	R_GenerateBlendTables_Core(&state);
 #endif
 }
@@ -290,6 +300,7 @@ void R_GenerateBlendTables(void)
 static void R_GenerateBlendTables_Core(struct GenerateBlendTables_State *state)
 {
 	InitColorLUT(&transtab_lut, state->LocalPalette, false);
+	InitColorLUT(&transtab_lut_corrected, state->gammaCorrectedPalette, false);
 
 	// Additive
 	BlendTab_GenerateMaps(blendtab_add, AST_ADD, BlendTab_Translucent);
@@ -655,7 +666,7 @@ void R_VideoErase(size_t ofs, INT32 count)
 	//  is not optimal, e.g. byte by byte on
 	//  a 32bit CPU, as GNU GCC/Linux libc did
 	//  at one point.
-	M_Memcpy(vid.screens[0] + ofs, vid.screens[1] + ofs, count);
+	memcpy(vid.screens[0] + ofs, vid.screens[1] + ofs, count);
 }
 
 // ==========================================================================

src/r_draw_column.cpp

@@ -260,7 +260,7 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 					// texture has no height, so just go
 					while (--count >= 0)
 					{
-						*dest = R_DrawColumnPixel<Type>(dc, dest, frac>>FRACBITS, source, colormap);
+						*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS), source, colormap);
 
 						dest += stride;
 						frac += fracstep;

src/r_draw_span.cpp

@@ -28,6 +28,8 @@
 #include <vector>
 #include <algorithm>
 
+#include "cxxutil.hpp"
+
 // ==========================================================================
 // SPANS
 // ==========================================================================
@@ -208,15 +210,15 @@ static void R_CalcTiltedLighting(std::vector<INT32>& lightbuffer, INT32 x1, INT3
 
 	for (i = x1; i <= x2; i++)
 	{
-		fixed_t light = start >> FRACBITS;
+		const 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 int width, const INT32 stride)
+static void R_GetTiltedLighting(std::vector<INT32>& tiltlighting, const drawspandata_t* ds, const float iz, const INT32 width, const INT32 stride)
 {
-	float planelightfloat = PLANELIGHTFLOAT;
+	const float planelightfloat = PLANELIGHTFLOAT;
 	const fixed_t lightstart = FloatToFixed(iz * planelightfloat);
 	const fixed_t lightend   = FloatToFixed((iz + ds->szp.x * width) * planelightfloat);
 
@@ -232,7 +234,7 @@ static void R_GetTiltedLighting(std::vector<INT32>& tiltlighting, const drawspan
 template<DrawSpanType Type>
 static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 {
-	int width = ds->x2 - ds->x1;
+	INT32 width = ds->x2 - ds->x1;
 	float iz, uz, vz;
 	UINT32 u, v;
 	int i;
@@ -246,7 +248,6 @@ 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;
@@ -263,6 +264,11 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 	const UINT8 * restrict source = ds->source;
 	const UINT8 * restrict colormap = ds->colormap;
 
+	const ptrdiff_t colormap_diff = (colormap - colormaps);
+
+	const INT32 * restrict tiltlight = tiltlighting.data();
+	lighttable_t * const * restrict planezlight = ds->planezlight;
+
 	if constexpr (Type & DS_RIPPLE)
 	{
 		dsrc = vid.screens[1] + (ds->y + ds->bgofs) * stride + ds->x1;
@@ -300,7 +306,6 @@ 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)
@@ -312,17 +317,17 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 		endz = 1.f/iz;
 		endu = uz*endz;
 		endv = vz*endz;
-		stepu = (INT64)((endu - startu) * INVSPAN);
-		stepv = (INT64)((endv - startv) * INVSPAN);
-		u = (INT64)(startu);
-		v = (INT64)(startv);
+		stepu = srb2::floattoint<float, INT64>((endu - startu) * INVSPAN);
+		stepv = srb2::floattoint<float, INT64>((endv - startv) * INVSPAN);
+		u = srb2::floattoint<float, INT64>(startu);
+		v = srb2::floattoint<float, INT64>(startv);
 
-		x1 = ds->x1;
+		const INT32 x1 = ds->x1;
 
 		for (i = 0; i < SPANSIZE; i++)
 		{
 			bit = (((v + stepv * i) >> nflatyshift) & nflatmask) | ((u + stepu * i) >> nflatxshift);
-			colormap = ds->planezlight[tiltlighting[x1 + i]] + (ds->colormap - colormaps);
+			colormap = planezlight[tiltlight[x1 + i]] + colormap_diff;
 			if constexpr (Type & DS_RIPPLE)
 				dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
 			else
@@ -342,10 +347,10 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 	{
 		if (width == 1)
 		{
-			u = (INT64)(startu);
-			v = (INT64)(startv);
+			u = srb2::floattoint<float, INT64>(startu);
+			v = srb2::floattoint<float, INT64>(startv);
 			bit = ((v >> nflatyshift) & nflatmask) | (u >> nflatxshift);
-			colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps);
+			colormap = planezlight[tiltlight[ds->x1]] + colormap_diff;
 			if constexpr (Type & DS_RIPPLE)
 				*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
 			else
@@ -363,15 +368,15 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
 			endu = uz*endz;
 			endv = vz*endz;
 			left = 1.f/left;
-			stepu = (INT64)((endu - startu) * left);
-			stepv = (INT64)((endv - startv) * left);
-			u = (INT64)(startu);
-			v = (INT64)(startv);
+			stepu = srb2::floattoint<float, INT64>((endu - startu) * left);
+			stepv = srb2::floattoint<float, INT64>((endv - startv) * left);
+			u = srb2::floattoint<float, INT64>(startu);
+			v = srb2::floattoint<float, INT64>(startv);
 
 			for (; width != 0; width--)
 			{
 				bit = ((v >> ds->nflatyshift) & ds->nflatmask) | (u >> ds->nflatxshift);
-				colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps);
+				colormap = planezlight[tiltlight[ds->x1]] + colormap_diff;
 				if constexpr (Type & DS_RIPPLE)
 					*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
 				else
@@ -410,7 +415,7 @@ DEFINE_SPAN_COMBO(R_DrawTranslucentWaterSpan, DS_TRANSMAP|DS_RIPPLE)
 */
 void R_DrawFogSpan(drawspandata_t* ds)
 {
-	INT32 count = ds->x2 - ds->x1 + 1;
+	intptr_t count = ds->x2 - ds->x1 + 1;
 
 	const UINT8 * restrict colormap = ds->colormap;
 	UINT8 * restrict dest = R_Address(ds->x1, ds->y);
@@ -435,20 +440,23 @@ void R_DrawFogSpan(drawspandata_t* ds)
 
 void R_DrawFogSpan_Tilted(drawspandata_t* ds)
 {
-	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);
+	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);
+
+	local_for_thread std::vector<INT32> tiltlighting;
 
 	// 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 = ds->planezlight[tiltlighting[ds->x1++]] + (ds->colormap - colormaps);
+		UINT8 *colormap = planezlight[tiltlight[ds->x1++]] + colormap_diff;
 		*dest = colormap[*dest];
 		dest++;
 	}

src/r_main.cpp

@@ -49,54 +49,54 @@
 // increment every time a check is made
 size_t validcount = 1;
 
-INT32 centerx, centery;
+INT32 centerx = 0, centery = 0;
 
-fixed_t centerxfrac, centeryfrac;
-fixed_t projection;
-fixed_t projectiony; // aspect ratio
-fixed_t fovtan; // field of view
+fixed_t centerxfrac = 0, centeryfrac = 0;
+fixed_t projection = 0;
+fixed_t projectiony = 0; // aspect ratio
+fixed_t fovtan = 0; // field of view
 
 // just for profiling purposes
-size_t framecount;
+size_t framecount = 0;
 
-size_t loopcount;
+size_t loopcount = 0;
 
-fixed_t viewx, viewy, viewz;
-angle_t viewangle, aimingangle, viewroll;
+fixed_t viewx = 0, viewy = 0, viewz = 0;
+angle_t viewangle = 0, aimingangle = 0, viewroll = 0;
 UINT8 viewssnum = 0;
-fixed_t viewcos, viewsin;
-boolean skyVisible;
-boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible for each splitscreen player
-sector_t *viewsector;
-player_t *viewplayer;
+fixed_t viewcos = 0, viewsin = 0;
+boolean skyVisible = 0;
+boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS] = {}; // saved values of skyVisible for each splitscreen player
+sector_t *viewsector = NULL;
+player_t *viewplayer = NULL;
 
-fixed_t renderdeltatics;
-boolean renderisnewtic;
+fixed_t renderdeltatics = 0;
+boolean renderisnewtic = true;
 
 //
 // precalculated math tables
 //
-angle_t clipangle;
-angle_t doubleclipangle;
+angle_t clipangle = 0;
+angle_t doubleclipangle = 0;
 
 // The viewangletox[viewangle + FINEANGLES/4] lookup
 // maps the visible view angles to screen X coordinates,
 // flattening the arc to a flat projection plane.
 // There will be many angles mapped to the same X.
-INT32 viewangletox[FINEANGLES/2];
+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;
 
-lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-lighttable_t *scalelightfixed[MAXLIGHTSCALE];
-lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
+lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE] = {};
+lighttable_t *scalelightfixed[MAXLIGHTSCALE] = {};
+lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ] = {};
 
 // Hack to support extra boom colormaps.
-size_t num_extra_colormaps;
-extracolormap_t extra_colormaps[MAXCOLORMAPS];
+size_t num_extra_colormaps = 0;
+extracolormap_t extra_colormaps[MAXCOLORMAPS] = {};
 
 // Performance stats
 precise_t ps_prevframetime = 0;
@@ -187,7 +187,7 @@ consvar_t cv_shadowoffs      = {"offsetshadows", "Off", CV_SAVE, CV_OnOff, NULL,
 consvar_t cv_skybox          = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_ffloorclip      = {"r_ffloorclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_spriteclip      = {"r_spriteclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_softcyancut     = {"softwarecyancut", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_softcyancut     = {"softwarecyancut", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_translucency    = {"translucency", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_drawdist        = {"drawdist", "Infinite", CV_SAVE, drawdist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_drawdist_precip = {"drawdist_precip", "1024", CV_SAVE|CV_CALL|CV_NOINIT, drawdist_precip_cons_t, Precipstuff_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -253,6 +253,7 @@ void SplitScreen_OnChange(void)
 			if (playeringame[i] && i != consoleplayer)
 			{
 				UINT8 j;
+
 				for (j = 1; j < MAXSPLITSCREENPLAYERS; j++)
 				{
 					if (displayplayers[j] == consoleplayer)
@@ -268,6 +269,7 @@ void SplitScreen_OnChange(void)
 		}
 	}
 }
+
 static void Fov_OnChange(void)
 {
 	R_SetViewSize();
@@ -943,9 +945,10 @@ 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;

src/r_patch.cpp

@@ -46,13 +46,14 @@ 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);
 	}
-	else
-		frameChar = sprinfoToken;
+
+	frameChar = sprinfoToken;
 
 	frameFrame = R_Char2Frame(frameChar[0]);
 	Z_Free(sprinfoToken);
@@ -61,53 +62,53 @@ static void R_ParseSpriteInfoFrame(spriteinfo_t *info)
 	sprinfoToken = M_GetToken(NULL);
 	if (sprinfoToken == NULL)
 		I_Error("Error parsing SPRTINFO lump: Missing sprite info");
-	else
+
+	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 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 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");
-				}
+				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;
@@ -137,6 +138,7 @@ 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)
 	{
@@ -145,10 +147,11 @@ static void R_ParseSpriteInfo(boolean spr2)
 	else
 	{
 		memset(&newSpriteName, 0, 5);
-		M_Memcpy(newSpriteName, sprinfoToken, sprinfoTokenLength);
+		memcpy(newSpriteName, sprinfoToken, sprinfoTokenLength);
 		// ^^ 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)
@@ -157,7 +160,8 @@ 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);
 				break;
@@ -175,17 +179,20 @@ 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 (strcmp(sprinfoToken,"{")==0)
+
+	if (fastcmp(sprinfoToken, "{"))
 	{
 		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 (strcmp(sprinfoToken,"}")!=0)
+
+		while (!fastcmp(sprinfoToken, "}"))
 		{
-			if (stricmp(sprinfoToken, "SKIN")==0)
+			if (fasticmp(sprinfoToken, "SKIN"))
 			{
 				INT32 skinnum;
 				char *skinName = NULL;
@@ -204,7 +211,7 @@ static void R_ParseSpriteInfo(boolean spr2)
 				// copy skin name yada yada
 				sprinfoTokenLength = strlen(sprinfoToken);
 				skinName = (char *)Z_Malloc((sprinfoTokenLength+1)*sizeof(char),PU_STATIC,NULL);
-				M_Memcpy(skinName,sprinfoToken,sprinfoTokenLength*sizeof(char));
+				memcpy(skinName,sprinfoToken,sprinfoTokenLength*sizeof(char));
 				skinName[sprinfoTokenLength] = '\0';
 				strlwr(skinName);
 				Z_Free(sprinfoToken);
@@ -216,10 +223,11 @@ static void R_ParseSpriteInfo(boolean spr2)
 				skinnumbers[foundskins] = skinnum;
 				foundskins++;
 			}
-			else if (stricmp(sprinfoToken, "FRAME")==0)
+			else if (fasticmp(sprinfoToken, "FRAME"))
 			{
 				R_ParseSpriteInfoFrame(info);
 				Z_Free(sprinfoToken);
+
 				if (spr2)
 				{
 					if (!foundskins)
@@ -232,11 +240,11 @@ static void R_ParseSpriteInfo(boolean spr2)
 							skin = &localskins[allskins[skinnum].localnum];
 						else
 							skin = &skins[allskins[skinnum].localnum];
-						M_Memcpy(&skin->sprinfo, info, sizeof(spriteinfo_t));
+						memcpy(&skin->sprinfo, info, sizeof(spriteinfo_t));
 					}
 				}
 				else
-					M_Memcpy(&spriteinfo[sprnum], info, sizeof(spriteinfo_t));
+					memcpy(&spriteinfo[sprnum], info, sizeof(spriteinfo_t));
 			}
 			else
 			{
@@ -254,6 +262,7 @@ 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);
 }
@@ -291,15 +300,18 @@ void R_ParseSPRTINFOLump(UINT16 wadNum, UINT16 lumpNum)
 	while (sprinfoToken != NULL)
 	{
 		CONS_Printf("Attempting to parse le SPRTINFO lump for ya..\n");
-		if (!stricmp(sprinfoToken, "SPRITE"))
+
+		if (fasticmp(sprinfoToken, "SPRITE"))
 			R_ParseSpriteInfo(false);
-		else if (!stricmp(sprinfoToken, "SPRITE2"))
+		else if (fasticmp(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);
 }
 
@@ -359,7 +371,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
 			I_Error("Patch_Create: no column data!");
 
 		patch->columns = static_cast<UINT8*>(Z_Calloc(colsize, PU_PATCH_DATA, NULL));
-		M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize);
+		memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize);
 	}
 
 	return patch;

src/r_patchrotation.cpp

@@ -23,8 +23,8 @@
 //
 // Angles precalculated in R_InitSprites.
 //
-fixed_t rollcosang[ROTANGLES];
-fixed_t rollsinang[ROTANGLES];
+fixed_t rollcosang[ROTANGLES] = {};
+fixed_t rollsinang[ROTANGLES] = {};
 
 INT32 R_GetRollAngle(angle_t rollangle)
 {
@@ -241,7 +241,7 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
 
 		while (dy--)
 		{
-			M_Memcpy(dest, src, width * sizeof(UINT16));
+			memcpy(dest, src, width * sizeof(UINT16));
 			dest += width;
 			src += newwidth;
 		}

src/r_plane.cpp

@@ -720,7 +720,7 @@ void R_DrawPlanes(void)
 	srb2::ThreadPool::Sema tp_sema;
 	srb2::g_main_threadpool->begin_sema();
 #endif
-	for (i = 0; i < MAXVISPLANES; i++, pl++)
+	for (i = 0; i < MAXVISPLANES; i++)
 	{
 		for (pl = visplanes[i]; pl; pl = pl->next)
 		{
@@ -755,7 +755,7 @@ void R_DrawSkyPlanes(void)
 	srb2::ThreadPool::Sema tp_sema;
 	srb2::g_main_threadpool->begin_sema();
 #endif
-	for (i = 0; i < MAXVISPLANES; i++, pl++)
+	for (i = 0; i < MAXVISPLANES; i++)
 	{
 		for (pl = visplanes[i]; pl; pl = pl->next)
 		{

src/r_portal.c

@@ -21,16 +21,16 @@
 #include "r_things.h"
 #include "r_sky.h"
 
-UINT8 portalrender;			/**< When rendering a portal, it establishes the depth of the current BSP traversal. */
+UINT8 portalrender = 0; /**< When rendering a portal, it establishes the depth of the current BSP traversal. */
 
 // Linked list for portals.
-portal_t *portal_base, *portal_cap;
+portal_t *portal_base = NULL, *portal_cap = NULL;
 
-line_t *portalclipline;
-sector_t *portalcullsector;
-INT32 portalclipstart, portalclipend;
+line_t *portalclipline = NULL;
+sector_t *portalcullsector = NULL;
+INT32 portalclipstart = 0, portalclipend = 0;
 
-portal_t *g_portal; // is curline a portal seg?
+portal_t *g_portal = NULL; // is curline a portal seg?
 
 void Portal_InitList (void)
 {

src/r_segs.cpp

@@ -30,6 +30,8 @@
 
 #include "core/memory.h"
 
+#include "cxxutil.hpp"
+
 #define HEIGHTBITS              12
 #define HEIGHTUNIT              (1<<HEIGHTBITS)
 
@@ -45,10 +47,10 @@ static INT32 toptexture, bottomtexture, midtexture;
 static bool topremap, bottomremap, midremap;
 static INT32 numthicksides, numbackffloors;
 
-angle_t rw_normalangle;
+angle_t rw_normalangle = 0;
 // angle to line origin
-angle_t rw_angle1;
-fixed_t rw_distance;
+angle_t rw_angle1 = 0;
+fixed_t rw_distance = 0;
 
 //
 // regular wall
@@ -1718,7 +1720,7 @@ static void R_AllocClippingTables(size_t range)
 	{
 		// Check if it's in range of the openings
 #define CHECK(which) \
-		if (which + drawseg->x1 >= oldopenings && which + drawseg->x1 <= oldlast) \
+		if (which != NULL && which + drawseg->x1 >= oldopenings && which + drawseg->x1 <= oldlast) \
 			which = (which - oldopenings) + openings
 		CHECK(drawseg->sprtopclip);
 		CHECK(drawseg->sprbottomclip);
@@ -1752,7 +1754,7 @@ static void R_AllocTextureColumnTables(size_t range)
 	{
 		// Check if it's in range of the tables
 #define CHECK(which) \
-		if (which + drawseg->x1 >= oldtable && which + drawseg->x1 <= oldlast) \
+		if (which != NULL && which + drawseg->x1 >= oldtable && which + drawseg->x1 <= oldlast) \
 			which = (which - oldtable) + texturecolumntable
 		CHECK(drawseg->maskedtexturecol);
 		CHECK(drawseg->thicksidecol);
@@ -1890,8 +1892,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 		det = a1*b2 - a2*b1;
 
-		ds_p->leftpos.x = segleft.x = DoubleToFixed((b2*c1 - b1*c2)/det);
-		ds_p->leftpos.y = segleft.y = DoubleToFixed((a1*c2 - a2*c1)/det);
+		ds_p->leftpos.x = segleft.x = srb2::floattofixed<double>((b2*c1 - b1*c2)/det);
+		ds_p->leftpos.y = segleft.y = srb2::floattofixed<double>((a1*c2 - a2*c1)/det);
 
 		// right
 		temp = xtoviewangle[stop]+viewangle;
@@ -1902,8 +1904,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 		det = a1*b2 - a2*b1;
 
-		ds_p->rightpos.x = segright.x = DoubleToFixed((b2*c1 - b1*c2)/det);
-		ds_p->rightpos.y = segright.y = DoubleToFixed((a1*c2 - a2*c1)/det);
+		ds_p->rightpos.x = segright.x = srb2::floattofixed<double>((b2*c1 - b1*c2)/det);
+		ds_p->rightpos.y = segright.y = srb2::floattofixed<double>((a1*c2 - a2*c1)/det);
 	}
 
 #define SLOPEPARAMS(slope, end1, end2, normalheight) \
@@ -3001,14 +3003,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 		if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
 		{
-			M_Memcpy(lastopening, ceilingclip + start, 2*(rw_stopx - start));
+			memcpy(lastopening, ceilingclip + start, 2*(rw_stopx - start));
 			ds_p->sprtopclip = lastopening - start;
 			lastopening += rw_stopx - start;
 		}
 
 		if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture) && !ds_p->sprbottomclip)
 		{
-			M_Memcpy(lastopening, floorclip + start, 2*(rw_stopx - start));
+			memcpy(lastopening, floorclip + start, 2*(rw_stopx - start));
 			ds_p->sprbottomclip = lastopening - start;
 			lastopening += rw_stopx - start;
 		}

src/r_skins.c

@@ -33,7 +33,7 @@
 
 #include "qs22j.h"
 
-CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2];
+CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2] = {}; // huehuehuehuehue
 
 #include "discord.h"
 
@@ -41,6 +41,7 @@ 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},
@@ -53,15 +54,16 @@ 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];
+
+UINT8 skinsorted[MAXSKINS] = {};
+skin_t localskins[MAXLOCALSKINS] = {};
+skin_t allskins[MAXSKINS+MAXLOCALSKINS] = {};
 
 // FIXTHIS: don't work because it must be inistilised before the config load
 //#define SKINVALUES
 #ifdef SKINVALUES
-CV_PossibleValue_t skin_cons_t[MAXSKINS+1];
-CV_PossibleValue_t localskin_cons_t[MAXLOCALSKINS+1];
+CV_PossibleValue_t skin_cons_t[MAXSKINS+1] = {};
+CV_PossibleValue_t localskin_cons_t[MAXLOCALSKINS+1] = {};
 #endif
 
 static void Sk_SetDefaultValue(skin_t *skin, boolean local)
@@ -70,13 +72,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;
+	skin->wadnum = INT16_MAX;
+
+	strcpy(skin->sprite, "");
 
 	strcpy(skin->realname, "Someone");
 	strcpy(skin->hudname, "???");
@@ -95,8 +98,12 @@ static void Sk_SetDefaultValue(skin_t *skin, boolean local)
 	skin->highresscale = FRACUNIT>>1;
 
 	for (i = 0; i < sfx_skinsoundslot0; i++)
-		if (S_sfx[i].skinsound != -1)
-			skin->soundsid[S_sfx[i].skinsound] = i;
+	{
+		const INT32 skinsound = S_sfx[i].skinsound;
+
+		if (skinsound != -1)
+			skin->soundsid[skinsound] = i;
+	}
 }
 
 //
@@ -124,6 +131,7 @@ void R_InitSkins(void)
 	skin = &skins[0];
 	numskins = 1;
 	Sk_SetDefaultValue(skin, false);
+
 	memset(skinstats, 0, sizeof(skinstats));
 	memset(skinsorted, 0, sizeof(skinsorted));
 
@@ -132,13 +140,16 @@ 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;
@@ -177,9 +188,10 @@ INT32 R_SkinAvailable(const char *name)
 
 	for (i = 0; i < numskins; i++)
 	{
-		if (stricmp(skins[i].name,name) == 0)
+		if (fasticmp(skins[i].name, name))
 			return i;
 	}
+
 	return -1;
 }
 
@@ -191,9 +203,10 @@ INT32 R_AnySkinAvailable(const char *name)
 
 	for (i = 0; i < numallskins; i++)
 	{
-		if (stricmp(allskins[i].name,name) == 0)
+		if (fasticmp(allskins[i].name, name))
 			return i;
 	}
+
 	return -1;
 }
 
@@ -205,32 +218,32 @@ INT32 R_LocalSkinAvailable(const char *name, boolean local)
 	{
 		for (i = 0; i < numlocalskins; i++)
 		{
-			if (stricmp(localskins[i].name,name) == 0)
+			if (fasticmp(localskins[i].name, name))
 				return i;
 		}
+
 		return -1;
 	}
-	else
-		return R_SkinAvailable(name);
+
+	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 (stricmp(skins[i].name, skinname) == 0)
+		if (fasticmp(skins[i].name, skinname))
 		{
 			SetPlayerSkinByNum(playernum, i);
 			return true;
 		}
 	}
 
-	if (P_IsLocalPlayer(player))
+	if (P_IsLocalPlayer(&players[playernum]))
 		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);
@@ -244,15 +257,16 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
 	INT32 i;
 	player_t *player = &players[playernum];
 
-	if (stricmp(skinname, "none"))
+	if (!fasticmp(skinname, "none"))
 	{
 		for (i = 0; i < numlocalskins; i++)
 		{
 			// search in the localskin list
-			if (stricmp(localskins[i].name, skinname) == 0)
+			if (fasticmp(localskins[i].name, skinname))
 			{
 				player->localskin = 1 + i;
 				player->skinlocal = true;
+
 				if (player->mo)
 				{
 					player->mo->localskin = &localskins[i];
@@ -266,10 +280,11 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
 		for (i = 0; i < numskins; i++)
 		{
 			// search in the skin list
-			if (stricmp(skins[i].name, skinname) == 0)
+			if (fasticmp(skins[i].name, skinname))
 			{
 				player->localskin = 1 + i;
 				player->skinlocal = false;
+
 				if (player->mo)
 				{
 					player->mo->localskin = &skins[i];
@@ -284,6 +299,7 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
 	{
 		player->localskin = 0;
 		player->skinlocal = false;
+
 		if (player->mo)
 		{
 			player->mo->localskin = 0;
@@ -318,6 +334,7 @@ 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;
 
@@ -360,117 +377,97 @@ 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
 {
-	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);
+	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];
 
-	//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
-			if ((temp = strcmp(in1->realname, in2->realname)))
-				return temp;
-			// sort by internal name
-			return strcmp(in1->name, in2->name);
-			break;
+			diff = strcmp(in1->realname, in2->realname);
+			if (diff != 0) return diff;
 
-		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");
+			// CONS_Printf("Sorting by speed\n");
 			// check speed
-			if (in1->kartspeed < in2->kartspeed)
-				return -1;
-			else if (in2->kartspeed < in1->kartspeed)
-				return 1;
+			diff = in1->kartspeed - in2->kartspeed;
+			if (diff != 0) return diff;
+
 			// 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;
+			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");
+			// CONS_Printf("Sorting by weight\n");
 			// check weight
-			if (in1->kartweight < in2->kartweight)
-				return -1;
-			else if (in2->kartweight < in1->kartweight)
-				return 1;
+			diff = in1->kartweight - in2->kartweight;
+			if (diff != 0) return diff;
+
 			// 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;
+			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");
+			// CONS_Printf("Sorting by prefcolor\n");
 			// check prefcolor
-			if (in1->prefcolor < in2->prefcolor)
-				return -1;
-			else if (in2->prefcolor < in1->prefcolor)
-				return 1;
+			diff = in1->prefcolor - in2->prefcolor;
+			if (diff != 0) return diff;
+
 			// then check name
-			if ((temp = strcmp(in1->realname, in2->realname)))
-				return temp;
-			// sort by internal name
-			return strcmp(in1->name, in2->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
-
-			if (val_a == val_b)
-				return 0;
-			else if (val_a < val_b)
-				return -1;
-			else
-				return 1;
-
+			// 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:
 		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
+
+	// 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
 	return strcmp(in1->name, in2->name);
 }
 
@@ -523,7 +520,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 		buf2 = malloc(size+1);
 		if (!buf2)
 			I_Error("R_AddSkins: No more free memory\n");
-		M_Memcpy(buf2,buf,size);
+		memcpy(buf2,buf,size);
 		buf2[size] = '\0';
 
 		// set defaults
@@ -531,8 +528,9 @@ 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] == '/')
@@ -548,7 +546,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 (!stricmp(stoken, "name"))
+			if (fasticmp(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'
@@ -562,18 +560,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);
 				}
 
@@ -589,115 +587,134 @@ 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 (!stricmp(stoken, "realname"))
+			else if (fasticmp(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 (!stricmp(stoken, "hudname"))
+			else if (fasticmp(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 (!stricmp(stoken, "sprite"))
+			else if (fasticmp(stoken, "sprite"))
 			{
 				strupr(value);
 				memcpy(skin->sprite, value, sizeof skin->sprite);
 			}
-			else if (!stricmp(stoken, "facerank"))
+			else if (fasticmp(stoken, "facerank"))
 			{
 				strupr(value);
 				memcpy(skin->facerank, value, sizeof(skin->facerank)-1);
 				skin->facerank[sizeof(skin->facerank)-1] = '\0';
 			}
-			else if (!stricmp(stoken, "facewant"))
+			else if (fasticmp(stoken, "facewant"))
 			{
 				strupr(value);
 				memcpy(skin->facewant, value, sizeof(skin->facewant)-1);
 				skin->facewant[sizeof(skin->facewant)-1] = '\0';
 			}
-			else if (!stricmp(stoken, "facemmap"))
+			else if (fasticmp(stoken, "facemmap"))
 			{
 				strupr(value);
 				strncpy(skin->facemmap, value, sizeof(skin->facemmap)-1);
 				skin->facemmap[sizeof(skin->facemmap)-1] = '\0';
 			}
-			else if (!stricmp(stoken, "flags")) // character type identification
+			else if (fasticmp(stoken, "flags")) // character type identification
 			{
 				skin->flags = get_number(value);
 			}
-			else if (!stricmp(stoken, "kartspeed"))
+			else if (fasticmp(stoken, "kartspeed"))
 			{
 				skin->kartspeed = atoi(value);
+
 				if (skin->kartspeed < 1)
 					skin->kartspeed = 1;
 				if (skin->kartspeed > 9)
 					skin->kartspeed = 9;
 			}
-			else if (!stricmp(stoken, "kartweight"))
+			else if (fasticmp(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 (!stricmp(stoken, "startcolor"))
+			else if (fasticmp(stoken, "startcolor"))
+			{
 				skin->starttranscolor = atoi(value);
-			else if (!stricmp(stoken, "prefcolor"))
+			}
+			else if (fasticmp(stoken, "prefcolor"))
+			{
 				skin->prefcolor = K_GetKartColorByName(value);
-			else if (!stricmp(stoken, "highresscale"))
+			}
+			else if (fasticmp(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++)
 				{
-					if (!S_sfx[i].name)
+					const sfxinfo_t *sfx = &S_sfx[i];
+
+					if (!sfx->name)
 						continue;
-					if (S_sfx[i].skinsound != -1
-						&& !stricmp(S_sfx[i].name,
-							stoken + 2))
+
+					if (sfx->skinsound != -1
+					&& fasticmp(sfx->name, stoken + 2))
 					{
-						skin->soundsid[S_sfx[i].skinsound] =
-							S_AddSoundFx(value+2, S_sfx[i].singularity, S_sfx[i].pitch, true);
+						skin->soundsid[sfx->skinsound] = S_AddSoundFx(value+2, sfx->singularity, sfx->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);
 		}
@@ -707,12 +724,15 @@ 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)
 				{
-					found = true;
 					skin->spritedef = sprites[name];
+					found = true;
 				}
+			}
 
 			// not found so make a new one
 			// go through the entire current wad looking for our sprite
@@ -726,7 +746,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;
@@ -741,6 +761,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 						}
 						// If not already set do nothing
 					}
+
 					++localllump;
 				}
 
@@ -760,7 +781,6 @@ 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_sky.c

@@ -22,8 +22,6 @@
 #include "w_wad.h"
 #include "z_zone.h"
 
-#include "p_maputl.h" // P_PointOnLineSide
-
 //
 // sky mapping
 //
@@ -31,28 +29,28 @@
 /**	\brief Needed to store the number of the dummy sky flat.
 	Used for rendering, as well as tracking projectiles etc.
 */
-INT32 skyflatnum;
+INT32 skyflatnum = 0;
 
 /**	\brief the lump number of the sky texture
 */
-INT32 skytexture;
+INT32 skytexture = 0;
 
 /**	\brief the horizon line in a 256x128 sky texture
 */
-INT32 skytexturemid;
+INT32 skytexturemid = 0;
 
 /**	\brief the x offset of the sky texture
  */
-INT32 skytextureoffset;
+INT32 skytextureoffset = 0;
 
 /**	\brief the scale of the sky
 */
-fixed_t skyscale;
+fixed_t skyscale = 0;
 
 /** \brief used for keeping track of the current sky
 */
-INT32 levelskynum;
-INT32 globallevelskynum;
+INT32 levelskynum = 0;
+INT32 globallevelskynum = 0;
 
 
 /**	\brief	The R_SetupSkyDraw function

src/r_things.cpp

@@ -95,15 +95,15 @@ static INT32 drawsegs_xrange_count = 0;
 // There was a lot of stuff grabbed wrong, so I changed it...
 //
 
-spriteinfo_t spriteinfo[NUMSPRITES];
+spriteinfo_t spriteinfo[NUMSPRITES] = {};
 
 //
 // INITIALIZATION FUNCTIONS
 //
 
 // variables used to look up and range check thing_t sprites patches
-spritedef_t *sprites;
-size_t numsprites;
+spritedef_t *sprites = NULL;
+size_t numsprites = 0;
 
 static spriteframe_t sprtemp[64];
 static size_t maxframe;
@@ -112,7 +112,7 @@ static const char *spritename;
 //
 // GAME FUNCTIONS
 //
-UINT32 visspritecount, numvisiblesprites;
+UINT32 visspritecount = 0, numvisiblesprites = 0;
 
 static UINT32 clippedvissprites;
 static vissprite_t *visspritechunks[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {NULL};
@@ -267,7 +267,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
 	if (spritedef->numframes) // (then spriteframes is not null)
 	{
 		// copy the already defined sprite frames
-		M_Memcpy(sprtemp, spritedef->spriteframes,
+		memcpy(sprtemp, spritedef->spriteframes,
 		 spritedef->numframes * sizeof (spriteframe_t));
 		maxframe = spritedef->numframes - 1;
 	}
@@ -403,7 +403,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
 		spritedef->spriteframes = static_cast<spriteframe_t*>(Z_Malloc(maxframe * sizeof (*spritedef->spriteframes), PU_STATIC, NULL));
 
 	spritedef->numframes = maxframe;
-	M_Memcpy(spritedef->spriteframes, sprtemp, maxframe*sizeof (spriteframe_t));
+	memcpy(spritedef->spriteframes, sprtemp, maxframe*sizeof (spriteframe_t));
 
 	return true;
 }
@@ -1019,7 +1019,7 @@ static void R_SplitSprite(vissprite_t *sprite)
 		INT16 *cliptop = newsprite->cliptop;
 		INT16 *clipbot = newsprite->clipbot;
 
-		M_Memcpy(newsprite, sprite, sizeof (vissprite_t));
+		memcpy(newsprite, sprite, sizeof (vissprite_t));
 
 		newsprite->cliptop = cliptop;
 		newsprite->clipbot = clipbot;

src/s_sound.c

@@ -45,7 +45,7 @@ static void Command_ShowMusicCredit_f(void);
 static void GameSounds_OnChange(void);
 static void GameMusic_OnChange(void);
 
-static void SoundPrecache_OnChange(void);
+static void SoundCache_OnChange(void);
 static void BufferSize_OnChange(void);
 
 #ifdef HAVE_OPENMPT
@@ -68,7 +68,8 @@ consvar_t cv_audbuffersize = {"audiobuffersize", "2048", CV_SAVE|CV_CALL, audbuf
 consvar_t stereoreverse = {"stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 // if true, all sounds are loaded at game startup
-consvar_t precachesound = {"precachesound", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, SoundPrecache_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t cachesounds_cons_t[] = {{0, "Off"}, {1, "Keep"}, {2, "On"}, {0, NULL}};
+consvar_t cv_cachesound = {"cachesound", "1", CV_SAVE|CV_CALL|CV_NOINIT, cachesounds_cons_t, SoundCache_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 // actual general (maximum) sound & music volume, saved into the config
 static CV_PossibleValue_t soundvolume_cons_t[] = {{0, "MIN"}, {31, "MAX"}, {0, NULL}};
@@ -274,7 +275,7 @@ void S_RegisterSoundStuff(void)
 	}
 
 	CV_RegisterVar(&stereoreverse);
-	CV_RegisterVar(&precachesound);
+	CV_RegisterVar(&cv_cachesound);
 #if defined(HAVE_SDL) && SOUND==SOUND_SDL
 	CV_RegisterVar(&cv_samplerate);
 #endif
@@ -362,9 +363,15 @@ boolean S_SoundDisabled(void)
 	return (sound_disabled || (window_notinfocus && !cv_playsoundifunfocused.value));
 }
 
-boolean S_PrecacheSound(void)
+int S_CacheSound(void)
 {
-	return (!sound_disabled && (M_CheckParm("-precachesound") || precachesound.value));
+	if (sound_disabled)
+		return SOUNDCACHE_OFF;
+
+	if (M_CheckParm("-precachesound"))
+		return SOUNDCACHE_PRECACHE;
+
+	return cv_cachesound.value;
 }
 
 // Stop all sounds, load level info, THEN start sounds.
@@ -1095,9 +1102,12 @@ void S_StartSoundName(void *mo, const char *soundname)
 	// Search existing sounds...
 	for (i = sfx_None + 1; i < NUMSFX; i++)
 	{
-		if (!S_sfx[i].name)
+		const sfxinfo_t *sfx = &S_sfx[i];
+
+		if (!sfx->name)
 			continue;
-		if (!stricmp(S_sfx[i].name, soundname))
+
+		if (fasticmp(sfx->name, soundname))
 		{
 			soundnum = i;
 			break;
@@ -1110,6 +1120,7 @@ void S_StartSoundName(void *mo, const char *soundname)
 		{
 			if (newsounds[i] == 0)
 				break;
+
 			if (!S_IdPlaying(newsounds[i]))
 			{
 				S_RemoveSoundFx(newsounds[i]);
@@ -1146,28 +1157,35 @@ void S_InitSfxChannels(INT32 sfxVolume)
 
 	SetChannelsNum();
 
-	// Note that sounds have not been cached (yet).
-	for (i = 1; i < NUMSFX; i++)
-	{
-		S_sfx[i].lumpnum = LUMPERROR;
-	}
-
 	// Precache sounds if requested
-	if (S_PrecacheSound())
+	if (S_CacheSound() == SOUNDCACHE_PRECACHE)
 	{
 		// Initialize external data (all sounds) at start, keep static.
 		CONS_Printf(M_GetText("Pre-caching sounds..."));
 
-			for (i = 1; i < sfx_freeslot0; i++)
-				if (S_sfx[i].name && !S_sfx[i].data)
-					S_sfx[i].data = I_GetSfx(&S_sfx[i]);
+		// NUMSFX is a big number, so merge the loops
+		for (i = 1; i < NUMSFX; i++)
+		{
+			S_sfx[i].lumpnum = LUMPERROR;
 
-			for (i = sfx_freeslot0; i < NUMSFX; i++)
-				if (S_sfx[i].priority && !S_sfx[i].data)
-					S_sfx[i].data = I_GetSfx(&S_sfx[i]);
+			if (S_sfx[i].data)
+				continue;
+
+			if ((i < sfx_freeslot0 && S_sfx[i].name) ||
+				(i >= sfx_freeslot0 && S_sfx[i].priority))
+				S_sfx[i].data = I_GetSfx(&S_sfx[i]);
+		}
 
 		CONS_Printf(M_GetText("...pre-cached all sound data\n"));
 	}
+	else
+	{
+		// Note that sounds have not been cached (yet).
+		for (i = 1; i < NUMSFX; i++)
+		{
+			S_sfx[i].lumpnum = LUMPERROR;
+		}
+	}
 }
 
 /// ------------------------
@@ -1266,7 +1284,7 @@ ReadMusicDefFields (UINT16 wadnum, int line, char *stoken, musicdef_t **defp)
 	char *value;
 	char *textline;
 
-	if (!stricmp(stoken, "lump"))
+	if (fasticmp(stoken, "lump"))
 	{
 		value = strtok(NULL, " ");
 
@@ -1341,24 +1359,24 @@ skip_lump:
 	for (textline = def->field; *textline; textline++)\
 		if (*textline == '_') *textline = ' ';
 
-			if (!stricmp(stoken, "usage"))
+			if (fasticmp(stoken, "usage"))
 			{
 				ADDDEF(usage);
 			}
-			else if (!stricmp(stoken, "source"))
+			else if (fasticmp(stoken, "source"))
 			{
 				ADDDEF(source);
 			}
-			else if (!stricmp(stoken, "title"))
+			else if (fasticmp(stoken, "title"))
 			{
 				def->use_info = true;
 				ADDDEF(title);
 			}
-			else if (!stricmp(stoken, "alttitle"))
+			else if (fasticmp(stoken, "alttitle"))
 			{
 				ADDDEF(alttitle);
 			}
-			else if (!stricmp(stoken, "authors"))
+			else if (fasticmp(stoken, "authors"))
 			{
 				ADDDEF(authors);
 			}
@@ -1405,7 +1423,7 @@ void S_LoadMusicDefs(UINT16 wadnum)
 		musdeftext = malloc(size+1);
 		if (!musdeftext)
 			I_Error("S_LoadMusicDefs: No more free memory for the parser\n");
-		M_Memcpy(musdeftext, lump, size);
+		memcpy(musdeftext, lump, size);
 		musdeftext[size] = '\0';
 
 		// Find music def
@@ -1479,7 +1497,8 @@ musicdef_t *S_FindMusicCredit(const char *musname)
 
 		if (hash != def->hash)
 			continue;
-		if (stricmp(def->name, musname))
+
+		if (!fasticmp(def->name, musname))
 			continue;
 
 		return def;
@@ -1813,7 +1832,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
 	}
 }
 
-void S_ChangeMusicSpecial (const char *mmusic)
+void S_ChangeMusicSpecial(const char *mmusic)
 {
 	if (cv_resetspecialmusic.value)
 		S_ChangeMusic(mmusic, MUSIC_FORCERESET, true);
@@ -1828,7 +1847,7 @@ void S_StopMusic(void)
 		|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
 		return;
 
-	mapmusic.resume = (cv_birdmusic.value && (strcasecmp(music.name, mapmusic.name) == 0)) ? I_GetSongPosition() : 0;
+	mapmusic.resume = (cv_birdmusic.value && fasticmp(music.name, mapmusic.name)) ? I_GetSongPosition() : 0;
 
 	S_SetKeepMusResume();
 
@@ -1934,7 +1953,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 (stricmp(music.name, mapmusic.name))
+	if (!fasticmp(music.name, mapmusic.name))
 		return true;
 
 	// dumb hack but dont keepmusic music that is supposed to reset
@@ -1944,7 +1963,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 (!stricmp(music.name, musicexception_list[i]) || !stricmp(checkmusic, musicexception_list[i]))
+		if (fasticmp(music.name, musicexception_list[i]) || fasticmp(checkmusic, musicexception_list[i]))
 		{
 			return true;
 		}
@@ -1964,7 +1983,7 @@ static void S_SetKeepMusResume(void)
 {
 	keepmusic.resume = 0;
 
-	if (strcasecmp(music.name, mapmusic.name) == 0)
+	if (fasticmp(music.name, mapmusic.name))
 	{
 		keepmusic.resume = I_GetSongPosition();
 	}
@@ -2030,12 +2049,12 @@ static boolean S_SkipIntroMusic(void)
 		return false;
 
 	// check if menu music is playing, otherwise it may continue playing
-	if (!stricmp(music.name, "titles"))
+	if (fasticmp(music.name, "titles"))
 		return false;
 
 	char *maptitle = G_BuildMapTitle(gamemap); // Zzz...
 
-	if (maptitle && !stricmp(maptitle, "Wandering Falls")) // wandering balls changes its song when the race starts Zzz...
+	if (maptitle && fasticmp(maptitle, "Wandering Falls")) // wandering balls changes its song when the race starts Zzz...
 	{
 		Z_Free(maptitle);
 		return false;
@@ -2148,19 +2167,19 @@ static void Command_Tunes_f(void)
 	tunenum = (UINT16)atoi(tunearg);
 	track = 0;
 
-	if (!strcasecmp(tunearg, "-show"))
+	if (fasticmp(tunearg, "-show"))
 	{
 		CONS_Printf(M_GetText("The current tune is: %s [track %d]\n"),
 			mapmusic.name, (mapmusic.flags & MUSIC_TRACKMASK));
 		return;
 	}
 
-	if (!strcasecmp(tunearg, "-none"))
+	if (fasticmp(tunearg, "-none"))
 	{
 		S_StopMusic();
 		return;
 	}
-	else if (!strcasecmp(tunearg, "-default"))
+	else if (fasticmp(tunearg, "-default"))
 	{
 		tunearg = mapheaderinfo[gamemap-1]->musname;
 		track = mapheaderinfo[gamemap-1]->mustrack;
@@ -2272,13 +2291,13 @@ static void GameSounds_OnChange(void)
 	}
 }
 
-static void SoundPrecache_OnChange(void)
+static void SoundCache_OnChange(void)
 {
-	if (S_PrecacheSound())
+	if (S_CacheSound() != SOUNDCACHE_OFF)
 	{
 		S_InitSfxChannels(cv_soundvolume.value);
 	}
-	else if (!S_PrecacheSound())
+	else
 	{
 		S_ClearSfx();
 

src/s_sound.h

@@ -75,9 +75,10 @@ extern consvar_t cv_skipintromusic;
 //extern consvar_t cv_ignoremusicchanges;
 extern boolean keepmapmusic;
 extern boolean skipintromus;
+
 #define MUSICSTARTTIME (starttime + (TICRATE/2))
 
-extern consvar_t precachesound;
+extern consvar_t cv_cachesound;
 
 typedef enum
 {
@@ -148,11 +149,18 @@ void S_StopSound(void *origin);
 // Music Status
 //
 
+enum
+{
+	SOUNDCACHE_OFF,
+	SOUNDCACHE_KEEP,
+	SOUNDCACHE_PRECACHE
+};
+
 boolean S_MusicDisabled(void);
 boolean S_MusicPlaying(void);
 boolean S_MusicPaused(void);
 boolean S_MusicNotInFocus(void);
-boolean S_PrecacheSound(void);
+int S_CacheSound(void);
 musictype_t S_MusicType(void);
 const char *S_MusicName(void);
 boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping);

src/screen.c

@@ -36,8 +36,8 @@
 // ------------------
 // global video state
 // ------------------
-viddef_t vid;
-INT32 setmodeneeded; // video mode change needed if > 0 (the mode number to set + 1)
+viddef_t vid = {};
+INT32 setmodeneeded = 0; // video mode change needed if > 0 (the mode number to set + 1)
 
 static CV_PossibleValue_t shittyscreen_cons_t[] = {{0, "Okay"}, {1, "Shitty"}, {2, "Extra Shitty"}, {0, NULL}};
 
@@ -215,7 +215,10 @@ void SCR_Startup(void)
 	CV_RegisterVar(&cv_menucaps);
 	CV_RegisterVar(&cv_constextsize);
 
+#ifdef BACKWARDSCOMPATCORRECTION
 	CV_RegisterVar(&cv_globalgamma);
+#endif
+	CV_RegisterVar(&cv_globalbrightness);
 	CV_RegisterVar(&cv_globalsaturation);
 
 	CV_RegisterVar(&cv_rhue);
@@ -225,12 +228,12 @@ void SCR_Startup(void)
 	CV_RegisterVar(&cv_bhue);
 	CV_RegisterVar(&cv_mhue);
 
-	CV_RegisterVar(&cv_rgamma);
-	CV_RegisterVar(&cv_ygamma);
-	CV_RegisterVar(&cv_ggamma);
-	CV_RegisterVar(&cv_cgamma);
-	CV_RegisterVar(&cv_bgamma);
-	CV_RegisterVar(&cv_mgamma);
+	CV_RegisterVar(&cv_rbrightness);
+	CV_RegisterVar(&cv_ybrightness);
+	CV_RegisterVar(&cv_gbrightness);
+	CV_RegisterVar(&cv_cbrightness);
+	CV_RegisterVar(&cv_bbrightness);
+	CV_RegisterVar(&cv_mbrightness);
 
 	CV_RegisterVar(&cv_rsaturation);
 	CV_RegisterVar(&cv_ysaturation);

src/sdl/hwsym_sdl.c

@@ -35,9 +35,6 @@
 
 #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_net.c

@@ -107,7 +107,7 @@ static void NET_Get(void)
 		{
 			size_t i;
 			newnode++;
-			M_Memcpy(&clientaddress[newnode], &mypacket.address, sizeof (IPaddress));
+			memcpy(&clientaddress[newnode], &mypacket.address, sizeof (IPaddress));
 			DEBFILE(va("New node detected: node:%d address:%s\n", newnode,
 					NET_GetNodeAddress(newnode)));
 			doomcom->remotenode = newnode; // good packet from a game player
@@ -257,7 +257,7 @@ static SINT8 NET_NetMakeNodewPort(const char *hostname, const char *port)
 		return newnode;
 	}
 	newnode++;
-	M_Memcpy(&clientaddress[newnode],&hostnameIP,sizeof (IPaddress));
+	memcpy(&clientaddress[newnode],&hostnameIP,sizeof (IPaddress));
 	return (SINT8)newnode;
 }
 
@@ -303,7 +303,7 @@ static boolean NET_Ban(INT32 node)
 	if (numbans == MAXBANS)
 		return false;
 
-	M_Memcpy(&banned[numbans], &clientaddress[node], sizeof (IPaddress));
+	memcpy(&banned[numbans], &clientaddress[node], sizeof (IPaddress));
 	banned[numbans].port = 0;
 	numbans++;
 	return true;

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,6 +553,9 @@ 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);
@@ -560,6 +563,10 @@ 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);
@@ -712,16 +719,13 @@ static void JoyReset(SDLJoyInfo_t *JoySet)
 	{
 		SDL_GameControllerClose(JoySet->dev);
 	}
+
 	JoySet->dev = NULL;
 	JoySet->oldjoy = -1;
+	JoySet->id = -1;
 	JoySet->axises = JoySet->buttons = JoySet->hats = JoySet->balls = 0;
-	//JoySet->scale
 }
 
-/**	\brief joystick up and running
-*/
-static INT32 joystick_started[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0};
-
 /**	\brief SDL info about joystick
 */
 SDLJoyInfo_t JoyInfo[MAXSPLITSCREENPLAYERS];
@@ -776,22 +780,26 @@ void I_UpdateJoystickDeviceIndex(UINT8 player)
 	///////////////////////////////////////////////
 	if (JoyInfo[player].dev)
 	{
-		cv_usejoystick[player].value = I_GetJoystickDeviceIndex(JoyInfo[player].dev) + 1;
+		cv_usejoystick[player].value = JoyInfo[player].id + 1;
 	}
 	else
 	{
 		UINT8 joystickID, compareJoystick;
+
 		for (joystickID = 0; joystickID < MAXSPLITSCREENPLAYERS; joystickID++)
 		{
 			// is this cv_usejoystick used?
 			const INT32 value = atoi(cv_usejoystick[joystickID].string);
+
 			for (compareJoystick = 0; compareJoystick < MAXSPLITSCREENPLAYERS; compareJoystick++)
 			{
 				if (compareJoystick == player)
 					continue;
+
 				if (value == JoyInfo[compareJoystick].oldjoy || value == cv_usejoystick[compareJoystick].value)
 					break;
 			}
+
 			if (compareJoystick == MAXSPLITSCREENPLAYERS)
 			{
 				// We DID make it through the whole loop, so we can use this one!
@@ -799,6 +807,7 @@ void I_UpdateJoystickDeviceIndex(UINT8 player)
 				break;
 			}
 		}
+
 		if (joystickID == MAXSPLITSCREENPLAYERS)
 		{
 			// We DID NOT make it through the whole loop, so we can't assign this joystick to anything.
@@ -821,14 +830,6 @@ void I_UpdateJoystickDeviceIndices(UINT8 excludePlayer)
 	}
 }
 
-/**	\brief Joystick buttons states
-*/
-static UINT64 lastjoybuttons[MAXSPLITSCREENPLAYERS] = {0,0,0,0};
-
-/**	\brief Joystick hats state
-*/
-static UINT64 lastjoyhats[MAXSPLITSCREENPLAYERS] = {0,0,0,0};
-
 /**	\brief	Shuts down joystick
 	\return void
 */
@@ -840,74 +841,34 @@ void I_ShutdownJoystick(UINT8 index)
 	event.data2 = 0;
 	event.data3 = 0;
 
-	lastjoybuttons[index] = lastjoyhats[index] = 0;
-
 	// emulate the up of all joystick buttons
 	for (i = 0; i < JOYBUTTONS; i++)
 	{
-		event.data1=KEY_JOY1 + i;
+		event.data1 = KEY_JOY1 + i;
 		D_PostEvent(&event);
 	}
 
 	// emulate the up of all joystick hats
 	for (i = 0; i < JOYHATS*4; i++)
 	{
-		event.data1=KEY_HAT1+i;
+		event.data1 = KEY_HAT1+i;
 		D_PostEvent(&event);
 	}
 
 	// reset joystick position
 	event.type = ev_joystick;
+
 	for (i = 0; i < JOYAXISSET; i++)
 	{
 		event.data1 = i;
 		D_PostEvent(&event);
 	}
 
-	joystick_started[index] = 0;
 	JoyReset(&JoyInfo[index]);
 
 	// don't shut down the subsystem here, because hotplugging
 }
 
-void I_GetJoystickEvents(UINT8 index)
-{
-	static event_t event = {};
-	INT32 i = 0;
-	UINT64 joyhats = 0;
-
-	if (!joystick_started[index])
-		return;
-
-	if (!JoyInfo[index].dev) //I_ShutdownJoystick();
-		return;
-
-	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_UP);
-	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_DOWN) << 1;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_LEFT) << 2;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_RIGHT) << 3;
-
-	if (joyhats != lastjoyhats[index])
-	{
-		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newhats = joyhats ^ lastjoyhats[index];
-		lastjoyhats[index] = joyhats;
-
-		for (i = 0; i < JOYHATS*4; i++, j <<= 1)
-		{
-			if (newhats & j) // hat changed state?
-			{
-				if (joyhats & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_HAT1 + i;
-				D_PostEvent(&event);
-			}
-		}
-	}
-}
-
 /**	\brief	Open joystick handle
 
 	\param	fname	name of joystick
@@ -924,6 +885,7 @@ static int joy_open(int playerIndex, int joyIndex)
 		CONS_Printf(M_GetText("Joystick subsystem not started\n"));
 		return -1;
 	}
+
 	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) == 0)
 	{
 		CONS_Printf(M_GetText("Game Controller subsystem not started\n"));
@@ -958,12 +920,14 @@ static int joy_open(int playerIndex, int joyIndex)
 		if (JoyInfo[playerIndex].dev == newdev // same device, nothing to do
 			|| (newdev == NULL && SDL_GameControllerGetAttached(JoyInfo[playerIndex].dev))) // we failed, but already have a working device
 			return SDL_CONTROLLER_AXIS_MAX;
+
 		// Else, we're changing devices, so send neutral joy events
 		CONS_Debug(DBG_GAMELOGIC, "Joystick1 device is changing; resetting events...\n");
 		I_ShutdownJoystick(playerIndex);
 	}
 
 	JoyInfo[playerIndex].dev = newdev;
+	JoyInfo[playerIndex].id = I_GetJoystickDeviceIndex(JoyInfo[playerIndex].dev);
 
 	if (JoyInfo[playerIndex].dev == NULL)
 	{
@@ -1000,8 +964,9 @@ void I_InitJoystick(UINT8 index)
 	UINT8 i;
 	SDL_GameController *newcontroller = NULL;
 
-	//I_ShutdownJoystick();
-	//SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
+	// not sure if this is the best place to put this
+	SDL_SetHint(SDL_HINT_AUTO_UPDATE_SENSORS, "0");
+
 	if (M_CheckParm("-nojoy"))
 		return;
 
@@ -1030,6 +995,11 @@ void I_InitJoystick(UINT8 index)
 		}
 	}
 
+	JoyInfo[index].dev = NULL;
+	JoyInfo[index].oldjoy = -1;
+	JoyInfo[index].id = -1;
+	JoyInfo[index].axises = JoyInfo[index].buttons = JoyInfo[index].hats = JoyInfo[index].balls = 0;
+
 	if (cv_usejoystick[index].value)
 		newcontroller = SDL_GameControllerOpen(cv_usejoystick[index].value-1);
 
@@ -1042,23 +1012,24 @@ void I_InitJoystick(UINT8 index)
 			break;
 	}
 
+	JoyInfo[index].id = I_GetJoystickDeviceIndex(JoyInfo[index].dev);
+
 	if (newcontroller && i < MAXSPLITSCREENPLAYERS) // don't override an active device
 	{
-		cv_usejoystick[index].value = I_GetJoystickDeviceIndex(JoyInfo[index].dev) + 1;
+		cv_usejoystick[index].value = JoyInfo[index].id + 1;
 	}
 	else if (newcontroller && joy_open(index, cv_usejoystick[index].value) != -1)
 	{
 		// SDL's device indexes are unstable, so cv_usejoystick may not match
 		// the actual device index. So let's cheat a bit and find the device's current index.
-		JoyInfo[index].oldjoy = I_GetJoystickDeviceIndex(JoyInfo[index].dev) + 1;
-		joystick_started[index] = 1;
+		JoyInfo[index].oldjoy = JoyInfo[index].id + 1;
 	}
 	else
 	{
 		if (JoyInfo[index].oldjoy)
 			I_ShutdownJoystick(index);
+
 		cv_usejoystick[index].value = 0;
-		joystick_started[index] = 0;
 	}
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
@@ -1123,8 +1094,10 @@ static void I_ShutdownInput(void)
 INT32 I_NumJoys(void)
 {
 	INT32 numjoy = 0;
+
 	if (SDL_WasInit(SDL_INIT_JOYSTICK) == SDL_INIT_JOYSTICK)
 		numjoy = SDL_NumJoysticks();
+
 	return numjoy;
 }
 
@@ -1135,15 +1108,18 @@ const char *I_GetJoyName(INT32 joyindex)
 	const char *tempname = NULL;
 	joyname[0] = 0;
 	joyindex--; //SDL's Joystick System starts at 0, not 1
+
 	if (SDL_WasInit(SDL_INIT_JOYSTICK) == SDL_INIT_JOYSTICK)
 	{
 		tempname = SDL_JoystickNameForIndex(joyindex);
+
 		if (tempname)
 		{
 			memcpy(joyname, tempname, 255);
 			joyname[255] = '\0';
 		}
 	}
+
 	return joyname;
 }
 
@@ -2281,8 +2257,9 @@ char *I_GetUserName(void)
 	}
 
 
-	if (strcmp(username, "") != 0)
+	if (!fastcmp(username, ""))
 		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;
-SDL_Renderer *renderer;
-static SDL_Texture  *texture;
+SDL_Window   *window = NULL;
+SDL_Renderer *renderer = NULL;
+static SDL_Texture  *texture = NULL;
 static SDL_bool      havefocus = SDL_TRUE;
 static const char *fallback_resolution_name = "Fallback";
 
@@ -412,6 +412,10 @@ 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
@@ -519,6 +523,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 #ifdef USE_FBO_OGL
 		I_DownSample();
 #endif
+		windowmoved = SDL_FALSE;
 	}
 
 	if (mousefocus && kbfocus)
@@ -553,7 +558,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 
 static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type)
 {
-	event_t event;
+	event_t event = {0};
 
 	switch (type)
 	{
@@ -581,7 +586,9 @@ static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type)
 	}
 
 	if (event.data1)
+	{
 		D_PostEvent(&event);
+	}
 }
 
 static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
@@ -633,7 +640,7 @@ static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
 
 static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
 {
-	event_t event;
+	event_t event = {0};
 
 	// Ignore the event if the mouse is not actually focused on the window.
 	// This can happen if you used the mouse to restore keyboard focus;
@@ -646,8 +653,6 @@ static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
 	/// \todo inputEvent.button.which
 	if (USE_MOUSEINPUT)
 	{
-		SDL_memset(&event, 0, sizeof(event_t));
-
 		switch (type)
 		{
 			case SDL_MOUSEBUTTONUP:
@@ -688,27 +693,28 @@ static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
 
 static void Impl_HandleMouseWheelEvent(SDL_MouseWheelEvent evt)
 {
-	event_t event;
+	event_t event = {0};
 
 	if (USE_MOUSEINPUT)
 	{
-		SDL_memset(&event, 0, sizeof(event_t));
-
 		if (evt.y > 0)
 		{
 			event.data1 = KEY_MOUSEWHEELUP;
 			event.type = ev_keydown;
 		}
+
 		if (evt.y < 0)
 		{
 			event.data1 = KEY_MOUSEWHEELDOWN;
 			event.type = ev_keydown;
 		}
+
 		if (evt.y == 0)
 		{
 			event.data1 = 0;
 			event.type = ev_keyup;
 		}
+
 		if (event.type == ev_keyup || event.type == ev_keydown)
 		{
 			D_PostEvent(&event);
@@ -716,40 +722,78 @@ static void Impl_HandleMouseWheelEvent(SDL_MouseWheelEvent evt)
 	}
 }
 
+static UINT8 hatrepeattimer[MAXSPLITSCREENPLAYERS];
+#define HATREPEATDELAY 19
+
+void I_HandleControllerHatRepeat(void)
+{
+	// why bother if theres no controllers?
+	if (numcontrollers == 0)
+		return;
+
+	event_t event = {ev_keydown, 0, 0, 0};
+
+	static const SDL_GameControllerButton hatbutt[4] =
+	{
+		SDL_CONTROLLER_BUTTON_DPAD_UP,
+		SDL_CONTROLLER_BUTTON_DPAD_DOWN,
+		SDL_CONTROLLER_BUTTON_DPAD_LEFT,
+		SDL_CONTROLLER_BUTTON_DPAD_RIGHT
+	};
+
+	for (int i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (!cv_usejoystick[i].value)
+			continue;
+
+		SDL_GameController *controller = JoyInfo[i].dev;
+
+		if (!controller)
+			continue;
+
+		for (UINT8 h = 0; h < JOYHATS; h++)
+		{
+			if (SDL_GameControllerGetButton(controller, hatbutt[h]))
+			{
+				if (hatrepeattimer[i] < HATREPEATDELAY)
+				{
+					hatrepeattimer[i]++;
+				}
+				else if (hatrepeattimer[i] == HATREPEATDELAY)
+				{
+					event.data1 = KEY_HAT1 + (i * JOYHATS) + h;
+					D_PostEvent(&event);
+				}
+
+				return;
+			}
+		}
+
+		hatrepeattimer[i] = 0;
+	}
+}
+
 static void Impl_HandleControllerAxisEvent(SDL_ControllerAxisEvent evt)
 {
 	event_t event;
-	SDL_JoystickID joyid[4];
 	INT32 value;
 	UINT8 i;
 
 	// Determine the Joystick IDs for each current open joystick
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		joyid[i] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo[i].dev));
+		if (evt.which == JoyInfo[i].id)
+		{
+			event.type = ev_joystick + i;
+			break;
+		}
 	}
 
+	if (i == MAXSPLITSCREENPLAYERS)
+		return;
+
 	event.data1 = event.data2 = event.data3 = INT32_MAX;
 
-	if (evt.which == joyid[0])
-	{
-		event.type = ev_joystick;
-	}
-	else if (evt.which == joyid[1])
-	{
-		event.type = ev_joystick2;
-	}
-	else if (evt.which == joyid[2])
-	{
-		event.type = ev_joystick3;
-	}
-	else if (evt.which == joyid[3])
-	{
-		event.type = ev_joystick4;
-	}
-	else
-		return;
-
 	//axis
 	if (evt.axis > JOYAXISSET*2)
 		return;
@@ -785,47 +829,89 @@ static void Impl_HandleControllerAxisEvent(SDL_ControllerAxisEvent evt)
 		default:
 			return;
 	}
+
 	D_PostEvent(&event);
 }
 
-static void Impl_HandleControllerButtonEvent(SDL_ControllerButtonEvent evt, Uint32 type)
+static void Impl_HandleControllerHatEvent(SDL_ControllerButtonEvent evt, Uint32 type)
 {
-	event_t event;
-	SDL_JoystickID joyid[4];
+	event_t event = {0};
 	UINT8 i;
+	static const int hat_buttons_base[] = {KEY_HAT1, KEY_2HAT1, KEY_3HAT1, KEY_4HAT1};
 
 	// Determine the Joystick IDs for each current open joystick
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		joyid[i] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo[i].dev));
+		if (evt.which == JoyInfo[i].id)
+		{
+			event.data1 = hat_buttons_base[i];
+			break;
+		}
 	}
 
-	if (   evt.button == SDL_CONTROLLER_BUTTON_DPAD_UP
-		|| evt.button == SDL_CONTROLLER_BUTTON_DPAD_DOWN
-		|| evt.button == SDL_CONTROLLER_BUTTON_DPAD_LEFT
-		|| evt.button == SDL_CONTROLLER_BUTTON_DPAD_RIGHT)
+	if (i == MAXSPLITSCREENPLAYERS)
+		return;
+
+	switch (type)
 	{
-		// dpad buttons are mapped as the hat instead
+		case SDL_CONTROLLERBUTTONUP:
+			event.type = ev_keyup;
+			break;
+		case SDL_CONTROLLERBUTTONDOWN:
+			event.type = ev_keydown;
+			break;
+		default:
+			return;
+	}
+
+	switch (evt.button)
+	{
+		case SDL_CONTROLLER_BUTTON_DPAD_UP:
+			break;
+		case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
+			event.data1 += 1;
+			break;
+		case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
+			event.data1 += 2;
+			break;
+		case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
+			event.data1 += 3;
+			break;
+		default:
+			return;
+	}
+
+	if (event.type != ev_console)
+	{
+		D_PostEvent(&event);
+	}
+}
+
+static void Impl_HandleControllerButtonEvent(SDL_ControllerButtonEvent evt, Uint32 type)
+{
+	event_t event = {0};
+	UINT8 i;
+	static const int buttons_base[] = {KEY_JOY1, KEY_2JOY1, KEY_3JOY1, KEY_4JOY1};
+
+	// dpad special case handling
+	if (evt.button >= SDL_CONTROLLER_BUTTON_DPAD_UP &&
+		evt.button <= SDL_CONTROLLER_BUTTON_DPAD_RIGHT)
+	{
+		Impl_HandleControllerHatEvent(evt, type);
 		return;
 	}
 
-	if (evt.which == joyid[0])
+	// Determine the Joystick IDs for each current open joystick
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		event.data1 = KEY_JOY1;
+		if (evt.which == JoyInfo[i].id)
+		{
+			event.data1 = buttons_base[i];
+			break;
+		}
 	}
-	else if (evt.which == joyid[1])
-	{
-		event.data1 = KEY_2JOY1;
-	}
-	else if (evt.which == joyid[2])
-	{
-		event.data1 = KEY_3JOY1;
-	}
-	else if (evt.which == joyid[3])
-	{
-		event.data1 = KEY_4JOY1;
-	}
-	else
+
+	if (i == MAXSPLITSCREENPLAYERS)
 		return;
 
 	switch (type)
@@ -848,7 +934,9 @@ static void Impl_HandleControllerButtonEvent(SDL_ControllerButtonEvent evt, Uint
 		return;
 
 	if (event.type != ev_console)
+	{
 		D_PostEvent(&event);
+	}
 }
 
 static void Impl_HandleControllerAddedEvent(SDL_Event evt)
@@ -901,10 +989,11 @@ static void Impl_HandleControllerAddedEvent(SDL_Event evt)
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		if (!strcmp(cv_usejoystick[i].string, "0") || !cv_usejoystick[i].value)
+		if (fastcmp(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);
 	}
 
@@ -972,7 +1061,7 @@ static void Impl_HandleControllerRemovedEvent(void)
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		if (!strcmp(cv_usejoystick[i].string, "0"))
+		if (fastcmp(cv_usejoystick[i].string, "0"))
 		{
 			cv_usejoystick[i].value = 0;
 		}
@@ -1091,7 +1180,6 @@ void I_StartupMouse(void)
 void I_OsPolling(void)
 {
 	SDL_Keymod mod;
-	INT32 i;
 
 	if (consolevent)
 		I_GetConsoleEvents();
@@ -1099,17 +1187,16 @@ void I_OsPolling(void)
 	if (SDL_WasInit(SDL_INIT_JOYSTICK|SDL_INIT_GAMECONTROLLER) == (SDL_INIT_JOYSTICK|SDL_INIT_GAMECONTROLLER))
 	{
 		SDL_GameControllerUpdate();
-
-		for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
-			I_GetJoystickEvents(i);
 	}
 
 	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;
@@ -1143,7 +1230,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;
@@ -1288,8 +1375,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);
@@ -1322,14 +1409,12 @@ void I_UpdateNoBlit(void)
 		if (rendermode == render_opengl)
 		{
 			OglSdlFinishUpdate(cv_vidwait.value);
+			return;
 		}
-		else
+
 #endif
-		if (rendermode == render_soft)
-		{
-			SDL_RenderCopy(renderer, texture, NULL, NULL);
-			SDL_RenderPresent(renderer);
-		}
+		SDL_RenderCopy(renderer, texture, NULL, NULL);
+		SDL_RenderPresent(renderer);
 	}
 
 	exposevideo = SDL_FALSE;
@@ -1354,7 +1439,8 @@ 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();
 	}
 
@@ -1363,7 +1449,15 @@ void I_FinishUpdate(void)
 		ST_AskToJoinEnvelope();
 #endif
 
-	if (rendermode == render_soft && vid.screens[0])
+#ifdef HWRENDER
+	if (rendermode == render_opengl)
+	{
+		OglSdlFinishUpdate(cv_vidwait.value);
+		return;
+	}
+#endif
+
+	if (vid.screens[0])
 	{
 		void *pixels;
 		int pitch;
@@ -1385,12 +1479,6 @@ void I_FinishUpdate(void)
 		SDL_RenderCopy(renderer, texture, &src_rect, NULL);
 		SDL_RenderPresent(renderer);
 	}
-#ifdef HWRENDER
-	else if (rendermode == render_opengl)
-	{
-		OglSdlFinishUpdate(cv_vidwait.value);
-	}
-#endif
 
 	exposevideo = SDL_FALSE;
 }
@@ -1413,7 +1501,8 @@ 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)
+
+	if (scale == 1)
 		VID_BlitLinearScreen(vid.screens[0], scr, vid.width, vid.height, vid.width, vid.width);
 	else
 	{
@@ -1588,8 +1677,9 @@ static SDL_bool Impl_CreateContext(void)
 		}
 
 		SDL_GL_MakeCurrent(window, sdlglcontext);
+
+		return SDL_TRUE;
 	}
-	else
 #endif
 	if (rendermode == render_soft)
 	{
@@ -1621,15 +1711,19 @@ 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);
+
+		return SDL_TRUE;
 	}
 
-	return SDL_TRUE;
+	return SDL_FALSE;
 }
 
 static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
@@ -1728,6 +1822,7 @@ 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;
@@ -1774,11 +1869,11 @@ void I_StartupGraphics(void)
 
 				if (rendermode == render_none)
 				{
-					if (strcasecmp(word, "software") == 0)
+					if (fasticmp(word, "software"))
 					{
 						rendermode = render_soft;
 					}
-					else if (strcasecmp(word, "opengl") == 0)
+					else if (fasticmp(word, "opengl"))
 					{
 						rendermode = render_opengl;
 					}
@@ -1791,7 +1886,7 @@ void I_StartupGraphics(void)
 
 				if (!msaa_set)
 				{
-					if (strcasecmp(word, "msaa") == 0)
+					if (fasticmp(word, "msaa"))
 					{
 						const char *nextword = strtok(NULL, " \n");
 
@@ -1808,7 +1903,7 @@ void I_StartupGraphics(void)
 
 				if (!a2c_set)
 				{
-					if (strcasecmp(word, "a2c") == 0)
+					if (fasticmp(word, "a2c"))
 					{
 						a2c = true;
 						CONS_Printf("Using a2c because it was specified to be used earlier\n");
@@ -1958,7 +2053,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

@@ -73,7 +73,7 @@ write netcode into the sound code, OKAY?
 
 
 //static UINT16 BUFFERSIZE = 2048;
-static UINT16 SAMPLERATE = 44100;
+static const UINT16 SAMPLERATE = 44100;
 
 #ifdef HAVE_OPENMPT
 #include "libopenmpt/libopenmpt.h"
@@ -123,13 +123,12 @@ 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;
@@ -229,6 +228,7 @@ void I_ShutdownSound(void)
 {
 	if (!sound_started)
 		return; // not an error condition
+
 	sound_started = false;
 
 	Mix_CloseAudio();
@@ -254,6 +254,7 @@ void I_UpdateSound(void)
 	{
 		if (fading_callback)
 			(*fading_callback)();
+
 		fading_callback = NULL;
 		fading_do_callback = false;
 	}
@@ -265,13 +266,13 @@ void I_UpdateSound(void)
 
 // this is as fast as I can possibly make it.
 // sorry. more asm needed.
-static Mix_Chunk *ds2chunk(void *stream)
+static Mix_Chunk *ds2chunk(const void *stream)
 {
 	UINT16 ver, freq;
 	UINT32 samples, i, newsamples;
 	UINT8 *sound;
 
-	SINT8 *s;
+	const SINT8 *s;
 	INT16 *d;
 	INT16 o;
 	fixed_t step, frac;
@@ -280,6 +281,7 @@ 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);
 
@@ -287,91 +289,100 @@ 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;
+	s = (const SINT8 *)stream;
 	d = (INT16 *)sound;
 
 	i = 0;
+
 	switch(freq)
 	{
-	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.
+		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
-				step += frac;
 			}
-			do {
-				i++; s++;
-				step -= FRACUNIT;
-			} while (step >= FRACUNIT);
-		}
-		break;
+			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;
 	}
 
 	// return Mixer Chunk.
@@ -390,12 +401,14 @@ 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);
@@ -415,6 +428,7 @@ 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
@@ -424,10 +438,13 @@ 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))
 				{
@@ -444,6 +461,7 @@ 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);
@@ -453,10 +471,14 @@ 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
@@ -477,6 +499,7 @@ 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);
@@ -487,6 +510,7 @@ 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);
@@ -502,19 +526,23 @@ 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;
 }
@@ -572,9 +600,12 @@ 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;
 }
@@ -589,8 +620,7 @@ static void do_fading_callback(void)
 /// Music Hooks
 /// ------------------------
 
-static void
-Countstutter (int len)
+static void Countstutter(int len)
 {
 	UINT32 bytes;
 
@@ -617,7 +647,7 @@ 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));
 		}
 	}
 }
@@ -628,7 +658,9 @@ static void count_music_bytes(int chan, void *stream, int len, void *udata)
 	(void)stream;
 	(void)udata;
 
-	if (!music || I_SongType() == MU_GME || I_SongType() == MU_MOD || I_SongType() == MU_MID)
+	const musictype_t mustype = I_SongType();
+
+	if (!music || mustype == MU_GME || mustype == MU_MOD || mustype == MU_MID)
 		return;
 
 	music_bytes += len;
@@ -662,7 +694,9 @@ 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;
@@ -675,11 +709,14 @@ 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;
 	}
 }
@@ -763,14 +800,22 @@ musictype_t I_SongType(void)
 #endif
 	if (!music)
 		return MU_NONE;
-	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);
+
+	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;
+	}
 }
 
 boolean I_SongPlaying(void)
@@ -799,6 +844,7 @@ boolean I_SetSongSpeed(float speed)
 {
 	if (speed > 250.0f)
 		speed = 250.0f; //limit speed up to 250x
+
 #ifdef HAVE_LIBGME
 	if (gme)
 	{
@@ -857,51 +903,63 @@ 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 || I_SongType() == MU_GME || I_SongType() == MU_MOD || I_SongType() == MU_MID || !is_looping)
+	if (!music|| !is_looping)
 		return false;
-	else
-	{
-		UINT32 length = I_GetSongLength();
 
-		if (length > 0)
-			looppoint %= length;
+	const musictype_t mustype = I_SongType();
 
-		loop_point = max((float)(looppoint / 1000.0L), 0);
-		return true;
-	}
+	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;
 }
 
 UINT32 I_GetSongLoopPoint(void)
@@ -927,14 +985,19 @@ 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)
 	{
@@ -971,9 +1034,13 @@ 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
@@ -981,11 +1048,13 @@ 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,
@@ -1025,6 +1094,7 @@ UINT32 I_GetSongPosition(void)
 		}
 
 		gme_free_info(info);
+
 		return max(position, 0);
 	}
 	else
@@ -1038,12 +1108,16 @@ 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)
@@ -1057,12 +1131,16 @@ void I_UpdateSongLagThreshold(void)
 
 boolean I_LoadSong(char *data, size_t len)
 {
-	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);
+	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);
+
 	char *p = data;
 	SDL_RWops *rw;
 
@@ -1099,6 +1177,7 @@ 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);
@@ -1114,10 +1193,12 @@ 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
@@ -1146,6 +1227,7 @@ 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);
@@ -1160,10 +1242,12 @@ 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());
@@ -1191,7 +1275,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)(atoi(p) / 1000.0L); // LOOPMS works by real time, as miliseconds.
+				loop_point = (float)(atof(p) / 1000.0); // LOOPMS works by real time, as miliseconds.
 				// Everything that uses LOOPMS will work perfectly with SDL_Mixer.
 			}
 		}
@@ -1201,6 +1285,7 @@ boolean I_LoadSong(char *data, size_t len)
 		else // continue searching
 			p++;
 	}
+
 	return true;
 }
 
@@ -1243,6 +1328,7 @@ boolean I_PlaySong(boolean looping)
 		gme_start_track(gme, 0);
 		current_track = 0;
 		Mix_HookMusic(mix_gme, gme);
+
 		return true;
 	}
 	else
@@ -1282,15 +1368,17 @@ boolean I_PlaySong(boolean looping)
 	if (!music)
 		return false;
 
-	if (fpclassify(song_length) == FP_ZERO && (I_SongType() == MU_OGG || I_SongType() == MU_MP3 || I_SongType() == MU_FLAC))
+	const musictype_t mustype = I_SongType();
+
+	if (fpclassify(song_length) == FP_ZERO && (mustype == MU_OGG || mustype == MU_MP3 || mustype == MU_FLAC))
 		CONS_Debug(DBG_DETAILED, "This song is missing a LENGTHMS= tag! Required to make seeking work properly.\n");
 
-	if (I_SongType() != MU_MOD && I_SongType() != MU_MID && Mix_PlayMusic(music, 0) == -1)
+	if (mustype != MU_MOD && mustype != MU_MID && Mix_PlayMusic(music, 0) == -1)
 	{
 		CONS_Alert(CONS_ERROR, "Mix_PlayMusic: %s\n", Mix_GetError());
 		return false;
 	}
-	else if ((I_SongType() == MU_MOD || I_SongType() == MU_MID) && Mix_PlayMusic(music, looping ? -1 : 0) == -1) // if MOD, loop forever
+	else if ((mustype == MU_MOD || mustype == 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;
@@ -1300,10 +1388,10 @@ boolean I_PlaySong(boolean looping)
 
 	I_SetMusicVolume(music_volume);
 
-	if (I_SongType() != MU_MOD && I_SongType() != MU_MID)
+	if (mustype != MU_MOD && mustype != MU_MID)
 		Mix_HookMusicFinished(music_loop); // don't bother counting if MOD
 
-	if(I_SongType() != MU_MOD && I_SongType() != MU_MID && !Mix_RegisterEffect(MIX_CHANNEL_POST, count_music_bytes, NULL, NULL))
+	if (mustype != MU_MOD && mustype != 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;
@@ -1339,10 +1427,12 @@ void I_StopSong(void)
 
 void I_PauseSong(void)
 {
-	if(I_SongType() == MU_MID) // really, SDL Mixer? why can't you pause MIDI???
+	const musictype_t mustype = I_SongType();
+
+	if (mustype == MU_MID) // really, SDL Mixer? why can't you pause MIDI???
 		return;
 
-	if(I_SongType() != MU_GME && I_SongType() != MU_MOD && I_SongType() != MU_MID)
+	if (mustype != MU_GME && mustype != MU_MOD && mustype != MU_MID)
 		Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes);
 
 	Mix_PauseMusic();
@@ -1351,15 +1441,17 @@ void I_PauseSong(void)
 
 void I_ResumeSong(void)
 {
-	if (I_SongType() == MU_MID)
+	const musictype_t mustype = I_SongType();
+
+	if (mustype == MU_MID)
 		return;
 
-	if (I_SongType() != MU_GME && I_SongType() != MU_MOD && I_SongType() != MU_MID)
+	if (mustype != MU_GME && mustype != MU_MOD && mustype != 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 && I_SongType() != MU_MOD && I_SongType() != MU_MID && !Mix_RegisterEffect(MIX_CHANNEL_POST, count_music_bytes, NULL, NULL))
+		if (music && mustype != MU_MOD && mustype != 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());
 	}
 
@@ -1392,20 +1484,24 @@ 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
@@ -1415,6 +1511,7 @@ boolean I_SetSongTrack(INT32 track)
 	{
 		if (current_subsong == track)
 			return false;
+
 		SDL_LockAudio();
 		if (track >= 0 && track < openmpt_module_get_num_subsongs(openmpt_mhandle))
 		{
@@ -1428,8 +1525,10 @@ boolean I_SetSongTrack(INT32 track)
 		return false;
 	}
 #endif
+
 	if (I_SongType() == MU_MOD)
 		return !Mix_SetMusicPosition(track);
+
 	(void)track;
 	return false;
 }
@@ -1441,8 +1540,10 @@ boolean I_SetSongTrack(INT32 track)
 void I_SetInternalMusicVolume(UINT8 volume)
 {
 	internal_volume = volume;
+
 	if (!I_SongPlaying())
 		return;
+
 	Mix_VolumeMusic(get_real_volume(music_volume));
 }
 
@@ -1450,6 +1551,7 @@ 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;
 }
@@ -1466,8 +1568,10 @@ boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms
 	if (!ms && volume_delta)
 	{
 		I_SetInternalMusicVolume(target_volume);
+
 		if (callback)
 			(*callback)();
+
 		return true;
 
 	}
@@ -1475,20 +1579,28 @@ 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
+	//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;
 
 	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;
@@ -1519,7 +1631,7 @@ boolean I_FadeInPlaySong(UINT32 ms, boolean looping)
 {
 	if (I_PlaySong(looping))
 		return I_FadeSongFromVolume(100, 0, ms, NULL);
-	else
-		return false;
+
+	return false;
 }
 #endif

src/sdl/ogl_sdl.c

@@ -170,8 +170,8 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 			}
 		}
 
-		if (strcmp((const char*)gl_renderer, "GDI Generic") == 0 &&
-			strcmp((const char*)gl_version, "1.1.0") == 0)
+		if (fastcmp((const char*)gl_renderer, "GDI Generic") &&
+			fastcmp((const char*)gl_version, "1.1.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.
@@ -197,6 +197,9 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 		else
 			maximumAnisotropy = 1;
 
+		if (GL_isExtAvailable("GL_ARB_texture_non_power_of_two", gl_extensions))
+			supportNPO2tex = true;
+
 		glanisotropicmode_cons_t[1].value = maximumAnisotropy;
 
 #if defined (__unix__)

src/sdl/sdl_sound.c

@@ -244,7 +244,7 @@ static void *getsfx(lumpnum_t sfxlump, size_t *len)
 
 		sfxcvt.len = (INT32)size-8; //Alam: Chop off the header
 		sfxcvt.buf = malloc(sfxcvt.len * sfxcvt.len_mult); //Alam: make room
-		if (sfxcvt.buf) M_Memcpy(sfxcvt.buf, &(sfx->data), sfxcvt.len); //Alam: copy the sfx sample
+		if (sfxcvt.buf) memcpy(sfxcvt.buf, &(sfx->data), sfxcvt.len); //Alam: copy the sfx sample
 
 		if (sfxcvt.buf && SDL_ConvertAudio(&sfxcvt) == 0) //Alam: let convert it!
 		{
@@ -255,9 +255,9 @@ static void *getsfx(lumpnum_t sfxlump, size_t *len)
 				paddedsfx = (dssfx_t *) Z_Malloc(size, PU_SOUND, NULL);
 
 				// Now copy and pad.
-				M_Memcpy(paddedsfx->data, sfxcvt.buf, sfxcvt.len_cvt);
+				memcpy(paddedsfx->data, sfxcvt.buf, sfxcvt.len_cvt);
 				free(sfxcvt.buf);
-				M_Memcpy(paddedsfx,sfx,8);
+				memcpy(paddedsfx,sfx,8);
 				paddedsfx->samplerate = SHORT(csr); // new freq
 		}
 		else //Alam: the convert failed, not needed or I couldn't malloc the buf
@@ -266,7 +266,7 @@ static void *getsfx(lumpnum_t sfxlump, size_t *len)
 			*len = size - 8;
 
 			// Allocate from zone memory then copy and pad
-			paddedsfx = (dssfx_t *)M_Memcpy(Z_Malloc(size, PU_SOUND, NULL), sfx, size);
+			paddedsfx = (dssfx_t *)memcpy(Z_Malloc(size, PU_SOUND, NULL), sfx, size);
 		}
 	}
 	else
@@ -276,7 +276,7 @@ static void *getsfx(lumpnum_t sfxlump, size_t *len)
 		*len = size - 8;
 
 		// Allocate from zone memory then copy and pad
-		paddedsfx = (dssfx_t *)M_Memcpy(Z_Malloc(size, PU_SOUND, NULL), sfx, size);
+		paddedsfx = (dssfx_t *)memcpy(Z_Malloc(size, PU_SOUND, NULL), sfx, size);
 	}
 
 	// Remove the cached lump.

src/sdl/sdlmain.h

@@ -42,6 +42,8 @@ typedef struct SDLJoyInfo_s
 {
 	/// Controller handle
 	SDL_GameController *dev;
+	/// Controller index
+	INT32 id;
 	/// number of old joystick
 	int oldjoy;
 	/// number of axies

src/sounds.c

@@ -1018,6 +1018,8 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean
 	else
 		slot = sfx_freeslot0;
 
+    const int precache = S_CacheSound();
+
 	for (i = slot; i < NUMSFX; i++)
 	{
 		if (!S_sfx[i].priority)
@@ -1030,7 +1032,7 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean
             S_sfx[i].length = 0;
 			S_sfx[i].skinsound = -1;
 
-			if (S_PrecacheSound())
+			if (precache == SOUNDCACHE_PRECACHE)
 				S_sfx[i].data = I_GetSfx(&S_sfx[i]);
 			else
 				S_sfx[i].data = NULL;