i_tcp: reset errno in UDP_Bind and SOCK_Send

on non WINSOCK systems

src/blua/lauxlib.c

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

src/blua/liolib.c

@@ -161,13 +161,12 @@ static int io_tostring (lua_State *L) {
 
 static int StartsWith(const char *a, const char *b) // this is wolfs being lazy yet again
 {
-   if (strncmp(a, b, strlen(b)) == 0) return 1;
+   if(strncmp(a, b, strlen(b)) == 0) return 1;
    return 0;
 }
 
 
-static int io_open(lua_State *L)
-{
+static int io_open (lua_State *L) {
 	FILE **pf;
 	const char *filename = luaL_checkstring(L, 1);
 	int pass = 0;
@@ -179,13 +178,12 @@ static int io_open(lua_State *L)
 
 	for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
 	{
-		if (fasticmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
+		if (!stricmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
 		{
 			pass = 1;
 			break;
 		}
 	}
-
 	if (l_unlikely(strstr(filename, "..") || strchr(filename, ':') || StartsWith(filename, "\\")
 		|| StartsWith(filename, "/") || !pass))
 	{

src/command.c

@@ -359,7 +359,7 @@ size_t COM_CheckParm(const char *check)
 	size_t i;
 
 	for (i = 1; i < com_argc; i++)
-		if (fasticmp(check, com_argv[i]))
+		if (!strcasecmp(check, com_argv[i]))
 			return i;
 	return 0;
 }
@@ -456,7 +456,7 @@ void COM_AddCommand(const char *name, com_func_t func)
 	// fail if the command already exists
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (fasticmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			// don't I_Error for Lua commands
 			// Lua commands can replace game commands, and they have priority.
@@ -492,7 +492,7 @@ int COM_AddLuaCommand(const char *name)
 	// command already exists
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (fasticmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			// replace the built in command.
 			cmd->function = COM_Lua_f;
@@ -519,7 +519,7 @@ static boolean COM_Exists(const char *com_name)
 	xcommand_t *cmd;
 
 	for (cmd = com_commands; cmd; cmd = cmd->next)
-		if (fasticmp(com_name, cmd->name))
+		if (!stricmp(com_name, cmd->name))
 			return true;
 
 	return false;
@@ -571,7 +571,7 @@ static void COM_ExecuteString(char *ptext)
 	// check functions
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (fasticmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (!stricmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			cmd->function();
 			return;
@@ -581,7 +581,7 @@ static void COM_ExecuteString(char *ptext)
 	// check aliases
 	for (a = com_alias; a; a = a->next)
 	{
-		if (fasticmp(com_argv[0], a->name))
+		if (!stricmp(com_argv[0], a->name))
 		{
 			if (recursion > MAX_ALIAS_RECURSION)
 				CONS_Alert(CONS_WARNING, M_GetText("Alias recursion cycle detected!\n"));
@@ -836,7 +836,7 @@ static void COM_Help_f(void)
 			if (cvar->PossibleValue)
 			{
 				{
-					if (fasticmp(cvar->PossibleValue[0].strvalue, "MIN") && fasticmp(cvar->PossibleValue[1].strvalue, "MAX"))
+					if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX"))
 					{
 						if (floatmode)
 						{
@@ -879,7 +879,7 @@ static void COM_Help_f(void)
 		{
 			for (cmd = com_commands; cmd; cmd = cmd->next)
 			{
-				if (!fastcmp(cmd->name, help))
+				if (strcmp(cmd->name, help))
 					continue;
 
 				CONS_Printf("\x82""Command %s:\n", cmd->name);
@@ -1176,7 +1176,7 @@ consvar_t *CV_FindVar(const char *name)
 	consvar_t *cvar;
 
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if (fasticmp(name,cvar->name))
+		if (!stricmp(name,cvar->name))
 			return cvar;
 
 	return NULL;
@@ -1366,7 +1366,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 				v = INT32_MIN; // Invalid integer trigger
 		}
 
-		if (var->PossibleValue[0].strvalue && fasticmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
+		if (var->PossibleValue[0].strvalue && !stricmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
 		{
 #define MINVAL 0
 #define MAXVAL 1
@@ -1379,21 +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 || fasticmp(var->PossibleValue[i].strvalue, valstr))
+				if (v == var->PossibleValue[i].value || !stricmp(var->PossibleValue[i].strvalue, valstr))
 				{
 					var->value = var->PossibleValue[i].value;
 					var->string = var->PossibleValue[i].strvalue;
 					goto finish;
 				}
 
-			if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || fasticmp(valstr, "MIN"))
+			if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || !stricmp(valstr, "MIN"))
 			{
 				v = var->PossibleValue[MINVAL].value;
 				valstr = var->PossibleValue[MINVAL].strvalue;
 				override = true;
 				overrideval = v;
 			}
-			else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || fasticmp(valstr, "MAX"))
+			else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || !stricmp(valstr, "MAX"))
 			{
 				v = var->PossibleValue[MAXVAL].value;
 				valstr = var->PossibleValue[MAXVAL].strvalue;
@@ -1411,7 +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 (fasticmp(var->PossibleValue[i].strvalue, valstr))
+				if (!stricmp(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 (fasticmp(valstr, "on") || fasticmp(valstr, "yes"))
+				if (!stricmp(valstr, "on") || !stricmp(valstr, "yes"))
 					overrideval = 1;
-				else if (fasticmp(valstr, "off") || fasticmp(valstr, "no"))
+				else if (!stricmp(valstr, "off") || !stricmp(valstr, "no"))
 					overrideval = 0;
 
 				if (overrideval != -1)
@@ -1610,7 +1610,7 @@ void CV_ResetCheatNetVars(void)
 // Returns true if the variable's current value is its default value
 boolean CV_IsSetToDefault(consvar_t *v)
 {
-	return (fastcmp(v->defaultvalue, v->string));
+	return (!(strcmp(v->defaultvalue, v->string)));
 }
 
 // If any cheats CVars are not at their default settings, return true.
@@ -1622,7 +1622,7 @@ UINT8 CV_CheatsEnabled(void)
 	consvar_t *cvar;
 
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if ((cvar->flags & CV_CHEAT) && !fastcmp(cvar->defaultvalue, cvar->string))
+		if ((cvar->flags & CV_CHEAT) && strcmp(cvar->defaultvalue, cvar->string))
 			return 1;
 	return 0;
 }
@@ -1643,7 +1643,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 	if (!var->string)
 		I_Error("CV_Set: %s no string set!\n", var->name);
 #endif
-	if (!var || !var->string || !value || fasticmp(var->string, value))
+	if (!var || !var->string || !value || !stricmp(var->string, value))
 		return; // no changes
 
 	if (var->flags & CV_NETVAR)
@@ -1665,7 +1665,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 
 		if (var == &cv_kartspeed && !M_SecretUnlocked(SECRET_HARDSPEED))
 		{
-			if (fasticmp(value, "Hard") || atoi(value) == 2)
+			if (!stricmp(value, "Hard") || atoi(value) == 2)
 			{
 				CONS_Alert(CONS_NOTICE, "You haven't unlocked this yet!\n");
 				return;
@@ -1799,7 +1799,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 		}
 #define MINVAL 0
 #define MAXVAL 1
-		else if (var->PossibleValue[MINVAL].strvalue && fastcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
+		else if (var->PossibleValue[MINVAL].strvalue && !strcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
 		{ // SRB2Kart
 #ifdef PARANOIA
 			if (!var->PossibleValue[MAXVAL].strvalue)
@@ -1971,12 +1971,12 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 	{
 		if (joyaxis_default[i])
 		{
-			if (fasticmp(v->name, "joyaxis_fire"))
+			if (!stricmp(v->name, "joyaxis_fire"))
 			{
 				if (joyaxis_count[i] > 7) return false;
 				else if (joyaxis_count[i] == 7) return true;
 
-				if (fasticmp(valstr, "None")) joyaxis_count[i]++;
+				if (!stricmp(valstr, "None")) joyaxis_count[i]++;
 				else joyaxis_default[i] = false;
 			}
 			// reset all axis settings to defaults
@@ -2008,37 +2008,37 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 // Block the Xbox DInput default axes and reset to the current defaults
 static boolean CV_FilterJoyAxisVars2(consvar_t *v, const char *valstr)
 {
-	if (fasticmp(v->name, "joyaxis_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis2_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis3_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_turn") && fasticmp(valstr, "X-Axis"))
+	if (!stricmp(v->name, "joyaxis4_turn") && !stricmp(valstr, "X-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis2_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis3_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_aim") && fasticmp(valstr, "Y-Axis"))
+	if (!stricmp(v->name, "joyaxis4_aim") && !stricmp(valstr, "Y-Axis"))
 		return false;
-	if (fasticmp(v->name, "joyaxis_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis2_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis3_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_fire") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis4_fire") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis_drift") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis2_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis2_drift") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis3_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis3_drift") && !stricmp(valstr, "None"))
 		return false;
-	if (fasticmp(v->name, "joyaxis4_drift") && fasticmp(valstr, "None"))
+	if (!stricmp(v->name, "joyaxis4_drift") && !stricmp(valstr, "None"))
 		return false;
 
 	return true;
@@ -2055,8 +2055,8 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr)
 
 	if (GETMAJOREXECVERSION(cv_execversion.value) < 8) // 8 = 1.4
 	{
-		if (fasticmp(v->name, "masterserver") // Replaces a hack in MasterServer_OnChange for the original SRB2 MS.
-			|| fasticmp(v->name, "gamma")) // Too easy to accidentially change in prior versions.
+		if (!stricmp(v->name, "masterserver") // Replaces a hack in MasterServer_OnChange for the original SRB2 MS.
+			|| !stricmp(v->name, "gamma")) // Too easy to accidentially change in prior versions.
 			return false;
 	}
 
@@ -2139,7 +2139,7 @@ void CV_SaveVariables(FILE *f)
 			char stringtowrite[MAXTEXTCMD+1];
 
 			// Silly hack for Min/Max vars
-			if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
+			if (!strcmp(cvar->string, "MAX") || !strcmp(cvar->string, "MIN"))
 			{
 				if (cvar->flags & CV_FLOAT)
 					sprintf(stringtowrite, "%f", FixedToFloat(cvar->value));

src/console.c

@@ -1010,7 +1010,7 @@ boolean CON_Responder(event_t *ev)
 		Lock_state();
 
 		// Only add command to history if it differs from previous one
-		if (!fastcmp(input.buffer, inputlines[(inputline-1) & 31]))
+		if (strcmp(input.buffer, inputlines[(inputline-1) & 31]))
 		{
 			inputline = (inputline+1) & 31;
 			M_TextInputInit(&input, inputlines[inputline], CON_MAXPROMPTCHARS);

src/d_clisrv.c

@@ -2174,7 +2174,7 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
 		if (info->subversion != SUBVERSION)
 			return; // Close, but no cigar.
 
-		if (!fastcmp(info->application, SRB2APPLICATION))
+		if (strcmp(info->application, SRB2APPLICATION))
 			return;/* that's a different mod */
 
 		i = serverlistcount++;
@@ -2219,7 +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 (fastcmp(version, server_list[i].version))
+		//if (strcmp(version, server_list[i].version) == 0)
 		{
 			INT32 node = I_NetMakeNodewPort(server_list[i].ip, server_list[i].port);
 			if (node == -1)
@@ -3215,7 +3215,7 @@ static void Command_connect(void)
 
 	server = false;
 
-	if (fasticmp(COM_Argv(1), "self"))
+	if (!stricmp(COM_Argv(1), "self"))
 	{
 		servernode = 0;
 		server = true;
@@ -3225,7 +3225,7 @@ static void Command_connect(void)
 	else
 	{
 		// used in menu to connect to a server in the list
-		if (netgame && fasticmp(COM_Argv(1), "node"))
+		if (netgame && !stricmp(COM_Argv(1), "node"))
 		{
 			servernode = (SINT8)atoi(COM_Argv(2));
 		}
@@ -3240,7 +3240,7 @@ static void Command_connect(void)
 			netgame = true;
 			multiplayer = true;
 
-			if (fasticmp(COM_Argv(1), "any"))
+			if (!stricmp(COM_Argv(1), "any"))
 				servernode = BROADCASTADDR;
 			else if (I_NetMakeNodewPort && COM_Argc() >= 3)
 				servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
@@ -3264,7 +3264,6 @@ static void Command_connect(void)
 		splitscreen = cv_splitplayers.value-1;
 		SplitScreen_OnChange();
 	}
-
 	botingame = false;
 	botskin = 0;
 	CL_ConnectToServer();
@@ -4650,22 +4649,11 @@ void SV_StopServer(void)
 		Y_EndIntermission();
 	if (gamestate == GS_VOTING)
 		Y_EndVote();
-
-	G_SetGamestate(GS_NULL);
-	wipegamestate = GS_NULL;
+	gamestate = wipegamestate = GS_NULL;
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
-	{
 		localtextcmd[i][0] = 0;
 
-		while (textcmdbuf[i] != NULL)
-		{
-			textcmdbuf_t *buf = textcmdbuf[i];
-			textcmdbuf[i] = textcmdbuf[i]->next;
-			Z_Free(buf);
-		}
-	}
-
 	for (i = firstticstosend; i < firstticstosend + BACKUPTICS; i++)
 		D_Clearticcmd(i);
 

src/d_main.c

@@ -97,15 +97,15 @@
 UINT8 window_notinfocus = false;
 
 static char *startupiwadfiles[MAX_WADFILES];
-static size_t startupiwadcount = 0;
 static char *startuppwads[MAX_WADFILES];
-static size_t startuppwadcount = 0;
 
 // autoloading
 static char *autoloadwadfiles[MAX_WADFILES];
 static char *autoloadwadfilespost[MAX_WADFILES];
-static size_t autoloadcount = 0;
-static size_t postloadcount = 0;
+boolean autoloading;
+boolean autoloaded;
+boolean postautoloaded = false;
+boolean wasautoloaded = false;
 //
 
 boolean devparm = false; // started game with -devparm
@@ -113,9 +113,7 @@ boolean devparm = false; // started game with -devparm
 boolean singletics = false; // timedemo
 boolean lastdraw = false;
 
-#ifdef MOTIONBLUR
 INT32 postimgparam[MAXSPLITSCREENPLAYERS];
-#endif
 
 // These variables are only true if
 // whether the respective sound system is disabled
@@ -399,11 +397,7 @@ static void D_Renderview(void)
 			if (i == 0)
 				R_ApplyViewMorph();
 
-#ifdef MOTIONBLUR
 			V_DoPostProcessor(i, postimgparam[i]);
-#else
-			V_DoPostProcessor(i, 0);
-#endif
 		}
 	}
 
@@ -1044,10 +1038,14 @@ void D_StartTitle(void)
 //
 // D_AddFile
 //
-static void D_AddFile(const char *file, char **filearray, size_t index)
+static void D_AddFile(const char *file, char **filearray)
 {
+	size_t pnumwadfiles;
 	char *newfile;
 
+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
+		;
+
 	newfile = malloc(strlen(file) + 1);
 	if (!newfile)
 	{
@@ -1055,17 +1053,16 @@ static void D_AddFile(const char *file, char **filearray, size_t index)
 	}
 	strcpy(newfile, file);
 
-	filearray[index] = newfile;
+	filearray[pnumwadfiles] = newfile;
 }
 
-static void D_CleanFile(char **filearray, size_t count)
+static void D_CleanFile(char **filearray)
 {
-	size_t i;
-
-	for (i = 0; i < count; i++)
+	size_t pnumwadfiles;
+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
 	{
-		free(filearray[i]);
-		filearray[i] = NULL;
+		free(filearray[pnumwadfiles]);
+		filearray[pnumwadfiles] = NULL;
 	}
 }
 
@@ -1078,27 +1075,28 @@ static INT32 D_DetectFileType(const char* filename)
 
 	const size_t len = strlen(filename);
 
-	if (fasticmp(&filename[len - 4], ".wad"))
+	if (!stricmp(&filename[len - 4], ".wad"))
 		return 2;
-	else if (fasticmp(&filename[len - 4], ".pk3"))
+	else if (!stricmp(&filename[len - 4], ".pk3"))
 		return 3;
-	else if (fasticmp(&filename[len - 5], ".kart"))
+	else if (!stricmp(&filename[len - 5], ".kart"))
 		return 4;
-	else if (fasticmp(&filename[len - 4], ".lua"))
+	else if (!stricmp(&filename[len - 4], ".lua"))
 		return 5;
-	else if (fasticmp(&filename[len - 4], ".soc"))
+	else if (!stricmp(&filename[len - 4], ".soc"))
 		return 6;
-	else if (fasticmp(&filename[len - 4], ".cfg"))
+	else if (!stricmp(&filename[len - 4], ".cfg"))
 		return 7;
-	else if (fasticmp(&filename[len - 4], ".txt"))
+	else if (!stricmp(&filename[len - 4], ".txt"))
 		return 8;
 
 	return 0;
 }
 
 // autoload that shit
-static void D_AutoloadFile(const char *file, char **filearray, size_t index)
+static void D_AutoloadFile(const char *file, char **filearray)
 {
+	size_t pnumwadfiles;
 	char *newfile;
 	INT32 fileType = D_DetectFileType(file);
 
@@ -1108,6 +1106,9 @@ static void D_AutoloadFile(const char *file, char **filearray, size_t index)
 		return;
 	}
 
+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
+		;
+
 	if (fileType <= 6)
 	{
 		newfile = malloc(strlen(file) + 1);
@@ -1115,7 +1116,7 @@ static void D_AutoloadFile(const char *file, char **filearray, size_t index)
 			I_Error("No more free memory to AutoloadFile %s",file);
 
 		strcpy(newfile, file);
-		filearray[index] = newfile;
+		filearray[pnumwadfiles] = newfile;
 	}
 	else
 	{
@@ -1145,44 +1146,42 @@ static void D_FindAddonsToAutoload(void)
 {
 	FILE *autoloadconfigfile;
 	const char *autoloadpath;
-	char *newline;
-
 	boolean postload;
 
+	INT32 i;
 	char wadsToAutoload[256] = "";
 
 	// does it exist tho
-	autoloadpath = va("%s"PATHSEP"%s", srb2home, AUTOLOADCONFIGFILENAME);
+	autoloadpath = va("%s"PATHSEP"%s",srb2home,AUTOLOADCONFIGFILENAME);
 	autoloadconfigfile = fopen(autoloadpath, "r");
 
 	// If the file is found, run our shit
 	if (!autoloadconfigfile) // nope outta here
 	{
-		autoloadcount = postloadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
+		wasautoloaded = postautoloaded = true; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
 		return;
 	}
 
-	while (fgets(wadsToAutoload, sizeof(wadsToAutoload), autoloadconfigfile) != NULL)
+	while (fgets(wadsToAutoload, sizeof wadsToAutoload, autoloadconfigfile) != NULL)
 	{
 		postload = false;
-
 		// skip if commented or empty
-		if (wadsToAutoload[0] == '\n' ||
-			wadsToAutoload[0] == '#'  ||
-			wadsToAutoload[0] == '\0')
+		if ((wadsToAutoload[1] == '\0' || wadsToAutoload[1] == '\n')
+			|| (wadsToAutoload[0] == '#'))
 			continue;
-
 		// this marks it so that it loads after loading server addons
-		if (fastncmp(wadsToAutoload, "postload ", 9))
+		else if (fastncmp(wadsToAutoload, "postload ", 9))
 		{
 			strremove(wadsToAutoload, "postload ");
 			postload = true;
 		}
 
 		// Remove Any Empty or Skipped Lines
-		newline = strchr(wadsToAutoload, '\n');
-		if (newline)
-			*newline = '\0';
+		for (i = 0; wadsToAutoload[i] != '\0'; i++)
+		{
+			if (wadsToAutoload[i] == '\n')
+				wadsToAutoload[i] = '\0';
+		}
 
 		if (!postload && W_CheckPostLoadList(wadsToAutoload))
 		{
@@ -1192,19 +1191,14 @@ static void D_FindAddonsToAutoload(void)
 
 		// LOAD IT
 		if (!postload)
-		{
-			D_AutoloadFile(wadsToAutoload, autoloadwadfiles, autoloadcount);
-			autoloadcount++;
-		}
+			D_AutoloadFile(wadsToAutoload, autoloadwadfiles);
 		else
-		{
-			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, postloadcount);
-			postloadcount++;
-		}
-	}
+			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost);
 
-	autoloadwadfiles[autoloadcount] = NULL;
-	autoloadwadfilespost[postloadcount] = NULL;
+		// end it here
+		for (i = 0; wadsToAutoload[i] != '\0'; i++)
+			wadsToAutoload[i] = '\0';
+	}
 
 	// we dont want memory leaks around here do we?
 	fclose(autoloadconfigfile);
@@ -1212,47 +1206,41 @@ static void D_FindAddonsToAutoload(void)
 
 static void D_AddAutoloadFiles(void)
 {
-	// nothing to autoload
-	if (autoloadcount == 0)
+	if (wasautoloaded)
 		return;
 
 	CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
-
 	if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
 		CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
+	D_CleanFile(autoloadwadfiles);
 
-	D_CleanFile(autoloadwadfiles, autoloadcount);
-
-	autoloadcount = 0;
+	wasautoloaded = true;
 }
 
 void D_AddPostloadFiles(void)
 {
-	// nothing to postload
-	if (postloadcount == 0 || !netgame)
+	if (postautoloaded || !netgame)
 		return;
 
 	CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
-
 	if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
 		CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
+	D_CleanFile(autoloadwadfilespost);
 
-	D_CleanFile(autoloadwadfilespost, postloadcount);
-
-	postloadcount = 0;
+	postautoloaded = true;
 }
 
 // ==========================================================================
 // Identify the SRB2 version, and IWAD file to use.
 // ==========================================================================
 
-static boolean AddIWAD(const char * file, const char *dir)
+static boolean AddIWAD(void)
 {
-	char * path = va(pandf, dir, file);
+	char * path = va(pandf, srb2path, "srb2.srb");
 
 	if (FIL_ReadFileOK(path))
 	{
-		D_AddFile(path, startupiwadfiles, startupiwadcount++);
+		D_AddFile(path, startupiwadfiles);
 		return true;
 	}
 
@@ -1288,14 +1276,14 @@ static void IdentifyVersion(void)
 	}
 
 #if (1) // reduce the amount of findfile by only using full cwd in this func
-	if (!fastcmp(tempsrb2path, srb2waddir))
+	if (strcmp(tempsrb2path, srb2waddir))
 #endif
 	{
 		strlcpy(srb2path, srb2waddir, sizeof (srb2path));
 	}
 
 	// Load the IWAD
-	if (!AddIWAD("srb2.srb", srb2path)) // not sure why this uses srb2path and not srb2waddir?
+	if (!AddIWAD())
 	{
 		I_Error("SRB2.SRB not found! Expected in %s\n", srb2waddir);
 	}
@@ -1309,60 +1297,57 @@ static void IdentifyVersion(void)
 
 #ifdef USE_PATCH_DTA
 	// Add our crappy patches to fix our bugs
-	if (!AddIWAD("patch.dta", srb2waddir))
-	{
-		I_Error("patch.dta not found! Expected in %s\n", srb2waddir);
-	}
+	D_AddFile(va(pandf,srb2waddir,"patch.dta"));
 #endif
-	if (!AddIWAD("gfx.kart", srb2waddir))
-	{
-		I_Error("gfx.kart not found! Expected in %s\n", srb2waddir);
-	}
 
-	if (!AddIWAD("textures.kart", srb2waddir))
-	{
-		I_Error("textures.kart not found! Expected in %s\n", srb2waddir);
-	}
-
-	if (!AddIWAD("chars.kart", srb2waddir))
-	{
-		I_Error("chars.kart not found! Expected in %s\n", srb2waddir);
-	}
-
-	if (!AddIWAD("maps.kart", srb2waddir))
-	{
-		I_Error("maps.kart not found! Expected in %s\n", srb2waddir);
-	}
+	D_AddFile(va(pandf, srb2waddir, "gfx.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "textures.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "chars.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "maps.kart"), startupiwadfiles);
 #ifdef USE_PATCH_KART
-	if (!AddIWAD("patch.kart", srb2waddir))
-	{
-		I_Error("patch.kart not found! Expected in %s\n", srb2waddir);
-	}
+	D_AddFile(va(pandf,srb2waddir,"patch.kart"), startupiwadfiles);
 #endif
 
+	const char *path = NULL;
+
+	path = va(pandf, srb2waddir, "extra.kart");
+
 	// completely optional
-	if (AddIWAD("extra.kart", srb2waddir))
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
 		found_extra_kart = true;
+	}
+
+	path = va(pandf, srb2waddir, "extra2.kart");
 
 	// completely optional 2: Back with a vengence
-	if (AddIWAD("extra2.kart", srb2waddir))
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
 		found_extra2_kart = true;
+	}
 
-	if (AddIWAD("extra3.kart", srb2waddir))
+	path = va(pandf, srb2waddir, "extra3.kart");
+
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
 		found_extra3_kart = true;
+	}
 
 #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
 #define MUSICTEST(str) \
-	musicpath = va(pandf, srb2waddir, str);\
+	musicpath = va(pandf,srb2waddir,str);\
 	handle = W_OpenWadFile(&musicpath, false); \
 	if (handle) \
-	{ \
+	{\
 		int ms = W_VerifyNMUSlumps(musicpath, handle, false); \
 		fclose(handle); \
 		if (ms == 0) \
 			I_Error("File " str " has been modified with non-music/sound lumps"); \
 		if (ms == 1) \
-			D_AddFile(musicpath, startupiwadfiles, startupiwadcount++); \
+			D_AddFile(musicpath, startupiwadfiles); \
 	}
 	{
 		const char *musicpath;
@@ -1736,14 +1721,8 @@ void D_SRB2Main(void)
 		else
 		{
 			// use user specific config file
-			if (M_CheckParm("-workdir") && M_IsNextParm())
-				snprintf(srb2home, sizeof srb2home, "%s", M_GetNextParm());
-			else
 #ifdef DEFAULTDIR
-				snprintf(srb2home, sizeof srb2home, "%s" PATHSEP DEFAULTDIR, userhome);
-#else // DEFAULTDIR
-				snprintf(srb2home, sizeof srb2home, "%s", userhome);
-#endif // DEFAULTDIR
+			snprintf(srb2home, sizeof srb2home, "%s" PATHSEP DEFAULTDIR, userhome);
 			snprintf(downloaddir, sizeof downloaddir, "%s" PATHSEP "DOWNLOAD", srb2home);
 			if (dedicated)
 				snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, srb2home);
@@ -1752,6 +1731,17 @@ void D_SRB2Main(void)
 
 			// can't use sprintf since there is %u in savegamename
 			strcatbf(savegamename, srb2home, PATHSEP);
+#else
+			snprintf(srb2home, sizeof srb2home, "%s", userhome);
+			snprintf(downloaddir, sizeof downloaddir, "%s", userhome);
+			if (dedicated)
+				snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, userhome);
+			else
+				snprintf(configfile, sizeof configfile, "%s" PATHSEP CONFIGFILENAME, userhome);
+
+			// can't use sprintf since there is %u in savegamename
+			strcatbf(savegamename, userhome, PATHSEP);
+#endif
 		}
 
 		configfile[sizeof configfile - 1] = '\0';
@@ -1777,9 +1767,6 @@ void D_SRB2Main(void)
 		}
 	}
 
-	// make sure workdir exists
-	I_mkdir(srb2home, 0755);
-
 	// Create addons dir
 	snprintf(addonsdir, sizeof addonsdir, "%s%s%s", srb2home, PATHSEP, "addons");
 	I_mkdir(addonsdir, 0755);
@@ -1808,7 +1795,7 @@ void D_SRB2Main(void)
 				const char *s = M_GetNextParm();
 
 				if (s) // Check for NULL?
-					D_AddFile(s, startuppwads, startuppwadcount++);
+					D_AddFile(s, startuppwads);
 			}
 		}
 	}
@@ -1841,10 +1828,8 @@ void D_SRB2Main(void)
 	// load wad, including the main wad file
 	CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
 
-	W_InitMultipleFiles(startupiwadfiles, startupiwadcount, false);
-	//mainwads = startupiwadcount - musicwads;
-	D_CleanFile(startupiwadfiles, startupiwadcount);
-	startupiwadcount = 0;
+	W_InitMultipleFiles(startupiwadfiles, false);
+	D_CleanFile(startupiwadfiles);
 	mainwads = 0;
 
 #ifndef DEVELOP
@@ -1883,16 +1868,15 @@ void D_SRB2Main(void)
 
 	D_CheckMaps(false);
 
-	W_InitMultipleFiles(startuppwads, startuppwadcount, true);
+	W_InitMultipleFiles(startuppwads, true);
 
 	// Only search for pwad maps if we actually have a pwad added
-	if (startuppwadcount > 0)
+	if (startuppwads[0] != NULL)
 	{
 		D_CheckMaps(true);
 	}
 
-	D_CleanFile(startuppwads, startuppwadcount);
-	startuppwadcount = 0;
+	D_CleanFile(startuppwads);
 
 	cht_Init();
 
@@ -2156,14 +2140,11 @@ void D_SRB2Main(void)
 			const char *sskill = M_GetNextParm();
 
 			for (j = 0; kartspeed_cons_t[j].strvalue; j++)
-			{
-				if (fasticmp(kartspeed_cons_t[j].strvalue, sskill))
+				if (!strcasecmp(kartspeed_cons_t[j].strvalue, sskill))
 				{
 					newskill = (INT16)kartspeed_cons_t[j].value;
 					break;
 				}
-			}
-
 			if (!kartspeed_cons_t[j].strvalue) // reached end of the list with no match
 			{
 				j = atoi(sskill); // assume they gave us a skill number, which is okay too

src/d_main.h

@@ -61,6 +61,9 @@ extern boolean minilighticon;     // mkwii-style minimap headlight
 //
 
 // autoload stuff
+extern boolean autoloading;
+extern boolean autoloaded;
+extern boolean postautoloaded;
 void D_AddPostloadFiles(void);
 
 // the infinite loop of D_SRB2Loop() called from win_main for windows version

src/d_netcmd.c

@@ -292,10 +292,6 @@ consvar_t cv_mouseturn = {"mouseturn", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL,
 // Lagless camera! Yay!
 consvar_t cv_laglesscam = {"lagless_camera", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-// makes the camera use the saved angleturn in replays instead of the players angle
-// more accurate to how the recording player seen things in game, but may be jittery if they encountered net issues
-consvar_t cv_demoangturn = {"useangleturninreplays", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_verticallook[MAXSPLITSCREENPLAYERS] = {
 	{"verticallook",  "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"verticallook2", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
@@ -1047,7 +1043,6 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_betainterscreen);
 
 	CV_RegisterVar(&cv_laglesscam);
-	CV_RegisterVar(&cv_demoangturn);
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
@@ -1219,7 +1214,7 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
 	for (ix = 0; ix < MAXPLAYERS; ix++)
 	{
 		if (ix != playernum && playeringame[ix]
-			&& fasticmp(name, player_names[ix]))
+			&& strcasecmp(name, player_names[ix]) == 0)
 		{
 			// We shouldn't kick people out just because
 			// they joined the game with the same name
@@ -1336,7 +1331,7 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
 			if (i != playernum && playeringame[i]
-				&& fasticmp(tmpname, player_names[i]))
+				&& strcasecmp(tmpname, player_names[i]) == 0)
 			{
 				break;
 			}
@@ -1386,7 +1381,7 @@ static void SetPlayerName(INT32 playernum, char *newname)
 {
 	if (EnsurePlayerNameIsGood(newname, playernum))
 	{
-		if (!fasticmp(newname, player_names[playernum]))
+		if (strcasecmp(newname, player_names[playernum]) != 0)
 		{
 			if (netgame)
 				HU_AddChatText(va("\x82*%s renamed to %s", player_names[playernum], newname), false);
@@ -1508,9 +1503,9 @@ static void SendNameAndColor(void)
 			CV_StealthSet(&cv_playercolor, cv_playercolor.defaultvalue);
 	}
 
-	if (fastcmp(cv_playername.string, player_names[consoleplayer])
+	if (!strcmp(cv_playername.string, player_names[consoleplayer])
 		&& cv_playercolor.value == players[consoleplayer].skincolor
-		&& fastcmp(cv_skin.string, skins[players[consoleplayer].skin].name))
+		&& !strcmp(cv_skin.string, skins[players[consoleplayer].skin].name))
 		return;
 
 	// We'll handle it later if we're not playing.
@@ -1945,7 +1940,7 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
 	// set name
 	if (player_name_changes[playernum] < MAXNAMECHANGES)
 	{
-		if (!fasticmp(player_names[playernum], name))
+		if (strcasecmp(player_names[playernum], name) != 0)
 			SetPlayerName(playernum, name);
 	}
 
@@ -2322,8 +2317,8 @@ static void Command_Playdemo_f(void)
 
 	CONS_Printf(M_GetText("Playing back demo '%s'.\n"), name);
 
-	demo.loadfiles = fastcmp(COM_Argv(2), "-addfiles");
-	demo.ignorefiles = fastcmp(COM_Argv(2), "-force");
+	demo.loadfiles = strcmp(COM_Argv(2), "-addfiles") == 0;
+	demo.ignorefiles = strcmp(COM_Argv(2), "-force") == 0;
 
 	// Internal if no extension, external if one exists
 	// If external, convert the file name to a path in SRB2's home directory
@@ -3194,20 +3189,20 @@ static void Command_Teamchange_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3284,20 +3279,20 @@ static void Command_Teamchange2_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3375,20 +3370,20 @@ static void Command_Teamchange3_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3466,20 +3461,20 @@ static void Command_Teamchange4_f(void)
 
 	if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(1), "red") || fasticmp(COM_Argv(1), "1"))
+		if (!strcasecmp(COM_Argv(1), "red") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(1), "blue") || fasticmp(COM_Argv(1), "2"))
+		else if (!strcasecmp(COM_Argv(1), "blue") || !strcasecmp(COM_Argv(1), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		else if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(1), "spectator") || fasticmp(COM_Argv(1), "0"))
+		if (!strcasecmp(COM_Argv(1), "spectator") || !strcasecmp(COM_Argv(1), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(1), "playing") || fasticmp(COM_Argv(1), "1"))
+		else if (!strcasecmp(COM_Argv(1), "playing") || !strcasecmp(COM_Argv(1), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -3565,33 +3560,33 @@ static void Command_ServerTeamChange_f(void)
 
 	if (G_TagGametype())
 	{
-		if (fasticmp(COM_Argv(2), "it") || fasticmp(COM_Argv(2), "1"))
+		if (!strcasecmp(COM_Argv(2), "it") || !strcasecmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(2), "notit") || fasticmp(COM_Argv(2), "2"))
+		else if (!strcasecmp(COM_Argv(2), "notit") || !strcasecmp(COM_Argv(2), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(2), "playing") || fasticmp(COM_Argv(2), "3"))
+		else if (!strcasecmp(COM_Argv(2), "playing") || !strcasecmp(COM_Argv(2), "3"))
 			NetPacket.packet.newteam = 3;
-		else if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
+		else if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasTeams())
 	{
-		if (fasticmp(COM_Argv(2), "red") || fasticmp(COM_Argv(2), "1"))
+		if (!strcasecmp(COM_Argv(2), "red") || !strcasecmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 1;
-		else if (fasticmp(COM_Argv(2), "blue") || fasticmp(COM_Argv(2), "2"))
+		else if (!strcasecmp(COM_Argv(2), "blue") || !strcasecmp(COM_Argv(2), "2"))
 			NetPacket.packet.newteam = 2;
-		else if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
+		else if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
 		else
 			error = true;
 	}
 	else if (G_GametypeHasSpectators())
 	{
-		if (fasticmp(COM_Argv(2), "spectator") || fasticmp(COM_Argv(2), "0"))
+		if (!strcasecmp(COM_Argv(2), "spectator") || !strcasecmp(COM_Argv(2), "0"))
 			NetPacket.packet.newteam = 0;
-		else if (fasticmp(COM_Argv(2), "playing") || fasticmp(COM_Argv(2), "1"))
+		else if (!strcasecmp(COM_Argv(2), "playing") || !strcasecmp(COM_Argv(2), "1"))
 			NetPacket.packet.newteam = 3;
 		else
 			error = true;
@@ -5209,14 +5204,14 @@ static void Ringslinger_OnChange(void)
 static void Gravity_OnChange(void)
 {
 	if (!M_SecretUnlocked(SECRET_PANDORA) && !netgame && !cv_debug
-		&& !fastcmp(cv_gravity.string, cv_gravity.defaultvalue))
+		&& strcmp(cv_gravity.string, cv_gravity.defaultvalue))
 	{
 		CONS_Printf(M_GetText("You haven't earned this yet.\n"));
 		CV_StealthSet(&cv_gravity, cv_gravity.defaultvalue);
 		return;
 	}
 #ifndef NETGAME_GRAVITY
-	if (netgame)
+	if(netgame)
 	{
 		CV_StealthSet(&cv_gravity, cv_gravity.defaultvalue);
 		return;

src/d_netcmd.h

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

src/d_netfil.c

@@ -550,8 +550,7 @@ INT32 CL_CheckFiles(void)
 		for (j = mainwads+1; j < numwadfiles; j++)
 		{
 			nameonly(strcpy(wadfilename, wadfiles[j]->filename));
-
-			if (fasticmp(wadfilename, fileneeded[i].filename) &&
+			if (!stricmp(wadfilename, fileneeded[i].filename) &&
 				!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
 			{
 				CONS_Debug(DBG_NETPLAY, "already loaded\n");
@@ -666,7 +665,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 		strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
 		nameonly(wadfilename);
 
-		if (fasticmp(wadfilename, p->id.filename))
+		if (!stricmp(wadfilename, p->id.filename))
 		{
 			// Copy file name with full path
 			strlcpy(p->id.filename, wadfiles[wadnum]->filename, MAX_WADPATH);
@@ -947,17 +946,17 @@ void Got_Filetxpak(void)
 	char *filename = file->filename;
 	static INT32 filetime = 0;
 
-	if ((fastcmp(filename, "srb2.srb")
-		//|| fastcmp(filename, "srb2.wad")
-		//|| fastcmp(filename, "patch.dta")
-		//|| fastcmp(filename, "music.dta")
-		|| fastcmp(filename, "gfx.kart")
-		|| fastcmp(filename, "textures.kart")
-		|| fastcmp(filename, "chars.kart")
-		|| fastcmp(filename, "maps.kart")
-		|| fastcmp(filename, "sounds.kart")
-		|| fastcmp(filename, "music.kart")
-		|| fastcmp(filename, "patch.kart")
+	if (!(strcmp(filename, "srb2.srb")
+		//&& strcmp(filename, "srb2.wad")
+		//&& strcmp(filename, "patch.dta")
+		//&& strcmp(filename, "music.dta")
+		&& strcmp(filename, "gfx.kart")
+		&& strcmp(filename, "textures.kart")
+		&& strcmp(filename, "chars.kart")
+		&& strcmp(filename, "maps.kart")
+		&& strcmp(filename, "sounds.kart")
+		&& strcmp(filename, "music.kart")
+		&& strcmp(filename, "patch.kart")
 		))
 		I_Error("Tried to download \"%s\"", filename);
 
@@ -1198,7 +1197,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}
 
 	// next, check SRB2's "home" directory (if non-'.')
-	if (!fastcmp(srb2home, "."))
+	if (strcmp(srb2home, "."))
 	{
 		homecheck = filesearch(filename, srb2home, wantedmd5sum, completepath, 10);
 
@@ -1210,7 +1209,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}
 
 	// next, check SRB2's "path" directory (also if non-'.')
-	if (!fastcmp(srb2path, "."))
+	if (strcmp(srb2path, "."))
 	{
 		homecheck = filesearch(filename, srb2path, wantedmd5sum, completepath, 10);
 
@@ -1555,7 +1554,7 @@ CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
 			( login = (*prev_next));
 			prev_next = &login->next
 	){
-		if (fastcmp(login->url, url) != 0)
+		if (strcmp(login->url, url) == 0)
 		{
 			if (return_prev_next)
 				(*return_prev_next) = prev_next;

src/d_protocol.c

@@ -211,12 +211,12 @@ void D_SetupProtocol(void)
 
 	if (result)
 	{
-		if (!fastcmp(buffer, "no"))
+		if (strcmp(buffer, "no") == 0)
 		{
 			fclose(fp);
 			return;
 		}
-		else if (fastcmp(buffer, exe_path))
+		else if (strcmp(buffer, exe_path) != 0)
 		{
 			// overwrite
 			fclose(fp);

src/dedicated/i_system.c

@@ -1709,9 +1709,9 @@ char *I_GetUserName(void)
 		strncpy(username, p, MAXPLAYERNAME);
 	}
 
-	if (!fastcmp(username, ""))
-		return username;
 
+	if (strcmp(username, "") != 0)
+		return username;
 	return NULL; // dummy for platform independent version
 }
 

src/discord.c

@@ -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 (fastcmp(newRequest->userID, append->userID))
+			if (!strcmp(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 (!fastcmp(address, "self"))
+		if (strcmp(address, "self"))
 		{
 			// We're not the server, so we could successfully get the IP!
 			// No need to do anything else :)
@@ -684,7 +684,7 @@ void DRPC_UpdatePresence(void)
 		// Character image
 		while (supportedSkins[checkSkin] != NULL)
 		{
-			if (fastcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
+			if (!strcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
 			{
 				snprintf(charimg, 21, "char%s", supportedSkins[checkSkin]);
 				discordPresence.smallImageKey = charimg;

src/doomdef.h

@@ -69,8 +69,6 @@ extern "C" {
 #include <sys/stat.h>
 #include <ctype.h>
 
-#include "fastcmp.h"
-
 #ifdef _WIN32
 #include <io.h>
 #endif

src/doomstat.h

@@ -116,10 +116,7 @@ extern UINT8 window_notinfocus; // are we in focus? (backend independant -- hand
 extern boolean nodrawers;
 extern boolean noblit;
 extern boolean lastdraw;
-
-#ifdef MOTIONBLUR
 extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
-#endif
 
 extern INT32 viewwindowx, viewwindowy;
 extern INT32 viewwidth;

src/filesrch.c

@@ -198,7 +198,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 
 				for (; *path != NULL; path++)
 				{
-					if (fasticmp(*path, dent->d_name))
+					if (strcasecmp(*path, dent->d_name) == 0)
 					{
 						skipfolder = true;
 						break;
@@ -212,7 +212,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 				}
 			}
 
-			if (!fasticmp(".git", dent->d_name) // sanity if you're weird like me
+			if (strcasecmp(".git", dent->d_name) // sanity if you're weird like me
 				&& (dirhandle[depthleft-1] = opendir(searchpath)) != NULL)
 			{
 				// Got read permissions!
@@ -227,7 +227,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 
 		// I am a file!
 
-		if (!fasticmp(searchname, dent->d_name))
+		if (strcasecmp(searchname, dent->d_name))
 			continue; // Not what we're looking for!
 
 		switch (checkfilemd5(searchpath, wantedmd5sum))
@@ -353,7 +353,7 @@ void searchfilemenu(char *tempname)
 		{
 			for (i = first; i < sizedirmenu; i++)
 			{
-				if (fastcmp(dirmenu[i]+DIR_STRING, tempname))
+				if (!strcmp(dirmenu[i]+DIR_STRING, tempname))
 				{
 					dir_on[menudepthleft] = i;
 					break;
@@ -400,7 +400,7 @@ void searchfilemenu(char *tempname)
 	{
 		if (filemenucmp(coredirmenu[i]+DIR_STRING, localmenusearch))
 		{
-			if (tempname && fastcmp(coredirmenu[i]+DIR_STRING, tempname))
+			if (tempname && !strcmp(coredirmenu[i]+DIR_STRING, tempname))
 			{
 				dir_on[menudepthleft] = sizedirmenu;
 				Z_Free(tempname);
@@ -478,14 +478,14 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 
 				if (replayhut)
 				{
-					if (!fasticmp(".lmp", dent->d_name+len-5))
+					if (strcasecmp(".lmp", dent->d_name+len-5))
 						continue; // Not a replay
 				}
 				else if (!cv_addons_showall.value)
 				{
 					UINT8 ext;
 					for (ext = 0; ext < NUM_EXT_TABLE; ext++)
-						if (fasticmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
 							break; // extension comparison
 
 					if (ext == NUM_EXT_TABLE)
@@ -559,7 +559,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 
 				if (replayhut)
 				{
-					if (!fasticmp(".lmp", dent->d_name+len-5))
+					if (strcasecmp(".lmp", dent->d_name+len-5))
 						continue; // Not a replay
 
 					ext = EXT_TXT; // This isn't used anywhere but better safe than sorry for messing with this...
@@ -567,7 +567,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 				else
 				{
 					for (; ext < NUM_EXT_TABLE; ext++)
-						if (fasticmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
 							break; // extension comparison
 
 					if (ext == NUM_EXT_TABLE && !cv_addons_showall.value)
@@ -587,7 +587,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 								nameonly(filenamebuf[i]);
 							}
 
-							if (!fastcmp(dent->d_name, filenamebuf[i]))
+							if (strcmp(dent->d_name, filenamebuf[i]))
 								continue;
 
 							if (cv_addons_md5.value && !checkfilemd5(menupath, wadfiles[i]->md5sum))
@@ -598,11 +598,11 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 					}
 					else if (ext == EXT_TXT)
 					{
-						if (!strncmp(dent->d_name, "log-", 4) || fastcmp(dent->d_name, "errorlog.txt"))
+						if (!strncmp(dent->d_name, "log-", 4) || !strcmp(dent->d_name, "errorlog.txt"))
 							ext |= EXT_LOADED;
 					}
 
-					if (fastcmp(dent->d_name, configfile))
+					if (!strcmp(dent->d_name, configfile))
 						ext |= EXT_LOADED;
 				}
 

src/g_demo.c

@@ -264,7 +264,7 @@ void G_ReadDemoExtraData(void)
 			kartspeed = READUINT8(demobuf.p);
 			kartweight = READUINT8(demobuf.p);
 
-			if (!fasticmp(skins[players[p].skin].name, name))
+			if (stricmp(skins[players[p].skin].name, name) != 0)
 				FindClosestSkinForStats(p, kartspeed, kartweight);
 
 			players[p].kartspeed = kartspeed;
@@ -277,7 +277,7 @@ void G_ReadDemoExtraData(void)
 			M_Memcpy(name, demobuf.p, 16);
 			demobuf.p += 16;
 			for (i = 0; i < MAXSKINCOLORS; i++)
-				if (fasticmp(KartColor_Names[i], name)) // SRB2kart
+				if (!stricmp(KartColor_Names[i], name))				// SRB2kart
 				{
 					players[p].skincolor = i;
 					if (players[p].mo)
@@ -2289,7 +2289,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 		{
 			for (UINT8 j = 0; kartspeed_cons_t[j].strvalue; j++)
 			{
-				if (fasticmp(kartspeed_cons_t[j].strvalue, svalue))
+				if (!stricmp(kartspeed_cons_t[j].strvalue, svalue))
 					pdemo->kartspeed = kartspeed_cons_t[j].value;
 			}
 		}
@@ -2321,7 +2321,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 
 		for (i = 0; i < numskins; i++)
 		{
-			if (fasticmp(skins[i].name, temp))
+			if (stricmp(skins[i].name, temp) == 0)
 			{
 				pdemo->standings[count].skin = i;
 				break;
@@ -2334,7 +2334,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (fasticmp(KartColor_Names[i],temp)) // SRB2kart
+			if (!stricmp(KartColor_Names[i],temp))				// SRB2kart
 			{
 				pdemo->standings[count].color = i;
 				break;
@@ -2807,7 +2807,7 @@ void G_DoPlayDemo(char *defdemoname)
 		// Set color
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (fasticmp(KartColor_Names[i],color)) // SRB2kart
+			if (!stricmp(KartColor_Names[i],color))				// SRB2kart
 			{
 				players[0].skincolor = i;
 				break;
@@ -2947,7 +2947,7 @@ void G_DoPlayDemo(char *defdemoname)
 
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (fasticmp(KartColor_Names[i],color)) // SRB2kart
+			if (!stricmp(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 (!fasticmp(skins[players[p].skin].name, skin))
+		if (stricmp(skins[players[p].skin].name, skin) != 0)
 			FindClosestSkinForStats(p, kartspeed[p], kartweight[p]);
 
 		// Look for the next player
@@ -3242,7 +3242,7 @@ void G_AddGhost(char *defdemoname)
 
 	for (i = 0; i < numskins; i++)
 	{
-		if (fasticmp(skins[i].name, skin))
+		if (!stricmp(skins[i].name,skin))
 		{
 			ghskin = &skins[i];
 			break;
@@ -3317,7 +3317,7 @@ void G_AddGhost(char *defdemoname)
 
 	for (i = 0; i < MAXSKINCOLORS; i++)
 	{
-		if (fasticmp(KartColor_Names[i],color)) // SRB2kart
+		if (!stricmp(KartColor_Names[i],color))				// SRB2kart
 		{
 			gh->mo->color = (UINT8)i;
 			break;

src/g_game.c

@@ -2768,7 +2768,7 @@ INT32 G_GetGametypeByName(const char *gametypestr)
 	INT32 i;
 
 	for (i = 0; i < NUMGAMETYPES; i++)
-		if (fasticmp(gametypestr, Gametype_Names[i]))
+		if (!stricmp(gametypestr, Gametype_Names[i]))
 			return i;
 
 	return -1; // unknown gametype
@@ -3463,8 +3463,7 @@ void G_LoadGameData(void)
 	if (READUINT32(save.p) != 0xFCAFE211)
 	{
 		const char *gdfolder = "the SRB2Kart folder";
-
-		if (!fastcmp(srb2home,"."))
+		if (strcmp(srb2home,"."))
 			gdfolder = srb2home;
 
 		Z_Free(save.buffer);
@@ -3548,8 +3547,7 @@ void G_LoadGameData(void)
 	datacorrupt:
 	{
 		const char *gdfolder = "the SRB2Kart folder";
-
-		if (!fastcmp(srb2home,"."))
+		if (strcmp(srb2home,"."))
 			gdfolder = srb2home;
 
 		Z_Free(save.buffer);
@@ -3760,8 +3758,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 
 	memset(vcheck, 0, sizeof (vcheck));
 	sprintf(vcheck, "version %d", VERSION);
-
-	if (!fastcmp((const char *)save.p, (const char *)vcheck))
+	if (strcmp((const char *)save.p, (const char *)vcheck))
 	{
 #ifdef SAVEGAME_OTHERVERSIONS
 		M_StartMessage(M_GetText("Save game from different version.\nYou can load this savegame, but\nsaving afterwards will be disabled.\n\nDo you want to continue anyway?\n\n(Press 'Y' to confirm)\n"),
@@ -4039,7 +4036,7 @@ char *G_BuildMapTitle(INT32 mapnum)
 	if (!mapheaderinfo[mapnum-1])
 		P_AllocMapHeader(mapnum-1);
 
-	if (!fastcmp(mapheaderinfo[mapnum-1]->lvlttl, ""))
+	if (strcmp(mapheaderinfo[mapnum-1]->lvlttl, ""))
 	{
 		size_t len = 1;
 		const char *zonetext = NULL;

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 (fasticmp(keynames[j].name, keystr))
+		if (!stricmp(keynames[j].name, keystr))
 			return keynames[j].keynum;
 
 	return 0;
@@ -1333,15 +1333,14 @@ static void setcontrol(INT32 (*gc)[2])
 		player = 0;
 
 	namectrl = COM_Argv(1);
-	for (numctrl = 0; numctrl < num_gamecontrols && !fasticmp(namectrl, gamecontrolname[numctrl]); numctrl++)
+	for (numctrl = 0; numctrl < num_gamecontrols && stricmp(namectrl, gamecontrolname[numctrl]);
+		numctrl++)
 		;
-
 	if (numctrl == num_gamecontrols)
 	{
 		CONS_Printf(M_GetText("Control '%s' unknown\n"), namectrl);
 		return;
 	}
-
 	keynum1 = G_KeyStringtoNum(COM_Argv(2));
 	keynum2 = G_KeyStringtoNum(COM_Argv(3));
 	keynum = G_FilterKeyByVersion(numctrl, 0, player, &keynum1, &keynum2, &nestedoverride);

src/hardware/hw_cache.c

@@ -437,16 +437,8 @@ void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipma
 //             CACHING HANDLING
 // =================================================
 
-typedef struct
-{
-	GLMapTexture_t normal;
-#ifdef GLENCORE
-	GLMapTexture_t encore;
-#endif
-} GLMapTextureSet_t; // idk i suck at naming things
-
 static size_t gl_numtextures = 0; // Texture count
-static GLMapTextureSet_t *gl_textures; // For all textures
+static GLMapTexture_t *gl_textures; // For all textures
 
 static void HWR_FreeTextureData(patch_t *patch)
 {
@@ -586,12 +578,13 @@ void HWR_FreeMapTextures(void)
 {
 	size_t i;
 
-	for (i = 0; i < gl_numtextures; i++)
-	{
-		FreeMapTexture(&gl_textures[i].normal);
 #ifdef GLENCORE
-		FreeMapTexture(&gl_textures[i].encore);
+	for (i = 0; i < gl_numtextures*2; i++)
+#else
+	for (i = 0; i < gl_numtextures; i++)
 #endif
+	{
+		FreeMapTexture(&gl_textures[i]);
 	}
 
 	// now the heap don't have any 'user' pointing to our
@@ -610,7 +603,7 @@ static void HWR_PrecacheLevelFlats(void)
 
 	// special case for encore
 #ifdef GLENCORE
-	if (encoremap)
+	if (encoremode)
 	{
 		// go through all sectors to determine if it should be remapped for encore
 		for (i = 0; i < numsectors; i++)
@@ -685,6 +678,8 @@ static void HWR_PrecacheLevelTextures(void)
 		const line_t *line = &lines[i];
 #ifdef GLENCORE
 		const int noencoremap = ((encoremap && (line->flags & ML_TFERLINE)) ? 2 : 1);
+#else
+		const int noencoremap = 1;
 #endif
 		// two sides
 		for (j = 0; j < 2; j++)
@@ -700,14 +695,11 @@ static void HWR_PrecacheLevelTextures(void)
 			for (f = 0; f < 3; f++)
 			{
 				const INT32 texnum = sidetex[f];
-
 				if (texnum < 0 || texnum >= numtextures || texturepresent[texnum])
 					continue;
-#ifdef GLENCORE
+
 				texturepresent[texnum] = 1|noencoremap;
-#else
-				texturepresent[texnum] = 1;
-#endif
+
 				HWR_GetTexture(texnum, false);
 #ifdef GLENCORE
 				if (noencoremap & 2)
@@ -745,7 +737,7 @@ static void HWR_PrecacheLevelTextures(void)
 	free(texturepresent);
 }
 
-/*static void HWR_PrecacheLevelSprites(void)
+static void HWR_PrecacheLevelSprites(void)
 {
 	patch_t *spritepatch;
 	char *spritepresent;
@@ -808,11 +800,11 @@ static void HWR_PrecacheLevelTextures(void)
 		}
 	}
 	free(spritepresent);
-}*/
+}
 
 void HWR_PrecacheLevel(void)
 {
-	if (gamestate != GS_LEVEL || !cv_precachetextures.value)
+	if (gamestate != GS_LEVEL)
 		return;
 
 	// Precache flats.
@@ -822,7 +814,7 @@ void HWR_PrecacheLevel(void)
 	HWR_PrecacheLevelTextures();
 
 	// Precache sprites.
-	//HWR_PrecacheLevelSprites();
+	HWR_PrecacheLevelSprites();
 }
 
 void HWR_LoadMapTextures(size_t pnumtextures)
@@ -831,8 +823,11 @@ void HWR_LoadMapTextures(size_t pnumtextures)
 	HWR_FreeMapTextures();
 
 	gl_numtextures = pnumtextures;
-	gl_textures = calloc(gl_numtextures, sizeof(*gl_textures)); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
-
+#ifdef GLENCORE
+	gl_textures = calloc(gl_numtextures, sizeof (*gl_textures)*2); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore)
+#else
+	gl_textures = calloc(gl_numtextures, sizeof (*gl_textures));
+#endif
 	if (gl_textures == NULL)
 		I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
 }
@@ -856,7 +851,7 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
 	// Every texture in memory, stored in the
 	// hardware renderer's bit depth format. Wow!
 #ifdef GLENCORE
-	gltex = (encoremap && !noencore) ? &gl_textures[tex].encore : &gl_textures[tex].normal;
+	gltex = &gl_textures[tex*2 + (encoremap && !noencore ? 0 : 1)];
 #else
 	gltex = &gl_textures[tex];
 #endif

src/hardware/hw_main.cpp

@@ -5840,7 +5840,7 @@ static void COM_HWR_glinfo(void)
 	{
 		argv = COM_Argv(i);
 
-		if (fastcmp(argv, "--list-extensions")|| fastcmp(argv, "-l"))
+		if (strcmp(argv, "--list-extensions") == 0 || strcmp(argv, "-l") == 0)
 		{
 			list_extensions = 1;
 		}

src/hardware/hw_md2.c

@@ -549,7 +549,7 @@ void HWR_InitMD2(void)
 	{
 		for (i = 0; i < NUMSPRITES; i++)
 		{
-			if (fasticmp(name, sprnames[i]))
+			if (stricmp(name, sprnames[i]) == 0)
 			{
 				md2_models[i].scale = scale;
 				md2_models[i].offset = offset;
@@ -561,7 +561,7 @@ void HWR_InitMD2(void)
 
 		for (s = 0; s < MAXSKINS; s++)
 		{
-			if (fasticmp(name, skins[s].name))
+			if (stricmp(name, skins[s].name) == 0)
 			{
 				md2_playermodels[s].skin = s;
 				md2_playermodels[s].scale = scale;
@@ -607,12 +607,11 @@ void HWR_AddPlayerMD2(int skin, boolean local) // For MD2's that were added afte
 		}
 	}
 
-	md2s = (local ? md2_localplayermodels : md2_playermodels);
-
+	md2s = ( (local) ? md2_localplayermodels : md2_playermodels );
 	// Check for any MD2s that match the names of player skins!
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
-		if (fasticmp(name, K_GetSkinArray(local)[skin].name))
+		if (stricmp(name, K_GetSkinArray(local)[skin].name) == 0)
 		{
 			md2s[skin].skin = skin;
 			md2s[skin].scale = scale;
@@ -651,7 +650,6 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
 	if (!f)
 	{
 		f = fopen(va("%s"PATHSEP"%s", srb2path, "mdls.dat"), "rt");
-
 		if (!f)
 		{
 			CONS_Printf("%s %s\n", M_GetText("Error while loading mdls.dat:"), strerror(errno));
@@ -663,7 +661,7 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
 	// Check for any MD2s that match the names of sprite names!
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
-		if (fasticmp(name, sprnames[spritenum]))
+		if (stricmp(name, sprnames[spritenum]) == 0)
 		{
 			md2_models[spritenum].scale = scale;
 			md2_models[spritenum].offset = offset;

src/hardware/hw_model.c

@@ -126,7 +126,7 @@ tag_t *GetTagByName(model_t *model, char *name, int frame)
 		int i;
 		for (i = 0; i < model->numTags; i++)
 		{
-			if (fasticmp(iterator[i].name, name))
+			if (!stricmp(iterator[i].name, name))
 				return &iterator[i];
 		}
 	}
@@ -163,22 +163,22 @@ model_t *LoadModel(const char *filename, int ztag)
 		return NULL;
 	}
 
-	if (fastcmp(extension, ".md3"))
+	if (!strcmp(extension, ".md3"))
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (fastcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
+	else if (!strcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, true)))
 			return NULL;
 	}
-	else if (fastcmp(extension, ".md2"))
+	else if (!strcmp(extension, ".md2"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (fastcmp(extension, ".md2s"))
+	else if (!strcmp(extension, ".md2s"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, true)))
 			return NULL;

src/hardware/hw_shaders.c

@@ -586,7 +586,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 			goto skip_field;
 		}
 
-		if (fasticmp(stoken, "GLSL"))
+		if (!stricmp(stoken, "GLSL"))
 		{
 			value = strtok(NULL, "\r\n ");
 			if (!value)
@@ -596,9 +596,9 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 				goto skip_lump;
 			}
 
-			if (fasticmp(value, "VERTEX"))
+			if (!stricmp(value, "VERTEX"))
 				shadertype = 1;
-			else if (fasticmp(value, "FRAGMENT"))
+			else if (!stricmp(value, "FRAGMENT"))
 				shadertype = 2;
 
 skip_lump:
@@ -624,7 +624,7 @@ skip_lump:
 
 			for (i = 0; shaderxlat[i].type; i++)
 			{
-				if (fasticmp(shaderxlat[i].type, stoken))
+				if (!stricmp(shaderxlat[i].type, stoken))
 				{
 					size_t shader_string_length;
 					char *shader_source;

src/i_tcp.c

@@ -746,12 +746,18 @@ static inline ssize_t SOCK_SendToAddr(SOCKET_TYPE socket, mysockaddr_t *sockaddr
 
 #define ALLOWEDERROR(x) ((x) == ECONNREFUSED || (x) == EWOULDBLOCK || (x) == EHOSTUNREACH || (x) == ENETUNREACH || (x) == EADDRNOTAVAIL)
 
+// FIXME: maybe retry if this failed somehow?
+// windows kinda dies rather often when some other network heavy thing runs besides kart
 static void SOCK_Send(void)
 {
 	ssize_t c = ERRSOCKET;
 	int e = 0; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once
 	size_t i, j;
 
+#ifndef USE_WINSOCK
+	errno = 0;
+#endif
+
 	if (doomcom->remotenode < 0 || !nodeconnected[doomcom->remotenode])
 		return;
 
@@ -840,6 +846,10 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 	mysockaddr_t straddr;
 	socklen_t len = sizeof(straddr);
 
+#ifndef USE_WINSOCK
+	errno = 0;
+#endif
+
 	if (s == (SOCKET_TYPE)ERRSOCKET)
 		return (SOCKET_TYPE)ERRSOCKET;
 
@@ -972,28 +982,41 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 	}
 	CONS_Printf(M_GetText("Network receive buffer: %dKb\n"), opt>>10);
 
-	if (opt < 64<<10) // 64k
+	//if (opt < 64<<10) // 64k minimum
+	if (opt < 256<<10) // no try 256k first
 	{
-		opt = 64<<10;
-		opts = (socklen_t)sizeof(opt);
-		rc = setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, opts);
-		if (rc <= -1)
+		const int buf_sizes[] = {256<<10, 128<<10, 64<<10}; // Try 256k, 128k, then 64k
+		size_t i;
+
+		for (i = 0; i < sizeof(buf_sizes) / sizeof(buf_sizes[0]); i++)
 		{
-			e = errno;
-			I_OutputMsg("setting SO_RCVBUF failed: #%u, %s\n", e, strerror(e));
-		}
-		opt = 0;
-		rc = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, &opts);
-		if (rc <= -1)
-		{
-			e = errno;
-			I_OutputMsg("getting SO_RCVBUF failed: #%u, %s\n", e, strerror(e));
+			opt = buf_sizes[i];
+			opts = (socklen_t)sizeof(opt);
+			rc = setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, opts);
+			if (rc <= -1)
+			{
+				e = errno;
+				I_OutputMsg("setting SO_RCVBUF to %dKb failed: #%u, %s\n", opt>>10, e, strerror(e));
+				continue;
+			}
+
+			opt = 0;
+			rc = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, &opts);
+			if (rc <= -1)
+			{
+				e = errno;
+				I_OutputMsg("getting SO_RCVBUF failed: #%u, %s\n", e, strerror(e));
+			}
+
+			if (opt >= buf_sizes[i])
+			{
+				CONS_Printf(M_GetText("Network system receive buffer set to: %dKb\n"), opt>>10);
+				break;
+			}
 		}
 
 		if (opt < 64<<10)
-			CONS_Alert(CONS_WARNING, M_GetText("Can't set receive buffer length to 64k, file transfer will be bad\n"));
-		else
-			CONS_Printf(M_GetText("Network receive buffer set to: %dKb\n"), opt>>10);
+			CONS_Alert(CONS_WARNING, M_GetText("Can't set receive buffer length to at least 64k, file transfer will be bad\n"));
 	}
 
 	opt = 0;
@@ -1006,29 +1029,41 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 	}
 	CONS_Printf(M_GetText("Network send buffer: %dKb\n"), opt>>10);
 
-	if (opt < 64<<10) // 64k
+	//if (opt < 64<<10) // 64k minimum
+	if (opt < 256<<10) // no try 256k first
 	{
-		opt = 64<<10;
-		opts = (socklen_t)sizeof(opt);
-		rc = setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, opts);
-		if (rc <= -1)
-		{
-			e = errno;
-			I_OutputMsg("setting SO_SNDBUF to %dKb failed: #%u, %s\n", opt>>10, e, strerror(e));
-		}
+		int buf_sizes[] = {256<<10, 128<<10, 64<<10}; // Try 256k, 128k, then 64k
+		size_t i;
 
-		opt = 0;
-		rc = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, &opts);
-		if (rc <= -1)
+		for (i = 0; i < sizeof(buf_sizes) / sizeof(buf_sizes[0]); i++)
 		{
-			e = errno;
-			I_OutputMsg("getting SO_SNDBUF failed: #%u, %s\n", e, strerror(e));
+			opt = buf_sizes[i];
+			opts = (socklen_t)sizeof(opt);
+			rc = setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, opts);
+			if (rc <= -1)
+			{
+				e = errno;
+				I_OutputMsg("setting SO_SNDBUF to %dKb failed: #%u, %s\n", opt>>10, e, strerror(e));
+				continue;
+			}
+
+			opt = 0;
+			rc = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, &opts);
+			if (rc <= -1)
+			{
+				e = errno;
+				I_OutputMsg("getting SO_SNDBUF failed: #%u, %s\n", e, strerror(e));
+			}
+
+			if (opt >= buf_sizes[i])
+			{
+				CONS_Printf(M_GetText("Network system send buffer set to: %dKb\n"), opt>>10);
+				break;
+			}
 		}
 
 		if (opt < 64<<10)
-			CONS_Alert(CONS_WARNING, M_GetText("Can't set send buffer length to 64k, file transfer will be bad\n"));
-		else
-			CONS_Printf(M_GetText("Network send system buffer set to: %dKb\n"), opt>>10);
+			CONS_Alert(CONS_WARNING, M_GetText("Can't set send buffer length to at least 64k, file transfer will be bad\n"));
 	}
 
 	rc = getsockname(s, &straddr.any, &len);

src/k_kart.c

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

src/lua_consolelib.c

@@ -453,7 +453,7 @@ static int lib_cvRegisterVar(lua_State *L)
 	if (cvar->flags & CV_MODIFIED)
 		return luaL_error(L, "failed to register cvar (probable conflict with internal variable/command names)");
 
-	if (!(((cvar->flags & CV_HIDEN)) || (cvar->flags & CV_NOSHOWHELP)) && (cvar->PossibleValue || !(cvar->value == 0 && !fasticmp(cvar->string, "0"))))
+	if (!(((cvar->flags & CV_HIDEN)) || (cvar->flags & CV_NOSHOWHELP)) && (cvar->PossibleValue || !(cvar->value == 0 && stricmp(cvar->string, "0"))))
 	{
 		if (!category)
 		{

src/lua_hooklib.c

@@ -83,7 +83,7 @@ FUNCINLINE static ATTRINLINE unsigned hook_in_list
 
 	for (type = 0; list[type] != NULL; ++type)
 	{
-		if (fastcmp(name, list[type]))
+		if (strcmp(name, list[type]) == 0)
 			break;
 	}
 
@@ -240,7 +240,7 @@ static int lib_addHook(lua_State *L)
 	{
 		add_hook(&hookIds[type]);
 	}
-	/*else if (fastcmp(name, "HUD")) // ehh this is cool and all, but i dont want modders potentially breaking vanilla clients lol
+	/*else if (strcmp(name, "HUD") == 0) // ehh this is cool and all, but i dont want modders potentially breaking vanilla clients lol
 	{
 		add_hud_hook(L, 3);
 	}*/
@@ -818,7 +818,7 @@ typedef struct {
 
 FUNCINLINE static ATTRINLINE boolean checkbotkey(const char *field)
 {
-	return lua_toboolean(gL, -1) && fastcmp(lua_tostring(gL, -2), field);
+	return lua_toboolean(gL, -1) && strcmp(lua_tostring(gL, -2), field) == 0;
 }
 
 static void res_botai(Hook_State *hook)

src/lua_mobjlib.c

@@ -455,12 +455,12 @@ int mobj_localskin_setter(lua_State *L)
 		strlcpy(skin, luaL_optstring(L, 2, "none"), sizeof skin);
 		strlwr(skin); // all skin names are lowercase
 
-		if (!fasticmp(skin, "none"))
+		if (stricmp(skin, "none"))
 		{
 			// Try localskins
 			for (i = 0; i < numlocalskins; i++)
 			{
-				if (fasticmp(localskins[i].name, skin))
+				if (stricmp(localskins[i].name, skin) == 0)
 				{
 					mo->localskin = &localskins[i];
 					mo->skinlocal = true;
@@ -471,7 +471,7 @@ int mobj_localskin_setter(lua_State *L)
 			// Try other skins
 			for (i = 0; i < numskins; i++)
 			{
-				if (fasticmp(skins[i].name, skin))
+				if (stricmp(skins[i].name, skin) == 0)
 				{
 					mo->localskin = &skins[i];
 					mo->skinlocal = false;

src/m_aatree.c

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

src/m_argv.c

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

src/m_emotes.cpp

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

src/m_menu.c

@@ -3719,10 +3719,10 @@ static void M_HandleAddons(INT32 choice)
 							break;
 						case EXT_TXT:
 						case EXT_CFG:
-							if (fastcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, CONFIGFILENAME)
-								|| fastcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, AUTOLOADCONFIGFILENAME)
-								|| fastcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartserv.cfg")
-								|| fastcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartexec.cfg"))
+							if ((strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, CONFIGFILENAME) == 0)
+								|| (strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, AUTOLOADCONFIGFILENAME) == 0)
+								|| (strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartserv.cfg") == 0)
+								|| (strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartexec.cfg") == 0))
 							{
 								M_StartMessage(va("%c%s\x80\nYou can't autoload this builds' base console scripts, silly!\n They're already autoloaded on startup! \n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
 								S_StartSound(NULL, sfx_s26d);
@@ -3830,7 +3830,7 @@ static void ReplayNamesLoadThread(void* userdata)
 
 	Lock_search_state();
 
-	if (fastcmp(menupath, replaydirpath))
+	if (strcmp(menupath, replaydirpath) == 0)
 	{
 		memcpy(demolist_all, demolist_all_local, sizeof(menudemo_t)*sizedirmenu);
 		replaynamesloaded = true;
@@ -6956,9 +6956,9 @@ static void M_ConnectMenuModChecks(INT32 choice)
 	(void)choice;
 	// okay never mind we want to COMMUNICATE to the player pre-emptively instead of letting them try and then get confused when it doesn't work
 
-	if (modifiedgame)
+	if (modifiedgame || autoloaded)
 	{
-		M_StartMessage("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nSRB2Kart will automatically add\neverything you need when you join.\n\n(Press a key)\n", M_ConnectMenu, MM_EVENTHANDLER);
+		M_StartMessage(M_GetText("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nSRB2Kart will automatically add\neverything you need when you join.\n\n(Press a key)\n"),M_ConnectMenu,MM_EVENTHANDLER);
 		return;
 	}
 
@@ -8808,7 +8808,7 @@ static boolean M_QuitMultiPlayerMenu(void)
 	size_t l;
 
 	// send name if changed
-	if (!fastcmp(setupm_name, setupm_cvname->string))
+	if (strcmp(setupm_name, setupm_cvname->string))
 	{
 		// remove trailing whitespaces
 		for (l= strlen(setupm_name)-1;
@@ -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 (fastcmp(modedescs[j].desc, desc))
+				if (!strcmp(modedescs[j].desc, desc))
 				{
 					// mode(0): 320x200 is always standard VGA, not vesa
 					if (modedescs[j].modenum)

src/m_menudefs.c

@@ -944,23 +944,21 @@ static menuitem_t OP_ExpOptionsMenu[] =
 
 	{IT_STRING | IT_CVAR,	NULL, "Skyboxes",						&cv_skybox,				 	 40},
 
-	{IT_STRING | IT_CVAR,	NULL, "Precache Level Textures",		&cv_precachetextures,		 50},
+	{IT_STRING | IT_CVAR,	NULL, "FPS counter sampling",			&cv_accuratefps,			 50},
 
-	{IT_STRING | IT_CVAR,	NULL, "FPS counter sampling",			&cv_accuratefps,			 60},
+	{IT_STRING | IT_CVAR,	NULL, "Frameskip",						&cv_frameskip,			 	 60},
 
-	{IT_STRING | IT_CVAR,	NULL, "Frameskip",						&cv_frameskip,			 	 70},
-
-	{IT_STRING | IT_CVAR,	NULL, "Votescreen Scaling",				&cv_votebgscaling,			 80},
+	{IT_STRING | IT_CVAR,	NULL, "Votescreen Scaling",				&cv_votebgscaling,			 70},
 
 #ifdef HWRENDER
-	{IT_STRING | IT_CVAR, 	NULL, "Screen Textures", 				&cv_glscreentextures, 		 90},
+	{IT_STRING | IT_CVAR, 	NULL, "Screen Textures", 				&cv_glscreentextures, 		 80},
 #ifdef USE_FBO_OGL
-	{IT_STRING | IT_CVAR, 	NULL, "FBO Downsampling support", 		&cv_glframebuffer, 			 95},
-	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		105},
-	{IT_DISABLED, 			NULL, "", 								NULL,     			 		115}, // dummy text
+	{IT_STRING | IT_CVAR, 	NULL, "FBO Downsampling support", 		&cv_glframebuffer, 			 85},
+	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		 95},
+	{IT_DISABLED, 			NULL, "", 								NULL,     			 		105}, // dummy text
 #else
-	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		100},
-	{IT_DISABLED, 			NULL, "", 								NULL,     			 		110}, // dummy text
+	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		 90},
+	{IT_DISABLED, 			NULL, "", 								NULL,     			 		100}, // dummy text
 #endif
 #endif
 };
@@ -973,7 +971,6 @@ static const char* OP_ExpTooltips[] =
 	"Sets minimum sector brightness, useful for dark areas.",
 	//"Should the directional lightning be randomized each map?\nTakes effect on next map load.",
 	"Toggle being able to see the sky.",
-	"Preload all level textures on level load.\nMassively reduces texture related stuttering during gameplay\nat the cost of longer level loading times.\nDisable this if you experience timeouts during level switches.",
 	"Change the FPS counter sampling method\nInaccurate updates slower\nand might miss sudden framerate changes and drops,\nproviding a more averaged result.\nAccurate updates faster, but might be less readable.", // how to ingles??
 	"Skips rendering frames if game logic takes too long\npreventing gameplay issues during performance drops.", // idk im shit as describing things
 	"Different methods of scaling the votescreen backgrounds.",
@@ -994,7 +991,6 @@ enum
 	op_exp_secbright,
 	//op_exp_dirlight,
 	op_exp_skybox,
-	op_exp_texcache,
 	op_exp_accuratefps,
 	op_exp_frameskip,
 	op_exp_votescrn,

src/m_misc.c

@@ -423,7 +423,7 @@ void Command_SaveConfig_f(void)
 	FIL_ForceExtension(tmpstr, ".cfg");
 
 	M_SaveConfig(tmpstr);
-	if (!fasticmp(COM_Argv(2), "-silent"))
+	if (stricmp(COM_Argv(2), "-silent"))
 		CONS_Printf(M_GetText("config saved as %s\n"), configfile);
 }
 

src/m_perfstats.c

@@ -916,7 +916,7 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 		int len = (int)strlen(str);
 		char* str_ptr;
 
-		if (fastcmp(".lua", str + len - 4))
+		if (strcmp(".lua", str + len - 4) == 0)
 		{
 			str[len-4] = '\0'; // remove .lua at end
 		}

src/p_saveg.c

@@ -3391,7 +3391,7 @@ FUNCINLINE static ATTRINLINE void P_UnArchiveSPGame(savebuffer_t *save, INT16 ma
 
 	READSTRINGN(save->p, testname, sizeof(testname));
 
-	if (!fastcmp(testname, timeattackfolder))
+	if (strcmp(testname, timeattackfolder))
 	{
 		if (modifiedgame)
 			I_Error("Save game not for this modification.");

src/p_spec.c

@@ -324,7 +324,6 @@ void P_InitPicAnims(void)
 			lastanim->speed = LONG(animdefs[i].speed);
 		lastanim++;
 	}
-
 	lastanim->istexture = -1;
 	R_ClearTextureNumCache(false);
 
@@ -332,7 +331,6 @@ void P_InitPicAnims(void)
 	// We'll only be using anims from now on.
 	if (animdefs != harddefs)
 		Z_Free(animdefs);
-
 	animdefs = NULL;
 }
 
@@ -363,21 +361,20 @@ void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum)
 
 	// Now, let's start parsing this thing
 	p = animdefsText;
-
 	animdefsToken = M_GetToken(p);
 	while (animdefsToken != NULL)
 	{
-		if (fasticmp(animdefsToken, "TEXTURE"))
+		if (stricmp(animdefsToken, "TEXTURE") == 0)
 		{
 			Z_Free(animdefsToken);
 			P_ParseAnimationDefintion(1);
 		}
-		else if (fasticmp(animdefsToken, "FLAT"))
+		else if (stricmp(animdefsToken, "FLAT") == 0)
 		{
 			Z_Free(animdefsToken);
 			P_ParseAnimationDefintion(0);
 		}
-		else if (fasticmp(animdefsToken, "OSCILLATE"))
+		else if (stricmp(animdefsToken, "OSCILLATE") == 0)
 		{
 			// This probably came off the tail of an earlier definition. It's technically legal syntax, but we don't support it.
 			I_Error("Error parsing ANIMDEFS lump: Animation definitions utilizing \"OSCILLATE\" (the animation plays in reverse when it reaches the end) are not supported by SRB2");
@@ -386,17 +383,11 @@ void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum)
 		{
 			I_Error("Error parsing ANIMDEFS lump: Expected \"TEXTURE\" or \"FLAT\", got \"%s\"",animdefsToken);
 		}
-
 		// parse next line
-		while (*p != '\0' && *p != '\n')
-			++p;
-
-		if (*p == '\n')
-			++p;
-
+		while (*p != '\0' && *p != '\n') ++p;
+		if (*p == '\n') ++p;
 		animdefsToken = M_GetToken(p);
 	}
-
 	Z_Free(animdefsToken);
 	Z_Free((void *)animdefsText);
 }
@@ -415,8 +406,7 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where start texture/flat name should be");
 	}
-
-	if (fasticmp(animdefsToken, "OPTIONAL"))
+	if (stricmp(animdefsToken, "OPTIONAL") == 0)
 	{
 		// This is meaningful to ZDoom - it tells the program NOT to bomb out
 		// if the textures can't be found - but it's useless in SRB2, so we'll
@@ -428,7 +418,7 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 		{
 			I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where start texture/flat name should be");
 		}
-		else if (fasticmp(animdefsToken, "RANGE"))
+		else if (stricmp(animdefsToken, "RANGE") == 0)
 		{
 			// Oh. Um. Apparently "OPTIONAL" is a texture name. Naughty.
 			// I should probably handle this more gracefully, but right now
@@ -437,17 +427,15 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 			I_Error("Error parsing ANIMDEFS lump: \"OPTIONAL\" is a keyword; you cannot use it as the startname of an animation");
 		}
 	}
-
 	animdefsTokenLength = strlen(animdefsToken);
-	if (animdefsTokenLength > 8)
+	if (animdefsTokenLength>8)
 	{
 		I_Error("Error parsing ANIMDEFS lump: lump name \"%s\" exceeds 8 characters", animdefsToken);
 	}
 
 	// Search for existing animdef
 	for (i = 0; i < maxanims; i++)
-	{
-		if (fasticmp(animdefsToken, animdefs[i].startname))
+		if (stricmp(animdefsToken, animdefs[i].startname) == 0)
 		{
 			//CONS_Alert(CONS_NOTICE, "Duplicate animation: %s\n", animdefsToken);
 
@@ -456,7 +444,6 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 			Z_Free(animdefsToken);
 			return;
 		}
-	}
 
 	// Not found
 	if (i == maxanims)
@@ -480,25 +467,21 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"RANGE\" after \"%s\"'s startname should be", animdefs[i].startname);
 	}
-
-	if (fasticmp(animdefsToken, "ALLOWDECALS"))
+	if (stricmp(animdefsToken, "ALLOWDECALS") == 0)
 	{
 		// Another ZDoom keyword, ho-hum. Skip it, move on to the next token.
 		Z_Free(animdefsToken);
 		animdefsToken = M_GetToken(NULL);
 	}
-
-	if (fasticmp(animdefsToken, "PIC"))
+	if (stricmp(animdefsToken, "PIC") == 0)
 	{
 		// This is technically legitimate ANIMDEFS syntax, but SRB2 doesn't support it.
 		I_Error("Error parsing ANIMDEFS lump: Animation definitions utilizing \"PIC\" (specific frames instead of a consecutive range) are not supported by SRB2");
 	}
-
-	if (!fasticmp(animdefsToken, "RANGE"))
+	if (stricmp(animdefsToken, "RANGE") != 0)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Expected \"RANGE\" after \"%s\"'s startname, got \"%s\"", animdefs[i].startname, animdefsToken);
 	}
-
 	Z_Free(animdefsToken);
 
 	// Endname
@@ -507,13 +490,11 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s end texture/flat name should be", animdefs[i].startname);
 	}
-
 	animdefsTokenLength = strlen(animdefsToken);
 	if (animdefsTokenLength>8)
 	{
 		I_Error("Error parsing ANIMDEFS lump: lump name \"%s\" exceeds 8 characters", animdefsToken);
 	}
-
 	strncpy(animdefs[i].endname, animdefsToken, 9);
 	Z_Free(animdefsToken);
 
@@ -523,18 +504,15 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s \"TICS\" should be", animdefs[i].startname);
 	}
-
-	if (fasticmp(animdefsToken, "RAND"))
+	if (stricmp(animdefsToken, "RAND") == 0)
 	{
 		// This is technically legitimate ANIMDEFS syntax, but SRB2 doesn't support it.
 		I_Error("Error parsing ANIMDEFS lump: Animation definitions utilizing \"RAND\" (random duration per frame) are not supported by SRB2");
 	}
-
-	if (!fasticmp(animdefsToken, "TICS"))
+	if (stricmp(animdefsToken, "TICS") != 0)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Expected \"TICS\" in animation definition for \"%s\", got \"%s\"", animdefs[i].startname, animdefsToken);
 	}
-
 	Z_Free(animdefsToken);
 
 	// Speed
@@ -543,7 +521,6 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s animation speed should be", animdefs[i].startname);
 	}
-
 	endPos = NULL;
 #ifndef AVOID_ERRNO
 	errno = 0;
@@ -558,7 +535,6 @@ void P_ParseAnimationDefintion(SINT8 istexture)
 	{
 		I_Error("Error parsing ANIMDEFS lump: Expected a positive integer for \"%s\"'s animation speed, got \"%s\"", animdefs[i].startname, animdefsToken);
 	}
-
 	animdefs[i].speed = animSpeed;
 	Z_Free(animdefsToken);
 }

src/p_user.c

@@ -3824,7 +3824,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 		// Hack-adjacent.
 		// Sometimes stale ticcmds send a weird angle at the start of the race.
 		// P_UpdatePlayerAngle knows to ignore cmd angle when you literally can't turn, so we do the same here.
-		if (cv_demoangturn.value && leveltime > starttime)
+		if (leveltime > starttime)
 			focusangle = player->cmd.angleturn << 16;
 		else
 			focusangle = mo->angle; // Just use something known sane.
@@ -4315,19 +4315,17 @@ static void P_CalcPostImg(player_t *player, camera_t *thiscam)
 {
 	sector_t *sector = NULL;
 	UINT8 postimgtype = 0;
+	//INT32 *param;
 	fixed_t pviewheight = 0;
-#ifdef MOTIONBLUR
-	INT32 *param;
 
-	for (i = 0; i <= splitscreen; i++)
+	/*for (i = 0; i <= splitscreen; i++)
 	{
 		if (player == &players[displayplayers[i]])
 		{
 			param = &postimgparam[i];
 			break;
 		}
-	}
-#endif
+	}*/
 
 	if (encoremode) // srb2kart
 		postimgtype |= POSTIMG_MIRROR;
@@ -4363,18 +4361,16 @@ static void P_CalcPostImg(player_t *player, camera_t *thiscam)
 	else if (P_CameraCheckHeatFirstperson(player, sector, pviewheight))
 		postimgtype |= POSTIMG_HEAT;
 
-#ifdef MOTIONBLUR
 	// Motion blur
 	// unused
-	if (player->speed > (35<<FRACBITS))
+	/*if (player->speed > (35<<FRACBITS))
 	{
 		postimgtype |= POSTIMG_MOTION;
 		*param = (player->speed - 32)/4;
 
 		if (*param > 5)
 			*param = 5;
-	}
-#endif
+	}*/
 
 	thiscam->postimg = postimgtype;
 }

src/r_data.c

@@ -867,7 +867,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after \"%s\"'s patch name should be",patchName);
 	}
 
-	if (!fastcmp(texturesToken,","))
+	if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after %s's patch name, got \"%s\"",patchName,texturesToken);
 	}
@@ -907,7 +907,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after patch \"%s\"'s x coordinate should be",patchName);
 	}
 
-	if (!fastcmp(texturesToken,","))
+	if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after patch \"%s\"'s x coordinate, got \"%s\"",patchName,texturesToken);
 	}
@@ -976,9 +976,8 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where texture name should be");
 	}
-
 	texturesTokenLength = strlen(texturesToken);
-	if (texturesTokenLength > 8)
+	if (texturesTokenLength>8)
 	{
 		I_Error("Error parsing TEXTURES lump: Texture name \"%s\" exceeds 8 characters",texturesToken);
 	}
@@ -989,7 +988,6 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 		// ^^ we've confirmed that the token is <= 8 characters so it will never overflow a 9 byte char buffer
 		strupr(newTextureName); // Just do this now so we don't have to worry about it
 	}
-
 	Z_Free(texturesToken);
 
 	// Comma 1
@@ -998,11 +996,10 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after texture \"%s\"'s name should be",newTextureName);
 	}
-	else if (!fastcmp(texturesToken, ","))
+	else if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after texture \"%s\"'s name, got \"%s\"",newTextureName,texturesToken);
 	}
-
 	Z_Free(texturesToken);
 
 	// Width
@@ -1033,12 +1030,10 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after texture \"%s\"'s width should be",newTextureName);
 	}
-
-	if (!fastcmp(texturesToken, ","))
+	if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after texture \"%s\"'s width, got \"%s\"",newTextureName,texturesToken);
 	}
-
 	Z_Free(texturesToken);
 
 	// Height
@@ -1071,7 +1066,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where open curly brace for texture \"%s\" should be",newTextureName);
 	}
 
-	if (fastcmp(texturesToken, "{"))
+	if (strcmp(texturesToken,"{")==0)
 	{
 		if (actuallyLoadTexture)
 		{
@@ -1083,18 +1078,15 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 			resultTexture->height = newTextureHeight;
 			resultTexture->type = TEXTURETYPE_COMPOSITE;
 		}
-
 		Z_Free(texturesToken);
-
 		texturesToken = M_GetToken(NULL);
 		if (texturesToken == NULL)
 		{
 			I_Error("Error parsing TEXTURES lump: Unexpected end of file where patch definition for texture \"%s\" should be",newTextureName);
 		}
-
-		while (!fastcmp(texturesToken, "}"))
+		while (strcmp(texturesToken,"}")!=0)
 		{
-			if (fasticmp(texturesToken, "PATCH"))
+			if (stricmp(texturesToken, "PATCH")==0)
 			{
 				Z_Free(texturesToken);
 				if (resultTexture)
@@ -1126,7 +1118,6 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 				I_Error("Error parsing TEXTURES lump: Unexpected end of file where patch declaration or right curly brace for texture \"%s\" should be",newTextureName);
 			}
 		}
-
 		if (resultTexture && resultTexture->patchcount == 0)
 		{
 			I_Error("Error parsing TEXTURES lump: Texture \"%s\" must have at least one patch",newTextureName);
@@ -1136,13 +1127,10 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \"{\" for texture \"%s\", got \"%s\"",newTextureName,texturesToken);
 	}
-
 	Z_Free(texturesToken);
 
-	if (actuallyLoadTexture)
-		return resultTexture;
-
-	return NULL;
+	if (actuallyLoadTexture) return resultTexture;
+	else return NULL;
 }
 
 // Parses the TEXTURES lump... but just to count the number of textures.
@@ -1174,7 +1162,7 @@ int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum)
 	texturesToken = M_GetToken(texturesText);
 	while (texturesToken != NULL)
 	{
-		if (fasticmp(texturesToken, "WALLTEXTURE"))
+		if (stricmp(texturesToken, "WALLTEXTURE")==0)
 		{
 			numTexturesInLump++;
 			Z_Free(texturesToken);
@@ -1184,10 +1172,8 @@ int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum)
 		{
 			I_Error("Error parsing TEXTURES lump: Expected \"WALLTEXTURE\", got \"%s\"",texturesToken);
 		}
-
 		texturesToken = M_GetToken(NULL);
 	}
-
 	Z_Free(texturesToken);
 	Z_Free((void *)texturesText);
 
@@ -1225,7 +1211,7 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex)
 	texturesToken = M_GetToken(texturesText);
 	while (texturesToken != NULL)
 	{
-		if (fasticmp(texturesToken, "WALLTEXTURE"))
+		if (stricmp(texturesToken, "WALLTEXTURE")==0)
 		{
 			Z_Free(texturesToken);
 			// Get the new texture
@@ -1241,10 +1227,8 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex)
 		{
 			I_Error("Error parsing TEXTURES lump: Expected \"WALLTEXTURE\", got \"%s\"",texturesToken);
 		}
-
 		texturesToken = M_GetToken(NULL);
 	}
-
 	Z_Free(texturesToken);
 	Z_Free((void *)texturesText);
 }
@@ -1350,9 +1334,8 @@ lumpnum_t R_GetFlatNumForName(const char *name)
 
 	if (lump == LUMPERROR)
 	{
-		if (!fastcmp(name, SKYFLATNAME))
+		if (strcmp(name, SKYFLATNAME))
 			CONS_Debug(DBG_SETUP, "R_GetFlatNumForName: Could not find flat %.8s\n", name);
-
 		lump = W_CheckNumForName("REDFLR");
 	}
 

src/r_patch.cpp

@@ -46,14 +46,13 @@ static void R_ParseSpriteInfoFrame(spriteinfo_t *info)
 	{
 		I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite frame should be");
 	}
-
 	sprinfoTokenLength = strlen(sprinfoToken);
 	if (sprinfoTokenLength != 1)
 	{
 		I_Error("Error parsing SPRTINFO lump: Invalid frame \"%s\"",sprinfoToken);
 	}
-
-	frameChar = sprinfoToken;
+	else
+		frameChar = sprinfoToken;
 
 	frameFrame = R_Char2Frame(frameChar[0]);
 	Z_Free(sprinfoToken);
@@ -62,53 +61,53 @@ static void R_ParseSpriteInfoFrame(spriteinfo_t *info)
 	sprinfoToken = M_GetToken(NULL);
 	if (sprinfoToken == NULL)
 		I_Error("Error parsing SPRTINFO lump: Missing sprite info");
-
-	if (fastcmp(sprinfoToken, "{"))
+	else
 	{
-		Z_Free(sprinfoToken);
-		sprinfoToken = M_GetToken(NULL);
-		if (sprinfoToken == NULL)
+		if (strcmp(sprinfoToken,"{")==0)
 		{
-			I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite info should be");
-		}
-		while (!fastcmp(sprinfoToken, "}"))
-		{
-			if (fasticmp(sprinfoToken, "XPIVOT"))
-			{
-				Z_Free(sprinfoToken);
-				sprinfoToken = M_GetToken(NULL);
-				frameXPivot = atoi(sprinfoToken);
-			}
-			else if (fasticmp(sprinfoToken, "YPIVOT"))
-			{
-				Z_Free(sprinfoToken);
-				sprinfoToken = M_GetToken(NULL);
-				frameYPivot = atoi(sprinfoToken);
-			}
-			else if (fasticmp(sprinfoToken, "ROTAXIS"))
-			{
-				Z_Free(sprinfoToken);
-				sprinfoToken = M_GetToken(NULL);
-				if (fasticmp(sprinfoToken, "X") || fasticmp(sprinfoToken, "XAXIS") || fasticmp(sprinfoToken, "ROLL"))
-					frameRotAxis = ROTAXIS_X;
-				else if (fasticmp(sprinfoToken, "Y") || fasticmp(sprinfoToken, "YAXIS") || fasticmp(sprinfoToken, "PITCH"))
-					frameRotAxis = ROTAXIS_Y;
-				else if (fasticmp(sprinfoToken, "Z") || fasticmp(sprinfoToken, "ZAXIS") || fasticmp(sprinfoToken, "YAW"))
-					frameRotAxis = ROTAXIS_Z;
-			}
-
 			Z_Free(sprinfoToken);
-
 			sprinfoToken = M_GetToken(NULL);
 			if (sprinfoToken == NULL)
 			{
-				I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite info or right curly brace should be");
+				I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite info should be");
+			}
+			while (strcmp(sprinfoToken,"}")!=0)
+			{
+				if (stricmp(sprinfoToken, "XPIVOT")==0)
+				{
+					Z_Free(sprinfoToken);
+					sprinfoToken = M_GetToken(NULL);
+					frameXPivot = atoi(sprinfoToken);
+				}
+				else if (stricmp(sprinfoToken, "YPIVOT")==0)
+				{
+					Z_Free(sprinfoToken);
+					sprinfoToken = M_GetToken(NULL);
+					frameYPivot = atoi(sprinfoToken);
+				}
+				else if (stricmp(sprinfoToken, "ROTAXIS")==0)
+				{
+					Z_Free(sprinfoToken);
+					sprinfoToken = M_GetToken(NULL);
+					if ((stricmp(sprinfoToken, "X")==0) || (stricmp(sprinfoToken, "XAXIS")==0) || (stricmp(sprinfoToken, "ROLL")==0))
+						frameRotAxis = ROTAXIS_X;
+					else if ((stricmp(sprinfoToken, "Y")==0) || (stricmp(sprinfoToken, "YAXIS")==0) || (stricmp(sprinfoToken, "PITCH")==0))
+						frameRotAxis = ROTAXIS_Y;
+					else if ((stricmp(sprinfoToken, "Z")==0) || (stricmp(sprinfoToken, "ZAXIS")==0) || (stricmp(sprinfoToken, "YAW")==0))
+						frameRotAxis = ROTAXIS_Z;
+				}
+				Z_Free(sprinfoToken);
+
+				sprinfoToken = M_GetToken(NULL);
+				if (sprinfoToken == NULL)
+				{
+					I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite info or right curly brace should be");
+				}
 			}
 		}
+		Z_Free(sprinfoToken);
 	}
 
-	Z_Free(sprinfoToken);
-
 	// set fields
 	info->pivot[frameFrame].x = frameXPivot;
 	info->pivot[frameFrame].y = frameYPivot;
@@ -138,7 +137,6 @@ static void R_ParseSpriteInfo(boolean spr2)
 	{
 		I_Error("Error parsing SPRTINFO lump: Unexpected end of file where sprite name should be");
 	}
-
 	sprinfoTokenLength = strlen(sprinfoToken);
 	if (sprinfoTokenLength != 4)
 	{
@@ -151,7 +149,6 @@ static void R_ParseSpriteInfo(boolean spr2)
 		// ^^ we've confirmed that the token is == 4 characters so it will never overflow a 5 byte char buffer
 		strupr(newSpriteName); // Just do this now so we don't have to worry about it
 	}
-
 	Z_Free(sprinfoToken);
 
 	if (!spr2)
@@ -160,8 +157,7 @@ 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;
@@ -179,20 +175,17 @@ static void R_ParseSpriteInfo(boolean spr2)
 	{
 		I_Error("Error parsing SPRTINFO lump: Unexpected end of file where open curly brace for sprite \"%s\" should be",newSpriteName);
 	}
-
-	if (fastcmp(sprinfoToken, "{"))
+	if (strcmp(sprinfoToken,"{")==0)
 	{
 		Z_Free(sprinfoToken);
-
 		sprinfoToken = M_GetToken(NULL);
 		if (sprinfoToken == NULL)
 		{
 			I_Error("Error parsing SPRTINFO lump: Unexpected end of file where definition for sprite \"%s\" should be",newSpriteName);
 		}
-
-		while (!fastcmp(sprinfoToken, "}"))
+		while (strcmp(sprinfoToken,"}")!=0)
 		{
-			if (fasticmp(sprinfoToken, "SKIN"))
+			if (stricmp(sprinfoToken, "SKIN")==0)
 			{
 				INT32 skinnum;
 				char *skinName = NULL;
@@ -223,11 +216,10 @@ static void R_ParseSpriteInfo(boolean spr2)
 				skinnumbers[foundskins] = skinnum;
 				foundskins++;
 			}
-			else if (fasticmp(sprinfoToken, "FRAME"))
+			else if (stricmp(sprinfoToken, "FRAME")==0)
 			{
 				R_ParseSpriteInfoFrame(info);
 				Z_Free(sprinfoToken);
-
 				if (spr2)
 				{
 					if (!foundskins)
@@ -262,7 +254,6 @@ static void R_ParseSpriteInfo(boolean spr2)
 	{
 		I_Error("Error parsing SPRTINFO lump: Expected \"{\" for sprite \"%s\", got \"%s\"",newSpriteName,sprinfoToken);
 	}
-
 	Z_Free(sprinfoToken);
 	Z_Free(info);
 }
@@ -300,18 +291,15 @@ void R_ParseSPRTINFOLump(UINT16 wadNum, UINT16 lumpNum)
 	while (sprinfoToken != NULL)
 	{
 		CONS_Printf("Attempting to parse le SPRTINFO lump for ya..\n");
-
-		if (fasticmp(sprinfoToken, "SPRITE"))
+		if (!stricmp(sprinfoToken, "SPRITE"))
 			R_ParseSpriteInfo(false);
-		else if (fasticmp(sprinfoToken, "SPRITE2"))
+		else if (!stricmp(sprinfoToken, "SPRITE2"))
 			R_ParseSpriteInfo(true);
 		else
 			I_Error("Error parsing SPRTINFO lump: Unknown keyword \"%s\"", sprinfoToken);
-
 		Z_Free(sprinfoToken);
 		sprinfoToken = M_GetToken(NULL);
 	}
-
 	Z_Free((void *)sprinfoText);
 }
 

src/r_skins.c

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

src/s_sound.c

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

src/sdl/hwsym_sdl.c

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

src/sdl/i_system.cpp

@@ -2288,9 +2288,8 @@ char *I_GetUserName(void)
 	}
 
 
-	if (!fastcmp(username, ""))
+	if (strcmp(username, "") != 0)
 		return username;
-
 	return NULL; // dummy for platform independent version
 }
 

src/sdl/i_video.c

@@ -905,7 +905,7 @@ static void Impl_HandleControllerAddedEvent(SDL_Event evt)
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		if (fastcmp(cv_usejoystick[i].string, "0") || !cv_usejoystick[i].value)
+		if (!strcmp(cv_usejoystick[i].string, "0") || !cv_usejoystick[i].value)
 			cv_usejoystick[i].value = 0;
 		else if (atoi(cv_usejoystick[i].string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
 			&& cv_usejoystick[i].value) // update the cvar ONLY if a device exists
@@ -977,7 +977,7 @@ static void Impl_HandleControllerRemovedEvent(void)
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 	{
-		if (fastcmp(cv_usejoystick[i].string, "0"))
+		if (!strcmp(cv_usejoystick[i].string, "0"))
 		{
 			cv_usejoystick[i].value = 0;
 		}
@@ -1785,11 +1785,11 @@ void I_StartupGraphics(void)
 
 				if (rendermode == render_none)
 				{
-					if (fasticmp(word, "software"))
+					if (strcasecmp(word, "software") == 0)
 					{
 						rendermode = render_soft;
 					}
-					else if (fasticmp(word, "opengl"))
+					else if (strcasecmp(word, "opengl") == 0)
 					{
 						rendermode = render_opengl;
 					}
@@ -1802,7 +1802,7 @@ void I_StartupGraphics(void)
 
 				if (!msaa_set)
 				{
-					if (fasticmp(word, "msaa"))
+					if (strcasecmp(word, "msaa") == 0)
 					{
 						const char *nextword = strtok(NULL, " \n");
 
@@ -1819,7 +1819,7 @@ void I_StartupGraphics(void)
 
 				if (!a2c_set)
 				{
-					if (fasticmp(word, "a2c"))
+					if (strcasecmp(word, "a2c") == 0)
 					{
 						a2c = true;
 						CONS_Printf("Using a2c because it was specified to be used earlier\n");

src/sdl/ogl_sdl.c

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

src/v_video.c

@@ -23,6 +23,7 @@
 #include "r_main.h"
 #include "r_fps.h"
 #include "console.h"
+
 #include "i_video.h" // rendermode
 #include "z_zone.h"
 #include "m_misc.h"
@@ -133,7 +134,7 @@ static boolean InitCube(void)
 	if (!loaded_config)
 		return false;
 
-#define diffcons(cv) (!fastcmp(cv.string, cv.defaultvalue))
+#define diffcons(cv) (strcmp(cv.string, cv.defaultvalue))
 #define diffconsgamma(cv) (cv.value != 0)
 #define diffconssat(cv) (cv.value != 10)
 
@@ -595,7 +596,7 @@ void V_ResetPaletteCVars(void)
 	if (!loaded_config)
 		return;
 
-#define diffcons(cv) (!fastcmp(cv.string, cv.defaultvalue))
+#define diffcons(cv) (strcmp(cv.string, cv.defaultvalue))
 	if diffcons(cv_palette)
 		CV_StealthSetValue(&cv_palette, atoi(cv_palette.defaultvalue));
 	if diffcons(cv_palettenum)
@@ -3580,9 +3581,6 @@ boolean *heatshifter = NULL;
 INT32 lastheight = 0;
 INT32 heatindex[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0};
 
-// unused motion blur effect, probably non functional
-//#define MOTIONBLUR
-
 //
 // V_DoPostProcessor
 //
@@ -3597,9 +3595,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 	(void)type;
 	(void)param;
 #else
-#ifndef MOTIONBLUR
 	(void)param; // unused motion blur stuff
-#endif
 	INT32 yoffset, xoffset;
 
 #ifdef HWRENDER
@@ -3734,8 +3730,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 		srcscr = tmp;
 	}
 
-#ifdef MOTIONBLUR
-	if (thiscam->postimg & POSTIMG_MOTION) // Motion Blur!
+	/*if (thiscam->postimg & POSTIMG_MOTION) // Motion Blur!
 	{
 		INT32 x, y;
 
@@ -3747,8 +3742,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 			for (x = xoffset; x < xoffset+viewwidth; x++)
 				tmpscr[y*vid.width + x] =     colormaps[*(transme     + (srcscr   [(y*vid.width)+x ] <<8) + (tmpscr[(y*vid.width)+x]))];
 		}
-	}
-#endif
+	}*/
 
 	if ((thiscam->postimg & POSTIMG_FLIP) && !(thiscam->postimg & POSTIMG_MIRROR)) // Flip the screen upside-down
 	{

src/w_wad.c

@@ -375,11 +375,11 @@ static restype_t ResourceFileDetect(const char* filename)
 {
 	size_t len = strlen(filename) - 4;
 
-	if (fasticmp(&filename[len], ".pk3"))
+	if (!stricmp(&filename[len], ".pk3"))
 		return RET_PK3;
-	if (fasticmp(&filename[len], ".soc"))
+	if (!stricmp(&filename[len], ".soc"))
 		return RET_SOC;
-	if (fasticmp(&filename[len], ".lua"))
+	if (!stricmp(&filename[len], ".lua"))
 		return RET_LUA;
 
 	return RET_WAD;
@@ -971,25 +971,24 @@ UINT16 W_InitFile(const char *filename, boolean local, boolean startup)
   * \return 1 if all files were loaded, 0 if at least one was missing or
   *           invalid.
   */
-INT32 W_InitMultipleFiles(char **filenames, size_t count, boolean addons)
+INT32 W_InitMultipleFiles(char **filenames, boolean addons)
 {
 	INT32 rc = 1;
 	INT32 overallrc = 1;
-	size_t i;
+
 	(void)addons;
 
-	for (i = 0; i < count; i++)
+	// will be realloced as lumps are added
+	for (; *filenames; filenames++)
 	{
-		const char *filename = filenames[i];
-
 		// Previously, W_VerifyNMUSlumps was called to mark game modified
 		// for addons... but W_InitFile already does exactly that!
 
 		//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
-		rc = W_InitFile(filename, false, true);
+		rc = W_InitFile(*filenames, false, true);
 
 		if (rc == INT16_MAX)
-			CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), filename);
+			CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), *filenames);
 
 		overallrc &= (rc != INT16_MAX) ? 1 : 0;
 	}
@@ -1130,7 +1129,7 @@ UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 		{
 			if (lump_p->longnamelength == namelen
 				&& lump_p->hash.longname == hash
-				&& fasticmp(lump_p->longname, name))
+				&& !stricmp(lump_p->longname, name))
 				return i;
 		}
 	}
@@ -1230,7 +1229,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
-				&& fasticmp(lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].lumpname, name))
+				&& stricmp(lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].lumpname, name) == 0)
 			{
 				lumpnumcacheindex = i & (LUMPNUMCACHESIZE - 1);
 				return lumpnumcache[lumpnumcacheindex].lumpnum;

src/w_wad.h

@@ -167,7 +167,7 @@ UINT16 W_InitFile(const char *filename, boolean local, boolean startup);
 
 // W_InitMultipleFiles returns 1 if all is okay, 0 otherwise,
 // so that it stops with a message if a file was not found, but not if all is okay.
-INT32 W_InitMultipleFiles(char **filenames, size_t count, boolean addons);
+INT32 W_InitMultipleFiles(char **filenames, boolean addons);
 
 // Used for autoload. Uses P_AddWadFileLocal instead of W_InitFiles.
 INT32 W_AddAutoloadedLocalFiles(char **filenames);