Merge branch 'Saturn-Next' into gammastuff

ugh i suck so much at explaining
this is the default now pretty much

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

@@ -27,7 +27,7 @@ extern "C" {
 //
 
 #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)
@@ -124,7 +124,7 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
 #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]))
+#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])

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_
@@ -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"));
@@ -836,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)
 						{
@@ -879,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);
@@ -1129,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
@@ -1146,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
 }
 
 // =========================================================================
@@ -1176,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;
@@ -1366,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
@@ -1379,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;
@@ -1411,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)
 			{
@@ -1424,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)
@@ -1614,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.
@@ -1626,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;
 }
@@ -1647,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)
@@ -1669,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;
@@ -1803,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)
@@ -1975,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
@@ -2012,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;
@@ -2059,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;
 	}
 
@@ -2143,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/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

@@ -331,7 +331,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);
 	}
 }
@@ -1585,7 +1585,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;
 
@@ -2174,7 +2174,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++;
@@ -2219,7 +2219,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)
@@ -3215,7 +3215,7 @@ static void Command_connect(void)
 
 	server = false;
 
-	if (!stricmp(COM_Argv(1), "self"))
+	if (fasticmp(COM_Argv(1), "self"))
 	{
 		servernode = 0;
 		server = true;
@@ -3225,7 +3225,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));
 		}
@@ -3240,7 +3240,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));
@@ -3264,6 +3264,7 @@ static void Command_connect(void)
 		splitscreen = cv_splitplayers.value-1;
 		SplitScreen_OnChange();
 	}
+
 	botingame = false;
 	botskin = 0;
 	CL_ConnectToServer();
@@ -4647,7 +4648,7 @@ void SV_StopServer(void)
 
 	if (gamestate == GS_INTERMISSION)
 		Y_EndIntermission();
-	if (gamestate == GS_VOTING)
+	else if (gamestate == GS_VOTING)
 		Y_EndVote();
 
 	G_SetGamestate(GS_NULL);
@@ -4663,6 +4664,8 @@ void SV_StopServer(void)
 			textcmdbuf[i] = textcmdbuf[i]->next;
 			Z_Free(buf);
 		}
+
+		textcmdbuf[i] = NULL;
 	}
 
 	for (i = firstticstosend; i < firstticstosend + BACKUPTICS; i++)
@@ -5686,7 +5689,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];
 	}
 }
@@ -5793,7 +5796,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;
 			}
 		}
@@ -6331,7 +6334,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...
@@ -6341,7 +6344,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);
 					}
@@ -6454,7 +6457,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_main.c

@@ -1078,19 +1078,19 @@ 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;
@@ -1288,7 +1288,7 @@ 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));
@@ -2156,11 +2156,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_net.c

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

src/d_netcmd.c

@@ -1219,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
@@ -1336,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;
 			}
@@ -1386,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);
@@ -1508,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.
@@ -1945,7 +1945,7 @@ static void Got_NameAndColor(const 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);
 	}
 
@@ -2324,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
@@ -3196,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;
@@ -3286,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;
@@ -3377,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;
@@ -3468,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;
@@ -3567,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;
@@ -5211,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;

src/d_netfil.c

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

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

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_demo.c

@@ -257,14 +257,14 @@ void G_ReadDemoExtraData(void)
 			UINT8 kartspeed, kartweight;
 
 			// Skin
-			M_Memcpy(name, demobuf.p, 16);
+			memcpy(name, demobuf.p, 16);
 			demobuf.p += 16;
 			SetPlayerSkin(p, name);
 
 			kartspeed = READUINT8(demobuf.p);
 			kartweight = READUINT8(demobuf.p);
 
-			if (stricmp(skins[players[p].skin].name, name) != 0)
+			if (!fasticmp(skins[players[p].skin].name, name))
 				FindClosestSkinForStats(p, kartspeed, kartweight);
 
 			players[p].kartspeed = kartspeed;
@@ -274,10 +274,10 @@ void G_ReadDemoExtraData(void)
 		if (extradata & DXD_COLOR)
 		{
 			// Color
-			M_Memcpy(name, demobuf.p, 16);
+			memcpy(name, demobuf.p, 16);
 			demobuf.p += 16;
 			for (i = 0; i < MAXSKINCOLORS; i++)
-				if (!stricmp(KartColor_Names[i], name))				// SRB2kart
+				if (fasticmp(KartColor_Names[i], name)) // SRB2kart
 				{
 					players[p].skincolor = i;
 					if (players[p].mo)
@@ -289,7 +289,7 @@ void G_ReadDemoExtraData(void)
 		if (extradata & DXD_NAME)
 		{
 			// Name
-			M_Memcpy(player_names[p],demobuf.p,16);
+			memcpy(player_names[p],demobuf.p,16);
 			demobuf.p += 16;
 		}
 
@@ -395,7 +395,7 @@ void G_WriteDemoExtraData(void)
 				// Skin
 				memset(name, 0, 16);
 				strncpy(name, skins[players[i].skin].name, 16);
-				M_Memcpy(demobuf.p,name,16);
+				memcpy(demobuf.p, name, 16);
 				demobuf.p += 16;
 
 				WRITEUINT8(demobuf.p, skins[players[i].skin].kartspeed);
@@ -407,7 +407,7 @@ void G_WriteDemoExtraData(void)
 				// Color
 				memset(name, 0, 16);
 				strncpy(name, KartColor_Names[players[i].skincolor], 16);
-				M_Memcpy(demobuf.p,name,16);
+				memcpy(demobuf.p, name, 16);
 				demobuf.p += 16;
 			}
 
@@ -416,7 +416,7 @@ void G_WriteDemoExtraData(void)
 				// Name
 				memset(name, 0, 16);
 				memcpy(name, player_names[i], 15); // Keeping 1 null byte for safety, sorry players with name containing more than 15 characters
-				M_Memcpy(demobuf.p,name,16);
+				memcpy(demobuf.p, name, 16);
 				demobuf.p += 16;
 			}
 
@@ -1670,7 +1670,7 @@ void G_BeginRecording(void)
 		demoflags |= DF_LUAVARS;
 
 	// Setup header.
-	M_Memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
+	memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
 	WRITEUINT8(demobuf.p,VERSION);
 	WRITEUINT8(demobuf.p,SUBVERSION);
 	WRITEUINT16(demobuf.p,DEMOVERSION);
@@ -1701,9 +1701,9 @@ void G_BeginRecording(void)
 	demobuf.p += 16;
 
 	// game data
-	M_Memcpy(demobuf.p, "PLAY", 4); demobuf.p += 4;
+	memcpy(demobuf.p, "PLAY", 4); demobuf.p += 4;
 	WRITEINT16(demobuf.p,gamemap);
-	M_Memcpy(demobuf.p, mapmd5, 16); demobuf.p += 16;
+	memcpy(demobuf.p, mapmd5, 16); demobuf.p += 16;
 
 	WRITEUINT8(demobuf.p, demoflags);
 	WRITEUINT8(demobuf.p, gametype & 0xFF);
@@ -1763,19 +1763,19 @@ void G_BeginRecording(void)
 		// Name
 		memset(name, 0, 16);
 		memcpy(name, player_names[p], 15);
-		M_Memcpy(demobuf.p,name,16);
+		memcpy(demobuf.p, name, 16);
 		demobuf.p += 16;
 
 		// Skin
 		memset(name, 0, 16);
 		strncpy(name, skins[player->skin].name, 16);
-		M_Memcpy(demobuf.p,name,16);
+		memcpy(demobuf.p, name, 16);
 		demobuf.p += 16;
 
 		// Color
 		memset(name, 0, 16);
 		strncpy(name, KartColor_Names[player->skincolor], 16);
-		M_Memcpy(demobuf.p,name,16);
+		memcpy(demobuf.p, name, 16);
 		demobuf.p += 16;
 
 		// Score, since Kart uses this to determine where you start on the map
@@ -1834,19 +1834,19 @@ void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT
 	// Name
 	memset(temp, 0, 16);
 	strncpy(temp, name, 16);
-	M_Memcpy(demobuf.p,temp,16);
+	memcpy(demobuf.p,temp,16);
 	demobuf.p += 16;
 
 	// Skin
 	memset(temp, 0, 16);
 	strncpy(temp, skins[skinnum].name, 16);
-	M_Memcpy(demobuf.p,temp,16);
+	memcpy(demobuf.p,temp,16);
 	demobuf.p += 16;
 
 	// Color
 	memset(temp, 0, 16);
 	strncpy(temp, KartColor_Names[color], 16);
-	M_Memcpy(demobuf.p,temp,16);
+	memcpy(demobuf.p,temp,16);
 	demobuf.p += 16;
 
 	// Score/time/whatever
@@ -2212,7 +2212,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 	{
 		case DEMOVERSION: // latest always supported
 			// demo title
-			M_Memcpy(pdemo->title, info_p, 64);
+			memcpy(pdemo->title, info_p, 64);
 			info_p += 64;
 			break;
 #ifdef DEMO_COMPAT_100
@@ -2289,7 +2289,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 		{
 			for (UINT8 j = 0; kartspeed_cons_t[j].strvalue; j++)
 			{
-				if (!stricmp(kartspeed_cons_t[j].strvalue, svalue))
+				if (fasticmp(kartspeed_cons_t[j].strvalue, svalue))
 					pdemo->kartspeed = kartspeed_cons_t[j].value;
 			}
 		}
@@ -2311,17 +2311,17 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 		pdemo->standings[count].ranking = READUINT8(extrainfo_p);
 
 		// Name
-		M_Memcpy(pdemo->standings[count].name, extrainfo_p, 16);
+		memcpy(pdemo->standings[count].name, extrainfo_p, 16);
 		extrainfo_p += 16;
 
 		// Skin
-		M_Memcpy(temp,extrainfo_p,16);
+		memcpy(temp,extrainfo_p,16);
 		extrainfo_p += 16;
 		pdemo->standings[count].skin = UINT8_MAX;
 
 		for (i = 0; i < numskins; i++)
 		{
-			if (stricmp(skins[i].name, temp) == 0)
+			if (fasticmp(skins[i].name, temp))
 			{
 				pdemo->standings[count].skin = i;
 				break;
@@ -2329,12 +2329,12 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 		}
 
 		// Color
-		M_Memcpy(temp,extrainfo_p,16);
+		memcpy(temp,extrainfo_p,16);
 		extrainfo_p += 16;
 
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (!stricmp(KartColor_Names[i],temp))				// SRB2kart
+			if (fasticmp(KartColor_Names[i],temp)) // SRB2kart
 			{
 				pdemo->standings[count].color = i;
 				break;
@@ -2494,7 +2494,7 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
 	{
 		case DEMOVERSION: // latest always supported
 			// demo title
-			M_Memcpy(pdemo->title, info_p, 64);
+			memcpy(pdemo->title, info_p, 64);
 
 			// demo date
 			char *demodate;
@@ -2627,7 +2627,7 @@ void G_DoPlayDemo(char *defdemoname)
 	{
 		case DEMOVERSION: // latest always supported
 			// demo title
-			M_Memcpy(demo.titlename, demobuf.p, 64);
+			memcpy(demo.titlename, demobuf.p, 64);
 			demobuf.p += 64;
 			break;
 #ifdef DEMO_COMPAT_100
@@ -2766,15 +2766,15 @@ void G_DoPlayDemo(char *defdemoname)
 	if (demo.version == 0x0001)
 	{
 		// Player name
-		M_Memcpy(player_names[0],demobuf.p,16);
+		memcpy(player_names[0],demobuf.p,16);
 		demobuf.p += 16;
 
 		// Skin
-		M_Memcpy(skin,demobuf.p,16);
+		memcpy(skin,demobuf.p,16);
 		demobuf.p += 16;
 
 		// Color
-		M_Memcpy(color,demobuf.p,16);
+		memcpy(color,demobuf.p,16);
 		demobuf.p += 16;
 
 		demobuf.p += 5; // Backwards compat - some stats
@@ -2807,7 +2807,7 @@ void G_DoPlayDemo(char *defdemoname)
 		// Set color
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (!stricmp(KartColor_Names[i],color))				// SRB2kart
+			if (fasticmp(KartColor_Names[i],color)) // SRB2kart
 			{
 				players[0].skincolor = i;
 				break;
@@ -2933,21 +2933,21 @@ void G_DoPlayDemo(char *defdemoname)
 		players[p].spectator = spectator;
 
 		// Name
-		M_Memcpy(player_names[p],demobuf.p,16);
+		memcpy(player_names[p],demobuf.p,16);
 		demobuf.p += 16;
 
 		// Skin
-		M_Memcpy(skin,demobuf.p,16);
+		memcpy(skin,demobuf.p,16);
 		demobuf.p += 16;
 		SetPlayerSkin(p, skin);
 
 		// Color
-		M_Memcpy(color,demobuf.p,16);
+		memcpy(color,demobuf.p,16);
 		demobuf.p += 16;
 
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (!stricmp(KartColor_Names[i],color))				// SRB2kart
+			if (fasticmp(KartColor_Names[i],color)) // SRB2kart
 			{
 				players[p].skincolor = i;
 				break;
@@ -2961,7 +2961,7 @@ void G_DoPlayDemo(char *defdemoname)
 		kartspeed[p] = READUINT8(demobuf.p);
 		kartweight[p] = READUINT8(demobuf.p);
 
-		if (stricmp(skins[players[p].skin].name, skin) != 0)
+		if (!fasticmp(skins[players[p].skin].name, skin))
 			FindClosestSkinForStats(p, kartspeed[p], kartweight[p]);
 
 		// Look for the next player
@@ -3101,7 +3101,7 @@ void G_AddGhost(char *defdemoname)
 			return;
 	}
 
-	M_Memcpy(md5, p, 16); p += 16; // demo checksum
+	memcpy(md5, p, 16); p += 16; // demo checksum
 
 	for (gh = ghosts; gh; gh = gh->next)
 	{
@@ -3157,15 +3157,15 @@ void G_AddGhost(char *defdemoname)
 	if (ghostversion == 0x0001)
 	{
 		// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
-		M_Memcpy(name, p,16);
+		memcpy(name, p,16);
 		p += 16;
 
 		// Skin
-		M_Memcpy(skin, p,16);
+		memcpy(skin, p,16);
 		p += 16;
 
 		// Color
-		M_Memcpy(color, p,16);
+		memcpy(color, p,16);
 		p += 16;
 
 		// Ghosts do not have a player structure to put this in.
@@ -3215,15 +3215,15 @@ void G_AddGhost(char *defdemoname)
 	}
 
 	// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
-	M_Memcpy(name, p, 16);
+	memcpy(name, p, 16);
 	p += 16;
 
 	// Skin
-	M_Memcpy(skin, p, 16);
+	memcpy(skin, p, 16);
 	p += 16;
 
 	// Color
-	M_Memcpy(color, p, 16);
+	memcpy(color, p, 16);
 	p += 16;
 
 	p += 4; // score
@@ -3242,7 +3242,7 @@ void G_AddGhost(char *defdemoname)
 
 	for (i = 0; i < numskins; i++)
 	{
-		if (!stricmp(skins[i].name,skin))
+		if (fasticmp(skins[i].name, skin))
 		{
 			ghskin = &skins[i];
 			break;
@@ -3260,7 +3260,7 @@ void G_AddGhost(char *defdemoname)
 	gh = Z_Calloc(sizeof(demoghost), PU_LEVEL, NULL);
 	gh->next = ghosts;
 	gh->buffer = buffer;
-	M_Memcpy(gh->checksum, md5, 16);
+	memcpy(gh->checksum, md5, 16);
 	gh->p = p;
 	buffer = NULL; // buffer can't be freed now!
 
@@ -3317,7 +3317,7 @@ void G_AddGhost(char *defdemoname)
 
 	for (i = 0; i < MAXSKINCOLORS; i++)
 	{
-		if (!stricmp(KartColor_Names[i],color))				// SRB2kart
+		if (fasticmp(KartColor_Names[i],color)) // SRB2kart
 		{
 			gh->mo->color = (UINT8)i;
 			break;
@@ -3409,7 +3409,7 @@ void G_UpdateStaffGhostName(lumpnum_t l)
 	if (ghostversion == 0x0001)
 	{
 		// Player name
-		M_Memcpy(dummystaffname, p,16);
+		memcpy(dummystaffname, p,16);
 		dummystaffname[16] = '\0';
 		return; // Not really a failure but whatever
 	}
@@ -3431,7 +3431,7 @@ void G_UpdateStaffGhostName(lumpnum_t l)
 	if (READUINT8(p) != 0)
 		return;
 
-	M_Memcpy(dummystaffname, p, 16);
+	memcpy(dummystaffname, p, 16);
 	dummystaffname[16] = '\0';
 
 	// Ok, no longer any reason to care, bye
@@ -3625,7 +3625,7 @@ void G_SaveDemo(void)
 	}
 	WRITEUINT8(demobuf.p, DW_END); // Mark end of demo extra data.
 
-	M_Memcpy(p, demo.titlename, 64); // Write demo title here
+	memcpy(p, demo.titlename, 64); // Write demo title here
 	p += 64;
 
 	if (multiplayer)

src/g_game.c

@@ -570,6 +570,7 @@ static void G_SetSaveGameModified(void)
 	{
 		if (!unlockables[i].conditionset)
 			continue;
+
 		if (!unlockables[i].unlocked)
 		{
 			unlockables[i].unlocked = true;
@@ -595,7 +596,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 +635,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 +689,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 +753,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 +797,9 @@ boolean InputDown(INT32 gc, UINT8 p)
 	}
 }
 
-INT32 localaiming[MAXSPLITSCREENPLAYERS];
-angle_t localangle[MAXSPLITSCREENPLAYERS];
-boolean camspin[MAXSPLITSCREENPLAYERS];
+INT32 localaiming[MAXSPLITSCREENPLAYERS] = {0};
+angle_t localangle[MAXSPLITSCREENPLAYERS] = {0};
+boolean camspin[MAXSPLITSCREENPLAYERS] = {0};
 
 static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
 static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
@@ -1210,7 +1201,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 +1210,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 +1252,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 +2320,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 +2338,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 +2756,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 +2858,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 +3057,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 +3067,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 +3214,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 +3230,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 +3369,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 +3385,7 @@ void G_EndGame(void)
 			F_StartCredits();
 			return;
 		}
+
 		if (nextmap == 1101-1) // end game with evaluation
 		{
 			F_StartGameEvaluation();
@@ -3463,7 +3470,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 +3485,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 +3551,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 +3766,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 +4045,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;
@@ -4263,18 +4272,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

@@ -1033,7 +1033,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 +1333,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/hardware/hw_bsp.c

@@ -637,7 +637,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?");

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;
@@ -970,7 +970,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)
@@ -1068,7 +1068,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
@@ -1091,7 +1091,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_main.cpp

@@ -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;
@@ -1237,7 +1237,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 +1259,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 +1270,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;
 		}
 	}
@@ -4280,8 +4276,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;
@@ -5840,7 +5836,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 +5958,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

@@ -417,7 +417,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 +549,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 +561,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 +607,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 +651,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 +663,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 +1058,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 +1085,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_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/i_tcp.c

@@ -670,7 +670,7 @@ static boolean SOCK_Get(void)
 			{
 				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)));
@@ -1485,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/k_kart.c

@@ -637,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;
 }
 
@@ -2857,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

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

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

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

@@ -3719,10 +3719,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 +3830,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;
@@ -8808,7 +8808,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;
@@ -9469,7 +9469,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)

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[] =
@@ -1153,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[] =
@@ -1175,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[] =

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

@@ -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_mobj.c

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

@@ -3370,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.");

src/p_setup.c

@@ -806,7 +806,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 +1177,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 +1309,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 +1326,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 +1382,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 +1401,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 +1418,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 +1887,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 +2201,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 +2766,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 +3035,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

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

src/r_data.c

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

src/r_draw.cpp

@@ -113,6 +113,7 @@ 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_span.cpp

@@ -28,6 +28,8 @@
 #include <vector>
 #include <algorithm>
 
+#include "cxxutil.hpp"
+
 // ==========================================================================
 // SPANS
 // ==========================================================================
@@ -315,10 +317,10 @@ 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);
 
 		const INT32 x1 = ds->x1;
 
@@ -345,8 +347,8 @@ 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 = planezlight[tiltlight[ds->x1]] + colormap_diff;
 			if constexpr (Type & DS_RIPPLE)
@@ -366,10 +368,10 @@ 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--)
 			{

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

@@ -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_segs.cpp

@@ -30,6 +30,8 @@
 
 #include "core/memory.h"
 
+#include "cxxutil.hpp"
+
 #define HEIGHTBITS              12
 #define HEIGHTUNIT              (1<<HEIGHTBITS)
 
@@ -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,6 +54,7 @@ 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];
@@ -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_things.cpp

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

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

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

@@ -905,7 +905,7 @@ 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
@@ -977,7 +977,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;
 		}
@@ -1785,11 +1785,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;
 					}
@@ -1802,7 +1802,7 @@ void I_StartupGraphics(void)
 
 				if (!msaa_set)
 				{
-					if (strcasecmp(word, "msaa") == 0)
+					if (fasticmp(word, "msaa"))
 					{
 						const char *nextword = strtok(NULL, " \n");
 
@@ -1819,7 +1819,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");

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

src/v_video.c

@@ -23,7 +23,6 @@
 #include "r_main.h"
 #include "r_fps.h"
 #include "console.h"
-
 #include "i_video.h" // rendermode
 #include "z_zone.h"
 #include "m_misc.h"
@@ -43,8 +42,13 @@ static void CV_palette_OnChange(void);
 consvar_t cv_palette = {"palette", "", CV_CALL|CV_NOINIT, NULL, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_palettenum = {"palettenum", "0", CV_CALL|CV_NOINIT, CV_Unsigned, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
-static CV_PossibleValue_t gamma_cons_t[] = {{-15, "MIN"}, {4, "MAX"}, {0, NULL}};
+#ifdef BACKWARDSCOMPATCORRECTION
+static CV_PossibleValue_t gamma_cons_t[] = {{0, "MIN"}, {4, "MAX"}, {0, NULL}};
 consvar_t cv_globalgamma = {"gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+#endif
+
+static CV_PossibleValue_t brightness_cons_t[] = {{-15, "MIN"}, {5, "MAX"}, {0, NULL}};
+consvar_t cv_globalbrightness = {"brightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t saturation_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
 consvar_t cv_globalsaturation = {"saturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -59,12 +63,12 @@ consvar_t cv_chue = {"chue", "12", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnCha
 consvar_t cv_bhue = {"bhue", "16", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_mhue = {"mhue", "20", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_rgamma = {"rgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ygamma = {"ygamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ggamma = {"ggamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cgamma = {"cgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_bgamma = {"bgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mgamma = {"mgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_rbrightness = {"rbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_ybrightness = {"ybrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gbrightness = {"gbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cbrightness = {"cbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_bbrightness = {"bbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mbrightness = {"mbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_rsaturation = {"rsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_ysaturation = {"ysaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -85,6 +89,7 @@ consvar_t cv_menucaps = {"menucaps", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NUL
 
 // local copy of the palette for V_GetColor()
 RGBA_t *pLocalPalette = NULL;
+RGBA_t *pGammaCorrectedPalette = NULL;
 
 static size_t currentPaletteSize;
 
@@ -128,100 +133,97 @@ static boolean InitCube(void)
 	};
 
 	float desatur[3]; // grey
-	float globalgammamul, globalgammaoffs;
-	boolean doinggamma;
+	float globalbrightnessmul, globalbrightnessoffs;
+	boolean doingbrightness;
 
 	if (!loaded_config)
 		return false;
 
-#define diffcons(cv) (strcmp(cv.string, cv.defaultvalue))
-#define diffconsgamma(cv) (cv.value != 0)
+#define diffcons(cv) (!fastcmp(cv.string, cv.defaultvalue))
+#define diffconsbrightness(cv) (cv.value != 0)
+
 #define diffconssat(cv) (cv.value != 10)
 
-#ifdef BACKWARDSCOMPATCORRECTION
-	doinggamma = (cv_globalgamma.value < 0); //dont mess up gamma when raising brightness pls
-#else
-	doinggamma = diffcons(cv_globalgamma);
-#endif
+	doingbrightness = diffcons(cv_globalbrightness);
 
-#define gammascale 8
-	globalgammamul = (cv_globalgamma.value ? ((255.0f - (gammascale*abs(cv_globalgamma.value))) / 255.0f) : 1.0f);
-	globalgammaoffs = ((cv_globalgamma.value > 0) ? ((gammascale*cv_globalgamma.value) / 255.0f) : 0.0f);
-	desatur[0] = desatur[1] = desatur[2] = globalgammaoffs + (0.33f * globalgammamul);
+#define brightnessscale 8
+	globalbrightnessmul = (cv_globalbrightness.value ? ((255.0f - (brightnessscale*abs(cv_globalbrightness.value))) / 255.0f) : 1.0f);
+	globalbrightnessoffs = ((cv_globalbrightness.value > 0) ? ((brightnessscale*cv_globalbrightness.value) / 255.0f) : 0.0f);
+	desatur[0] = desatur[1] = desatur[2] = globalbrightnessoffs + (0.33f * globalbrightnessmul);
 
-	if (doinggamma
+	if (doingbrightness
 		|| diffcons(cv_rhue)
 		|| diffcons(cv_yhue)
 		|| diffcons(cv_ghue)
 		|| diffcons(cv_chue)
 		|| diffcons(cv_bhue)
 		|| diffcons(cv_mhue)
-		|| diffconsgamma(cv_rgamma)
-		|| diffconsgamma(cv_ygamma)
-		|| diffconsgamma(cv_ggamma)
-		|| diffconsgamma(cv_cgamma)
-		|| diffconsgamma(cv_bgamma)
-		|| diffconsgamma(cv_mgamma)) // set the gamma'd/hued positions (saturation is done later)
+		|| diffconsbrightness(cv_rbrightness)
+		|| diffconsbrightness(cv_ybrightness)
+		|| diffconsbrightness(cv_gbrightness)
+		|| diffconsbrightness(cv_cbrightness)
+		|| diffconsbrightness(cv_bbrightness)
+		|| diffconsbrightness(cv_mbrightness)) // set the brightness'd/hued positions (saturation is done later)
 	{
-		float mod, tempgammamul, tempgammaoffs;
+		float mod, tempbrightnessmul, tempbrightnessoffs;
 
 		apply = true;
 
-		working[0][0][0][0] = working[0][0][0][1] = working[0][0][0][2] = globalgammaoffs;
-		working[1][1][1][0] = working[1][1][1][1] = working[1][1][1][2] = globalgammaoffs+globalgammamul;
+		working[0][0][0][0] = working[0][0][0][1] = working[0][0][0][2] = globalbrightnessoffs;
+		working[1][1][1][0] = working[1][1][1][1] = working[1][1][1][2] = globalbrightnessoffs+globalbrightnessmul;
 
-#define dohue(hue, gamma, loc) \
-		tempgammamul = (gamma ? ((255.0f - (gammascale*abs(gamma)))/255.0f)*globalgammamul : globalgammamul);\
-		tempgammaoffs = ((gamma > 0) ? ((gammascale*gamma)/255.0f) + globalgammaoffs : globalgammaoffs);\
-		mod = ((hue % huecoloursteps)*(tempgammamul)/huecoloursteps);\
+#define dohue(hue, brightness, loc) \
+		tempbrightnessmul = (brightness ? ((255.0f - (brightnessscale*abs(brightness)))/255.0f)*globalbrightnessmul : globalbrightnessmul);\
+		tempbrightnessoffs = ((brightness > 0) ? ((brightnessscale*brightness)/255.0f) + globalbrightnessoffs : globalbrightnessoffs);\
+		mod = ((hue % huecoloursteps)*(tempbrightnessmul)/huecoloursteps);\
 		switch (hue/huecoloursteps)\
 		{\
 			case 0:\
 			default:\
-				loc[0] = tempgammaoffs+tempgammamul;\
-				loc[1] = tempgammaoffs+mod;\
-				loc[2] = tempgammaoffs;\
+				loc[0] = tempbrightnessoffs+tempbrightnessmul;\
+				loc[1] = tempbrightnessoffs+mod;\
+				loc[2] = tempbrightnessoffs;\
 				break;\
 			case 1:\
-				loc[0] = tempgammaoffs+tempgammamul-mod;\
-				loc[1] = tempgammaoffs+tempgammamul;\
-				loc[2] = tempgammaoffs;\
+				loc[0] = tempbrightnessoffs+tempbrightnessmul-mod;\
+				loc[1] = tempbrightnessoffs+tempbrightnessmul;\
+				loc[2] = tempbrightnessoffs;\
 				break;\
 			case 2:\
-				loc[0] = tempgammaoffs;\
-				loc[1] = tempgammaoffs+tempgammamul;\
-				loc[2] = tempgammaoffs+mod;\
+				loc[0] = tempbrightnessoffs;\
+				loc[1] = tempbrightnessoffs+tempbrightnessmul;\
+				loc[2] = tempbrightnessoffs+mod;\
 				break;\
 			case 3:\
-				loc[0] = tempgammaoffs;\
-				loc[1] = tempgammaoffs+tempgammamul-mod;\
-				loc[2] = tempgammaoffs+tempgammamul;\
+				loc[0] = tempbrightnessoffs;\
+				loc[1] = tempbrightnessoffs+tempbrightnessmul-mod;\
+				loc[2] = tempbrightnessoffs+tempbrightnessmul;\
 				break;\
 			case 4:\
-				loc[0] = tempgammaoffs+mod;\
-				loc[1] = tempgammaoffs;\
-				loc[2] = tempgammaoffs+tempgammamul;\
+				loc[0] = tempbrightnessoffs+mod;\
+				loc[1] = tempbrightnessoffs;\
+				loc[2] = tempbrightnessoffs+tempbrightnessmul;\
 				break;\
 			case 5:\
-				loc[0] = tempgammaoffs+tempgammamul;\
-				loc[1] = tempgammaoffs;\
-				loc[2] = tempgammaoffs+tempgammamul-mod;\
+				loc[0] = tempbrightnessoffs+tempbrightnessmul;\
+				loc[1] = tempbrightnessoffs;\
+				loc[2] = tempbrightnessoffs+tempbrightnessmul-mod;\
 				break;\
 		}
-		dohue(cv_rhue.value, cv_rgamma.value, working[1][0][0]);
-		dohue(cv_yhue.value, cv_ygamma.value, working[1][1][0]);
-		dohue(cv_ghue.value, cv_ggamma.value, working[0][1][0]);
-		dohue(cv_chue.value, cv_cgamma.value, working[0][1][1]);
-		dohue(cv_bhue.value, cv_bgamma.value, working[0][0][1]);
-		dohue(cv_mhue.value, cv_mgamma.value, working[1][0][1]);
+		dohue(cv_rhue.value, cv_rbrightness.value, working[1][0][0]);
+		dohue(cv_yhue.value, cv_ybrightness.value, working[1][1][0]);
+		dohue(cv_ghue.value, cv_gbrightness.value, working[0][1][0]);
+		dohue(cv_chue.value, cv_cbrightness.value, working[0][1][1]);
+		dohue(cv_bhue.value, cv_bbrightness.value, working[0][0][1]);
+		dohue(cv_mhue.value, cv_mbrightness.value, working[1][0][1]);
 #undef dohue
 	}
 
 #define dosaturation(a, e) a = ((1 - work)*e + work*a)
-#define docvsat(cv_sat, hue, gamma, r, g, b) \
+#define docvsat(cv_sat, hue, brightness, r, g, b) \
 	if diffconssat(cv_sat)\
 	{\
-		float work, mod, tempgammamul, tempgammaoffs;\
+		float work, mod, tempbrightnessmul, tempbrightnessoffs;\
 		apply = true;\
 		work = (cv_sat.value/10.0f);\
 		mod = ((hue % huecoloursteps)*(1.0f)/huecoloursteps);\
@@ -229,20 +231,20 @@ static boolean InitCube(void)
 			mod = 2-mod;\
 		else\
 			mod += 1;\
-		tempgammamul = (gamma ? ((255.0f - (gammascale*abs(gamma)))/255.0f)*globalgammamul : globalgammamul);\
-		tempgammaoffs = ((gamma > 0) ? ((gammascale*gamma)/255.0f) + globalgammaoffs : globalgammaoffs);\
+		tempbrightnessmul = (brightness ? ((255.0f - (brightnessscale*abs(brightness)))/255.0f)*globalbrightnessmul : globalbrightnessmul);\
+		tempbrightnessoffs = ((brightness > 0) ? ((brightnessscale*brightness)/255.0f) + globalbrightnessoffs : globalbrightnessoffs);\
 		for (q = 0; q < 3; q++)\
-			dosaturation(working[r][g][b][q], (tempgammaoffs+(desatur[q]*mod*tempgammamul)));\
+			dosaturation(working[r][g][b][q], (tempbrightnessoffs+(desatur[q]*mod*tempbrightnessmul)));\
 	}
 
-	docvsat(cv_rsaturation, cv_rhue.value, cv_rgamma.value, 1, 0, 0);
-	docvsat(cv_ysaturation, cv_yhue.value, cv_ygamma.value, 1, 1, 0);
-	docvsat(cv_gsaturation, cv_ghue.value, cv_ggamma.value, 0, 1, 0);
-	docvsat(cv_csaturation, cv_chue.value, cv_cgamma.value, 0, 1, 1);
-	docvsat(cv_bsaturation, cv_bhue.value, cv_bgamma.value, 0, 0, 1);
-	docvsat(cv_msaturation, cv_mhue.value, cv_mgamma.value, 1, 0, 1);
+	docvsat(cv_rsaturation, cv_rhue.value, cv_rbrightness.value, 1, 0, 0);
+	docvsat(cv_ysaturation, cv_yhue.value, cv_ybrightness.value, 1, 1, 0);
+	docvsat(cv_gsaturation, cv_ghue.value, cv_gbrightness.value, 0, 1, 0);
+	docvsat(cv_csaturation, cv_chue.value, cv_cbrightness.value, 0, 1, 1);
+	docvsat(cv_bsaturation, cv_bhue.value, cv_bbrightness.value, 0, 0, 1);
+	docvsat(cv_msaturation, cv_mhue.value, cv_mbrightness.value, 1, 0, 1);
 
-#undef gammascale
+#undef brightnessscale
 
 	if diffconssat(cv_globalsaturation)
 	{
@@ -265,7 +267,7 @@ static boolean InitCube(void)
 #undef dosaturation
 
 #undef diffcons
-#undef diffconsgamma
+#undef diffconsbrightness
 #undef diffconssat
 
 	if (!apply)
@@ -302,24 +304,6 @@ same, I'm not gonna be the one to remove this base modification.
 toast 20/04/17
 ... welp yes i am (27/07/19, see the ifdef around it)
 */
-const UINT8 correctiontable[256] =
-	{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,
-	17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,
-	33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,
-	49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,
-	65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,
-	81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,
-	97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
-	113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,
-	128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-	144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-	160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
-	176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
-	192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-	208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-	224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-	240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255};
-
 const UINT8 gammatable[5][256] =
 {
 	{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,
@@ -405,6 +389,26 @@ const UINT8 gammatable[5][256] =
 };
 #endif
 
+UINT32 V_GammaCorrect(UINT32 input, double power)
+{
+	RGBA_t result;
+	double linear;
+
+	result.rgba = input;
+
+	linear = ((double)result.s.red)/255.0f;
+	linear = pow(linear, power)*255.0f;
+	result.s.red = (UINT8)(linear);
+	linear = ((double)result.s.green)/255.0f;
+	linear = pow(linear, power)*255.0f;
+	result.s.green = (UINT8)(linear);
+	linear = ((double)result.s.blue)/255.0f;
+	linear = pow(linear, power)*255.0f;
+	result.s.blue = (UINT8)(linear);
+
+	return result.rgba;
+}
+
 // keep a copy of the palette so that we can get the RGB value for a color index at any time.
 static void LoadPalette(const char *lumpname)
 {
@@ -413,7 +417,7 @@ static void LoadPalette(const char *lumpname)
 	lumpnum_t lumpnum;
 
 #ifdef BACKWARDSCOMPATCORRECTION
-	const UINT8 *usegamma = gammatable[min(max(cv_globalgamma.value, 0), 4)];
+	const UINT8 *usegamma = gammatable[cv_globalgamma.value];
 #endif
 	Cubeapply = InitCube();
 
@@ -423,25 +427,18 @@ static void LoadPalette(const char *lumpname)
 	palsize = currentPaletteSize / 3;
 
 	Z_Free(pLocalPalette);
+	Z_Free(pGammaCorrectedPalette);
 
 	pLocalPalette = Z_Malloc(sizeof (*pLocalPalette)*palsize, PU_STATIC, NULL);
+	pGammaCorrectedPalette = Z_Malloc(sizeof (*pGammaCorrectedPalette)*palsize, PU_STATIC, NULL);
 
 	pal = W_CacheLumpNum(lumpnum, PU_CACHE);
 	for (i = 0; i < palsize; i++)
 	{
 #ifdef BACKWARDSCOMPATCORRECTION
-		if (cv_globalgamma.value >= 0 && cv_globalgamma.value <= 4)
-		{
-			pLocalPalette[i].s.red = usegamma[*pal++];
-			pLocalPalette[i].s.green = usegamma[*pal++];
-			pLocalPalette[i].s.blue = usegamma[*pal++];
-		}
-		else
-		{
-			pLocalPalette[i].s.red = correctiontable[*pal++];
-			pLocalPalette[i].s.green = correctiontable[*pal++];
-			pLocalPalette[i].s.blue = correctiontable[*pal++];
-		}
+		pLocalPalette[i].s.red = usegamma[*pal++];
+		pLocalPalette[i].s.green = usegamma[*pal++];
+		pLocalPalette[i].s.blue = usegamma[*pal++];
 #else
 		pLocalPalette[i].s.red = *pal++;
 		pLocalPalette[i].s.green = *pal++;
@@ -449,15 +446,17 @@ static void LoadPalette(const char *lumpname)
 #endif
 		pLocalPalette[i].s.alpha = 0xFF;
 
+		pGammaCorrectedPalette[i].rgba = V_GammaDecode(pLocalPalette[i].rgba);
+
 		if (!Cubeapply)
 			continue;
 
-		// lerp of colour cubing! if you want, make it smoother yourself
-		V_CubeApply(&pLocalPalette[i].s.red, &pLocalPalette[i].s.green, &pLocalPalette[i].s.blue);
+		V_CubeApply(&pGammaCorrectedPalette[i]);
+		pLocalPalette[i].rgba = V_GammaEncode(pGammaCorrectedPalette[i].rgba);
 	}
 }
 
-void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue)
+void V_CubeApply(RGBA_t *input)
 {
 	float working[4][3];
 	float linear;
@@ -466,7 +465,7 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue)
 	if (!Cubeapply)
 		return;
 
-	linear = (*red/255.0f);
+	linear = ((*input).s.red/255.0);
 #define dolerp(e1, e2) ((1 - linear)*e1 + linear*e2)
 	for (q = 0; q < 3; q++)
 	{
@@ -475,13 +474,15 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue)
 		working[2][q] = dolerp(Cubepal[0][0][1][q], Cubepal[1][0][1][q]);
 		working[3][q] = dolerp(Cubepal[0][1][1][q], Cubepal[1][1][1][q]);
 	}
-	linear = (*green/255.0f);
+
+	linear = ((*input).s.green/255.0);
 	for (q = 0; q < 3; q++)
 	{
 		working[0][q] = dolerp(working[0][q], working[1][q]);
 		working[1][q] = dolerp(working[2][q], working[3][q]);
 	}
-	linear = (*blue/255.0f);
+
+	linear = ((*input).s.blue/255.0);
 	for (q = 0; q < 3; q++)
 	{
 		working[0][q] = 255*dolerp(working[0][q], working[1][q]);
@@ -492,9 +493,9 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue)
 	}
 #undef dolerp
 
-	*red = (UINT8)(working[0][0]);
-	*green = (UINT8)(working[0][1]);
-	*blue = (UINT8)(working[0][2]);
+	(*input).s.red = (UINT8)(working[0][0]);
+	(*input).s.green = (UINT8)(working[0][1]);
+	(*input).s.blue = (UINT8)(working[0][2]);
 }
 
 const char *R_GetPalname(UINT16 num)
@@ -596,7 +597,7 @@ void V_ResetPaletteCVars(void)
 	if (!loaded_config)
 		return;
 
-#define diffcons(cv) (strcmp(cv.string, cv.defaultvalue))
+#define diffcons(cv) (!fastcmp(cv.string, cv.defaultvalue))
 	if diffcons(cv_palette)
 		CV_StealthSetValue(&cv_palette, atoi(cv_palette.defaultvalue));
 	if diffcons(cv_palettenum)
@@ -627,13 +628,13 @@ void VID_BlitLinearScreen(const UINT8 *restrict srcptr, UINT8 *restrict destptr,
 			i -= 16;
 		}
 #endif
-		M_Memcpy(destptr, srcptr, i);
+		memcpy(destptr, srcptr, i);
 	}
 	else
 	{
 		while (height--)
 		{
-			M_Memcpy(destptr, srcptr, width);
+			memcpy(destptr, srcptr, width);
 
 			destptr += destrowbytes;
 			srcptr += srcrowbytes;
@@ -1194,7 +1195,7 @@ void V_DrawBlock(INT32 x, INT32 y, INT32 scrn, INT32 width, INT32 height, const
 
 	while (height--)
 	{
-		M_Memcpy(dest, src, width);
+		memcpy(dest, src, width);
 
 		src += width;
 		dest += vid.width;
@@ -1329,37 +1330,37 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 // This is now a function since it's otherwise repeated 2 times and honestly looks retarded:
 static UINT32 V_GetHWConsBackColor(void)
 {
-	UINT8 r, g, b;
+	RGBA_t output;
 
 	switch (cons_backcolor.value)
 	{
-		case 0:		r = 0xff; g = 0xff; b = 0xff;	break; 	// White
-		case 1:		r = 0x80; g = 0x80; b = 0x80;	break; 	// Black
-		case 2:		r = 0xde; g = 0xb8; b = 0x87;	break;	// Sepia
-		case 3:		r = 0x40; g = 0x20; b = 0x10;	break; 	// Brown
-		case 4:		r = 0xfa; g = 0x80; b = 0x72;	break; 	// Pink
-		case 5:		r = 0xff; g = 0x69; b = 0xb4;	break; 	// Raspberry
-		case 6:		r = 0xff; g = 0x00; b = 0x00;	break; 	// Red
-		case 7:		r = 0xff; g = 0xd6; b = 0x83;	break;	// Creamsicle
-		case 8:		r = 0xff; g = 0x80; b = 0x00;	break; 	// Orange
-		case 9:		r = 0xda; g = 0xa5; b = 0x20;	break; 	// Gold
-		case 10:	r = 0x80; g = 0x80; b = 0x00;	break; 	// Yellow
-		case 11:	r = 0x00; g = 0xff; b = 0x00;	break; 	// Emerald
-		case 12:	r = 0x00; g = 0x80; b = 0x00;	break; 	// Green
-		case 13:	r = 0x40; g = 0x80; b = 0xff;	break; 	// Cyan
-		case 14:	r = 0x46; g = 0x82; b = 0xb4;	break; 	// Steel
-		case 15:	r = 0x1e; g = 0x90; b = 0xff;	break;	// Periwinkle
-		case 16:	r = 0x00; g = 0x00; b = 0xff;	break; 	// Blue
-		case 17:	r = 0xff; g = 0x00; b = 0xff;	break; 	// Purple
-		case 18:	r = 0xee; g = 0x82; b = 0xee;	break; 	// Lavender
+		case 0:		output.s.red = 0xff; output.s.green = 0xff; output.s.blue = 0xff;	break; 	// White
+		case 1:		output.s.red = 0x80; output.s.green = 0x80; output.s.blue = 0x80;	break; 	// Black
+		case 2:		output.s.red = 0xde; output.s.green = 0xb8; output.s.blue = 0x87;	break;	// Sepia
+		case 3:		output.s.red = 0x40; output.s.green = 0x20; output.s.blue = 0x10;	break; 	// Brown
+		case 4:		output.s.red = 0xfa; output.s.green = 0x80; output.s.blue = 0x72;	break; 	// Pink
+		case 5:		output.s.red = 0xff; output.s.green = 0x69; output.s.blue = 0xb4;	break; 	// Raspberry
+		case 6:		output.s.red = 0xff; output.s.green = 0x00; output.s.blue = 0x00;	break; 	// Red
+		case 7:		output.s.red = 0xff; output.s.green = 0xd6; output.s.blue = 0x83;	break;	// Creamsicle
+		case 8:		output.s.red = 0xff; output.s.green = 0x80; output.s.blue = 0x00;	break; 	// Orange
+		case 9:		output.s.red = 0xda; output.s.green = 0xa5; output.s.blue = 0x20;	break; 	// Gold
+		case 10:	output.s.red = 0x80; output.s.green = 0x80; output.s.blue = 0x00;	break; 	// Yellow
+		case 11:	output.s.red = 0x00; output.s.green = 0xff; output.s.blue = 0x00;	break; 	// Emerald
+		case 12:	output.s.red = 0x00; output.s.green = 0x80; output.s.blue = 0x00;	break; 	// Green
+		case 13:	output.s.red = 0x40; output.s.green = 0x80; output.s.blue = 0xff;	break; 	// Cyan
+		case 14:	output.s.red = 0x46; output.s.green = 0x82; output.s.blue = 0xb4;	break; 	// Steel
+		case 15:	output.s.red = 0x1e; output.s.green = 0x90; output.s.blue = 0xff;	break;	// Periwinkle
+		case 16:	output.s.red = 0x00; output.s.green = 0x00; output.s.blue = 0xff;	break; 	// Blue
+		case 17:	output.s.red = 0xff; output.s.green = 0x00; output.s.blue = 0xff;	break; 	// Purple
+		case 18:	output.s.red = 0xee; output.s.green = 0x82; output.s.blue = 0xee;	break; 	// Lavender
 		// Default green
-		default:	r = 0x00; g = 0x80; b = 0x00;	break;
+		default:	output.s.red = 0x00; output.s.green = 0x80; output.s.blue = 0x00;	break;
 	}
 
 	if (!HWR_ShouldUsePaletteRendering())
-		V_CubeApply(&r, &g, &b);
+		V_CubeApply(&output);
 
-	return (r << 24) | (g << 16) | (b << 8);
+	return (output.s.red << 24) | (output.s.green << 16) | (output.s.blue << 8);
 }
 #endif
 
@@ -1739,7 +1740,8 @@ void V_DrawHorizontallyScaledFullScreenPatch(patch_t *patch)
 
 void V_DrawVhsEffect(boolean rewind)
 {
-	static fixed_t upbary = 100, downbary = 150;
+	fixed_t uby, dby;
+	static fixed_t upbary = 100*FRACUNIT, downbary = 150*FRACUNIT;
 
 	UINT8 barsize, updistort, downdistort;
 
@@ -1760,19 +1762,21 @@ void V_DrawVhsEffect(boolean rewind)
 	if (rewind)
 		V_DrawVhsEffect(false); // experimentation
 
-	upbary -= FixedMul(vid.dup * (rewind ? 3 : 1.8f), renderdeltatics);
-	downbary += FixedMul(vid.dup * (rewind ? 2 : 1), renderdeltatics);
+	upbary -= renderdeltatics * (vid.dup * (rewind ? 3 : 1.8f));
+	downbary += renderdeltatics * (vid.dup * (rewind ? 2 : 1));
 
-	if (upbary < -barsize)
-		upbary = vid.height;
+	if (upbary < -barsize*FRACUNIT)
+		upbary = vid.height << FRACBITS;
+	if (downbary > vid.height << FRACBITS)
+		downbary = -barsize*FRACUNIT;
 
-	if (downbary > vid.height)
-		downbary = -barsize;
+	uby = upbary >> FRACBITS;
+	dby = downbary >> FRACBITS;
 
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
 	{
-		HWR_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
+		HWR_RenderVhsEffect(uby, dby, updistort, downdistort, barsize);
 		return;
 	}
 #endif
@@ -1792,16 +1796,16 @@ void V_DrawVhsEffect(boolean rewind)
 		thismapstart = normalmapstart;
 		offs = 0;
 
-		if (y >= upbary && y < upbary+barsize)
+		if (y >= uby && y < uby+barsize)
 		{
 			thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
-			offs += updistort * 2.0f * min(y-upbary, upbary+barsize-y) / barsize;
+			offs += updistort * 2.0f * min(y-uby, uby+barsize-y) / barsize;
 		}
 
-		if (y >= downbary && y < downbary+barsize)
+		if (y >= dby && y < dby+barsize)
 		{
 			thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
-			offs -= downdistort * 2.0f * min(y-downbary, downbary+barsize-y) / barsize;
+			offs -= downdistort * 2.0f * min(y-dby, dby+barsize-y) / barsize;
 		}
 
 		offs += M_RandomKey(vid.dup<<1);
@@ -3645,7 +3649,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 
 			if (sine < 0)
 			{
-				M_Memcpy(&tmpscr[(y*vid.width)+xoffset+newpix], &srcscr[(y*vid.width)+xoffset], viewwidth-newpix);
+				memcpy(&tmpscr[(y*vid.width)+xoffset+newpix], &srcscr[(y*vid.width)+xoffset], viewwidth-newpix);
 
 				// Cleanup edge
 				while (newpix)
@@ -3656,7 +3660,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 			}
 			else
 			{
-				M_Memcpy(&tmpscr[(y*vid.width)+xoffset+0], &srcscr[(y*vid.width)+xoffset+sine], viewwidth-newpix);
+				memcpy(&tmpscr[(y*vid.width)+xoffset+0], &srcscr[(y*vid.width)+xoffset+sine], viewwidth-newpix);
 
 				// Cleanup edge
 				while (newpix)
@@ -3716,10 +3720,10 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 			{
 				// Shift this row of pixels to the right by 2
 				tmpscr[(y*vid.width)+xoffset] = srcscr[(y*vid.width)+xoffset];
-				M_Memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset+vid.dup], viewwidth-vid.dup);
+				memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset+vid.dup], viewwidth-vid.dup);
 			}
 			else
-				M_Memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
+				memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
 
 			heatindex[view] %= viewheight;
 		}
@@ -3756,7 +3760,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 		INT32 y, y2;
 
 		for (y = yoffset, y2 = yoffset+viewheight - 1; y < yoffset+viewheight; y++, y2--)
-			M_Memcpy(&tmpscr[(y2*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
+			memcpy(&tmpscr[(y2*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
 
 		UINT8 *tmp = tmpscr;
 		tmpscr = srcscr;
@@ -3812,12 +3816,14 @@ void InitColorLUT(colorlookup_t *lut, RGBA_t *palette, boolean makecolors)
 			UINT8 r, g, b;
 
 			for (r = 0; r < 0xFF; r++)
-			for (g = 0; g < 0xFF; g++)
-			for (b = 0; b < 0xFF; b++)
 			{
-				i = CLUTINDEX(r, g, b);
-				if (lut->table[i] == 0xFFFF)
-					lut->table[i] = NearestPaletteColor(r, g, b, palette);
+				for (g = 0; g < 0xFF; g++)
+				{
+					for (b = 0; b < 0xFF; b++)
+					{
+						lut->table[i] = GetColorLUT(lut, r, g, b);
+					}
+				}
 			}
 		}
 	}

src/v_video.h

@@ -40,9 +40,12 @@ extern "C" {
 //
 
 extern consvar_t cv_ticrate, cv_accuratefps, cv_allcaps, cv_constextsize, cv_menucaps,
-cv_globalgamma, cv_globalsaturation,
+#ifdef BACKWARDSCOMPATCORRECTION
+cv_globalgamma,
+#endif
+cv_globalbrightness, cv_globalsaturation,
 cv_rhue, cv_yhue, cv_ghue, cv_chue, cv_bhue, cv_mhue,
-cv_rgamma, cv_ygamma, cv_ggamma, cv_cgamma, cv_bgamma, cv_mgamma,
+cv_rbrightness, cv_ybrightness, cv_gbrightness, cv_cbrightness, cv_bbrightness, cv_mbrightness,
 cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation, cv_msaturation,
 cv_palette, cv_palettenum;
 
@@ -78,10 +81,15 @@ const char *R_GetPalname(UINT16 num);
 const char *GetPalette(void);
 
 extern RGBA_t *pLocalPalette;
+extern RGBA_t *pGammaCorrectedPalette;
 
 extern UINT8 hudtrans;
 
-void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
+UINT32 V_GammaCorrect(UINT32 input, double power);
+#define V_GammaDecode(input) V_GammaCorrect(input, 2.2f)
+#define V_GammaEncode(input) V_GammaCorrect(input, (1/2.2f))
+
+void V_CubeApply(RGBA_t *input);
 
 // Retrieve the ARGB value from a palette color index
 #define V_GetColor(color) (pLocalPalette[color&0xFF])

src/w_wad.c

@@ -375,11 +375,11 @@ static restype_t ResourceFileDetect(const char* filename)
 {
 	size_t len = strlen(filename) - 4;
 
-	if (!stricmp(&filename[len], ".pk3"))
+	if (fasticmp(&filename[len], ".pk3"))
 		return RET_PK3;
-	if (!stricmp(&filename[len], ".soc"))
+	if (fasticmp(&filename[len], ".soc"))
 		return RET_SOC;
-	if (!stricmp(&filename[len], ".lua"))
+	if (fasticmp(&filename[len], ".lua"))
 		return RET_LUA;
 
 	return RET_WAD;
@@ -906,7 +906,7 @@ UINT16 W_InitFile(const char *filename, boolean local, boolean startup)
 	wadfile->endfolders = M_AATreeAlloc(AATREE_STRING);
 
 	// already generated, just copy it over
-	M_Memcpy(&wadfile->md5sum, &md5sum, 16);
+	memcpy(&wadfile->md5sum, &md5sum, 16);
 
 	//
 	// set up caching
@@ -1130,7 +1130,7 @@ UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 		{
 			if (lump_p->longnamelength == namelen
 				&& lump_p->hash.longname == hash
-				&& !stricmp(lump_p->longname, name))
+				&& fasticmp(lump_p->longname, name))
 				return i;
 		}
 	}
@@ -1230,7 +1230,7 @@ static lumpnum_t CheckLumpInCache(const char *name, boolean longname)
 		for (INT32 i = lumpnumcacheindex + LUMPNUMCACHESIZE; i > lumpnumcacheindex; i--)
 		{
 			if (lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].hash == hash
-				&& stricmp(lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].lumpname, name) == 0)
+				&& fasticmp(lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].lumpname, name))
 			{
 				lumpnumcacheindex = i & (LUMPNUMCACHESIZE - 1);
 				return lumpnumcache[lumpnumcacheindex].lumpnum;
@@ -1637,7 +1637,7 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
 
 			if (!decData) // Did we get no data at all?
 				return 0;
-			M_Memcpy(dest, decData + offset, size);
+			memcpy(dest, decData + offset, size);
 			Z_Free(rawData);
 			Z_Free(decData);
 #ifdef NO_PNG_LUMPS

src/z_zone.cpp

@@ -35,7 +35,6 @@
 #include "i_system.h" // I_GetFreeMem
 #include "i_video.h" // rendermode
 #include "z_zone.h"
-#include "m_misc.h" // M_Memcpy
 #include "lua_script.h"
 
 #ifdef HWRENDER
@@ -383,7 +382,7 @@ void *Z_Realloc(void *ptr, size_t size, INT32 tag, void *user)
 	else
 		copysize = block->size;
 
-	M_Memcpy(rez, ptr, copysize);
+	memcpy(rez, ptr, copysize);
 
 #ifdef ZDEBUG
 	Z_Free2(ptr, file, line);