fix issues with interpolation when spawning mobjs

fixes them seemingly coming really fast out of nowhere
needs testing as this may break some things from addons

src/CMakeLists.txt

@@ -247,9 +247,6 @@ set(SRB2_CONFIG_ASAN OFF CACHE BOOL
 set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
 	"Compile with UndefinedBehaviorSanitizer (libubsan).")
 
-set(SRB2_CONFIG_MUMBLE ON CACHE BOOL
-	"Enable Mumble support")
-
 set(SRB2_CONFIG_SATURNPAK ON CACHE BOOL
 	"Enable Saturn specific special packet. Required for using the newer resynch system")
 set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
@@ -257,9 +254,6 @@ set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
 set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL
 	"Enable hardware renderer (OpenGL) FBO downsampling support")
 
-set(SRB2_CONFIG_PHOBOS OFF CACHE BOOL
-	" Compile the Phobos client. Which contains things not compatible with vanilla, such as raised skinlimits, 32 player support, bugfixes, etc.")
-
 if(${SRB2_CONFIG_DEDICATED})
 	set(SRB2_CONFIG_HAVE_GME NO)
 	set(SRB2_CONFIG_HAVE_OPENMPT NO)
@@ -281,7 +275,6 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_hooklib.c
 		lua_hudlib.c
 		lua_hudlib_drawlist.c
-		lua_profile.cpp
 		lua_infolib.c
 		lua_maplib.c
 		lua_mathlib.c
@@ -297,7 +290,6 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_hook.h
 		lua_hud.h
 		lua_hudlib_drawlist.h
-		lua_profile.h
 		lua_libs.h
 		lua_script.h
 		lua_udatalib.h
@@ -586,10 +578,6 @@ if(${SRB2_CONFIG_SATURNJOIN})
 	add_definitions(-DDOSATURNJOIN)
 endif()
 
-if(${SRB2_CONFIG_PHOBOS})
-	add_definitions(-DPHOBOS_BUILD)
-endif()
-
 # Targets
 
 # Compatibility flag with later versions of GCC

src/Makefile

@@ -65,10 +65,6 @@
 # DEBUGMODE=1 - Enable various debugging capabilities.
 #               Also disables optimizations.
 #
-# PHOBOS_BUILD=1 - Compile the Phobos client.
-#                  Contains things not compatible with vanilla.
-#                  such as raised skinlimits, 32 player support, bugfixes, etc.
-#
 # Development flags:
 #
 # VALGRIND=1 - Enable Valgrind memory debugging support.
@@ -250,6 +246,10 @@ ifdef STATIC
 libs+=-static
 endif
 
+ifneq (,$(filter $(CC) $(CXX),gcc g++))
+ opts+=-mno-ms-bitfields
+endif
+
 # build with profiling information
 ifdef PROFILEMODE
 opts+=-pg

src/Makefile.d/features.mk

@@ -9,7 +9,6 @@ passthru_opts+=\
 	HAVE_DISCORDRPC DEVELOP\
 	NOHOLEPUNCH\
 	HAVE_IPV6\
-	PHOBOS_BUILD\
 
 # build with debugging information
 ifdef DEBUGMODE
@@ -87,7 +86,7 @@ ifdef VALGRIND
 VALGRIND_PKGCONFIG?=valgrind
 VALGRIND_LDFLAGS=
 $(eval $(call Use_pkg_config,VALGRIND))
-#ZDEBUG=1 we enable this by default
+ZDEBUG=1
 opts+=-DHAVE_VALGRIND
 endif
 

src/Sourcefile

@@ -99,4 +99,3 @@ lua_skinlib.c
 lua_thinkerlib.c
 lua_udatalib.c
 lua_glib.c
-lua_profile.cpp

src/blua/ldo.c

@@ -55,8 +55,8 @@ struct lua_longjmp {
 
 void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
   switch (lerrcode) {
-    case LUA_ERRMEM: {  /* memory error? */
-      setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
+    case LUA_ERRMEM: {
+      setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG));
       break;
     }
     case LUA_ERRERR: {

src/blua/lmem.h

@@ -13,6 +13,8 @@
 #include "llimits.h"
 #include "lua.h"
 
+#define MEMERRMSG	"not enough memory"
+
 
 #define luaM_reallocv(L,b,on,n,e) \
 	((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ?  /* +1 to avoid warnings */ \

src/blua/lobject.c

@@ -143,7 +143,7 @@ const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
       }
       case 'p': {
         char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
-        snprintf(buff, sizeof(buff), "%p", va_arg(argp, void *));
+        sprintf(buff, "%p", va_arg(argp, void *));
         pushstr(L, buff);
         break;
       }

src/blua/lstate.c

@@ -64,9 +64,6 @@ static void freestack (lua_State *L, lua_State *L1) {
 }
 
 
-#define MEMERRMSG       "not enough memory"
-
-
 /*
 ** open parts that may cause memory-allocation errors
 */
@@ -79,9 +76,7 @@ static void f_luaopen (lua_State *L, void *ud) {
   luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
   luaT_init(L);
   luaX_init(L);
-  /* pre-create memory-error message */
-  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
-  luaS_fix(g->memerrmsg);  /* it should never be collected */
+  luaS_fix(luaS_newliteral(L, MEMERRMSG));
   g->GCthreshold = 4*g->totalbytes;
 }
 

src/blua/lstate.h

@@ -88,7 +88,6 @@ typedef struct global_State {
   lua_CFunction panic;  /* to be called in unprotected errors */
   TValue l_registry;
   struct lua_State *mainthread;
-  TString *memerrmsg;  /* memory-error message */
   UpVal uvhead;  /* head of double-linked list of all open upvalues */
   struct Table *mt[NUM_TAGS];  /* metatables for basic types */
   TString *tmname[TM_N];  /* array with tag-method names */

src/blua/lstrlib.c

@@ -776,23 +776,23 @@ static int str_format (lua_State *L) {
       strfrmt = scanformat(L, strfrmt, form);
       switch (*strfrmt++) {
         case 'c': {
-          snprintf(buff, sizeof(buff), form, (int)luaL_checknumber(L, arg));
+          sprintf(buff, form, (int)luaL_checknumber(L, arg));
           break;
         }
         case 'd':  case 'i': {
           addintlen(form);
-          snprintf(buff, sizeof(buff), form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
+          sprintf(buff, form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
           break;
         }
         case 'o':  case 'u':  case 'x':  case 'X': {
           addintlen(form);
-          snprintf(buff, sizeof(buff), form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
+          sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
           break;
         }
         case 'e':  case 'E': case 'f':
         case 'g': case 'G': {
-          lua_Number n = luaL_checknumber(L, arg);
-          snprintf(buff, sizeof(buff), form, (double)n);
+					lua_Number n = luaL_checknumber(L, arg);
+          sprintf(buff, form, (double)n);
           break;
         }
         case 'q': {
@@ -810,7 +810,7 @@ static int str_format (lua_State *L) {
             continue;  /* skip the `addsize' at the end */
           }
           else {
-            snprintf(buff, sizeof(buff), form, s);
+            sprintf(buff, form, s);
             break;
           }
         }

src/blua/luaconf.h

@@ -536,7 +536,7 @@
 	#define LUA_NUMBER_SCAN		"%d"
 	#define LUA_NUMBER_FMT		"%d"
 #endif
-#define lua_number2str(s,n)	snprintf((s), LUAI_MAXNUMBER2STR, LUA_NUMBER_FMT, (n))
+#define lua_number2str(s,n)	sprintf((s), LUA_NUMBER_FMT, (n))
 #define LUAI_MAXNUMBER2STR	12 /* 10 digits, sign, and \0 */
 #define lua_str2number(s,p) ({ \
 		long nmr = strtol((s), (p), 10); \

src/byteptr.h

@@ -206,15 +206,6 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
 	p += n;                   \
 } while (0)
 
-
-#ifdef PHOBOS_BUILD
-#define WRITESKIN(p,b) WRITEUINT16(p,b)
-#define READSKIN(p) READUINT16(p)
-#else
-#define WRITESKIN(p,b) WRITEUINT8(p,b)
-#define READSKIN(p) READUINT8(p)
-#endif
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

src/command.c

@@ -113,29 +113,18 @@ static vsbuf_t com_text; // variable sized buffer
   * \param ptext The text to add.
   * \sa COM_BufInsertText
   */
-void COM_BufAddTextEx(const char *ptext, size_t plen)
+void COM_BufAddText(const char *ptext)
 {
 	size_t l;
-	char *text;
 
-	if (plen == 0)
-		plen = strlen(ptext);
-
-	text = Z_Malloc(sizeof(char) * (plen+1), PU_STATIC, NULL);
-	memcpy(text, ptext, plen);
-	text[plen] = '\0';
-
-	l = strlen(text);
+	l = strlen(ptext);
 
 	if (com_text.cursize + l >= com_text.maxsize)
 	{
 		CONS_Alert(CONS_WARNING, M_GetText("Command buffer full!\n"));
 		return;
 	}
-
-	VS_Write(&com_text, text, l);
-
-	Z_Free(text);
+	VS_Write(&com_text, ptext, l);
 }
 
 /** Adds command text and executes it immediately.
@@ -143,10 +132,8 @@ void COM_BufAddTextEx(const char *ptext, size_t plen)
   * \param ptext The text to execute. A newline is automatically added.
   * \sa COM_BufAddText
   */
-void COM_BufInsertTextEx(const char *ptext, size_t plen)
+void COM_BufInsertText(const char *ptext)
 {
-	const INT32 old_wait = com_wait;
-
 	char *temp = NULL;
 	size_t templen;
 
@@ -158,14 +145,10 @@ void COM_BufInsertTextEx(const char *ptext, size_t plen)
 		VS_Clear(&com_text);
 	}
 
-	com_wait = 0;
-
 	// add the entire text of the file (or alias)
-	COM_BufAddTextEx(ptext, plen);
+	COM_BufAddText(ptext);
 	COM_BufExecute(); // do it right away
 
-	com_wait += old_wait;
-
 	// add the copied off data
 	if (templen)
 	{
@@ -176,7 +159,8 @@ void COM_BufInsertTextEx(const char *ptext, size_t plen)
 
 /** Progress the wait timer and flush waiting console commands when ready.
   */
-void COM_BufTicker(void)
+void
+COM_BufTicker(void)
 {
 	if (com_wait)
 	{
@@ -1612,9 +1596,7 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
 	// send only changed cvars ...
 	// the client will reset all netvars to default before loading
 	WRITEUINT16(*p, 0x0000);
-
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-	{
 		if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (isdemorecording && cvar->netid == cv_numlaps.netid))
 		{
 			WRITEUINT16(*p, cvar->netid);
@@ -1632,7 +1614,7 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
 				else
 				{
 					char buf[9];
-					snprintf(buf, sizeof(buf), "%d", mapheaderinfo[gamemap - 1]->numlaps);
+					sprintf(buf, "%d", mapheaderinfo[gamemap - 1]->numlaps);
 					WRITESTRING(*p, buf);
 				}
 			}
@@ -1644,8 +1626,6 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
 			WRITEUINT8(*p, false);
 			++count;
 		}
-	}
-
 	WRITEUINT16(count_p, count);
 }
 
@@ -1802,7 +1782,8 @@ void CV_StealthSet(consvar_t *var, const char *value)
 void CV_StealthSetValue(consvar_t *var, INT32 value)
 {
 	char val[32];
-	snprintf(val, sizeof(val), "%d", value);
+
+	sprintf(val, "%d", value);
 	CV_SetCVar(var, val, true);
 }
 
@@ -1822,7 +1803,8 @@ void CV_Set(consvar_t *var, const char *value)
 void CV_SetValue(consvar_t *var, INT32 value)
 {
 	char val[32];
-	snprintf(val, sizeof(val), "%d", value);
+
+	sprintf(val, "%d", value);
 	CV_SetCVar(var, val, false);
 }
 
@@ -2220,7 +2202,6 @@ void CV_SaveVariables(FILE *f)
 	consvar_t *cvar;
 
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-	{
 		if (cvar->flags & CV_SAVE)
 		{
 			char stringtowrite[MAXTEXTCMD+1];
@@ -2229,23 +2210,15 @@ void CV_SaveVariables(FILE *f)
 			if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
 			{
 				if (cvar->flags & CV_FLOAT)
-				{
-					snprintf(stringtowrite, sizeof(stringtowrite), "%f", FixedToFloat(cvar->value));
-				}
+					sprintf(stringtowrite, "%f", FixedToFloat(cvar->value));
 				else
-				{
-					snprintf(stringtowrite, sizeof(stringtowrite), "%d", cvar->value);
-				}
+					sprintf(stringtowrite, "%d", cvar->value);
 			}
 			else
-			{
-				strncpy(stringtowrite, cvar->string, sizeof(stringtowrite)-1);
-				stringtowrite[sizeof(stringtowrite)-1] = '\0';
-			}
+				strcpy(stringtowrite, cvar->string);
 
 			fprintf(f, "%s \"%s\"\n", cvar->name, stringtowrite);
 		}
-	}
 }
 
 //============================================================================

src/command.h

@@ -52,12 +52,10 @@ size_t COM_FirstOption(void);
 const char *COM_CompleteCommand(const char *partial, INT32 skips);
 
 // insert at queu (at end of other command)
-#define COM_BufAddText(s) COM_BufAddTextEx(s, 0)
-void COM_BufAddTextEx(const char *ptext, size_t plen);
+void COM_BufAddText(const char *btext);
 
 // insert in head (before other command)
-#define COM_BufInsertText(s) COM_BufInsertTextEx(s, 0)
-void COM_BufInsertTextEx(const char *ptext, size_t plen);
+void COM_BufInsertText(const char *btext);
 
 // don't bother inserting, just do immediately
 void COM_ImmedExecute(const char *ptext);

src/core/memory.cpp

@@ -1,7 +1,7 @@
-// DR. ROBOTNIK'S RING RACERS
+// BLANKART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Ronald "Eidolon" Kinard
-// Copyright (C) 2025 by Kart Krew
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.

src/core/memory.h

@@ -1,7 +1,7 @@
-// DR. ROBOTNIK'S RING RACERS
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Ronald "Eidolon" Kinard
-// Copyright (C) 2025 by Kart Krew
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.

src/core/static_vec.hpp

@@ -1,7 +1,7 @@
-// DR. ROBOTNIK'S RING RACERS
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Ronald "Eidolon" Kinard
-// Copyright (C) 2025 by Kart Krew
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.

src/core/thread_pool.cpp

@@ -1,7 +1,7 @@
-// DR. ROBOTNIK'S RING RACERS
+// BLANKART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Ronald "Eidolon" Kinard
-// Copyright (C) 2025 by Kart Krew
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.

src/core/thread_pool.h

@@ -1,7 +1,7 @@
-// DR. ROBOTNIK'S RING RACERS
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Ronald "Eidolon" Kinard
-// Copyright (C) 2025 by Kart Krew
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.

src/d_clisrv.c

@@ -811,7 +811,7 @@ static void resynch_read_player(resynch_pak *rsp)
 	players[i].mo->scalespeed = (fixed_t)LONG(rsp->scalespeed);
 
 	// And finally, SET THE MOBJ SKIN damn it.
-	players[i].mo->skin = skins[players[i].skin];
+	players[i].mo->skin = &skins[players[i].skin];
 	players[i].mo->color = players[i].skincolor;
 
 	P_SetThingPosition(players[i].mo);
@@ -1125,7 +1125,7 @@ static cl_mode_t cl_mode = CL_SEARCHING;
 static UINT16 cl_lastcheckedfilecount = 0; // used for full file list
 
 // Player name send/load
-#ifndef PHOBOS_BUILD
+
 static void CV_SavePlayerNames(UINT8 **p)
 {
 	INT32 i = 0;
@@ -1161,7 +1161,6 @@ static void CV_LoadPlayerNames(UINT8 **p)
 		memcpy(player_names[i], tmp_name, MAXPLAYERNAME+1);
 	}
 }
-#endif
 
 static void CL_DrawAddonTypes(void)
 {
@@ -1630,8 +1629,8 @@ static boolean CL_SendJoin(void)
 	netbuffer->u.clientcfg.packetversion = PACKETVERSION;
 	netbuffer->u.clientcfg.version = VERSION;
 	netbuffer->u.clientcfg.subversion = SUBVERSION;
-	strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION, sizeof(netbuffer->u.clientcfg.application)-1);
-	netbuffer->u.clientcfg.application[sizeof(netbuffer->u.clientcfg.application)-1] = '\0';
+	strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION,
+			sizeof(netbuffer->u.clientcfg.application));
 #ifdef SATURNJOIN
 	netbuffer->u.clientcfg.issaturn = ISSATURN;
 #endif
@@ -1656,91 +1655,88 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
-	serverinfo_pak *serverinfo = &netbuffer->u.serverinfo;
-
 	netbuffer->packettype = PT_SERVERINFO;
-	serverinfo->_255 = 255;
-	serverinfo->packetversion = PACKETVERSION;
-	serverinfo->version = VERSION;
-	serverinfo->subversion = SUBVERSION;
-	strncpy(serverinfo->application, SRB2APPLICATION, sizeof(serverinfo->application)-1);
-	serverinfo->application[sizeof(serverinfo->application)-1] = '\0';
+	netbuffer->u.serverinfo._255 = 255;
+	netbuffer->u.serverinfo.packetversion = PACKETVERSION;
+	netbuffer->u.serverinfo.version = VERSION;
+	netbuffer->u.serverinfo.subversion = SUBVERSION;
+	strncpy(netbuffer->u.serverinfo.application, SRB2APPLICATION,
+			sizeof netbuffer->u.serverinfo.application);
 	// return back the time value so client can compute their ping
-	serverinfo->time = (tic_t)LONG(servertime);
-	serverinfo->leveltime = (tic_t)LONG(leveltime);
+	netbuffer->u.serverinfo.time = (tic_t)LONG(servertime);
+	netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime);
 
 	// force 1 player
 	if (UseFakeSeed())
-		serverinfo->numberofplayer = (UINT8)1;
+		netbuffer->u.serverinfo.numberofplayer = (UINT8)1;
 	else
-		serverinfo->numberofplayer = (UINT8)D_NumPlayers();
+		netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
 
-	serverinfo->maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
+	netbuffer->u.serverinfo.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
 
 	// SRB2Kart: Vanilla's gametype constants for MS support
-	serverinfo->gametype = (UINT8)((gt == GT_MATCH) ? VANILLA_GT_MATCH : VANILLA_GT_RACE);
+	netbuffer->u.serverinfo.gametype = (UINT8)((gt == GT_MATCH) ? VANILLA_GT_MATCH : VANILLA_GT_RACE);
 
-	serverinfo->modifiedgame = (UINT8)modifiedgame;
-	serverinfo->cheatsenabled = CV_CheatsEnabled();
+	netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame;
+	netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled();
 
-	serverinfo->kartvars = (UINT8) (
+	netbuffer->u.serverinfo.kartvars = (UINT8) (
 		(cv_kartspeed.value & SV_SPEEDMASK) |
 		(dedicated ? SV_DEDICATED : 0)
 	);
 
-	CopyCaretColors(serverinfo->servername, cv_servername.string, MAXSERVERNAME);
+	CopyCaretColors(netbuffer->u.serverinfo.servername, cv_servername.string,
+		MAXSERVERNAME);
+	strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), sizeof(netbuffer->u.serverinfo.mapname)-1);
 
-	strncpy(serverinfo->mapname, G_BuildMapName(gamemap), sizeof(serverinfo->mapname)-1);
-	serverinfo->mapname[sizeof(serverinfo->mapname)-1] = '\0';
+	memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5));
 
-	memcpy(serverinfo->mapmd5, mapmd5, sizeof(serverinfo->mapmd5));
+	netbuffer->u.serverinfo.iszone = 0;
 
-	serverinfo->iszone = 0;
-
-	memset(serverinfo->maptitle, 0, sizeof(serverinfo->maptitle));
-	memset(serverinfo->httpsource, 0, MAX_MIRROR_LENGTH);
+	memset(netbuffer->u.serverinfo.maptitle, 0, sizeof(netbuffer->u.serverinfo.maptitle));
+	memset(netbuffer->u.serverinfo.httpsource, 0, MAX_MIRROR_LENGTH);
 
 	if (!(mapheaderinfo[gamemap-1]->menuflags & LF2_HIDEINMENU) && mapheaderinfo[gamemap-1]->lvlttl[0])
 	{
-		strncpy(serverinfo->maptitle, mapheaderinfo[gamemap-1]->lvlttl, sizeof(serverinfo->maptitle)-1);
+		strncpy(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->lvlttl, sizeof(netbuffer->u.serverinfo.maptitle)-1);
 
 		if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
 		{
 			if (mapheaderinfo[gamemap-1]->zonttl[0])
 			{
-				strncat(serverinfo->maptitle, " ", sizeof(serverinfo->maptitle)-1);
-				strncat(serverinfo->maptitle, mapheaderinfo[gamemap-1]->zonttl, sizeof(serverinfo->maptitle)-1);
+				strncat(netbuffer->u.serverinfo.maptitle, " ", sizeof(netbuffer->u.serverinfo.maptitle)-1);
+				strncat(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->zonttl,
+						sizeof(netbuffer->u.serverinfo.maptitle)-1);
 			}
 			else
 			{
-				serverinfo->iszone = 1; // ms and clients will append this themselves
+				netbuffer->u.serverinfo.iszone = 1; // ms and clients will append this themselves
 			}
 		}
 
 		if (mapheaderinfo[gamemap-1]->actnum[0])
 		{
-			strncat(serverinfo->maptitle, " ", sizeof(serverinfo->maptitle)-1);
-			strncat(serverinfo->maptitle, mapheaderinfo[gamemap-1]->actnum, sizeof(serverinfo->maptitle)-1);
+			strncat(netbuffer->u.serverinfo.maptitle, " ", sizeof(netbuffer->u.serverinfo.maptitle)-1);
+			strncat(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->actnum,
+					sizeof(netbuffer->u.serverinfo.maptitle)-1);
 		}
 	}
 	else
-	{
-		strncpy(serverinfo->maptitle, "Unknown", sizeof(serverinfo->maptitle)-1);
-	}
+		strncpy(netbuffer->u.serverinfo.maptitle, "Unknown", 33);
 
-	serverinfo->maptitle[sizeof(serverinfo->maptitle)-1] = '\0';
+	netbuffer->u.serverinfo.maptitle[32] = '\0';
 
-	serverinfo->actnum = 0; //mapheaderinfo[gamemap-1]->actnum
+	netbuffer->u.serverinfo.actnum = 0; //mapheaderinfo[gamemap-1]->actnum
 
 	mirror_length = strlen(httpurl);
 	if (mirror_length > MAX_MIRROR_LENGTH)
 		mirror_length = MAX_MIRROR_LENGTH;
 
-	if (snprintf(serverinfo->httpsource, mirror_length+1, "%s", httpurl) < 0)
+	if (snprintf(netbuffer->u.serverinfo.httpsource, mirror_length+1, "%s", httpurl) < 0)
 		// If there's an encoding error, send nothing, we accept that the above may be truncated
-		strncpy(serverinfo->httpsource, "", mirror_length);
+		strncpy(netbuffer->u.serverinfo.httpsource, "", mirror_length);
 
-	serverinfo->httpsource[MAX_MIRROR_LENGTH-1] = '\0';
+	netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = '\0';
 
 	p = PutFileNeeded(0);
 
@@ -1773,7 +1769,7 @@ static void SV_SendPlayerInfo(INT32 node)
 		// doesent really matter what we put here lel
 		netbuffer->u.playerinfo[0].score = LONG(42069);
 		netbuffer->u.playerinfo[0].timeinserver = SHORT(42069);
-		netbuffer->u.playerinfo[0].skin = (skinnum_t)1; // no clue wtf skin 1 is, tails maybe?
+		netbuffer->u.playerinfo[0].skin = (UINT8)1; // no clue wtf skin 1 is, tails maybe?
 
 		netbuffer->u.playerinfo[0].data = 0;
 
@@ -1818,11 +1814,11 @@ static void SV_SendPlayerInfo(INT32 node)
 
 		netbuffer->u.playerinfo[i].score = LONG(players[i].score);
 		netbuffer->u.playerinfo[i].timeinserver = SHORT((UINT16)(players[i].jointime / TICRATE));
-		netbuffer->u.playerinfo[i].skin = (skinnum_t)players[i].skin;
+		netbuffer->u.playerinfo[i].skin = (UINT8)players[i].skin;
 
 		// Extra data
 		// Kart has extra skincolors, so we can't use this
-		//netbuffer->u.playerinfo[i].data = 0;
+		//netbuffer->u.playerinfo[i].data = 0; //netbuffer->u.playerinfo[i].data = players[i].skincolor;
 
 		// well why not, we only got like 100 of these?
 		netbuffer->u.playerinfo[i].data = players[i].skincolor;
@@ -1928,10 +1924,8 @@ static void SV_SendMapIcon(INT32 node)
   */
 static boolean SV_SendServerConfig(INT32 node)
 {
-#ifndef PHOBOS_BUILD
 	INT32 i;
 	UINT8 *p, *op;
-#endif
 	boolean waspacketsent;
 
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
@@ -1949,7 +1943,6 @@ static boolean SV_SendServerConfig(INT32 node)
 	netbuffer->u.servercfg.gametype = (UINT8)gametype;
 	netbuffer->u.servercfg.modifiedgame = (UINT8)modifiedgame;
 
-#ifndef PHOBOS_BUILD
 	// we fill these structs with FFs so that any players not in game get sent as 0xFFFF
 	// which is nice and easy for us to detect
 	memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins));
@@ -1965,7 +1958,6 @@ static boolean SV_SendServerConfig(INT32 node)
 		netbuffer->u.servercfg.playerskins[i] = (UINT8)players[i].skin;
 		netbuffer->u.servercfg.playercolor[i] = (UINT8)players[i].skincolor;
 	}
-#endif
 
 	netbuffer->u.servercfg.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
 	netbuffer->u.servercfg.allownewplayer = cv_allownewplayer.value;
@@ -1973,16 +1965,12 @@ static boolean SV_SendServerConfig(INT32 node)
 
 	memcpy(netbuffer->u.servercfg.server_context, server_context, 8);
 
-#ifdef PHOBOS_BUILD
-	const size_t len = sizeof(serverconfig_pak);
-#else
 	op = p = netbuffer->u.servercfg.varlengthinputs;
 
 	CV_SavePlayerNames(&p);
 	CV_SaveNetVars(&p, false);
 
 	const size_t len = sizeof (serverconfig_pak) + (size_t)(p - op);
-#endif
 
 #ifdef DEBUGFILE
 	if (debugfile)
@@ -2106,7 +2094,7 @@ static void SV_SavedGame(void)
 	if (!cv_dumpconsistency.value)
 		return;
 
-	snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home);
+	sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
 
 	// first save it in a malloced buffer
 	save.p = save.buffer = (UINT8 *)Z_Malloc(SAVEGAMESIZE, PU_STATIC, NULL);
@@ -2144,7 +2132,7 @@ static void CL_LoadReceivedSavegame(boolean reloading)
 	size_t length, decompressedlen;
 	char tmpsave[264];
 
-	snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home);
+	sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
 
 	length = FIL_ReadFile(tmpsave, &save.buffer);
 
@@ -2223,7 +2211,7 @@ static void CL_ReloadReceivedSavegame(void)
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		LUA_InvalidatePlayer(&players[i]);
-		snprintf(player_names[i], MAXPLAYERNAME+1, "Player %d", i + 1);
+		sprintf(player_names[i], "Player %d", i + 1);
 	}
 
 	CL_LoadReceivedSavegame(true);
@@ -2959,7 +2947,7 @@ static void CL_ConnectToServer(void)
 	tic_t asksent;
 	char tmpsave[264];
 
-	snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home);
+	sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
 
 	filedownload.current = -1;
 	cl_mode = CL_SEARCHING;
@@ -3347,7 +3335,6 @@ static void Command_connect(void)
 		return;
 	}
 
-	// StarManiaKG: allow us to join servers from anywhere at any time //
 	if (Playing() || demo.title || demo.playback)
 	{
 		if (demo.title || demo.playback)
@@ -3366,9 +3353,7 @@ static void Command_connect(void)
 		D_StartTitle();
 	}
 	else
-	{
 		M_ClearMenus(true); // close the menus
-	}
 
 	// modified game check: no longer handled
 	// we don't request a restart unless the filelist differs
@@ -3384,52 +3369,37 @@ static void Command_connect(void)
 	}
 	else
 	{
-		// Get the server node.
-		if (netgame)
+		// used in menu to connect to a server in the list
+		if (netgame && fasticmp(COM_Argv(1), "node"))
 		{
-			// used in menu to connect to a server in the list
-			if (fasticmp(COM_Argv(1), "node"))
-			{
-				servernode = (SINT8)atoi(COM_Argv(2));
-			}
-			else
-			{
-				D_QuitNetGame();
-				CL_Reset();
-				D_StartTitle();
-			}
+			servernode = (SINT8)atoi(COM_Argv(2));
 		}
-		else
+		else if (netgame)
 		{
-			// Standard behaviour
-			if (I_NetOpenSocket)
-			{
-				I_NetOpenSocket();
-				netgame = true;
-				multiplayer = true;
+			CONS_Printf(M_GetText("You cannot connect while in a game. End this game first.\n"));
+			return;
+		}
+		else if (I_NetOpenSocket)
+		{
+			I_NetOpenSocket();
+			netgame = true;
+			multiplayer = true;
 
-				if (fasticmp(COM_Argv(1), "any"))
-					servernode = BROADCASTADDR;
-				else if (I_NetMakeNodewPort)
-				{
-					if (COM_Argc() >= 3) // address AND port
-						servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
-					else // address only, or address:port
-						servernode = I_NetMakeNode(COM_Argv(1));
-				}
-				else
-				{
-					CONS_Alert(CONS_ERROR, M_GetText("There is no server identification with this network driver\n"));
-					D_CloseConnection();
-					return;
-				}
-			}
+			if (fasticmp(COM_Argv(1), "any"))
+				servernode = BROADCASTADDR;
+			else if (I_NetMakeNodewPort && COM_Argc() >= 3)
+				servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
+			else if (I_NetMakeNodewPort)
+				servernode = I_NetMakeNode(COM_Argv(1));
 			else
 			{
-				CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
+				CONS_Alert(CONS_ERROR, M_GetText("There is no server identification with this network driver\n"));
+				D_CloseConnection();
 				return;
 			}
 		}
+		else
+			CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
 
 		// invalid address
 		if (servernode == -1)
@@ -3476,7 +3446,6 @@ static void ResetNode(INT32 node);
 //
 void CL_ClearPlayer(INT32 playernum)
 {
-	// Handle mobj_t pointers.
 	if (players[playernum].mo)
 	{
 		// Don't leave a NiGHTS ghost!
@@ -3485,7 +3454,6 @@ void CL_ClearPlayer(INT32 playernum)
 		P_RemoveMobj(players[playernum].mo);
 	}
 
-	// Wipe the struct.
 	memset(&players[playernum], 0, sizeof(player_t));
 }
 
@@ -3542,7 +3510,7 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason)
 	player_muted[playernum] = false;
 
 	// Reset the name
-	snprintf(player_names[playernum], MAXPLAYERNAME+1, "Player %d", playernum+1);
+	sprintf(player_names[playernum], "Player %d", playernum+1);
 
 	player_name_changes[playernum] = 0;
 
@@ -4128,7 +4096,7 @@ static void Got_KickCmd(const UINT8 **p, INT32 playernum)
 						if (!players[i].mo->skin)
 							CONS_Printf("Mobj skin: NULL!\n");
 						else
-							CONS_Printf("Mobj skin: %s\n", players[i].mo->skin->name);
+							CONS_Printf("Mobj skin: %s\n", ((skin_t *)players[i].mo->skin)->name);
 						CONS_Printf("Position: %d, %d, %d\n", players[i].mo->x, players[i].mo->y, players[i].mo->z);
 						if (!players[i].mo->state)
 							CONS_Printf("State: S_NULL\n");
@@ -4504,7 +4472,7 @@ void SV_ResetServer(void)
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		LUA_InvalidatePlayer(&players[i]);
-		snprintf(player_names[i], MAXPLAYERNAME+1, "Player %d", i + 1);
+		sprintf(player_names[i], "Player %d", i + 1);
 	}
 
 	memset(player_name_changes, 0, sizeof(player_name_changes));
@@ -5194,7 +5162,7 @@ static void PT_ServerInfo(SINT8 node)
 	const tic_t ticthen = (tic_t)LONG(netbuffer->u.serverinfo.time);
 	const tic_t ticdiff = (ticnow - ticthen)*1000/NEWTICRATE;
 	netbuffer->u.serverinfo.time = (tic_t)LONG(ticdiff);
-	netbuffer->u.serverinfo.servername[MAXSERVERNAME-1] = '\0';
+	netbuffer->u.serverinfo.servername[MAXSERVERNAME-1] = 0;
 	netbuffer->u.serverinfo.application
 		[sizeof netbuffer->u.serverinfo.application - 1] = '\0';
 	memcpy(servername, netbuffer->u.serverinfo.servername, MAXSERVERNAME);
@@ -5443,10 +5411,8 @@ static void PT_ServerRefuse(SINT8 node)
 // Positive response of client join request
 static void PT_ServerCFG(SINT8 node)
 {
-#ifndef PHOBOS_BUILD
 	INT32 j;
 	UINT8 *scp;
-#endif
 
 	if (server && serverrunning && node != servernode)
 	{ // but wait I thought I'm the server?
@@ -5469,10 +5435,8 @@ static void PT_ServerCFG(SINT8 node)
 		if ((gametype = netbuffer->u.servercfg.gametype) >= NUMGAMETYPES)
 			I_Error("Bad gametype %d in cliserv!", gametype);
 		modifiedgame = netbuffer->u.servercfg.modifiedgame;
-#ifndef PHOBOS_BUILD
 		for (j = 0; j < MAXPLAYERS; j++)
 			adminplayers[j] = netbuffer->u.servercfg.adminplayers[j];
-#endif
 		memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
 	}
 
@@ -5498,7 +5462,6 @@ static void PT_ServerCFG(SINT8 node)
 	SendSaturnInfo(node);
 #endif
 
-#ifndef PHOBOS_BUILD
 	memset(playeringame, 0, sizeof(playeringame));
 
 	for (j = 0; j < MAXPLAYERS; j++)
@@ -5515,7 +5478,6 @@ static void PT_ServerCFG(SINT8 node)
 	scp = netbuffer->u.servercfg.varlengthinputs;
 	CV_LoadPlayerNames(&scp);
 	scp += CV_LoadNetVars(scp);
-#endif
 
 	/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
 	///       Shouldn't them be downloaded even at intermission time?
@@ -5569,7 +5531,7 @@ static void PT_WillResendGamestate(void)
 
 	CONS_Printf(M_GetText("Reloading game state...\n"));
 
-	snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home);
+	sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
 
 	// Don't get a corrupt savegame error because tmpsave already exists
 	if (FIL_FileExists(tmpsave) && unlink(tmpsave) == -1)
@@ -6911,10 +6873,7 @@ boolean TryRunTics(tic_t realtics)
 			DEBFILE(va("============ Running tic %d (local %d)\n", gametic, leveltime));
 
 			if (update_stats)
-			{
-				ps_prevtictime = ps_tictime;
 				PS_START_TIMING(ps_tictime);
-			}
 
 			G_Ticker((gametic % NEWTICRATERATIO) == 0);
 			ExtraDataTicker();
@@ -7273,7 +7232,6 @@ static void DedicatedIdleUpdate(INT32 *realtics)
 		{
 			CONS_Printf("DEDICATED: Awakening from idle (Player detected...)\n");
 		}
-
 		dedicatedidle = 0;
 	}
 }

src/d_clisrv.h

@@ -339,17 +339,13 @@ typedef struct
 	UINT8 clientnode;
 	UINT8 gamestate;
 
-#ifndef PHOBOS_BUILD
 	// 0xFF == not in game; else player skin num
 	UINT8 playerskins[MAXPLAYERS];
 	UINT8 playercolor[MAXPLAYERS];
-#endif
 
 	UINT8 gametype;
 	UINT8 modifiedgame;
-#ifndef PHOBOS_BUILD
 	SINT8 adminplayers[MAXPLAYERS]; // Needs to be signed
-#endif
 
 	char server_context[8]; // Unique context id, generated at server startup.
 
@@ -358,9 +354,7 @@ typedef struct
 	boolean allownewplayer;
 	boolean discordinvites;
 
-#ifndef PHOBOS_BUILD
 	UINT8 varlengthinputs[0]; // Playernames and netvars
-#endif
 } ATTRPACK serverconfig_pak;
 
 typedef struct {
@@ -450,7 +444,7 @@ typedef struct
 	char name[MAXPLAYERNAME+1];
 	UINT8 address[4]; // sending another string would run us up against MAXPACKETLENGTH
 	UINT8 team;
-	skinnum_t skin;
+	UINT8 skin;
 	UINT8 data; // Color is first four bits, hasflag, isit and issuper have one bit each, the last is unused.
 	UINT32 score;
 	UINT16 timeinserver; // In seconds.
@@ -460,7 +454,7 @@ typedef struct
 typedef struct
 {
 	char name[MAXPLAYERNAME+1];
-	skinnum_t skin;
+	UINT8 skin;
 	UINT8 color;
 	UINT32 pflags;
 	UINT32 score;

src/d_main.c

@@ -79,7 +79,6 @@
 #include "core/memory.h"
 
 #include "lua_script.h"
-#include "lua_profile.h"
 
 /* Manually defined asset hashes for non-CMake builds
  * Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb
@@ -645,11 +644,6 @@ static boolean D_Display(void)
 
 	    CON_Drawer(); // Ha, i LIED!
 
-		if (cv_lua_profile.value > 0)
-		{
-			LUA_RenderTimers();
-		}
-
 		PS_START_TIMING(ps_swaptime);
 		I_FinishUpdate(); // page flip or blit buffer
 		PS_STOP_TIMING(ps_swaptime);
@@ -1149,19 +1143,13 @@ static void D_FindAddonsToAutoload(void)
 		// ok so theres still issues with players adding stuff to autoload by accident
 		// sometimes this stuff contains maps
 		// you can probably imagine how that goes in a netgame....
-		int retmap = W_CheckAutoLoadContainsMap(wadsToAutoload);
-		if (retmap == -1)
-		{
-			CONS_Alert(CONS_WARNING, "Autoload: file %s was not found or not valid.\n", wadsToAutoload);
-			continue;
-		}
-		if (retmap > 0)
+		if (W_CheckAutoLoadContainsMap(wadsToAutoload))
 		{
 			CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload);
 			continue;
 		}
 
-		if (!postload && W_CheckPostLoadList(wadsToAutoload) > 0)
+		if (!postload && W_CheckPostLoadList(wadsToAutoload))
 		{
 			CONS_Printf("Autoload: forcing postload for file %s\n", wadsToAutoload);
 			postload = true;
@@ -1251,7 +1239,7 @@ static void IdentifyVersion(void)
 #endif
 
 	char tempsrb2path[256] = ".";
-	if (I_GetCwd(tempsrb2path, 256) == NULL)
+	if (getcwd(tempsrb2path, 256) == NULL)
 		strcpy(tempsrb2path, ".");
 
 	// get the current directory (possible problem on NT with "." as current dir)

src/d_net.c

@@ -1315,9 +1315,7 @@ boolean D_CheckNetGame(void)
 		while (!debugfile && k < MAXPLAYERS)
 		{
 			k++;
-
-			snprintf(filename, sizeof(filename), "debug%d.txt", k);
-
+			sprintf(filename, "debug%d.txt", k);
 			debugfile = fopen(va("%s" PATHSEP "%s", srb2home, filename), "w");
 		}
 

src/d_netcmd.c

@@ -47,7 +47,6 @@
 #include "z_zone.h"
 #include "lua_script.h"
 #include "lua_hook.h"
-#include "lua_profile.h"
 #include "m_cond.h"
 #include "m_anigif.h"
 #include "k_kart.h" // SRB2kart
@@ -147,11 +146,6 @@ static void Command_Addfilelocal(void);
 static void Command_Addfile(void);
 static void Command_Addskins(void);
 static void Command_GLocalSkin(void);
-static void SetPrefcolor(int splitplayer);
-static void Command_UsePrefcolor(void);
-static void Command_UsePrefcolor2(void);
-static void Command_UsePrefcolor3(void);
-static void Command_UsePrefcolor4(void);
 static void Command_ListWADS_f(void);
 static void Command_LocateLump_f(void);
 static void Command_ListDoomednums_f(void);
@@ -440,18 +434,10 @@ consvar_t cv_pointlimit = {"pointlimit", "0", CV_NETVAR|CV_CALL|CV_NOINIT, point
 static CV_PossibleValue_t timelimit_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL}};
 consvar_t cv_timelimit = {"timelimit", "0", CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t,
 	TimeLimit_OnChange, 0, NULL, NULL, 0, 0, NULL};
-#ifdef PHOBOS_BUILD
-static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, NULL}};
-#else
 static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, NULL}};
-#endif
 consvar_t cv_numlaps = {"numlaps", "3", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_cons_t,
 	NumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
-#ifdef PHOBOS_BUILD
-static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, "Map default"}, {0, NULL}};
-#else
 static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}};
-#endif
 consvar_t cv_basenumlaps = {"basenumlaps", "Map default", CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_forceskin = {"forceskin", "Off", CV_NETVAR|CV_CALL|CV_CHEAT, Forceskin_cons_t, ForceSkin_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -520,9 +506,6 @@ static CV_PossibleValue_t ps_descriptor_cons_t[] = {
 	{1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}};
 consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-//consvar_t cv_lua_profile = {"lua_profile", "0").values(CV_Unsigned).onchange(lua_profile_OnChange).description("Show hook timings over an average of N tics");
-consvar_t cv_lua_profile = {"lua_profile", "0", CV_CALL, CV_Unsigned, lua_profile_OnChange, 0, NULL, NULL, 0, 0, NULL};
-
 // only there to better keep track of it globally
 consvar_t cv_director = {"director", "Off", CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
@@ -617,12 +600,6 @@ void D_RegisterServerCommands(void)
 		Forceskin_cons_t[i].value = 0;
 		Forceskin_cons_t[i].strvalue = NULL;
 	}
-
-	// Set default player names
-	// Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well
-	for (i = 0; i < MAXPLAYERS; i++)
-		snprintf(player_names[i], sizeof(player_names[i]), "Player %d", 1 + i);
-
 	RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor);
 	RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref);
 	RegisterNetXCmd(XD_MAP, Got_Mapcmd);
@@ -871,11 +848,6 @@ void D_RegisterClientCommands(void)
 
 	COM_AddCommand("localskin", Command_GLocalSkin);
 
-	COM_AddCommand("useprefcolor", Command_UsePrefcolor);
-	COM_AddCommand("useprefcolor2", Command_UsePrefcolor2);
-	COM_AddCommand("useprefcolor3", Command_UsePrefcolor3);
-	COM_AddCommand("useprefcolor4", Command_UsePrefcolor4);
-
 	K_RegisterClientKartStuff(); // SRB2kart
 
 	CV_RegisterVar(&cv_screenshot_option);
@@ -962,8 +934,6 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_palette);
 	CV_RegisterVar(&cv_palettenum);
 
-	CV_RegisterVar(&cv_lua_profile);
-
 	// m_menu.c
 	CV_RegisterVar(&cv_chatheight);
 	CV_RegisterVar(&cv_chatwidth);
@@ -1174,14 +1144,14 @@ static void Skin_FindRealNameSkin(consvar_t *cvar)
 	for (i = 0; i < numskins; i++)
 	{
 		// Perfect match with some skin name, no need to find matching realname
-		if (strncasecmp(value, skins[i]->name, sizeof skins[i]->name) == 0)
+		if (strncasecmp(value, skins[i].name, sizeof skins[i].name) == 0)
 			return;
 
-		const char *match = strcasestr(skins[i]->realname, value);
+		const char *match = strcasestr(skins[i].realname, value);
 		if (match != NULL)
 		{
 			matches[nummatches] = i;
-			matches_pos[nummatches] = match - skins[i]->realname;
+			matches_pos[nummatches] = match - skins[i].realname;
 			++nummatches;
 		}
 	}
@@ -1189,7 +1159,7 @@ static void Skin_FindRealNameSkin(consvar_t *cvar)
 	if (nummatches == 1)
 	{
 		// Change the cvar to be the value of the name.
-		CV_StealthSet(cvar, skins[matches[0]]->name);
+		CV_StealthSet(cvar, skins[matches[0]].name);
 	}
 	else if (nummatches > 1)
 	{
@@ -1203,7 +1173,7 @@ static void Skin_FindRealNameSkin(consvar_t *cvar)
 
 		for (i = 0; i < nummatches; ++i)
 		{
-			const char *realname = skins[matches[i]]->realname;
+			const char *realname = skins[matches[i]].realname;
 
 			if (matches_pos[i] == 0)
 				start[0] = 0;
@@ -1218,7 +1188,7 @@ static void Skin_FindRealNameSkin(consvar_t *cvar)
 
 			end = realname + matches_pos[i] + query_length;
 
-			CONS_Printf("%s\x85%s\x80%s (%s)\n", start, match, end, skins[matches[i]]->name);
+			CONS_Printf("%s\x85%s\x80%s (%s)\n", start, match, end, skins[matches[i]].name);
 		}
 
 		CONS_Printf("\x86Try be more specific\n");
@@ -1306,8 +1276,7 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
 			else if (len == 1) // Agh!
 			{
 				// Last ditch effort...
-				snprintf(name, MAXPLAYERNAME+1, "%d", M_RandomKey(10));
-
+				sprintf(name, "%d", M_RandomKey(10));
 				if (!EnsurePlayerNameIsGood(name, playernum))
 					return false;
 			}
@@ -1553,13 +1522,13 @@ static void ForceAllSkins(INT32 forcedskin)
 		if (!dedicated) // But don't do this for dedicated servers, of course.
 		{
 			if (i == consoleplayer)
-				CV_StealthSet(&cv_skin, skins[forcedskin]->name);
+				CV_StealthSet(&cv_skin, skins[forcedskin].name);
 			else if (i == displayplayers[1])
-				CV_StealthSet(&cv_skin2, skins[forcedskin]->name);
+				CV_StealthSet(&cv_skin2, skins[forcedskin].name);
 			else if (i == displayplayers[2])
-				CV_StealthSet(&cv_skin3, skins[forcedskin]->name);
+				CV_StealthSet(&cv_skin3, skins[forcedskin].name);
 			else if (i == displayplayers[3])
-				CV_StealthSet(&cv_skin4, skins[forcedskin]->name);
+				CV_StealthSet(&cv_skin4, skins[forcedskin].name);
 		}
 	}
 }
@@ -1613,8 +1582,8 @@ static void SendNameAndColor(UINT8 splitplayer)
 	{
 		if (player->skincolor)
 			CV_StealthSetValue(playercolor, player->skincolor);
-		else if (skins[player->skin]->prefcolor)
-			CV_StealthSetValue(playercolor, skins[player->skin]->prefcolor);
+		else if (skins[player->skin].prefcolor)
+			CV_StealthSetValue(playercolor, skins[player->skin].prefcolor);
 		else
 			CV_StealthSet(playercolor, playercolor->defaultvalue);
 	}
@@ -1625,7 +1594,7 @@ static void SendNameAndColor(UINT8 splitplayer)
 
 	if (fastcmp(playername->string, player_names[pnum])
 		&& playercolor->value == player->skincolor
-		&& fastcmp(playerskin->string, skins[player->skin]->name))
+		&& fastcmp(playerskin->string, skins[player->skin].name))
 		return;
 
 	if (playerisbot)
@@ -1654,12 +1623,12 @@ static void SendNameAndColor(UINT8 splitplayer)
 		{
 			playerskin->value = foundskin;
 			SetPlayerSkin(pnum, playerskin->string);
-			CV_StealthSet(playerskin, skins[playerskin->value]->name);
+			CV_StealthSet(playerskin, skins[playerskin->value].name);
 		}
 		else
 		{
 			playerskin->value = player->skin;
-			CV_StealthSet(playerskin, skins[player->skin]->name);
+			CV_StealthSet(playerskin, skins[player->skin].name);
 			// will always be same as current
 			SetPlayerSkin(pnum, playerskin->string);
 		}
@@ -1684,7 +1653,7 @@ static void SendNameAndColor(UINT8 splitplayer)
 
 	// Don't change skin if the server doesn't want you to.
 	if (!CanChangeSkin(pnum))
-		CV_StealthSet(playerskin, skins[player->skin]->name);
+		CV_StealthSet(playerskin, skins[player->skin].name);
 
 	// check if player has the skin loaded (cv_skin may have
 	// the name of a skin that was available in the previous game)
@@ -1692,15 +1661,14 @@ static void SendNameAndColor(UINT8 splitplayer)
 	if (playerskin->value < 0)
 	{
 		INT32 skinnum = player->skin;
-		CV_StealthSet(playerskin, skins[skinnum]->name);
+		CV_StealthSet(playerskin, skins[skinnum].name);
 		playerskin->value = skinnum;
 	}
 
 	// Finally write out the complete packet and send it off.
 	WRITESTRINGN(p, playername->zstring, MAXPLAYERNAME);
 	WRITEUINT8(p, (UINT8)playercolor->value);
-	WRITESKIN(p, (skinnum_t)playerskin->value);
-
+	WRITEUINT8(p, (UINT8)playerskin->value);
 	SendNetXCmdForPlayer(splitplayer, XD_NAMEANDCOLOR, buf, p - buf);
 }
 
@@ -1708,8 +1676,7 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
 {
 	player_t *player;
 	char name[MAXPLAYERNAME+1] = {};
-	UINT8 color;
-	skinnum_t skin;
+	UINT8 color, skin;
 
 #ifdef PARANOIA
 	if (playernum < 0 || playernum > MAXPLAYERS)
@@ -1731,7 +1698,7 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
 
 	READSTRINGN(*cp, name, MAXPLAYERNAME);
 	color = READUINT8(*cp);
-	skin = READSKIN(*cp);
+	skin = READUINT8(*cp);
 
 	// set name
 	if (player_name_changes[playernum] < MAXNAMECHANGES)
@@ -1780,13 +1747,13 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
 
 		// TODO: make cv_skin an array
 		if (playernum == consoleplayer)
-			CV_StealthSet(&cv_skin, skins[forcedskin]->name);
+			CV_StealthSet(&cv_skin, skins[forcedskin].name);
 		else if (playernum == displayplayers[1])
-			CV_StealthSet(&cv_skin2, skins[forcedskin]->name);
+			CV_StealthSet(&cv_skin2, skins[forcedskin].name);
 		else if (playernum == displayplayers[2])
-			CV_StealthSet(&cv_skin3, skins[forcedskin]->name);
+			CV_StealthSet(&cv_skin3, skins[forcedskin].name);
 		else if (playernum == displayplayers[3])
-			CV_StealthSet(&cv_skin4, skins[forcedskin]->name);
+			CV_StealthSet(&cv_skin4, skins[forcedskin].name);
 	}
 	else
 		SetPlayerSkinByNum(playernum, skin);
@@ -2363,12 +2330,11 @@ static char *ConcatCommandArgv(int start, int end)
 	if (!p)
 		I_Error("ConcatCommandArgv: Out of memory!\n");
 
-	--end; /* handle the final argument separately */
+	--end;/* handle the final argument separately */
 
 	for (i = start; i < end; ++i)
 	{
-		if (size - (p - final) > 0)
-			p += snprintf(p, size - (p - final), "%s ", COM_Argv(i));
+		p += sprintf(p, "%s ", COM_Argv(i));
 	}
 
 	/* at this point "end" is actually the last argument's position */
@@ -2782,11 +2748,11 @@ static void Command_ReplayMarker(void)
 
 		if (title)
 		{
-			snprintf(demo.titlename, sizeof(demo.titlename)-1, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
+			snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
 			Z_Free(title);
 		}
 		else
-			snprintf(demo.titlename, sizeof(demo.titlename)-1, "[%i:%02d/%.5s]", G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
+			snprintf(demo.titlename, 64, "[%i:%02d/%.5s]", G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
 
 		CONS_Printf("Replay will be saved!\n");
 	}
@@ -4344,49 +4310,6 @@ static void Command_GLocalSkin(void)
 	}
 }
 
-static void SetPrefcolor(int splitplayer)
-{
-	// splitscreen
-	if (splitscreen < splitplayer)
-		return;
-
-	const INT32 pnum = P_GetLocalPlayerNumForNum(splitplayer);
-
-	player_t *player = &players[pnum];
-	consvar_t *colorvars[] = {&cv_playercolor, &cv_playercolor2, &cv_playercolor3, &cv_playercolor4};
-	consvar_t *playercolor = colorvars[splitplayer];
-
-	if (skins[player->skin]->prefcolor)
-	{
-		CV_SetValue(playercolor, skins[player->skin]->prefcolor);
-		CONS_Printf("Set color to %s%s\n", HU_SkinColorToConsoleColor(skins[player->skin]->prefcolor), KartColor_Names[skins[player->skin]->prefcolor]);
-	}
-	else
-	{
-		CONS_Printf("\x86Your skin has no prefcolor set\n");
-	}
-}
-
-static void Command_UsePrefcolor(void)
-{
-	SetPrefcolor(0);
-}
-
-static void Command_UsePrefcolor2(void)
-{
-	SetPrefcolor(1);
-}
-
-static void Command_UsePrefcolor3(void)
-{
-	SetPrefcolor(2);
-}
-
-static void Command_UsePrefcolor4(void)
-{
-	SetPrefcolor(3);
-}
-
 static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
 {
 	char filename[241];
@@ -4426,15 +4349,15 @@ static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
 		char message[275];
 
 		if (toomany)
-			snprintf(message, sizeof(message), M_GetText("Too many files loaded to add %s\n"), filename);
+			sprintf(message, M_GetText("Too many files loaded to add %s\n"), filename);
 		else if (ncs == FS_NOTFOUND)
-			snprintf(message, sizeof(message), M_GetText("The server doesn't have %s\n"), filename);
+			sprintf(message, M_GetText("The server doesn't have %s\n"), filename);
 		else if (ncs == FS_MD5SUMBAD)
-			snprintf(message, sizeof(message), M_GetText("Checksum mismatch on %s\n"), filename);
+			sprintf(message, M_GetText("Checksum mismatch on %s\n"), filename);
 		else
-			snprintf(message, sizeof(message), M_GetText("Unknown error finding wad file (%s)\n"), filename);
+			sprintf(message, M_GetText("Unknown error finding wad file (%s)\n"), filename);
 
-		CONS_Printf("%s", message);
+		CONS_Printf("%s",message);
 
 		for (j = 0; j < MAXPLAYERS; j++)
 			if (adminplayers[j])
@@ -5266,10 +5189,8 @@ static void Command_Mapmd5_f(void)
 	{
 		INT32 i;
 		char md5tmp[33];
-
 		for (i = 0; i < 16; ++i)
-			snprintf(&md5tmp[i*2], 3, "%02x", mapmd5[i]);
-
+			sprintf(&md5tmp[i*2], "%02x", mapmd5[i]);
 		CONS_Printf("%s: %s\n", G_BuildMapName(gamemap), md5tmp);
 	}
 	else
@@ -5632,7 +5553,7 @@ static void Skin_OnChange(void)
 	if (!(cv_debug || devparm) && !(multiplayer || netgame) // In single player.
 		&& (gamestate != GS_WAITINGPLAYERS)) // allows command line -warp x +skin y
 	{
-		CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin]->name);
+		CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
 		return;
 	}
 
@@ -5641,7 +5562,7 @@ static void Skin_OnChange(void)
 	else
 	{
 		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
-		CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin]->name);
+		CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
 	}
 }
 
@@ -5662,7 +5583,7 @@ static void Skin2_OnChange(void)
 	else
 	{
 		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
-		CV_StealthSet(&cv_skin2, skins[players[displayplayers[1]].skin]->name);
+		CV_StealthSet(&cv_skin2, skins[players[displayplayers[1]].skin].name);
 	}
 }
 
@@ -5678,7 +5599,7 @@ static void Skin3_OnChange(void)
 	else
 	{
 		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
-		CV_StealthSet(&cv_skin3, skins[players[displayplayers[2]].skin]->name);
+		CV_StealthSet(&cv_skin3, skins[players[displayplayers[2]].skin].name);
 	}
 }
 
@@ -5694,7 +5615,7 @@ static void Skin4_OnChange(void)
 	else
 	{
 		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
-		CV_StealthSet(&cv_skin4, skins[players[displayplayers[3]].skin]->name);
+		CV_StealthSet(&cv_skin4, skins[players[displayplayers[3]].skin].name);
 	}
 }
 
@@ -5737,7 +5658,7 @@ static void Command_ListSkins(void)
 	for (i = page * 10; i < numskins && i < (page + 1) * 10; i++)
 	{
 		int length;
-		skin_t *skin = skins[i];
+		skin_t *skin = &skins[i];
 
 		if ((length = strlen(skin->name)) > longest_name)
 			longest_name = length;
@@ -5745,7 +5666,7 @@ static void Command_ListSkins(void)
 
 	for (i = page * 10; i < numskins && i < (page + 1) * 10; i++)
 	{
-		skin_t *skin = skins[i];
+		skin_t *skin = &skins[i];
 
 		CONS_Printf(
 			"%s[%-*s]\x80 %s\n",
@@ -5775,7 +5696,7 @@ static void Command_SkinSearch(void)
 	{
 		for (s = 0; s < numskins; s++)
 		{
-			skin_t *skininput = skins[s];
+			skin_t *skininput = &skins[s];
 
 			if (strcasestr(skininput->realname, COM_Argv(i)))
 			{
@@ -5799,7 +5720,7 @@ static void Color_OnChange(void)
 
 	if (!(cv_debug || devparm) && !(multiplayer || netgame || modeattacking)) // In single player.
 	{
-		CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin]->name);
+		CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
 		return;
 	}
 

src/d_netcmd.h

@@ -189,8 +189,6 @@ extern consvar_t cv_ps_thinkframe_page;
 extern consvar_t cv_ps_samplesize;
 extern consvar_t cv_ps_descriptor;
 
-extern consvar_t cv_lua_profile;
-
 extern consvar_t cv_director, cv_kartdebugdirector, cv_showdirectorhud;
 
 extern consvar_t cv_showtrackaddon;

src/d_netfil.c

@@ -299,13 +299,10 @@ boolean CL_CheckDownloadable(void)
 			{
 				INT32 j;
 				char md5tmp[33];
-
 				for (j = 0; j < 16; j++)
-					snprintf(&md5tmp[j*2], 3, "%02x", fileneeded[i].md5sum[j]);
-
+					sprintf(&md5tmp[j*2], "%02x", fileneeded[i].md5sum[j]);
 				CONS_Printf("%s", md5tmp);
 			}
-
 			CONS_Printf("\n");
 		}
 	}
@@ -1619,7 +1616,8 @@ static void CURLGetFile(void)
 #endif
 }
 
-HTTP_login *CURLGetLogin(const char *url, HTTP_login ***return_prev_next)
+HTTP_login *
+CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
 {
 	HTTP_login  * login;
 	HTTP_login ** prev_next;
@@ -1629,7 +1627,7 @@ HTTP_login *CURLGetLogin(const char *url, HTTP_login ***return_prev_next)
 			( login = (*prev_next));
 			prev_next = &login->next
 	){
-		if (fastcmp(login->url, url))
+		if (fastcmp(login->url, url) != 0)
 		{
 			if (return_prev_next)
 				(*return_prev_next) = prev_next;

src/d_player.h

@@ -361,17 +361,11 @@ typedef struct squishdance_s
 {
 	tic_t   countdown; // hold "custom 3" for 2 seconds to engange le dance
 	tic_t   time;
+	fixed_t work;
+	fixed_t ang;
+	fixed_t bounce;    // hehe squishy
 } squishdance_t;
 
-typedef struct salty_s
-{
-	bool ready;
-	bool tapping;
-	fixed_t zoffset;
-	fixed_t momz;
-	bool jump;
-} salty_t;
-
 // ========================================================================
 //                          PLAYER STRUCTURE
 // ========================================================================
@@ -567,9 +561,6 @@ typedef struct player_s
 
 	fixed_t spinoutrot; // When a player spins out, this value increments modulus 360.
 
-	// saltyhop! hardcode edition
-	salty_t salty;
-
 	squishdance_t squishdance;
 
 	fixed_t fovadd; // adjust FOV for hw rendering

src/d_protocol.c

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

src/dedicated/i_system.c

@@ -542,7 +542,7 @@ void I_OutputMsg(const char *fmt, ...)
 		I_Error("I_OutputMsg: Out of memory!\n");
 
 	va_start(argptr, fmt);
-	vsnprintf(txt, len+1, fmt, argptr);
+	vsprintf(txt, fmt, argptr);
 	va_end(argptr);
 
 #ifdef HAVE_TTF
@@ -550,7 +550,7 @@ void I_OutputMsg(const char *fmt, ...)
 	DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt);
 #endif
 
-	len = strnlen(txt, len+1);
+	len = strlen(txt);
 
 #ifdef LOGMESSAGES
 	if (logstream)
@@ -968,18 +968,14 @@ void I_Sleep(UINT32 ms)
 
 void I_SleepDuration(precise_t duration)
 {
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__) || defined(__OpenBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__)
 	UINT64 precision = I_GetPrecisePrecision();
 	struct timespec ts = {
 		.tv_sec = duration / precision,
 		.tv_nsec = duration * 1000000000 / precision % 1000000000,
 	};
 	int status;
-#ifdef __OpenBSD__
-	do status = nanosleep(&ts, &ts);
-#else
 	do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
-#endif
 	while (status == EINTR);
 #elif defined (MIN_SLEEP_DURATION_MS)
 	UINT64 precision = I_GetPrecisePrecision();
@@ -1057,7 +1053,7 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
 			sigmsg = ("SIGABRT - SRB2Kart-Saturn was terminated by an abort signal.");
 			break;
 		default:
-			snprintf(signal_msg, 512, "Signal number %d", signal_num);
+			sprintf(signal_msg, "Signal number %d", signal_num);
 			sigmsg = (core_dumped ? "Unknown signal" : signal_msg);
 			break;
 	}
@@ -1065,17 +1061,13 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
 	if (core_dumped)
 	{
 		if (sigmsg)
-		{
-			snprintf(signal_msg, 512, "%s (core dumped)", sigmsg);
-		}
+			sprintf(signal_msg, "%s (core dumped)", sigmsg);
 		else
-		{
 			strcat(signal_msg, " (core dumped)");
-		}
 	}
 	else
 	{
-		snprintf(signal_msg, 512, "%s", sigmsg);
+		sprintf(signal_msg, "%s", sigmsg);
 	}
 }
 
@@ -1352,7 +1344,7 @@ FUNCNORETURN static ATTRNORETURN void newsignalhandler_Warn(const char *pr)
 {
 	char text[128];
 
-	snprintf(text, sizeof(text),
+	snprintf(text, sizeof text,
 			"Error while setting up signal reporting: %s: %s",
 			pr,
 			strerror(errno)
@@ -1538,7 +1530,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 		if (errorcount > 20)
 		{
 			va_start(argptr, error);
-			vsnprintf(buffer, sizeof(buffer), error, argptr);
+			vsnprintf(buffer, 8192, error, argptr);
 			va_end(argptr);
 
 			I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
@@ -1551,7 +1543,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 
 	// Display error message in the console before we start shutting it down
 	va_start(argptr, error);
-	vsnprintf(buffer, sizeof(buffer), error, argptr);
+	vsnprintf(buffer, 8192, error, argptr);
 	va_end(argptr);
 	I_OutputMsg("\nI_Error(): %s\n", buffer);
 
@@ -1772,8 +1764,7 @@ char *I_GetUserName(void)
 				}
 			}
 		}
-
-		snprintf(username, sizeof(username), "%s", p);
+		strncpy(username, p, MAXPLAYERNAME);
 	}
 
 	if (!fastcmp(username, ""))
@@ -1797,24 +1788,6 @@ INT32 I_mkdir(const char *dirname, INT32 unixright)
 #endif
 }
 
-INT32 I_ChDir(const char *path)
-{
-#ifdef _WIN32
-	return (SetCurrentDirectoryA(path) ? 0 : -1);
-#else
-	return chdir(path);
-#endif
-}
-
-char *I_GetCwd(char *buf, size_t size)
-{
-#ifdef _WIN32
-	return (GetCurrentDirectoryA((DWORD)size, buf) ? buf : NULL);
-#else
-	return getcwd(buf, size);
-#endif
-}
-
 char *I_GetEnv(const char *name)
 {
 	return getenv(name);
@@ -1847,23 +1820,28 @@ const char *I_ClipboardPaste(void)
 */
 static boolean isWadPathOk(const char *path)
 {
-	char wad3path[256];
+	char *wad3path = (char*)(malloc(256));
 
-	snprintf(wad3path, sizeof(wad3path), pandf, path, WADKEYWORD);
+	if (!wad3path)
+		return false;
+
+	sprintf(wad3path, pandf, path, WADKEYWORD);
 
 	if (FIL_ReadFileOK(wad3path))
 	{
+		free(wad3path);
 		return true;
 	}
 
+	free(wad3path);
 	return false;
 }
 
-static void pathonly(char *s, size_t size)
+static void pathonly(char *s)
 {
 	size_t j;
 
-	for (j = strnlen(s, size); j != (size_t)-1; j--)
+	for (j = strlen(s); j != (size_t)-1; j--)
 	{
 		if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
 		{
@@ -1890,12 +1868,11 @@ static const char *searchWad(const char *searchDir)
 	static char tempsw[256] = "";
 	filestatus_t fstemp;
 
-	snprintf(tempsw, sizeof(tempsw), "%s", WADKEYWORD);
+	strcpy(tempsw, WADKEYWORD);
 	fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
-
 	if (fstemp == FS_FOUND)
 	{
-		pathonly(tempsw, sizeof(tempsw));
+		pathonly(tempsw);
 		return tempsw;
 	}
 
@@ -1933,7 +1910,7 @@ static const char *locateWad(void)
 
 #ifndef NOCWD
 	// examine current dir
-	snprintf(returnWadPath, sizeof(returnWadPath), "%s", ".");
+	strcpy(returnWadPath, ".");
 	I_OutputMsg(",%s", returnWadPath);
 	if (isWadPathOk(returnWadPath))
 		return NULL;
@@ -1945,7 +1922,7 @@ static const char *locateWad(void)
 	// examine user jart directory
 	if ((envstr = I_GetEnv("HOME")) != NULL)
 	{
-		snprintf(returnWadPath, sizeof(returnWadPath), "%s" PATHSEP DEFAULTDIR, envstr);
+		sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
 		CHECKWADPATH(returnWadPath);
 	}
 #endif
@@ -1959,7 +1936,7 @@ static const char *locateWad(void)
 	// examine default dirs
 	for (i = 0; wadDefaultPaths[i]; i++)
 	{
-		snprintf(returnWadPath, sizeof(returnWadPath), "%s", wadDefaultPaths[i]);
+		strcpy(returnWadPath, wadDefaultPaths[i]);
 		CHECKWADPATH(returnWadPath);
 	}
 
@@ -1987,11 +1964,12 @@ const char *I_LocateWad(void)
 		// change to the directory where we found srb2.srb
 #if defined (_WIN32)
 		waddir = _fullpath(NULL, waddir, MAX_PATH);
+		SetCurrentDirectoryA(waddir);
 #else
 		waddir = realpath(waddir, NULL);
-#endif
-		if (waddir == NULL || I_ChDir(waddir) == -1)
+		if (waddir == NULL || chdir(waddir) == -1)
 			I_OutputMsg("Couldn't change working directory\n");
+#endif
 	}
 
 	return waddir;

src/discord.c

@@ -402,7 +402,7 @@ static void Discordrp_OnChange(void)
 static void DRPC_GotServerIP(UINT32 address)
 {
 	const unsigned char * p = (const unsigned char *)&address;
-	snprintf(self_ip, IP_SIZE+1, "%u.%u.%u.%u:%u", p[0], p[1], p[2], p[3], current_port);
+	sprintf(self_ip, "%u.%u.%u.%u:%u", p[0], p[1], p[2], p[3], current_port);
 }
 
 /*--------------------------------------------------
@@ -684,7 +684,7 @@ void DRPC_UpdatePresence(void)
 		// Character image
 		while (supportedSkins[checkSkin] != NULL)
 		{
-			if (fastcmp(skins[players[consoleplayer].skin]->name, supportedSkins[checkSkin]))
+			if (fastcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
 			{
 				snprintf(charimg, 21, "char%s", supportedSkins[checkSkin]);
 				discordPresence.smallImageKey = charimg;
@@ -701,7 +701,7 @@ void DRPC_UpdatePresence(void)
 			discordPresence.smallImageKey = "charcustom";
 		}
 
-		snprintf(charname, 28, "Character: %s", skins[players[consoleplayer].skin]->realname);
+		snprintf(charname, 28, "Character: %s", skins[players[consoleplayer].skin].realname);
 		discordPresence.smallImageText = charname; // Character name
 	}
 

src/doomdef.h

@@ -128,24 +128,10 @@ extern char  logfilename[1024];
 // most interface strings are ignored in development mode.
 // we use comprevision and compbranch instead.
 #else
-#ifdef PHOBOS_BUILD
-#define VERSION    1 // Game version
-#define SUBVERSION 69 // more precise version number
-#else
 #define VERSION    1 // Game version
 #define SUBVERSION 6 // more precise version number
-#endif
-
-#ifdef PHOBOS_BUILD
-#define CLIENTNAME  "Phobos"
-#define CLIENTNAMEW L"Phobos"
-#else
-#define CLIENTNAME  "Saturn"
-#define CLIENTNAMEW L"Saturn"
-#endif
-
-#define VERSIONSTRING  CLIENTNAME  " v10.1"
-#define VERSIONSTRINGW CLIENTNAMEW L" v10.1"
+#define VERSIONSTRING "Saturn v9.3"
+#define VERSIONSTRINGW L"Saturn v9.3"
 
 #define SATURN_TESTING // comment out for saturn release builds!
 
@@ -616,19 +602,11 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 // None of these that are disabled in the normal build are guaranteed to work perfectly
 // Compile them at your own risk!
 
-#ifdef PHOBOS_BUILD
-// we want 32 players yesss
-#undef MAXPLAYERS
-#define MAXPLAYERS 32
-
-// raise skinlimit to 1024
-#undef MAXSKINS
-#define MAXSKINS 1024
-
-// overwrite some of those
-// when not compiling in vanilla compat mode
-#define SATURNJOIN
-#define SATURNPAK
+// undefine to enable fixes and features that are not vanilla compatible
+#define COMPAT_VANILLA
+// if we build with 32 player (or more!) support we dont need to care vanilla compat
+#if MAXPLAYERS > 16
+#undef COMPAT_VANILLA
 #endif
 
 //-- SATURN __
@@ -695,6 +673,13 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 #undef UPDATE_ALERT
 #endif
 
+// overwrite some of those
+// when not compiling in vanilla compat mode
+#ifndef COMPAT_VANILLA
+	#define SATURNJOIN
+	#define SATURNPAK
+#endif
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

src/doomtype.h

@@ -42,12 +42,6 @@ extern "C" {
 #define INT64  int64_t
 #define UINT64 uint64_t
 
-#ifdef PHOBOS_BUILD
-typedef uint16_t skinnum_t;
-#else
-typedef uint8_t skinnum_t;
-#endif
-
 #ifdef __APPLE_CC__
 #define DEBUG_LOG
 #define NOIPX

src/f_finale.c

@@ -324,7 +324,7 @@ void F_IntroTicker(void)
 			// Need to use M_Random otherwise it always uses the same sound
 			INT32 rskin = M_RandomKey(numskins);
 			UINT8 rtaunt = M_RandomKey(2);
-			sfxenum_t rsound = skins[rskin]->soundsid[SKSKBST1+rtaunt];
+			sfxenum_t rsound = skins[rskin].soundsid[SKSKBST1+rtaunt];
 			S_StartSound(NULL, rsound);
 		}
 	}
@@ -1162,17 +1162,17 @@ void F_StartWaitingPlayers(void)
 	finalecount = 0;
 
 	randskin = M_RandomKey(numskins);
-	boolean waithires = skins[randskin]->flags && SF_HIRES;
+	boolean waithires = skins[randskin].flags && SF_HIRES;
 
 	Z_Free(waitcolormap);
-	waitcolormap = R_GetTranslationColormap(randskin, skins[randskin]->prefcolor, 0);
+	waitcolormap = R_GetTranslationColormap(randskin, skins[randskin].prefcolor, 0);
 
 	if (waithires)
-		waitscale = waitscale * FIXED_TO_FLOAT(skins[randskin]->highresscale); // need to set scale here cause im lazy
+		waitscale = waitscale * FIXED_TO_FLOAT(skins[randskin].highresscale); // need to set scale here cause im lazy
 
 	for (i = 0; i < 2; i++)
 	{
-		sprframe = &skins[randskin]->spritedef.spriteframes[(6+(i*3)) & FF_FRAMEMASK];
+		sprframe = &skins[randskin].spritedef.spriteframes[(6+(i*3)) & FF_FRAMEMASK];
 		driver[i] = W_CachePatchNum(sprframe->lumppat[1], PU_CACHE);
 	}
 }

src/f_wipe.c

@@ -111,8 +111,7 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum)
 		goto freemask;
 
 	// SRB2Kart: This suddenly triggers ERRORMODE now
-	//snprintf(&lumpname[4], 3, "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum);
-	//lumpname[8] = 0;
+	//sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum);
 
 	lumpname[4] = '0'+(masknum/10);
 	lumpname[5] = '0'+(masknum%10);

src/g_demo.c

@@ -203,7 +203,7 @@ static INT32 GetSkinNumClosestToStats(UINT8 kartspeed, UINT8 kartweight)
 
 	for (i = 0; i < numskins; i++)
 	{
-		stat_diff = abs(skins[i]->kartspeed - kartspeed) + abs(skins[i]->kartweight - kartweight);
+		stat_diff = abs(skins[i].kartspeed - kartspeed) + abs(skins[i].kartweight - kartweight);
 
 		if (stat_diff < closest_stats)
 		{
@@ -266,7 +266,7 @@ void G_ReadDemoExtraData(void)
 			kartspeed = READUINT8(demobuf.p);
 			kartweight = READUINT8(demobuf.p);
 
-			if (!fasticmp(skins[player->skin]->name, name))
+			if (!fasticmp(skins[player->skin].name, name))
 				FindClosestSkinForStats(p, kartspeed, kartweight);
 
 			player->kartspeed = kartspeed;
@@ -396,12 +396,12 @@ void G_WriteDemoExtraData(void)
 			{
 				// Skin
 				memset(name, 0, 16);
-				strncpy(name, skins[players[i].skin]->name, 16);
+				strncpy(name, skins[players[i].skin].name, 16);
 				memcpy(demobuf.p, name, 16);
 				demobuf.p += 16;
 
-				WRITEUINT8(demobuf.p, skins[players[i].skin]->kartspeed);
-				WRITEUINT8(demobuf.p, skins[players[i].skin]->kartweight);
+				WRITEUINT8(demobuf.p, skins[players[i].skin].kartspeed);
+				WRITEUINT8(demobuf.p, skins[players[i].skin].kartweight);
 			}
 
 			if (demo_extradata[i] & DXD_COLOR)
@@ -1723,11 +1723,11 @@ void G_BeginRecording(void)
 		// Print to a separate temp buffer instead of demo.titlename, so we can use it in M_TextInputSetString
 		if (title)
 		{
-			snprintf(demotitlename, sizeof(demotitlename)-1, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername);
+			snprintf(demotitlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername);
 			Z_Free(title);
 		}
 		else
-			snprintf(demotitlename, sizeof(demotitlename)-1, "%s", modeattacking ? "Time Attack" : connectedservername);
+			snprintf(demotitlename, 64, "%s", modeattacking ? "Time Attack" : connectedservername);
 
 		// Init just in case it isn't initialized already
 		M_TextInputInit(&demo.titlenameinput, demo.titlename, sizeof(demo.titlename));
@@ -1807,7 +1807,7 @@ void G_BeginRecording(void)
 
 		// Skin
 		memset(name, 0, 16);
-		strncpy(name, skins[player->skin]->name, 16);
+		strncpy(name, skins[player->skin].name, 16);
 		memcpy(demobuf.p, name, 16);
 		demobuf.p += 16;
 
@@ -1821,8 +1821,8 @@ void G_BeginRecording(void)
 		WRITEUINT32(demobuf.p, player->score);
 
 		// Kart speed and weight
-		WRITEUINT8(demobuf.p, skins[player->skin]->kartspeed);
-		WRITEUINT8(demobuf.p, skins[player->skin]->kartweight);
+		WRITEUINT8(demobuf.p, skins[player->skin].kartspeed);
+		WRITEUINT8(demobuf.p, skins[player->skin].kartweight);
 	}
 
 	WRITEUINT8(demobuf.p, 0xFF); // Denote the end of the player listing
@@ -1878,7 +1878,7 @@ void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT
 
 	// Skin
 	memset(temp, 0, 16);
-	strncpy(temp, skins[skinnum]->name, 16);
+	strncpy(temp, skins[skinnum].name, 16);
 	memcpy(demobuf.p, temp, 16);
 	demobuf.p += 16;
 
@@ -2212,7 +2212,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath);
 		pdemo->type = MD_INVALID;
-		snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
+		sprintf(pdemo->title, "INVALID REPLAY");
 		return;
 	}
 
@@ -2222,7 +2222,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
 		pdemo->type = MD_INVALID;
-		snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
+		sprintf(pdemo->title, "INVALID REPLAY");
 		return;
 	}
 
@@ -2247,14 +2247,14 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 #ifdef DEMO_COMPAT_100
 		case 0x0001:
 			pdemo->type = MD_OUTDATED;
-			snprintf(pdemo->title, sizeof(pdemo->title), "Legacy Replay");
+			sprintf(pdemo->title, "Legacy Replay");
 			break;
 #endif
 		// too old, cannot support.
 		default:
 			CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath);
 			pdemo->type = MD_INVALID;
-			snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
+			sprintf(pdemo->title, "INVALID REPLAY");
 			return;
 	}
 
@@ -2267,7 +2267,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemo->filepath);
 		pdemo->type = MD_INVALID;
-		snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
+		sprintf(pdemo->title, "INVALID REPLAY");
 		return;
 	}
 
@@ -2288,7 +2288,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("%s is a legacy multiplayer replay and cannot be played.\n"), pdemo->filepath);
 		pdemo->type = MD_INVALID;
-		snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
+		sprintf(pdemo->title, "INVALID REPLAY");
 		return;
 	}
 #endif
@@ -2335,7 +2335,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 	while (READUINT8(extrainfo_p) == DW_STANDING) // Assume standings are always first in the extrainfo
 	{
 		INT32 i;
-		char temp[17];
+		char temp[16];
 
 		pdemo->standings[count].ranking = READUINT8(extrainfo_p);
 
@@ -2345,13 +2345,12 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 
 		// Skin
 		memcpy(temp, extrainfo_p, 16);
-		temp[16] = '\0';
 		extrainfo_p += 16;
 		pdemo->standings[count].skin = UINT8_MAX;
 
 		for (i = 0; i < numskins; i++)
 		{
-			if (fasticmp(skins[i]->name, temp))
+			if (fasticmp(skins[i].name, temp))
 			{
 				pdemo->standings[count].skin = i;
 				break;
@@ -2360,7 +2359,6 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 
 		// Color
 		memcpy(temp, extrainfo_p, 16);
-		temp[16] = '\0';
 		extrainfo_p += 16;
 
 		for (i = 0; i < MAXSKINCOLORS; i++)
@@ -2524,7 +2522,7 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
 	if (!handle)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath);
-		snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
+		sprintf(pdemo->title, "INVALID REPLAY");
 		return;
 	}
 
@@ -2536,7 +2534,7 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
 	if (count < 96 || memcmp(info_p, DEMOHEADER, 12))
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
-		snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
+		sprintf(pdemo->title, "INVALID REPLAY");
 		return;
 	}
 
@@ -2565,13 +2563,13 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
 			break;
 #ifdef DEMO_COMPAT_100
 		case 0x0001:
-			snprintf(pdemo->title, sizeof(pdemo->title), "Legacy Replay");
+			sprintf(pdemo->title, "Legacy Replay");
 			break;
 #endif
 		// too old, cannot support.
 		default:
 			CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath);
-			snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
+			sprintf(pdemo->title, "INVALID REPLAY");
 	}
 }
 
@@ -2635,7 +2633,7 @@ void G_DoPlayDemo(char *defdemoname)
 			//FIL_DefaultExtension(defdemoname, ".lmp");
 			if (!FIL_ReadFile(defdemoname, &demobuf.buffer))
 			{
-				snprintf(msg, sizeof(msg), M_GetText("Failed to read file '%s'.\n"), defdemoname);
+				snprintf(msg, 1024, M_GetText("Failed to read file '%s'.\n"), defdemoname);
 				CONS_Alert(CONS_ERROR, "%s", msg);
 				gameaction = ga_nothing;
 				M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
@@ -2647,7 +2645,7 @@ void G_DoPlayDemo(char *defdemoname)
 		// load demo resource from WAD
 		else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
 		{
-			snprintf(msg, sizeof(msg), M_GetText("Failed to read lump '%s'.\n"), defdemoname);
+			snprintf(msg, 1024, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
 			CONS_Alert(CONS_ERROR, "%s", msg);
 			gameaction = ga_nothing;
 			M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
@@ -2668,7 +2666,7 @@ void G_DoPlayDemo(char *defdemoname)
 
 	if (memcmp(demobuf.p, DEMOHEADER, 12))
 	{
-		snprintf(msg, sizeof(msg), M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname);
+		snprintf(msg, 1024, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname);
 		CONS_Alert(CONS_ERROR, "%s", msg);
 		M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 		G_ResetDemoPlayback();
@@ -2694,7 +2692,7 @@ void G_DoPlayDemo(char *defdemoname)
 #endif
 		// too old, cannot support.
 		default:
-			snprintf(msg, sizeof(msg), M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
+			snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
 			CONS_Alert(CONS_ERROR, "%s", msg);
 			M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 			G_ResetDemoPlayback();
@@ -2705,7 +2703,7 @@ void G_DoPlayDemo(char *defdemoname)
 
 	if (memcmp(demobuf.p, "PLAY", 4))
 	{
-		snprintf(msg, sizeof(msg), M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
+		snprintf(msg, 1024, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
 		CONS_Alert(CONS_ERROR, "%s", msg);
 		M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 		G_ResetDemoPlayback();
@@ -2722,7 +2720,7 @@ void G_DoPlayDemo(char *defdemoname)
 	{
 		if (demoflags & DF_MULTIPLAYER)
 		{
-			snprintf(msg, sizeof(msg), M_GetText("%s is an alpha multiplayer replay and cannot be played.\n"), pdemoname);
+			snprintf(msg, 1024, M_GetText("%s is an alpha multiplayer replay and cannot be played.\n"), pdemoname);
 			CONS_Alert(CONS_ERROR, "%s", msg);
 			M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 			G_ResetDemoPlayback();
@@ -2749,31 +2747,31 @@ void G_DoPlayDemo(char *defdemoname)
 			switch (error)
 			{
 				case DFILE_ERROR_NOTLOADED:
-					snprintf(msg, sizeof(msg),
+					snprintf(msg, 1024,
 						"Required files for this demo are not loaded.\n\nUse\n\"playdemo %s -addfiles\"\nto load them and play the demo.\n",
 						 pdemoname);
 					break;
 
 				case DFILE_ERROR_OUTOFORDER:
-					snprintf(msg, sizeof(msg),
+					snprintf(msg, 1024,
 						"Required files for this demo are loaded out of order.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n",
 						 pdemoname);
 					break;
 
 				case DFILE_ERROR_INCOMPLETEOUTOFORDER:
-					snprintf(msg, sizeof(msg),
+					snprintf(msg, 1024,
 						"Required files for this demo are not loaded, and some are out of order.\n\nUse\n\"playdemo %s -addfiles\"\nto load needed files and play the demo.\n",
 						 pdemoname);
 					break;
 
 				case DFILE_ERROR_CANNOTLOAD:
-					snprintf(msg, sizeof(msg),
+					snprintf(msg, 1024,
 						"Required files for this demo cannot be loaded.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n",
 						 pdemoname);
 					break;
 
 				case DFILE_ERROR_EXTRAFILES:
-					snprintf(msg, sizeof(msg),
+					snprintf(msg, 1024,
 						"You have additional files loaded beyond the demo's file list.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n",
 						 pdemoname);
 					break;
@@ -2823,7 +2821,7 @@ void G_DoPlayDemo(char *defdemoname)
 	// ...*map* not loaded?
 	if (!gamemap || (gamemap > NUMMAPS) || (W_CheckNumForName(G_BuildMapName(gamemap)) == LUMPERROR))
 	{
-		snprintf(msg, sizeof(msg), M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
+		snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
 		CONS_Alert(CONS_ERROR, "%s", msg);
 		M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 		G_ResetDemoPlayback();
@@ -2855,7 +2853,7 @@ void G_DoPlayDemo(char *defdemoname)
 		// Skin not loaded?
 		if (!SetPlayerSkin(0, skin))
 		{
-			snprintf(msg, sizeof(msg), M_GetText("%s features a character that is not currently loaded.\n"), pdemoname);
+			snprintf(msg, 1024, M_GetText("%s features a character that is not currently loaded.\n"), pdemoname);
 			CONS_Alert(CONS_ERROR, "%s", msg);
 			M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 			G_ResetDemoPlayback();
@@ -2865,7 +2863,7 @@ void G_DoPlayDemo(char *defdemoname)
 		// ...*map* not loaded?
 		if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK))
 		{
-			snprintf(msg, sizeof(msg), M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
+			snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
 			CONS_Alert(CONS_ERROR, "%s", msg);
 			M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 			G_ResetDemoPlayback();
@@ -2888,7 +2886,7 @@ void G_DoPlayDemo(char *defdemoname)
 		// Sigh ... it's an empty demo.
 		if (*demobuf.p == DEMOMARKER)
 		{
-			snprintf(msg, sizeof(msg), M_GetText("%s contains no data to be played.\n"), pdemoname);
+			snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
 			CONS_Alert(CONS_ERROR, "%s", msg);
 			M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 			G_ResetDemoPlayback();
@@ -2926,7 +2924,7 @@ void G_DoPlayDemo(char *defdemoname)
 	// Sigh ... it's an empty demo.
 	if (*demobuf.p == DEMOMARKER)
 	{
-		snprintf(msg, sizeof(msg), M_GetText("%s contains no data to be played.\n"), pdemoname);
+		snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
 		CONS_Alert(CONS_ERROR, "%s", msg);
 		M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 		G_ResetDemoPlayback();
@@ -2975,7 +2973,7 @@ void G_DoPlayDemo(char *defdemoname)
 
 			if (modeattacking)
 			{
-				snprintf(msg, sizeof(msg), M_GetText("%s is a Record Attack replay with spectators, and is thus invalid.\n"), pdemoname);
+				snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with spectators, and is thus invalid.\n"), pdemoname);
 				CONS_Alert(CONS_ERROR, "%s", msg);
 				M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 				G_ResetDemoPlayback();
@@ -2987,7 +2985,7 @@ void G_DoPlayDemo(char *defdemoname)
 
 		if (modeattacking && numslots > 1)
 		{
-			snprintf(msg, sizeof(msg), M_GetText("%s is a Record Attack replay with multiple players, and is thus invalid.\n"), pdemoname);
+			snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with multiple players, and is thus invalid.\n"), pdemoname);
 			CONS_Alert(CONS_ERROR, "%s", msg);
 			M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
 			G_ResetDemoPlayback();
@@ -3029,7 +3027,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 (!fasticmp(skins[players[p].skin].name, skin))
 			FindClosestSkinForStats(p, kartspeed[p], kartweight[p]);
 
 		// Look for the next player
@@ -3106,7 +3104,7 @@ void G_AddGhost(char *defdemoname)
 	CLEANUP(Z_Pfree) UINT8 *buffer = NULL;
 	mapthing_t *mthing;
 	UINT16 count, ghostversion;
-	skin_t *ghskin = skins[0];
+	skin_t *ghskin = &skins[0];
 	UINT8 kartspeed = UINT8_MAX, kartweight = UINT8_MAX;
 
 	name[16] = '\0';
@@ -3313,9 +3311,9 @@ void G_AddGhost(char *defdemoname)
 
 	for (i = 0; i < numskins; i++)
 	{
-		if (fasticmp(skins[i]->name, skin))
+		if (fasticmp(skins[i].name, skin))
 		{
-			ghskin = skins[i];
+			ghskin = &skins[i];
 			break;
 		}
 	}
@@ -3323,7 +3321,7 @@ void G_AddGhost(char *defdemoname)
 	if (i == numskins)
 	{
 		if (kartspeed != UINT8_MAX && kartweight != UINT8_MAX)
-			ghskin = skins[GetSkinNumClosestToStats(kartspeed, kartweight)];
+			ghskin = &skins[GetSkinNumClosestToStats(kartspeed, kartweight)];
 
 		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Invalid character. Falling back to %s.\n"), pdemoname, ghskin->name);
 	}

src/g_demo.h

@@ -82,8 +82,7 @@ typedef struct menudemo_s {
 	struct {
 		UINT8 ranking;
 		char name[17];
-		skinnum_t skin;
-		UINT8 color;
+		UINT8 skin, color;
 		UINT32 timeorscore;
 	} standings[MAXPLAYERS];
 } menudemo_t;

src/g_game.c

@@ -63,7 +63,7 @@ gameaction_t gameaction = 0;
 gamestate_t gamestate = GS_NULL;
 
 boolean botingame = false;
-skinnum_t botskin = 0;
+UINT8 botskin = 0;
 UINT8 botcolor = 0;
 
 // SRB2kart
@@ -453,13 +453,34 @@ consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, dr
 static CV_PossibleValue_t cechotoggle_t[] = {{0, "Off"}, {1, "On"}, {2, "Console"}, {0, NULL}};
 consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+#if MAXPLAYERS > 16
+#error "please update player_name table using the new value for MAXPLAYERS"
+#endif
+
 #ifdef SEENAMES
 player_t *seenplayer = NULL; // player we're aiming at right now
 #endif
 
-// now automatically allocated in D_RegisterServerCommands
-// so that it doesn't have to be updated depending on the value of MAXPLAYERS
-char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
+char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
+{
+	"Player 1",
+	"Player 2",
+	"Player 3",
+	"Player 4",
+	"Player 5",
+	"Player 6",
+	"Player 7",
+	"Player 8",
+	"Player 9",
+	"Player 10",
+	"Player 11",
+	"Player 12",
+	"Player 13",
+	"Player 14",
+	"Player 15",
+	"Player 16"
+}; // SRB2kart - removed Players 17 through 32
+
 INT32 player_name_changes[MAXPLAYERS] = {};
 
 INT16 rw_maximums[NUM_WEAPONS] =
@@ -604,18 +625,14 @@ const char *G_BuildMapName(INT32 map)
 	}
 
 	if (map < 100 && map >= 0) // ...but why use signed integer in first place? idk but this prevents warning (and potential buffer overflow lol)
-	{
-		snprintf(&mapname[3], sizeof(mapname)-3, "%.2d", map);
-	}
+		sprintf(&mapname[3], "%.2d", map);
 	else
 	{
 		mapname[3] = (char)('A' + (char)((map - 100) / 36));
-
 		if ((map - 100) % 36 < 10)
 			mapname[4] = (char)('0' + (char)((map - 100) % 36));
 		else
 			mapname[4] = (char)('A' + (char)((map - 100) % 36) - 10);
-
 		mapname[5] = '\0';
 	}
 
@@ -2630,18 +2647,12 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
 		// Just spawn there.
 		//return playerstarts[0];
 
-#if MAXPLAYERS > 16
-		//this section courtesy of fickle - v1.1 battle royale
-		// screw collision chex
-		return playerstarts[pos % numcoopstarts];
-#else
 		if (P_IsLocalPlayerNum(playernum))
 		{
 			CONS_Alert(CONS_WARNING, "Could not spawn at any Race starts!\n");
 		}
 
 		return NULL;
-#endif
 	}
 
 	if (P_IsLocalPlayerNum(playernum))
@@ -3776,7 +3787,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 	startonmapnum = mapoverride;
 #endif
 
-	snprintf(savename, sizeof(savename), savegamename, slot);
+	sprintf(savename, savegamename, slot);
 
 	length = FIL_ReadFile(savename, &save.buffer);
 	if (!length)
@@ -3788,7 +3799,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 	save.p = save.buffer;
 
 	memset(vcheck, 0, sizeof (vcheck));
-	snprintf(vcheck, sizeof(vcheck), "version %d", VERSION);
+	sprintf(vcheck, "version %d", VERSION);
 
 	if (!fastcmp((const char *)save.p, (const char *)vcheck))
 	{
@@ -3854,8 +3865,8 @@ void G_SaveGame(UINT32 savegameslot)
 	const char *backup;
 	savebuffer_t save = {};
 
-	snprintf(savename, sizeof(savename), savegamename, savegameslot);
-	backup = va("%s", savename);
+	sprintf(savename, savegamename, savegameslot);
+	backup = va("%s",savename);
 
 	// save during evaluation or credits? game's over, folks!
 	if (gamestate == GS_CREDITS || gamestate == GS_EVALUATION)
@@ -3873,8 +3884,8 @@ void G_SaveGame(UINT32 savegameslot)
 			return;
 		}
 
-		memset(name, 0, sizeof(name));
-		snprintf(name, sizeof(name), "version %d", VERSION);
+		memset(name, 0, sizeof (name));
+		sprintf(name, "version %d", VERSION);
 		WRITEMEM(save.p, name, VERSIONSIZE);
 
 		P_SaveGame(&save);
@@ -3935,9 +3946,9 @@ void G_DeferedInitNew(boolean pencoremode, const char *mapname, INT32 pickedchar
 	}
 
 	if (!color && !modeattacking)
-		color = skins[pickedchar]->prefcolor;
+		color = skins[pickedchar].prefcolor;
 	SetPlayerSkinByNum(consoleplayer, pickedchar);
-	CV_StealthSet(&cv_skin, skins[pickedchar]->name);
+	CV_StealthSet(&cv_skin, skins[pickedchar].name);
 
 	if (color)
 		CV_StealthSetValue(&cv_playercolor, color);
@@ -4103,12 +4114,12 @@ char *G_BuildMapTitle(INT32 mapnum)
 		if (!title)
 			return NULL;
 
-		snprintf(title, len, "%s", mapheaderinfo[mapnum-1]->lvlttl);
+		sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);
 
 		if (zonetext)
-			snprintf(title + strlen(title), len - strlen(title), " %s", zonetext);
+			sprintf(title + strlen(title), " %s", zonetext);
 		if (actnum)
-			snprintf(title + strlen(title), len - strlen(title), " %s", actnum);
+			sprintf(title + strlen(title), " %s", actnum);
 	}
 
 	return title;

src/g_input.c

@@ -1250,8 +1250,7 @@ const char *G_KeynumToString(INT32 keynum)
 			return keynames[j].name;
 
 	// create a name for unknown keys
-	snprintf(keynamestr, sizeof(keynamestr), "KEY%d", keynum);
-
+	sprintf(keynamestr, "KEY%d", keynum);
 	return keynamestr;
 }
 

src/g_state.h

@@ -55,7 +55,6 @@ extern gamestate_t gamestate;
 extern gameaction_t gameaction;
 
 extern boolean botingame;
-extern skinnum_t botskin;
-extern UINT8 botcolor;
+extern UINT8 botskin, botcolor;
 
 #endif //__G_STATE__

src/hardware/hw_batching.c

@@ -35,7 +35,7 @@ static int finalVertexArrayAllocSize = 65536;
 // not gonna use this for now, just sort by color and change state when it changes
 // later maybe when using vertex attributes if it's needed
 
-static PolygonArrayEntry* polygonArray        = NULL; // contains the polygon data from DrawPolygon, waiting to be processed
+static PolygonArrayEntry* polygonArray        = NULL ;// contains the polygon data from DrawPolygon, waiting to be processed
 static PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray
 static int polygonArraySize      = 0;
 static int polygonArrayAllocSize = 65536;
@@ -171,8 +171,8 @@ static int comparePolygons(const void *p1, const void *p2)
 
 	// special case with signedness to prevent overflowing
 	// FIXME: check for prediction slowdowns!
-	const int shader1 = (poly1->hash & 0x80000000) ? -1 : poly1->shader;
-	const int shader2 = (poly2->hash & 0x80000000) ? -1 : poly2->shader;
+	const int shader1 = poly1->hash & 0x80000000 ? -1 : poly1->shader;
+	const int shader2 = poly2->hash & 0x80000000 ? -1 : poly2->shader;
 
 	// skywalls and horizon lines must retain their order for horizon lines to work
 	if (shader1 == -1 && shader2 == -1)
@@ -214,8 +214,8 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
 	const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
 	const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
 
-	const GLMipmap_t *texture1 = (poly1->hash & 0x80000000) ? NULL : poly1->texture;
-	const GLMipmap_t *texture2 = (poly2->hash & 0x80000000) ? NULL : poly2->texture;
+	const GLMipmap_t *texture1 = poly1->hash & 0x80000000 ? NULL : poly1->texture;
+	const GLMipmap_t *texture2 = poly2->hash & 0x80000000 ? NULL : poly2->texture;
 
 	// skywalls and horizon lines must retain their order for horizon lines to work
 	if (!texture1 && !texture2)

src/hardware/hw_bsp.c

@@ -346,15 +346,15 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 }
 
 // checks if any line is a portal or horizonline, for optimization
-static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_t *line)
+static inline void CheckForPortalsAndHorizonLines(seg_t *lseg, const line_t *line)
 {
 	// portal check
-	if (!gl_maphasportals && firstside && line->special == PORTALSPECIAL)
+	if (!gl_maphasportals && lseg->side == 0 && line->special == PORTALSPECIAL)
 	{
 		// Find the other side!
 		INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, -1);
 
-		if (line2 >= 0 && line == &lines[line2])
+		if (line == &lines[line2])
 			line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2);
 
 		if (line2 >= 0) // found it!
@@ -397,7 +397,7 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
 		if (!line)
 			continue;
 
-		CheckForPortalsAndHorizonLines(lseg->side == 0, line);
+		CheckForPortalsAndHorizonLines(lseg, line);
 
 		if (line->sidenum[1] != NO_INDEX)
 		{
@@ -581,8 +581,7 @@ static void loading_status(void)
 
 	I_OsPolling();
 	CON_Drawer();
-	snprintf(s, sizeof(s), "%d%%", (++ls_percent)<<1);
-
+	sprintf(s, "%d%%", (++ls_percent)<<1);
 	x = BASEVIDWIDTH/2;
 	y = BASEVIDHEIGHT/2;
 	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); // Black background to match fade in effect

src/hardware/hw_cache.c

@@ -555,8 +555,7 @@ static void HWR_FreePatchCache(boolean freeall)
 		callback = FreeColormapsCallback;
 
 	//Z_IterateTags(PU_PATCH, PU_PATCH_ROTATED, callback);
-	//Z_IterateTags(PU_PATCH, PU_PATCH_LOWPRIORITY, callback); // we dont really need to free low priority patches here as P_FreeLevelState takes care of them
-	Z_IterateTag(PU_PATCH, callback);
+	Z_IterateTags(PU_PATCH, PU_PATCH, callback);
 	Z_IterateTags(PU_SPRITE, PU_HUDGFX, callback);
 }
 
@@ -624,26 +623,13 @@ static void HWR_PrecacheLevelFlats(void)
 {
 	// lookup for flats that may´ve been already loaded
 	flatcheck flatpresent;
-	size_t i;
-#if 0
-	size_t j;
-#endif
+	size_t i, j;
 	INT32 k;
 
-	// this kinda messes up encore remapping behavior at times
-	// so just disable it for now ig
-#ifdef GLENCORE
-	if (encoremap)
-	{
-		return;
-	}
-#endif
-
 	flatcheck_init(&flatpresent);
 	flatcheck_reserve(&flatpresent, numlevelflats);
 
 	// special case for encore
-#if 0
 #ifdef GLENCORE
 	if (encoremap)
 	{
@@ -683,7 +669,6 @@ static void HWR_PrecacheLevelFlats(void)
 		}
 	}
 	else
-#endif
 #endif
 	{
 		// on non encore we have it simple
@@ -1013,7 +998,7 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
 		const char *flatname = W_CheckNameForNum(flatlumpnum);
 
 		// hack for gba rainbow roads cyan floors
-		if (UNLIKELY(flatname && memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
+		if (UNLIKELY(memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
 		{
 			glMipmap->flags &= ~TF_CHROMAKEYED;
 		}
@@ -1329,7 +1314,6 @@ void HWR_SetPalette(RGBA_t *palette)
 				crushed_palette[i].s.blue = (UINT8)(fblue / 31.0f * 255.0f);
 				crushed_palette[i].s.alpha = 255;
 			}
-
 			GL_SetScreenPalette(crushed_palette);
 		}
 		else
@@ -1407,7 +1391,6 @@ void HWR_SetMapPalette(void)
 			I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
 
 		RGB_data = (UINT8 *)(W_CacheLumpNum(lumpnum, PU_CACHE));
-
 		// we got the RGB palette now, but we need it in RGBA format.
 		for (i = 0; i < 256; i++)
 		{
@@ -1416,7 +1399,6 @@ void HWR_SetMapPalette(void)
 			RGBA_converted[i].s.blue = *(RGB_data++);
 			RGBA_converted[i].s.alpha = 255;
 		}
-
 		palette = RGBA_converted;
 	}
 
@@ -1424,7 +1406,6 @@ void HWR_SetMapPalette(void)
 	if (memcmp(mapPalette, palette, sizeof(mapPalette)))
 	{
 		memcpy(mapPalette, palette, sizeof(mapPalette));
-
 		// in palette rendering mode, this means that all rgba textures now have wrong colors
 		// and the lookup table is outdated
 		HWR_SetPaletteLookup(mapPalette);

src/hardware/hw_main.cpp

@@ -514,7 +514,7 @@ static FUINT HWR_CalcWallLight(FUINT lightnum, seg_t *seg, extracolormap_t *colo
 		const INT16 offset = (cv_glfakecontrast.value == 2) ? seg->hwLightOffset : ((INT16)seg->lightOffset * 8);
 
 		finallight += offset;
-		finallight = CLAMP(finallight, 0, 255);
+		finallight = CLAMP(finallight, 0 , 255);
 	}
 
 	return (FUINT)finallight;
@@ -532,7 +532,7 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, pslope_t *slope, const sector_t
 		const INT16 offset = (cv_glfakecontrast.value == 2) ? slope->hwLightOffset : ((INT16)slope->lightOffset * 8);
 
 		finallight += (fof ? -offset : offset);
-		finallight = CLAMP(finallight, 0, 255);
+		finallight = CLAMP(finallight, 0 , 255);
 	}
 
 	return (FUINT)finallight;
@@ -1101,8 +1101,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
 
 		// Found a break
 		// The heights are clamped to ensure the polygon doesn't cross itself.
-		bot    = std::min(std::max(bheight, realbot), top);
-		endbot = std::min(std::max(endbheight, endrealbot), endtop);
+		bot    = std::clamp(bheight, realbot, top);
+		endbot = std::clamp(endbheight, endrealbot, endtop);
 
 		Surf->PolyColor.s.alpha = alpha;
 
@@ -1236,7 +1236,7 @@ static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf)
 // Returns true if the midtexture is visible, and false if... it isn't...
 static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
 {
-	FUINT blendmode = PF_Masked;
+	FUINT blendmode = PF_Masked | PF_Translucent;
 
 	pSurf->PolyColor.s.alpha = 0xFF;
 
@@ -2306,7 +2306,7 @@ static inline void DoAddLine(seg_t* line, angle_t angle1, angle_t angle2)
 				// Find the other side!
 				INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, -1);
 
-				if (line2 >= 0 && line->linedef == &lines[line2])
+				if (line->linedef == &lines[line2])
 					line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, line2);
 
 				if (line2 >= 0) // found it!
@@ -2662,13 +2662,11 @@ static void HWR_AddPolyObjectPlanes(void)
 
 		polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector
 
-		if (polyobjsector->floorheight <= gl_frontsector->ceilingheight &&
-			polyobjsector->floorheight >= gl_frontsector->floorheight &&
-			(viewz < polyobjsector->floorheight))
+		if (polyobjsector->floorheight <= gl_frontsector->ceilingheight
+			&& polyobjsector->floorheight >= gl_frontsector->floorheight
+			&& (viewz < polyobjsector->floorheight))
 		{
 			light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true);
-			const INT16 llevel = (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel);
-			extracolormap_t *colmap = (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap);
 
 			if (po_ptrs[i]->translucency > 0)
 			{
@@ -2676,24 +2674,22 @@ static void HWR_AddPolyObjectPlanes(void)
 				FBITFIELD blendmode;
 				blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
 				HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight,
-													llevel, Surf.PolyColor.s.alpha, polyobjsector, blendmode, colmap);
+												(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
 			}
 			else
 			{
 				HWR_GetFlat(levelflats[polyobjsector->floorpic].lumpnum, R_NoEncore(polyobjsector, false));
 				HWR_RenderPolyObjectPlane(po_ptrs[i], false, polyobjsector->floorheight, PF_Occlude,
-											llevel, levelflats[polyobjsector->floorpic].lumpnum,
-											polyobjsector, 255, colmap);
+											(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->floorpic].lumpnum,
+											polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
 			}
 		}
 
-		if (polyobjsector->ceilingheight >= gl_frontsector->floorheight &&
-			polyobjsector->ceilingheight <= gl_frontsector->ceilingheight &&
-			(viewz > polyobjsector->ceilingheight))
+		if (polyobjsector->ceilingheight >= gl_frontsector->floorheight
+			&& polyobjsector->ceilingheight <= gl_frontsector->ceilingheight
+			&& (viewz > polyobjsector->ceilingheight))
 		{
 			light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true);
-			const INT16 llevel = (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel);
-			extracolormap_t *colmap = (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap);
 
 			if (po_ptrs[i]->translucency > 0)
 			{
@@ -2701,14 +2697,14 @@ static void HWR_AddPolyObjectPlanes(void)
 				FBITFIELD blendmode;
 				blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
 				HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight,
-													llevel, Surf.PolyColor.s.alpha, polyobjsector, blendmode, colmap);
+												(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
 			}
 			else
 			{
 				HWR_GetFlat(levelflats[polyobjsector->ceilingpic].lumpnum, R_NoEncore(polyobjsector, true));
 				HWR_RenderPolyObjectPlane(po_ptrs[i], true, polyobjsector->ceilingheight, PF_Occlude,
-											llevel, levelflats[polyobjsector->ceilingpic].lumpnum,
-											polyobjsector, 255, colmap);
+										(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->ceilingpic].lumpnum,
+										polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
 			}
 		}
 	}
@@ -3239,18 +3235,6 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
 	if (!spr->mobj)
 		return;
 
-	// Ceiling scenery have no shadow.
-	if ((spr->mobj->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) == (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY))
-		return;
-
-	// Debris have no corona or shadow.
-	if (spr->mobj->flags2 & MF2_DEBRIS)
-		return;
-
-	// Without this, your shadow shows on the floor, even after you die and fall through the ground.
-	if (spr->mobj->z < spr->mobj->floorz)
-		return;
-
 	R_GetShadowZ(spr->mobj, &floorslope);
 
 	mobjfloor = HWR_OpaqueFloorAtPos(
@@ -3296,7 +3280,7 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
 	// technically this_scale gets multiplied and added to sprite y/x scale, but this thing needs it for some crap so ill just throw it in here again
 	this_scale = FixedToFloat(spr->mobj->scale);
 
-	const skin_t *moskin = R_GetMobjSkin(spr->mobj);
+	const skin_t *moskin = K_GetMobjSkin(spr->mobj);
 	if (moskin && moskin->flags & SF_HIRES)
 		this_scale *= FixedToFloat(moskin->highresscale);
 
@@ -3511,7 +3495,10 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
 	hwrpatch = static_cast<GLPatch_t *>(gpatch->hardware);
 
 	// Draw shadow BEFORE sprite
-	if (UNLIKELY(cv_shadow.value))
+	if (UNLIKELY(cv_shadow.value // Shadows enabled
+		&& (sprmo->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow.
+		&& !(sprmo->flags2 & MF2_DEBRIS) // Debris have no corona or shadow.
+		&& (sprmo->z >= sprmo->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground.
 	{
 		////////////////////
 		// SHADOW SPRITE! //
@@ -3721,7 +3708,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
 
 		Surf.PolyColor.s.alpha = alpha;
 
-		HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
+		HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); // sprite shader
 
 		top = bot;
 		endtop = endbot;
@@ -3748,7 +3735,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
 
 	Surf.PolyColor.s.alpha = alpha;
 
-	HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
+	HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); // sprite shader
 }
 
 // -----------------+
@@ -3837,7 +3824,10 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
 	}
 
 	// Draw shadow BEFORE sprite
-	if (UNLIKELY(cv_shadow.value))
+	if (UNLIKELY(cv_shadow.value // Shadows enabled
+		&& (sprmo->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow.
+		&& !(sprmo->flags2 & MF2_DEBRIS) // Debris have no corona or shadow.
+		&& (sprmo->z >= sprmo->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground.
 	{
 		////////////////////
 		// SHADOW SPRITE! //
@@ -4361,8 +4351,17 @@ static void HWR_DrawSprites(void)
 			{
 				if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
 				{
-					/* fuck you */
-					md2_t *md2 = &R_GetMobjSkin(spr->mobj)->playermodel;
+					md2_t *md2;
+
+					if (spr->mobj->localskin)
+					{
+						if (spr->mobj->skinlocal)
+							md2 = &md2_localplayermodels[(skin_t *)spr->mobj->localskin - localskins];
+						else
+							md2 = &md2_playermodels     [(skin_t *)spr->mobj->localskin -      skins];
+					}
+					else
+						md2 = &md2_playermodels[(skin_t *)spr->mobj->skin - skins];
 
 					// 8/1/19: Only don't display player models if no default SPR_PLAY is found.
 					if (((md2->notfound || md2->scale < 0.0f) && ((!cv_glfallbackplayermodel.value) || md2_models[SPR_PLAY].notfound || md2_models[SPR_PLAY].scale < 0.0f)) || spr->mobj->state == &states[S_PLAY_SIGN])
@@ -4584,7 +4583,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
 
 	rot = (thing->frame & FF_FRAMEMASK);
 
-	sprskin = R_GetMobjSkin(thing);
+	sprskin = K_GetMobjSkin(thing);
 
 	//Fab : 02-08-98: 'skin' override spritedef currently used for skin
 	if (sprskin && thing->sprite == SPR_PLAY)
@@ -6116,7 +6115,7 @@ static boolean HWR_WipeCheck(UINT8 wipenum, UINT8 scrnnum)
 	}
 
 	// puts the numbers into the lumpname
-	snprintf(&lumpname[4], sizeof(lumpname) - 4, "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum);
+	sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum);
 	wipelumpnum = W_CheckNumForName(lumpname);
 
 	// again, shouldn't be here really

src/hardware/hw_md2.c

@@ -73,6 +73,8 @@
 #endif
 
 md2_t md2_models[NUMSPRITES] = {};
+md2_t md2_playermodels[MAXSKINS] = {};
+md2_t md2_localplayermodels[MAXLOCALSKINS] = {};
 
 /*
  * free model
@@ -419,7 +421,6 @@ static void md2_loadTexture(md2_t *model)
 			}
 		}
 	}
-
 	GL_SetTexture(glPatch->mipmap);
 	HWR_UnlockCachedPatch(glPatch);
 }
@@ -477,7 +478,6 @@ static void md2_loadBlendTexture(md2_t *model)
 		glPatch->mipmap->width = (UINT16)w;
 		glPatch->mipmap->height = (UINT16)h;
 	}
-
 	GL_SetTexture(glPatch->mipmap); // We do need to do this so that it can be cleared and knows to recreate it when necessary
 	HWR_UnlockCachedPatch(glPatch);
 
@@ -487,19 +487,6 @@ static void md2_loadBlendTexture(md2_t *model)
 // Don't spam the console, or the OS with fopen requests!
 static boolean nomd2s = false;
 
-// initializes an md2 model
-static void HWR_InitModel(md2_t *md2)
-{
-	md2->scale = -1.0f;
-	md2->model = NULL;
-	md2->glpatch = NULL;
-	md2->skinnum = -1;
-	md2->notexturefile = false;
-	md2->noblendfile = false;
-	md2->notfound = true;
-	md2->error = false;
-}
-
 void HWR_InitMD2(void)
 {
 	size_t i;
@@ -509,22 +496,38 @@ void HWR_InitMD2(void)
 	float scale, offset;
 
 	CONS_Printf("InitMD2()...\n");
-
-	for (s = 0; s < numskins; s++)
+	for (s = 0; s < MAXSKINS; s++)
 	{
-		skin_t *skin = skins[s];
-		HWR_InitModel(&skin->playermodel);
+		md2_playermodels[s].scale = -1.0f;
+		md2_playermodels[s].model = NULL;
+		md2_playermodels[s].glpatch = NULL;
+		md2_playermodels[s].skin = -1;
+		md2_playermodels[s].notexturefile = false;
+		md2_playermodels[s].noblendfile = false;
+		md2_playermodels[s].notfound = true;
+		md2_playermodels[s].error = false;
 	}
-
-	for (s = 0; s < numlocalskins; s++)
+	for (s = 0; s < MAXLOCALSKINS; s++)
 	{
-		skin_t *skin = localskins[s];
-		HWR_InitModel(&skin->playermodel);
+		md2_localplayermodels[s].scale = -1.0f;
+		md2_localplayermodels[s].model = NULL;
+		md2_localplayermodels[s].glpatch = NULL;
+		md2_localplayermodels[s].skin = -1;
+		md2_localplayermodels[s].notexturefile = false;
+		md2_localplayermodels[s].noblendfile = false;
+		md2_localplayermodels[s].notfound = true;
+		md2_localplayermodels[s].error = false;
 	}
-
 	for (i = 0; i < NUMSPRITES; i++)
 	{
-		HWR_InitModel(&md2_models[i]);
+		md2_models[i].scale = -1.0f;
+		md2_models[i].model = NULL;
+		md2_models[i].glpatch = NULL;
+		md2_models[i].skin = -1;
+		md2_models[s].notexturefile = false;
+		md2_models[s].noblendfile = false;
+		md2_models[i].notfound = true;
+		md2_models[i].error = false;
 	}
 
 	// read the mdls.dat file
@@ -541,7 +544,6 @@ void HWR_InitMD2(void)
 			return;
 		}
 	}
-
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
 		for (i = 0; i < NUMSPRITES; i++)
@@ -556,21 +558,18 @@ void HWR_InitMD2(void)
 			}
 		}
 
-		for (s = 0; s < numskins; s++)
+		for (s = 0; s < MAXSKINS; s++)
 		{
-			skin_t *skin = skins[s];
-
-			if (fasticmp(name, skin->name))
+			if (fasticmp(name, skins[s].name))
 			{
-				skin->playermodel.skinnum = s;
-				skin->playermodel.scale = scale;
-				skin->playermodel.offset = offset;
-				skin->playermodel.notfound = false;
-				strcpy(skin->playermodel.filename, filename);
+				md2_playermodels[s].skin = s;
+				md2_playermodels[s].scale = scale;
+				md2_playermodels[s].offset = offset;
+				md2_playermodels[s].notfound = false;
+				strcpy(md2_playermodels[s].filename, filename);
 				goto md2found;
 			}
 		}
-
 		// no sprite/player skin name found?!?D
 		CONS_Printf("Unknown sprite/player skin %s detected in mdls.dat\n", name);
 md2found:
@@ -580,16 +579,12 @@ md2found:
 	fclose(f);
 }
 
-void HWR_AddPlayerMD2(INT32 skinnum, boolean local) // For MD2's that were added after startup
+void HWR_AddPlayerMD2(INT32 skin, boolean local) // For MD2's that were added after startup
 {
 	FILE *f;
 	char name[20], filename[32];
 	float scale, offset;
-
-	skin_t *skin = R_GetSkinArray(local)[skinnum];
-
-	// ensure we ALWAYS initialize the model even if no mdls.dat was found!
-	HWR_InitModel(&skin->playermodel);
+	md2_t *md2s;
 
 	if (nomd2s)
 		return;
@@ -603,7 +598,6 @@ void HWR_AddPlayerMD2(INT32 skinnum, boolean local) // For MD2's that were added
 	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));
@@ -612,25 +606,25 @@ void HWR_AddPlayerMD2(INT32 skinnum, boolean local) // For MD2's that were added
 		}
 	}
 
+	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, skin->name))
+		if (fasticmp(name, K_GetSkinArray(local)[skin].name))
 		{
-			skin->playermodel.skinnum = skinnum;
-			skin->playermodel.scale = scale;
-			skin->playermodel.offset = offset;
-			skin->playermodel.notfound = false;
-			strcpy(skin->playermodel.filename, filename);
+			md2s[skin].skin = skin;
+			md2s[skin].scale = scale;
+			md2s[skin].offset = offset;
+			md2s[skin].notfound = false;
+			strcpy(md2s[skin].filename, filename);
 			goto playermd2found;
 		}
 	}
 
-	//CONS_Printf("MD2 for player skin %s not found\n", skins[skinnum].name);
-	skin->playermodel.notfound = true;
-
+	//CONS_Printf("MD2 for player skin %s not found\n", skins[skin].name);
+	md2s[skin].notfound = true;
 playermd2found:
-
 	fclose(f);
 }
 
@@ -680,7 +674,6 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
 
 	//CONS_Printf("MD2 for sprite %s not found\n", sprnames[spritenum]);
 	md2_models[spritenum].notfound = true;
-
 spritemd2found:
 	fclose(f);
 }
@@ -1153,6 +1146,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 
 	// Look at HWR_ProjectSprite for more
 	{
+		md2_t *md2s;
+		int skinnum;
 		patch_t *gpatch, *blendgpatch;
 		GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
 		INT32 durs = spr->mobj->state->tics;
@@ -1212,29 +1207,36 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 		// dont forget to enabled the depth test because we can't do this like
 		// before: polygons models are not sorted
 
-		// 1. load model+texture if not already loaded
-		// 2. draw model with correct position, rotation,...
-
-		// Use the player MD2 list if the mobj has a skin and is using the player sprites
-		if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
+		/* fuck you */
+		if (spr->mobj->localskin)
 		{
-			/* fuck you */
-			md2_t *md2s = &R_GetMobjSkin(spr->mobj)->playermodel;
-
-			if (!md2s->notfound)
+			if (spr->mobj->skinlocal)
 			{
-				md2 = md2s;
-				md2->skinnum = R_GetMobjSkinNum(spr->mobj);
-				sprinfo = &spriteinfo[spr->mobj->sprite];
+				md2s = md2_localplayermodels;
+				skinnum = (skin_t *)spr->mobj->localskin - localskins;
 			}
-			else // if we can't find the player md2, use SPR_PLAY's MD2.
+			else
 			{
-				md2 = &md2_models[spr->mobj->sprite];
-				sprinfo = &spriteinfo[spr->mobj->sprite];
+				md2s = md2_playermodels;
+				skinnum = (skin_t *)spr->mobj->localskin - skins;
 			}
 		}
 		else
 		{
+			md2s = md2_playermodels;
+			skinnum = (skin_t *)spr->mobj->skin - skins;
+		}
+
+		// 1. load model+texture if not already loaded
+		// 2. draw model with correct position, rotation,...
+		if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY && !md2s[skinnum].notfound) // Use the player MD2 list if the mobj has a skin and is using the player sprites
+		{
+			md2 = &md2s[skinnum];
+			md2->skin = skinnum;
+			sprinfo = &spriteinfo[spr->mobj->sprite];
+		}
+		else
+		{	// if we can't find the player md2, use SPR_PLAY's MD2.
 			md2 = &md2_models[spr->mobj->sprite];
 			sprinfo = &spriteinfo[spr->mobj->sprite];
 		}
@@ -1245,7 +1247,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 		if (!md2->model)
 		{
 			CONS_Debug(DBG_RENDER, "Loading model... (%s, %s)", sprnames[spr->mobj->sprite], md2->filename);
-			snprintf(filename, sizeof(filename), "mdls/%s", md2->filename);
+			sprintf(filename, "mdls/%s", md2->filename);
 			md2->model = md2_readModel(filename);
 
 			if (md2->model)
@@ -1297,7 +1299,6 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 				&& gpatch->width == blendgpatch->width && gpatch->height == blendgpatch->height)
 			{
 				INT32 tcskinnum = TC_DEFAULT;
-
 				if ((spr->mobj->flags & MF_BOSS) && (spr->mobj->flags2 & MF2_FRET) && (leveltime & 1)) // Bosses "flash"
 				{
 					if (spr->mobj->type == MT_CYBRAKDEMON)
@@ -1312,16 +1313,13 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 					if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
 					{
 						if (spr->mobj->colorized)
-						{
 							tcskinnum = TC_RAINBOW;
-						}
 						else
 						{
-							tcskinnum = (INT32)R_GetMobjSkinNum(spr->mobj);
+							tcskinnum = (INT32)(K_GetMobjSkinNum(K_GetMobjSkin(spr->mobj), spr->mobj->skinlocal));
 						}
 					}
-					else
-						tcskinnum = TC_DEFAULT;
+					else tcskinnum = TC_DEFAULT;
 				}
 
 				HWR_GetBlendedTexture(gpatch, blendgpatch, tcskinnum, spr->colormap, (skincolors_t)spr->mobj->color);
@@ -1385,7 +1383,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 			p.z = FIXED_TO_FLOAT(interp.z);
 
 		if ((spr->mobj->skin || spr->mobj->localskin) && spr->mobj->sprite == SPR_PLAY)
-			sprdef = &R_GetMobjSkin(spr->mobj)->spritedef;
+			sprdef = &K_GetMobjSkin(spr->mobj)->spritedef;
 		else
 			sprdef = &sprites[spr->mobj->sprite];
 
@@ -1485,7 +1483,7 @@ void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t c
 	{
 		char filename[64];
 		CONS_Debug(DBG_RENDER, "Loading model... (%s)\n", md2->filename);
-		snprintf(filename, sizeof(filename), "mdls/%s", md2->filename);
+		sprintf(filename, "mdls/%s", md2->filename);
 		md2->model = md2_readModel(filename);
 
 		if (md2->model)

src/hardware/hw_md2.h

@@ -33,11 +33,13 @@ typedef struct
 	void        *blendglpatch;
 	boolean     noblendfile; // true if blend texture file was not found
 	boolean     notfound;
-	INT32       skinnum;
+	INT32       skin;
 	boolean     error;
 } md2_t;
 
 extern md2_t md2_models[NUMSPRITES];
+extern md2_t md2_playermodels[MAXSKINS];
+extern md2_t md2_localplayermodels[MAXLOCALSKINS];
 
 void HWR_InitMD2(void);
 void HWR_DrawMD2(gl_vissprite_t *spr);

src/hardware/hw_md2load.c

@@ -275,6 +275,13 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 		return NULL;
 
 	retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL);
+
+	//size_t fileLen;
+
+	//int i, j;
+
+	//size_t namelen;
+	//char *texturefilename;
 	texPos = strchr(fileName, '/');
 
 	if (texPos)
@@ -311,6 +318,8 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 	retModel->numMeshes = 1; // MD2 only has one mesh
 	retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * retModel->numMeshes, ztag, NULL);
 	retModel->meshes[0].numFrames = header->numFrames;
+	// const float WUNITS = 1.0f;
+	// float dataScale = WUNITS;
 
 	// Tris and ST are simple structures that can be straight-copied
 	tris = (md2triangle_t*)&buffer[header->offsetTris];
@@ -346,6 +355,47 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 		retModel->materials[t].specular[3] = 1.0f;
 		retModel->materials[t].shininess = 0.0f;
 		retModel->materials[t].spheremap = false;
+
+		/*		retModel->materials[t].texture = Texture::ReadTexture((char*)texturefilename, ZT_TEXTURE);
+
+				if (!systemSucks)
+				{
+					// Check for a normal map...??
+					char openfilename[1024];
+					char normalMapName[1024];
+					strcpy(normalMapName, texturefilename);
+					size_t len = strlen(normalMapName);
+					char *ptr = &normalMapName[len];
+					ptr--; // z
+					ptr--; // u
+					ptr--; // b
+					ptr--; // .
+					*ptr++ = '_';
+					*ptr++ = 'n';
+					*ptr++ = '.';
+					*ptr++ = 'b';
+					*ptr++ = 'u';
+					*ptr++ = 'z';
+					*ptr++ = '\0';
+
+					sprintf(openfilename, "%s/%s", "textures", normalMapName);
+					// Convert backslashes to forward slashes
+					for (int k = 0; k < 1024; k++)
+					{
+						if (openfilename[k] == '\0')
+							break;
+
+						if (openfilename[k] == '\\')
+							openfilename[k] = '/';
+					}
+
+					Resource::resource_t *res = Resource::Open(openfilename);
+					if (res)
+					{
+						Resource::Close(res);
+						retModel->materials[t].lightmap = Texture::ReadTexture(normalMapName, ZT_TEXTURE);
+					}
+				}*/
 	}
 
 	retModel->meshes[0].numTriangles = header->numTris;
@@ -375,11 +425,15 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 			md2frame_t *framePtr = (md2frame_t*)ptr;
 			retModel->meshes[0].tinyframes[i].vertices = (short*)Z_Malloc(sizeof(short) * 3 * header->numXYZ, ztag, NULL);
 			retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, NULL);
+
+			//			if (retModel->materials[0].lightmap)
+			//				retModel->meshes[0].tinyframes[i].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*header->numVerts, ztag);
 			retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, NULL);
 
 			vertptr = retModel->meshes[0].tinyframes[i].vertices;
 			normptr = retModel->meshes[0].tinyframes[i].normals;
 
+			//			tanptr = retModel->meshes[0].tinyframes[i].tangents;
 			retModel->meshes[0].tinyframes[i].material = &retModel->materials[0];
 
 			framePtr++; // Advance to vertex list
@@ -455,7 +509,9 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 			md2frame_t *framePtr = (md2frame_t*)ptr;
 			retModel->meshes[0].frames[i].normals = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
 			retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
-
+			//			if (retModel->materials[0].lightmap)
+			//				retModel->meshes[0].frames[i].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*header->numTris*3, ztag);
+			//float *vertptr, *normptr;
 			normptr = (float*)retModel->meshes[0].frames[i].normals;
 			vertptr = (float*)retModel->meshes[0].frames[i].vertices;
 			trisPtr = tris;

src/hardware/hw_md3load.c

@@ -243,6 +243,48 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 			mdShader[j].name[len-1] = 'z';
 			mdShader[j].name[len-2] = 'u';
 			mdShader[j].name[len-3] = 'b';
+
+			// Load material
+/*			retModel->materials[matCount].texture = Texture::ReadTexture(mdShader[j].name, ZT_TEXTURE);
+
+			if (!systemSucks)
+			{
+				// Check for a normal map...??
+				char openfilename[1024];
+				char normalMapName[1024];
+				strcpy(normalMapName, mdShader[j].name);
+				len = strlen(normalMapName);
+				char *ptr = &normalMapName[len];
+				ptr--; // z
+				ptr--; // u
+				ptr--; // b
+				ptr--; // .
+				*ptr++ = '_';
+				*ptr++ = 'n';
+				*ptr++ = '.';
+				*ptr++ = 'b';
+				*ptr++ = 'u';
+				*ptr++ = 'z';
+				*ptr++ = '\0';
+
+				sprintf(openfilename, "%s/%s", "textures", normalMapName);
+				// Convert backslashes to forward slashes
+				for (int k = 0; k < 1024; k++)
+				{
+					if (openfilename[k] == '\0')
+						break;
+
+					if (openfilename[k] == '\\')
+						openfilename[k] = '/';
+				}
+
+				Resource::resource_t *res = Resource::Open(openfilename);
+				if (res)
+				{
+					Resource::Close(res);
+					retModel->materials[matCount].lightmap = Texture::ReadTexture(normalMapName, ZT_TEXTURE);
+				}
+			}*/
 		}
 
 		retModel->meshes[i].numFrames = mdS->numFrames;
@@ -263,15 +305,19 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 			{
 				short *vertptr;
 				char *normptr;
+				// char *tanptr;
 				int k;
 				md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
 				retModel->meshes[i].tinyframes[j].vertices = (short*)Z_Malloc(sizeof(short)*3*mdS->numVerts, ztag, NULL);
 				retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, NULL);
 
+//				if (retModel->materials[0].lightmap)
+//					retModel->meshes[i].tinyframes[j].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag);
 				retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, NULL);
 				vertptr = retModel->meshes[i].tinyframes[j].vertices;
 				normptr = retModel->meshes[i].tinyframes[j].normals;
 
+//				tanptr = retModel->meshes[i].tinyframes[j].tangents;
 				retModel->meshes[i].tinyframes[j].material = &retModel->materials[i];
 
 				for (k = 0; k < mdS->numVerts; k++)
@@ -338,7 +384,8 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 				md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
 				retModel->meshes[i].frames[j].vertices = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
 				retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
-
+//				if (retModel->materials[i].lightmap)
+//					retModel->meshes[i].frames[j].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag);
 				vertptr = retModel->meshes[i].frames[j].vertices;
 				normptr = retModel->meshes[i].frames[j].normals;
 				retModel->meshes[i].frames[j].material = &retModel->materials[i];
@@ -424,6 +471,37 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 			}
 		}
 	}
+	/*
+	// Tags?
+	retModel->numTags = mdh->numTags;
+	retModel->maxNumFrames = mdh->numFrames;
+	retModel->tags = (tag_t*)Z_Calloc(sizeof(tag_t) * retModel->numTags * mdh->numFrames, ztag);
+	md3Tag *mdTag = (md3Tag*)&buffer[mdh->offsetTags];
+	tag_t *curTag = retModel->tags;
+	for (i = 0; i < mdh->numFrames; i++)
+	{
+		int j;
+		for (j = 0; j < retModel->numTags; j++, mdTag++)
+		{
+			strcpys(curTag->name, mdTag->name, sizeof(curTag->name) / sizeof(char));
+			curTag->transform.m[0][0] = mdTag->axis[0];
+			curTag->transform.m[0][1] = mdTag->axis[1];
+			curTag->transform.m[0][2] = mdTag->axis[2];
+			curTag->transform.m[1][0] = mdTag->axis[3];
+			curTag->transform.m[1][1] = mdTag->axis[4];
+			curTag->transform.m[1][2] = mdTag->axis[5];
+			curTag->transform.m[2][0] = mdTag->axis[6];
+			curTag->transform.m[2][1] = mdTag->axis[7];
+			curTag->transform.m[2][2] = mdTag->axis[8];
+			curTag->transform.m[3][0] = mdTag->origin[0] * WUNITS;
+			curTag->transform.m[3][1] = mdTag->origin[1] * WUNITS;
+			curTag->transform.m[3][2] = mdTag->origin[2] * WUNITS;
+			curTag->transform.m[3][3] = 1.0f;
+
+			Matrix::Rotate(&curTag->transform, 90.0f, &Vector::Xaxis);
+			curTag++;
+		}
+	}*/
 
 	free(buffer);
 

src/hardware/r_opengl/r_opengl.c

@@ -1931,7 +1931,6 @@ static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD, UINT32
 				{
 					if (samplePoint[p].s.alpha == 0)
 						continue;
-
 					sumR += samplePoint[p].s.red;
 					sumG += samplePoint[p].s.green;
 					sumB += samplePoint[p].s.blue;
@@ -3283,7 +3282,7 @@ static void GL_Framebuffer_Generate(void)
 	{
 		pglGenTextures(1, &framebufferobject.tex);
 		pglBindTexture(GL_TEXTURE_2D, framebufferobject.tex);
-		pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, screen_width, screen_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, screen_width, screen_height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 		Clamp2D(GL_TEXTURE_WRAP_S);

src/http-mserv.c

@@ -135,7 +135,8 @@ HMS_on_read (char *s, size_t _1, size_t n, void *userdata)
 	return n;
 }
 
-static struct HMS_buffer *HMS_connect(const char *format, ...)
+static struct HMS_buffer *
+HMS_connect (const char *format, ...)
 {
 	va_list ap;
 	CURL *curl;
@@ -173,7 +174,7 @@ static struct HMS_buffer *HMS_connect(const char *format, ...)
 	if (cv_masterserver_token.string && cv_masterserver_token.string[0])
 	{
 		quack_token = curl_easy_escape(curl, cv_masterserver_token.string, 0);
-		token_length = ( sizeof "&token="-1 ) + strlen(quack_token);
+		token_length = ( sizeof "&token="-1 )+ strlen(quack_token);
 	}
 	else
 	{
@@ -185,30 +186,27 @@ static struct HMS_buffer *HMS_connect(const char *format, ...)
 	I_lock_mutex(&hms_api_mutex);
 #endif
 
-	seek = strlen(hms_api) + 1; /* + '/' */
+	seek = strlen(hms_api) + 1;/* + '/' */
 
 	va_start (ap, format);
-	size_t url_size = (seek + vsnprintf(NULL, 0, format, ap) +
-					   sizeof HMS_QUERY_VERSION - 1 +
-					   token_length + 1);
-	url = malloc(url_size);
+	url = malloc(seek + vsnprintf(NULL, 0, format, ap) + sizeof HMS_QUERY_VERSION - 1 + token_length + 1);
 	va_end (ap);
 
-	snprintf(url, seek + 1, "%s/", hms_api);
+	sprintf(url, "%s/", hms_api);
 
 #ifdef HAVE_THREADS
 	I_unlock_mutex(hms_api_mutex);
 #endif
 
 	va_start (ap, format);
-	seek += vsnprintf(&url[seek], url_size - seek, format, ap);
+	seek += vsprintf(&url[seek], format, ap);
 	va_end (ap);
 
 	strcpy(&url[seek], HMS_QUERY_VERSION);
 	seek += sizeof HMS_QUERY_VERSION - 1;
 
 	if (quack_token)
-		snprintf(&url[seek], url_size - seek, "&token=%s", quack_token);
+		sprintf(&url[seek], "&token=%s", quack_token);
 
 	Printf_url(url);
 

src/hu_stuff.c

@@ -154,14 +154,14 @@ void HU_LoadGraphics(void)
 	for (i = 0; i < HU_FONTSIZE; i++, j++)
 	{
 		// cache the heads-up font for entire game execution
-		snprintf(buffer, sizeof(buffer), "STCFN%.3d", j);
+		sprintf(buffer, "STCFN%.3d", j);
 		if (W_CheckNumForName(buffer) == LUMPERROR)
 			hu_font[i] = NULL;
 		else
 			hu_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 
 		// tiny version of the heads-up font
-		snprintf(buffer, sizeof(buffer), "TNYFN%.3d", j);
+		sprintf(buffer, "TNYFN%.3d", j);
 		if (W_CheckNumForName(buffer) == LUMPERROR)
 			tny_font[i] = NULL;
 		else
@@ -188,7 +188,7 @@ void HU_LoadGraphics(void)
 	for (i = 0; i < KART_FONTSIZE; i++, j++)
 	{
 		// cache the heads-up font for entire game execution
-		snprintf(buffer, sizeof(buffer), "MKFNT%.3d", j);
+		sprintf(buffer, "MKFNT%.3d", j);
 		if (W_CheckNumForName(buffer) == LUMPERROR)
 			kart_font[i] = NULL;
 		else
@@ -199,7 +199,7 @@ void HU_LoadGraphics(void)
 	j = LT_FONTSTART;
 	for (i = 0; i < LT_FONTSIZE; i++)
 	{
-		snprintf(buffer, sizeof(buffer), "LTFNT%.3d", j);
+		sprintf(buffer, "LTFNT%.3d", j);
 		j++;
 
 		if (W_CheckNumForName(buffer) == LUMPERROR)
@@ -212,7 +212,7 @@ void HU_LoadGraphics(void)
 	j = CRED_FONTSTART;
 	for (i = 0; i < CRED_FONTSIZE; i++)
 	{
-		snprintf(buffer, sizeof(buffer), "CRFNT%.3d", j);
+		sprintf(buffer, "CRFNT%.3d", j);
 		j++;
 
 		if (W_CheckNumForName(buffer) == LUMPERROR)
@@ -224,11 +224,11 @@ void HU_LoadGraphics(void)
 	// cache numbers too!
 	for (i = 0; i < 10; i++)
 	{
-		snprintf(buffer, sizeof(buffer), "STTNUM%d", i);
+		sprintf(buffer, "STTNUM%d", i);
 		tallnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-		snprintf(buffer, sizeof(buffer), "PINGN%d", i);
+		sprintf(buffer, "PINGN%d", i);
 		pingnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-		snprintf(buffer, sizeof(buffer), "OPPRNK0%d", i);
+		sprintf(buffer, "OPPRNK0%d", i);
 		ranknum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
@@ -240,7 +240,7 @@ void HU_LoadGraphics(void)
 	// cache ping gfx:
 	for (i = 0; i < 5; i++)
 	{
-		snprintf(buffer, sizeof(buffer), "PINGGFX%d", i+1);
+		sprintf(buffer, "PINGGFX%d", i+1);
 		pinggfx[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
@@ -472,7 +472,9 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
 		strlcat(msg, COM_Argv(ix + usedargs), msgspace);
 	}
 
-	if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
+	const size_t msglength = strlen(msg);
+
+	if (msglength > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
 	{
 		// what we're gonna do now is check if the node exists
 		// with that logic, characters 4 and 5 are our numbers:
@@ -526,7 +528,7 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
 		strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
 	}
 
-	SendNetXCmd(XD_SAY, buf, strlen(msg) + 1 + msg-buf);
+	SendNetXCmd(XD_SAY, buf, msglength + 1 + msg-buf);
 }
 
 /** Send a message to everyone.
@@ -777,11 +779,12 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
 		return;
 	}
 
+	const size_t msglength = strlen(msg);
+
 	//check for invalid characters (0x80 or above)
 	{
 		size_t i;
-		const size_t j = strlen(msg);
-
+		const size_t j = msglength;
 		for (i = 0; i < j; i++)
 		{
 			if (msg[i] & 0x80)
@@ -828,7 +831,7 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
 	}
 
 	// Handle "/me" actions, but only in messages to everyone.
-	if (target == 0 && strlen(msg) > 4 && strnicmp(msg, "/me ", 4) == 0)
+	if (target == 0 && msglength > 4 && strnicmp(msg, "/me ", 4) == 0)
 	{
 		msg += 4;
 		action = true;
@@ -2654,12 +2657,9 @@ static inline void HU_DrawSpectatorTicker(void)
 
 				if (player->mo && player->mo->color)
 				{
-					const UINT8 *colormap = NULL;
-
+					const UINT8 *colormap = R_GetTranslationColormap(player->skin, player->mo->color, GTC_CACHE);
 					if (player->mo->colorized)
 						colormap = R_GetTranslationColormap(TC_RAINBOW, player->mo->color, GTC_CACHE);
-					else
-						colormap = R_GetTranslationColormap(player->skin, player->mo->color, GTC_CACHE);
 
 					if (K_UseHighResPortraits())
 						V_DrawSmallMappedPatch((templength - duptweak), height+10, V_TRANSLUCENT, R_GetSkinFaceWant(player), colormap);
@@ -2830,9 +2830,8 @@ static void HU_DrawRankings(void)
 		scorelines++;
 
 #if MAXPLAYERS > 16
-	// 32 Player TODO: port over and cleanup scoreboard from sat-32p/blankart
-	if (scorelines >= 16)
-		break; // dont draw past bottom of screen, show the best only
+	if (scorelines > 16)
+		break; //dont draw past bottom of screen, show the best only
 #endif
 	}
 

src/i_system.h

@@ -237,21 +237,6 @@ char *I_GetUserName(void);
 */
 INT32 I_mkdir(const char *dirname, INT32 unixright);
 
-/**	\brief Change current working directory
-
-	\param path directory path
-	\return 0 on success, -1 on error
-*/
-INT32 I_ChDir(const char *path);
-
-/**	\brief Get current working directory
-
-	\param buf buffer to store path
-	\param size size of buffer
-	\return buf on success, NULL on error
-*/
-char *I_GetCwd(char *buf, size_t size);
-
 /**	\brief Find main WAD
 		\return path to main WAD
 */

src/i_tcp.c

@@ -213,7 +213,7 @@ static char *get_WSAErrorStr(int e)
 		NULL);
 
 	if (!buf[0]) // provide a fallback error message if no message is available for some reason
-		snprintf(buf, sizeof(buf), "Unknown error");
+		sprintf(buf, "Unknown error");
 
 	return buf;
 }
@@ -364,12 +364,12 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 
 	if (addr == NULL)
 	{
-		snprintf(s, sizeof(s), "No address");
+		sprintf(s, "No address");
 	}
 	else if (inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
 	{
 		e = errno;
-		snprintf(s, sizeof(s), "Unknown family type, error #%u: %s", e, strerror(e));
+		sprintf(s, "Unknown family type, error #%u: %s", e, strerror(e));
 	}
 #ifdef HAVE_IPV6
 	else if(sk->any.sa_family == AF_INET6)
@@ -416,7 +416,7 @@ static const char *SOCK_GetBanMask(size_t ban)
 	if (ban >= numbans)
 		return NULL;
 
-	if (snprintf(s, sizeof(s), "%d",banned[ban].mask) > 0)
+	if (sprintf(s,"%d",banned[ban].mask) > 0)
 		return s;
 
 	return NULL;
@@ -622,6 +622,7 @@ static boolean hole_punch(ssize_t c)
 	{
 		return false;
 	}
+
 }
 #endif //ifdef HOLEPUNCH
 

src/info.h

@@ -452,10 +452,10 @@ void A_SpawnFreshCopy(void *actor);
 extern boolean actionsoverridden[NUMACTIONS];
 
 // ratio of states to sprites to mobj types is roughly 6 : 1 : 1
-#ifdef PHOBOS_BUILD
-#define NUMMOBJFREESLOTS 4096 // should be sufficient
-#else
+#ifdef COMPAT_VANILLA
 #define NUMMOBJFREESLOTS 1024
+#else
+#define NUMMOBJFREESLOTS 4096 // should be sufficient
 #endif
 #define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
 #define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)

src/k_hud.c

@@ -388,7 +388,7 @@ static void K_LoadSaturnHUDGraphics(void)
 			skp_speedpatchesdial[3] = (patch_t *)W_CachePatchName("SP_DFRAC", PU_HUDGFX);
 			skp_speedpatchesdial[4] = (patch_t *)W_CachePatchName("SP_DPERC", PU_HUDGFX);
 
-			snprintf(buffer, sizeof(buffer), "K_DSPNMx");
+			sprintf(buffer, "K_DSPNMx");
 			for (i = 0; i < 10; i++)
 			{
 				buffer[7] = '0'+(i%10);
@@ -507,7 +507,7 @@ static void K_LoadSaturnHUDGraphics(void)
 			skp_speedpatchesdialclr[3] = (patch_t *)W_CachePatchName("SC_DFRAC", PU_HUDGFX);
 			skp_speedpatchesdialclr[4] = (patch_t *)W_CachePatchName("SC_DPERC", PU_HUDGFX);
 
-			snprintf(buffer, sizeof(buffer), "K_DSPNCx");
+			sprintf(buffer, "K_DSPNCx");
 			for (i = 0; i < 10; i++)
 			{
 				buffer[7] = '0'+(i%10);
@@ -677,7 +677,7 @@ void K_LoadKartHUDGraphics(void)
 	kp_racefinish[5] = (patch_t *)W_CachePatchName("K_2PFINB", PU_HUDGFX);
 
 	// Position numbers
-	snprintf(buffer, sizeof(buffer), "K_POSNxx");
+	sprintf(buffer, "K_POSNxx");
 	for (i = 0; i < NUMPOSNUMS; i++)
 	{
 		buffer[6] = '0'+i;
@@ -688,17 +688,14 @@ void K_LoadKartHUDGraphics(void)
 		}
 	}
 
-	snprintf(buffer, sizeof(buffer), "K_POSNWx");
+	sprintf(buffer, "K_POSNWx");
 	for (i = 0; i < NUMWINFRAMES; i++)
 	{
 		buffer[7] = '0'+i;
 		kp_winnernum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	// 32 player note: there are only 16 of those!
-	// so slots after this will just be missing patches!
-	// but keeping like this incase of missed adjustments which might cause crashes otherwise
-	snprintf(buffer, sizeof(buffer), "OPPRNKxx");
+	sprintf(buffer, "OPPRNKxx");
 	for (i = 0; i <= MAXPLAYERS; i++)
 	{
 		buffer[6] = '0'+(i/10);
@@ -706,7 +703,7 @@ void K_LoadKartHUDGraphics(void)
 		kp_facenum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	snprintf(buffer, sizeof(buffer), "K_CHILIx");
+	sprintf(buffer, "K_CHILIx");
 	for (i = 0; i < 8; i++)
 	{
 		buffer[7] = '0'+(i+1);
@@ -775,21 +772,21 @@ void K_LoadKartHUDGraphics(void)
 	kp_kitchensink[1]       = (patch_t *)W_CachePatchName("K_ISSINK", PU_HUDGFX);
 	kp_sadface[1]           = (patch_t *)W_CachePatchName("K_ISSAD", PU_HUDGFX);
 
-	snprintf(buffer, sizeof(buffer), "K_ITINVx");
+	sprintf(buffer, "K_ITINVx");
 	for (i = 0; i < 7; i++)
 	{
 		buffer[7] = '1'+i;
 		kp_invincibility[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	snprintf(buffer, sizeof(buffer), "K_ITORBx");
+	sprintf(buffer, "K_ITORBx");
 	for (i = 0; i < 4; i++)
 	{
 		buffer[7] = '1'+i;
 		kp_orbinaut[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	snprintf(buffer, sizeof(buffer), "K_ISINVx");
+	sprintf(buffer, "K_ISINVx");
 	for (i = 0; i < 6; i++)
 	{
 		buffer[7] = '1'+i;
@@ -797,7 +794,7 @@ void K_LoadKartHUDGraphics(void)
 	}
 
 	// CHECK indicators
-	snprintf(buffer, sizeof(buffer), "K_CHECKx");
+	sprintf(buffer, "K_CHECKx");
 	for (i = 0; i < 6; i++)
 	{
 		buffer[7] = '1'+i;
@@ -805,7 +802,7 @@ void K_LoadKartHUDGraphics(void)
 	}
 
 	// Eggman warning numbers
-	snprintf(buffer, sizeof(buffer), "K_EGGNx");
+	sprintf(buffer, "K_EGGNx");
 	for (i = 0; i < 4; i++)
 	{
 		buffer[6] = '0'+i;
@@ -818,7 +815,7 @@ void K_LoadKartHUDGraphics(void)
 	kp_fpview[2] = (patch_t *)W_CachePatchName("VIEWC0E0", PU_HUDGFX);
 
 	// Input UI Wheel
-	snprintf(buffer, sizeof(buffer), "K_WHEELx");
+	sprintf(buffer, "K_WHEELx");
 	for (i = 0; i < 5; i++)
 	{
 		buffer[7] = '0'+i;
@@ -826,7 +823,7 @@ void K_LoadKartHUDGraphics(void)
 	}
 
 	// HERE COMES A NEW CHALLENGER
-	snprintf(buffer, sizeof(buffer), "K_CHALxx");
+	sprintf(buffer, "K_CHALxx");
 	for (i = 0; i < 25; i++)
 	{
 		buffer[6] = '0'+((i+1)/10);
@@ -835,14 +832,14 @@ void K_LoadKartHUDGraphics(void)
 	}
 
 	// Lap start animation
-	snprintf(buffer, sizeof(buffer), "K_LAP0x");
+	sprintf(buffer, "K_LAP0x");
 	for (i = 0; i < 7; i++)
 	{
 		buffer[6] = '0'+(i+1);
 		kp_lapanim_lap[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	snprintf(buffer, sizeof(buffer), "K_LAPFxx");
+	sprintf(buffer, "K_LAPFxx");
 	for (i = 0; i < 11; i++)
 	{
 		buffer[6] = '0'+((i+1)/10);
@@ -850,7 +847,7 @@ void K_LoadKartHUDGraphics(void)
 		kp_lapanim_final[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	snprintf(buffer, sizeof(buffer), "K_LAPNxx");
+	sprintf(buffer, "K_LAPNxx");
 	for (i = 0; i < 10; i++)
 	{
 		buffer[6] = '0'+i;
@@ -861,14 +858,14 @@ void K_LoadKartHUDGraphics(void)
 		}
 	}
 
-	snprintf(buffer, sizeof(buffer), "K_LAPE0x");
+	sprintf(buffer, "K_LAPE0x");
 	for (i = 0; i < 2; i++)
 	{
 		buffer[7] = '0'+(i+1);
 		kp_lapanim_emblem[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	snprintf(buffer, sizeof(buffer), "K_LAPH0x");
+	sprintf(buffer, "K_LAPH0x");
 	for (i = 0; i < 3; i++)
 	{
 		buffer[7] = '0'+(i+1);
@@ -1221,8 +1218,10 @@ boolean K_UseHighResPortraits(void)
 // accounts for localskins
 patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum)
 {
-	const skin_t *skin = R_GetSkinArray(player->skinlocal)[skinnum];
-	return (K_UseHighResPortraits() ? skin->facewantprefix : skin->facerankprefix);
+	if (!player->skinlocal)
+		return (K_UseHighResPortraits() ? facewantprefix[skinnum] : facerankprefix[skinnum]);
+	else
+		return (K_UseHighResPortraits() ? localfacewantprefix[skinnum] : localfacerankprefix[skinnum]);
 }
 
 INT32 K_calcSplitFlags(INT32 snapflags)
@@ -1424,7 +1423,7 @@ static void K_drawKartStats(void)
 		flags |= V_HUDTRANS;
 		flags2 = flags|V_ALLOWLOWERCASE|V_SkinColorToHighlightcolor(stplyr->skincolor);
 
-		fakeskin = R_GetPlayerSkin(stplyr);
+		fakeskin = K_GetPlayerSkin(stplyr);
 
 		// Skin name
 		if (cv_showstats_skinname.value)
@@ -1975,7 +1974,7 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UI
 							goto bademblem;
 						}
 
-						snprintf(targettext, sizeof(targettext), "%i'%02i\"%02i",
+						snprintf(targettext, 9, "%i'%02i\"%02i",
 							G_TicsToMinutes(timetoreach, false),
 							G_TicsToSeconds(timetoreach),
 							G_TicsToCentiseconds(timetoreach));
@@ -2295,11 +2294,6 @@ static boolean K_drawKartPositionFaces(void)
 			if (pos < 0 || pos > MAXPLAYERS)
 				pos = 0;
 
-#if MAXPLAYERS > 16
-			if (pos > 16)
-				V_DrawPingNum(FACE_X+2, Y+10, V_HUDTRANS|V_SNAPTOLEFT, pos, NULL);
-			else
-#endif
 			// Draws the little number over the face
 			V_DrawScaledPatch(FACE_X-5, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_facenum[pos]);
 		}
@@ -2391,12 +2385,6 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
 			INT32 pos = player->kartstuff[k_position];
 			if (pos < 0 || pos > MAXPLAYERS)
 				pos = 0;
-
-#if MAXPLAYERS > 16
-			if (pos > 16)
-				V_DrawPingNum(x+2, y+10, 0, pos, NULL);
-			else
-#endif
 			// Draws the little number over the face
 			V_DrawScaledPatch(x-5, y+6, 0, kp_facenum[pos]);
 		}
@@ -3107,7 +3095,7 @@ static void K_drawNameTags(void)
 		cm = R_GetTranslationColormap(players[i].skin, players[i].mo->color, GTC_CACHE);
 		tagcolor = colortranslations[players[i].mo->color][7];
 		vflags = trans | V_NOSCALESTART;
-		usenametagrestat = ((cv_nametagrestat.value == 1 && (players[i].kartspeed != skins[players[i].skin]->kartspeed || players[i].kartweight != skins[players[i].skin]->kartweight)) || cv_nametagrestat.value == 2);
+		usenametagrestat = ((cv_nametagrestat.value == 1 && (players[i].kartspeed != skins[players[i].skin].kartspeed || players[i].kartweight != skins[players[i].skin].kartweight)) || cv_nametagrestat.value == 2);
 		tagwidthsmall = cv_smallnametags.value ? V_SmallStringWidth(player_names[i], V_ALLOWLOWERCASE) : V_ThinStringWidth(player_names[i], V_ALLOWLOWERCASE);
 		tagwidth = vid.dup*tagwidthsmall;
 
@@ -3592,12 +3580,8 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
 	INT32 rot = 0;
 #endif
 
-	skin = R_GetMobjSkin(mo);
-
-	if (!skin)
-		return;
-
-	minimaphead = skin->facemmapprefix;
+	skin = K_GetMobjSkin(mo);
+	minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)];
 
 	if (minimaphead == NULL)
 		return;
@@ -3800,9 +3784,6 @@ static void K_drawKartMinimap(void)
 
 		mobj_t *mobj = players[localplayers[i]].mo;
 
-		if (!mobj)
-			continue;
-
 		// dont draw for no contestants
 		boolean playertimedout = (mobj->health <= 0 && players[localplayers[i]].pflags & PF_TIMEOVER);
 
@@ -3827,8 +3808,10 @@ static void K_drawKartMinimap(void)
 				}
 				else
 				{
+					const INT32 skinnum = K_GetMobjLocalSkinNum(mobj->skin, mobj->localskin, mobj->skinlocal);
+
 					// special case if startcolor is not the default (160 / Green)
-					if (R_GetMobjSkin(mobj)->starttranscolor != skins[0]->starttranscolor)
+					if (skinnum && skins[skinnum].starttranscolor != skins[0].starttranscolor)
 					{
 						colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE);
 					}
@@ -4903,7 +4886,7 @@ void K_drawKartHUD(void)
 		for (c = 1; c < MAXSKINCOLORS; c++)
 		{
 			UINT8 *cm = R_GetTranslationColormap(TC_RAINBOW, c, GTC_CACHE);
-			V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT>>1, 0, skins[stplyr->skin]->facewantprefix, cm);
+			V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT>>1, 0, facewantprefix[stplyr->skin], cm);
 
 			x += 16;
 			if (x > BASEVIDWIDTH-16)

src/k_hud.h

@@ -78,8 +78,6 @@ INT32 K_getMinimapTrans(void);
 void K_getLapsDrawinfo(drawinfo_t *out);
 void K_getMinimapDrawinfo(drawinfo_t *out);
 
-patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

src/k_kart.c

@@ -71,11 +71,12 @@ consvar_t cv_stairjank = {"stairjank", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistor
 consvar_t cv_stairjanksfx = {"stairjanksfx", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 //hardcode saltyhop mhhm
-consvar_t cv_saltyhop = {"hardcodehop", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static void saltyhop_onchange(void);
+consvar_t cv_saltyhop = {"hardcodehop", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, saltyhop_onchange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_saltyhopsfx = {"hardcodehopsfx", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_saltysquish = {"hardcodehopsquish", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 static CV_PossibleValue_t saltyheight_t[] = {{FRACUNIT/4, "MIN"}, {2*FRACUNIT, "MAX"}, {0, NULL}};
-consvar_t cv_saltyheight = {"hardcodehopheight", "1", CV_FLOAT|CV_SAVE, saltyheight_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_saltyheight = {"hardcodehopheight", "1", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, saltyheight_t, saltyhop_onchange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_saltyroll = {"hardcodehoproll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_squishdance = {"squishdance", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -83,6 +84,23 @@ consvar_t cv_squishdance = {"squishdance", "On", CV_SAVE, CV_OnOff, NULL, 0, NUL
 static CV_PossibleValue_t squishdancespeed_cons_t[] = {{20, "MIN"}, {280, "MAX"}, {0, NULL}};
 consvar_t cv_squishdancespeed = {"squishdance_speed", "140", CV_SAVE, squishdancespeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+static void saltyhop_onchange(void)
+{
+	// reset everything when toggling saltyhop
+	if (gamestate != GS_LEVEL)
+		return;
+
+	for (INT32 i = 0; i < MAXPLAYERS; i++)
+	{
+		player_t *player = &players[i];
+
+		if (!player || P_MobjWasRemoved(player->mo))
+			continue;
+
+		memset(&player->mo->salty, 0, sizeof(player->mo->salty));
+	}
+}
+
 // SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H:
 // gamespeed is cc (0 for easy, 1 for normal, 2 for hard)
 // franticitems is Frantic Mode items, bool
@@ -592,7 +610,7 @@ void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, bo
 	if (color >= MAXTRANSLATIONS)
 		I_Error("Invalid skin color #%hu.", (UINT16)color);
 
-	starttranscolor = (skinnum != TC_DEFAULT) ? R_GetSkinArray(local)[skinnum]->starttranscolor : DEFAULT_STARTTRANSCOLOR;
+	starttranscolor = (skinnum != TC_DEFAULT) ? K_GetSkinArray(local)[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;
 
 	if (starttranscolor >= NUM_PALETTE_ENTRIES)
 		I_Error("Invalid startcolor #%d.", starttranscolor);
@@ -632,6 +650,60 @@ UINT8 K_GetKartColorByName(const char *name)
 	return 0;
 }
 
+//
+// returns the players skinnumber
+// accounts for localskins
+//
+INT32 K_GetSkinNum(player_t *player)
+{
+	return player->localskin ? (player->localskin - 1) : player->skin;
+}
+
+//
+// returns the mobj skinnumber
+// accounts for localskins ?
+//
+INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local)
+{
+	return skin - K_GetSkinArray(local);
+}
+
+//
+// returns the mobj skinnumber
+// accounts for localskins
+//
+INT32 K_GetMobjLocalSkinNum(const skin_t *skin, const skin_t *localskin, boolean local)
+{
+	return localskin ? (localskin - K_GetSkinArray(local)) : (skin - skins);
+}
+
+//
+// returns the players skinnumber
+// accounts for localskins
+//
+skin_t *K_GetMobjSkin(const mobj_t *mobj)
+{
+	return mobj->localskin ? mobj->localskin : mobj->skin;
+}
+
+//
+// returns the skin array to use
+// accounts for localskins
+//
+skin_t *K_GetSkinArray(boolean local)
+{
+	return local ? localskins : skins;
+}
+
+//
+// returns the players skin
+// accounts for localskins
+//
+skin_t *K_GetPlayerSkin(player_t *player)
+{
+	return &K_GetSkinArray(player->skinlocal)[K_GetSkinNum(player)];
+}
+
 //}
 
 //{ SRB2kart Net Variables
@@ -961,12 +1033,6 @@ INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush)
 		}
 	}
 
-#if MAXPLAYERS > 16
-	// courtesy of fickle from 1.1 battleroyale
-	// battleroyale: limit how much items will scale to try to prevent shit-tier items in shit-huge netames
-	pingame = min(pingame, 12);
-#endif
-
 	if (first != -1 && second != -1) // calculate 2nd's distance from 1st, for SPB
 	{
 		secondist = P_AproxDistance(P_AproxDistance(players[first].mo->x - players[second].mo->x,
@@ -1755,56 +1821,25 @@ void K_RespawnChecker(player_t *player)
 				mobj_t *mo;
 				angle_t newangle;
 				fixed_t newx, newy, newz;
-#ifdef PHOBOS_BUILD
-				const fixed_t fscale = player->mo->scale;
-#else
-				static const fixed_t fscale = FRACUNIT; // does NOT use scale, since this effect doesn't scale properly
-#endif
+
 				newangle = FixedAngle(((360/8)*i)*FRACUNIT);
-				newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31 * fscale);
-				newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * fscale);
+				newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31<<FRACBITS); // does NOT use scale, since this effect doesn't scale properly
+				newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31<<FRACBITS);
 				if (player->mo->eflags & MFE_VERTICALFLIP)
 					newz = player->mo->z + player->mo->height;
 				else
 					newz = player->mo->z;
 
 				mo = P_SpawnMobj(newx, newy, newz, MT_DEZLASER);
-				if (!P_MobjWasRemovedCompat(mo))
+				if (mo)
 				{
 					if (player->mo->eflags & MFE_VERTICALFLIP)
 						mo->eflags |= MFE_VERTICALFLIP;
 					P_SetTarget(&mo->target, player->mo);
 					mo->angle = newangle+ANGLE_90;
-					mo->momz = (8 * fscale) * P_MobjFlip(player->mo);
-					P_SetScale(mo, (mo->destscale = fscale));
+					mo->momz = (8<<FRACBITS) * P_MobjFlip(player->mo);
+					P_SetScale(mo, (mo->destscale = FRACUNIT));
 				}
-#ifndef PHOBOS_BUILD
-				// vanilla compat really is annoying.......
-				// but this stuff is messed up on mobjscaled maps
-				// and we gotta respawn it locally to avoid desynchs...
-				if (mapobjectscale != FRACUNIT)
-				{
-					// hide the normal lazers!
-					mo->flags2 |= MF2_DONTDRAW;
-
-					newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31 * player->mo->scale);
-					newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * player->mo->scale);
-
-					// now spawn our local lazers
-					mo = P_SpawnMobj(newx, newy, newz, MT_DEZLASER);
-					if (!P_MobjWasRemovedCompat(mo))
-					{
-						if (player->mo->eflags & MFE_VERTICALFLIP)
-							mo->eflags |= MFE_VERTICALFLIP;
-						P_SetTarget(&mo->target, player->mo);
-						mo->angle = newangle+ANGLE_90;
-						mo->momz = (8 * player->mo->scale) * P_MobjFlip(player->mo);
-						P_SetScale(mo, (mo->destscale = player->mo->scale));
-
-						mo->islocal = true; // Keep this local!
-					}
-				}
-#endif
 			}
 		}
 	}
@@ -1935,7 +1970,7 @@ static void K_PlayGenericCombatSound(mobj_t *source, mobj_t *other, sfxenum_t sf
 	// I HATE LOCALSKINS! I HATE LOCALSKINS! :AAAAAAAAAA:
 	if (source->player)
 	{
-		skin = R_GetPlayerSkin(source->player);
+		skin = K_GetPlayerSkin(source->player);
 	}
 
 	if (!skin)
@@ -2153,7 +2188,7 @@ static void K_GetKartBoostPower(player_t *player)
 
 		// Technically, all mobjs that think can cause desynchs if they are spawned conditionally, so best we can do
 		// is to hide them if you are in saltyhop jump
-		if (dust && player->salty.jump)
+		if (dust && player->mo->salty.jump)
 			dust->flags2 |= MF2_DONTDRAW;
 
 		if (leveltime % 6 == 0)
@@ -3182,8 +3217,10 @@ static void K_SpawnDriftSparks(player_t *player)
 
 	for (i = 0; i < 2; i++)
 	{
-		const angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135);
-		const fixed_t smolscale = FixedMul(32*FRACUNIT, player->mo->scale);
+		fixed_t driftExtraScale = 0;
+
+		angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135);
+		fixed_t smolscale = FixedMul(32*FRACUNIT, player->mo->scale);
 
 		newx = player->mo->x + P_ReturnThrustX(player->mo, thrustangle, smolscale);
 		newy = player->mo->y + P_ReturnThrustY(player->mo, thrustangle, smolscale);
@@ -3195,9 +3232,9 @@ static void K_SpawnDriftSparks(player_t *player)
 		spark->angle = travelangle-(ANGLE_45/5)*player->kartstuff[k_drift];
 
 		// scale increase while driftspark level gained timer is running
-		const fixed_t driftExtraScale = FixedDiv(player->driftsparkGrowTimer, DRIFTSPARKGROWTICS);
+		driftExtraScale = FixedDiv(player->driftsparkGrowTimer, DRIFTSPARKGROWTICS);
 		spark->destscale = FixedMul(player->mo->scale, FRACUNIT + FixedMul(driftExtraScale, cv_driftsparkpulse.value));
-		P_SetScale(spark, spark->destscale);
+		P_SetScale(spark, spark->destscale); // why not use what we calculated above?
 
 		spark->momx = player->mo->momx/2;
 		spark->momy = player->mo->momy/2;
@@ -3292,7 +3329,7 @@ static void K_StretchPlayerGravity(player_t *player)
 	fixed_t tempxscale = pmo->realxscale;
 	fixed_t tempyscale = pmo->realyscale;
 
-	stretchScaleFactor = FixedDiv(mapobjectscale*60, cv_gravstretch.value);
+	stretchScaleFactor = FixedDiv(FRACUNIT*60, cv_gravstretch.value);
 	stretchScaleFactor = min(stretchScaleFactor, MAXSTRETCHDIV);
 
 	if (pmo->slamsoundtimer)
@@ -3300,26 +3337,26 @@ static void K_StretchPlayerGravity(player_t *player)
 
 	if (!P_IsObjectOnGround(pmo))
 	{
-		const fixed_t pzmom = abs(pmo->momz);
+		fixed_t pzmom = abs(pmo->momz);
 		const fixed_t stretchDiv = FixedDiv(pzmom, stretchScaleFactor);
 
-		if (abs(pzmom/mapobjectscale) != 0)
+		if (abs(pzmom/FRACUNIT) != 0)
 		{
-			if ((tempxscale - stretchDiv) > (tempxscale / 5))
+			if (((tempxscale-(stretchDiv))) > (tempxscale/5))
 			{
 				pmo->spritexscale = (tempxscale - stretchDiv);
 				pmo->stretchslam = pzmom;
 			}
 			else
-				pmo->spritexscale = (tempxscale / 5);
+				pmo->spritexscale = (tempxscale/5);
 
-			pmo->spriteyscale = (tempyscale + ((stretchDiv * 2) / 3));
+			pmo->spriteyscale = (tempyscale + ((stretchDiv*2)/3));
 		}
 	}
 	else if (pmo->stretchslam > 0)
 	{
 		// Funni slam sound when landing
-		if (cv_slamsound.value && (pmo->eflags & MFE_JUSTHITFLOOR) && !pmo->slamsoundtimer && (pmo->stretchslam > 4*mapobjectscale))
+		if (cv_slamsound.value && (pmo->eflags & MFE_JUSTHITFLOOR) && !pmo->slamsoundtimer && (pmo->stretchslam > 4*FRACUNIT))
 		{
 			S_StartSound(pmo, sfx_s3k4c);
 			pmo->slamsoundtimer = TICRATE;
@@ -3327,9 +3364,9 @@ static void K_StretchPlayerGravity(player_t *player)
 
 		const fixed_t slamDiv = FixedDiv(pmo->stretchslam, stretchScaleFactor);
 
-		pmo->spritexscale = (tempxscale + (((slamDiv * 2) / 3 ) * 2));
+		pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2));
 		pmo->spriteyscale = (tempyscale - slamDiv);
-		pmo->stretchslam -= (4*mapobjectscale);
+		pmo->stretchslam -= (4*FRACUNIT);
 	}
 	else
 		pmo->stretchslam = 0;
@@ -3349,11 +3386,11 @@ static void K_SaltySquish(player_t *player)
 
 	if (pmo->stretchslam > 0)
 	{
-		const fixed_t slamDiv = FixedDiv(pmo->stretchslam, mapobjectscale*60); // stretchScaleFactor = FixedDiv(mapobjectscale*60, FRACUNIT)
+		const fixed_t slamDiv = FixedDiv(pmo->stretchslam, FRACUNIT*60); // stretchScaleFactor = FixedDiv(FRACUNIT*60, FRACUNIT)
 
-		pmo->spritexscale = (tempxscale + (((slamDiv * 2) / 3) * 2));
+		pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2));
 		pmo->spriteyscale = (tempyscale - slamDiv);
-		pmo->stretchslam -= (4*mapobjectscale);
+		pmo->stretchslam -= (4*FRACUNIT);
 	}
 	else
 		pmo->stretchslam = 0;
@@ -3361,92 +3398,88 @@ static void K_SaltySquish(player_t *player)
 
 static void K_QuiteSaltyHop(player_t *player)
 {
-	I_Assert(player != NULL);
-	I_Assert(!P_MobjWasRemoved(player->mo));
+	if (!cv_saltyhop.value)
+		return;
 
 	// what the fuck is this haya
 	mobj_t *pmo = player->mo;
-	salty_t *psalty = &player->salty;
-
-	if (!cv_saltyhop.value)
-	{
-		// reset before we leave
-		psalty->jump = psalty->ready = psalty->tapping = false;
-		psalty->momz = psalty->zoffset = 0;
-		return;
-	}
-
+	salty_t *psalt = &pmo->salty;
 	const boolean onground = P_IsObjectOnGround(pmo);
 
 	// ready?
 	if (!player->kartstuff[k_jmp])
 	{
-		psalty->ready = true;
-		psalty->tapping = false;
+		psalt->ready = true;
+		psalt->tapping = false;
 	}
-	else if (psalty->ready)
+	else if (psalt->ready)
 	{
-		psalty->ready = false;
-		psalty->tapping = true;
+		psalt->ready = false;
+		psalt->tapping = true;
 	}
 	else
 	{
-		psalty->tapping = false;
+		psalt->tapping = false;
 	}
 
 	// GO!
-	if (psalty->jump)
+	if (!psalt->init)
+	{
+		psalt->jump = false;
+		psalt->zoffset = 0;
+		psalt->momz = 0;
+		psalt->init = true;
+	}
+	else if (psalt->jump)
 	{
 		if (pmo->eflags & MFE_JUSTHITFLOOR)
 		{
-			psalty->zoffset = 0;
+			psalt->zoffset = 0;
 		}
 		else if (onground)
 		{
-			psalty->zoffset += psalty->momz;
-			psalty->momz -= (FRACUNIT*3/2);
+			psalt->zoffset += psalt->momz;
+			psalt->momz -= (FRACUNIT*3/2);
 		}
 		else
 		{
-			//psalty->zoffset *= (49/50)*FRACUNIT; // this just rounds down to 0 lol
-			psalty->zoffset = 0;
-			psalty->momz = 0;
+			psalt->zoffset *= (49/50)*FRACUNIT;
+			psalt->momz = 0;
 		}
 
-		if (psalty->zoffset <= 0)
+		if (psalt->zoffset <= 0)
 		{
 			if (cv_saltyhopsfx.value && !(pmo->eflags & MFE_JUSTHITFLOOR) && onground)
 				S_StartSound(pmo, sfx_s268);
-			psalty->jump = false;
-			psalty->zoffset = 0;
-			psalty->momz = 0;
+			psalt->jump = false;
+			psalt->zoffset = 0;
+			psalt->momz = 0;
 			// shlamma damma
 			if (cv_saltysquish.value)
-				pmo->stretchslam += 8*mapobjectscale;
+				pmo->stretchslam += 8*FRACUNIT;
 		}
-		else if (psalty->zoffset > 0)
+		else if (cv_saltysquish.value && psalt->zoffset >= 0)
 		{
-			if (cv_saltysquish.value)
-			{
-				// goofy ahh hack
-				pmo->spriteyscale += (FRACUNIT/8);
-				pmo->spritexscale -= (FRACUNIT/8);
-			}
+			// goofy ahh hack
+			pmo->spriteyscale += (FRACUNIT/8);
+			pmo->spritexscale -= (FRACUNIT/8);
 		}
 
-		pmo->spriteyoffset += FixedMul(psalty->zoffset, cv_saltyheight.value);
+		pmo->spriteyoffset += FixedMul(psalt->zoffset, cv_saltyheight.value);
 
-		// Stop any and all drift sounds when hopping.
-		if (S_SoundPlaying(pmo, sfx_screec))
-			S_StopSoundByID(pmo, sfx_screec);
-		if (S_SoundPlaying(pmo, sfx_drift))
-			S_StopSoundByID(pmo, sfx_drift);
+		if (cv_saltyhopsfx.value)
+		{
+			if (S_SoundPlaying(pmo, sfx_screec))
+				S_StopSoundByID(pmo, sfx_screec);
+			if (S_SoundPlaying(pmo, sfx_drift))
+				S_StopSoundByID(pmo, sfx_drift);
+		}
 	}
-	else if (psalty->tapping && onground && !player->kartstuff[k_spinouttimer] && !player->kartstuff[k_squishedtimer])
+	else if (psalt->tapping && onground && !player->kartstuff[k_spinouttimer] && !player->kartstuff[k_squishedtimer])
 	{
-		psalty->jump = true;
-		psalty->zoffset = 0;
-		psalty->momz = 6*FRACUNIT;
+		psalt->jump = true;
+		psalt->zoffset = 0;
+		psalt->momz = 6*FRACUNIT;
 		if (cv_saltyhopsfx.value)
 			S_StartSound(pmo, sfx_s25a);
 	}
@@ -3473,7 +3506,7 @@ boolean K_ShouldSlopeRoll(mobj_t *mobj)
 		return false;
 
 	// seeing a character rotate mid-hop looks really janky
-	if (!cv_saltyroll.value && mobj->player && mobj->player->salty.jump)
+	if (!cv_saltyroll.value && mobj->player && mobj->player->mo->salty.jump)
 		return false;
 
 	return K_CheckSlopeRollDist(mobj);
@@ -3685,7 +3718,7 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
 	dust = P_SpawnMobj(rand_x, rand_y, mo->z, MT_WIPEOUTTRAIL);
 
 	P_SetTarget(&dust->target, mo);
-	dust->angle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
+	dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy);
 	dust->destscale = mo->scale;
 	P_SetScale(dust, mo->scale);
 	K_FlipFromObject(dust, mo);
@@ -3711,11 +3744,6 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
 void K_DriftDustHandling(mobj_t *spawner)
 {
 	angle_t anglediff;
-#ifdef PHOBOS_BUILD
-	const fixed_t fscale = spawner->scale;
-#else
-	static const fixed_t fscale = FRACUNIT; // should be spawner->scale but the below calls P_Random!
-#endif
 
 	if (leveltime % 2 != 0 || !P_IsObjectOnGround(spawner))
 		return;
@@ -3732,7 +3760,7 @@ void K_DriftDustHandling(mobj_t *spawner)
 		{
 			angle_t playerangle = spawner->angle;
 
-			if (spawner->player->speed < (5 * fscale))
+			if (spawner->player->speed < 5<<FRACBITS)
 				return;
 
 			if (spawner->player->cmd.forwardmove < 0)
@@ -3743,7 +3771,7 @@ void K_DriftDustHandling(mobj_t *spawner)
 	}
 	else
 	{
-		if (P_AproxDistance(spawner->momx, spawner->momy) < (5 * fscale))
+		if (P_AproxDistance(spawner->momx, spawner->momy) < 5<<FRACBITS)
 			return;
 
 		anglediff = abs((signed)(spawner->angle - R_PointToAngle2(0, 0, spawner->momx, spawner->momy)));
@@ -3756,29 +3784,13 @@ void K_DriftDustHandling(mobj_t *spawner)
 
 	if (anglediff > ANG10*4) // Trying to turn further than 40 degrees
 	{
-		mobj_t *dust = NULL;
-
 		fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
 		fixed_t spawny = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
 		INT32 speedrange = 2;
-
-		dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST);
-
-		const INT32 momxrand = P_RandomRange(-speedrange, speedrange);
-		const INT32 momyrand = P_RandomRange(-speedrange, speedrange);
-		const INT32 momzrand = P_RandomRange(1, 4);
-
-		if (P_MobjWasRemovedCompat(dust))
-			return;
-
-#ifdef PHOBOS_BUILD
-		dust->momx = FixedMul(spawner->momx + (momxrand * spawner->scale), 3*FRACUNIT/4);
-		dust->momy = FixedMul(spawner->momy + (momyrand * spawner->scale), 3*FRACUNIT/4);
-#else
-		dust->momx = FixedMul(spawner->momx + (momxrand<<FRACBITS), 3*(spawner->scale)/4);
-		dust->momy = FixedMul(spawner->momy + (momyrand<<FRACBITS), 3*(spawner->scale)/4);
-#endif
-		dust->momz = P_MobjFlip(spawner) * (momzrand * (spawner->scale));
+		mobj_t *dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST);
+		dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*(spawner->scale)/4);
+		dust->momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*(spawner->scale)/4);
+		dust->momz = P_MobjFlip(spawner) * (P_RandomRange(1, 4) * (spawner->scale));
 		P_SetScale(dust, spawner->scale/2);
 		dust->destscale = spawner->scale * 3;
 		dust->scalespeed = spawner->scale/12;
@@ -3787,33 +3799,6 @@ void K_DriftDustHandling(mobj_t *spawner)
 			S_StartSound(spawner, sfx_screec);
 
 		K_MatchGenericExtraFlags(dust, spawner);
-
-#ifndef PHOBOS_BUILD
-		// vanilla compat really is annoying.......
-		// but this stuff is messed up on mobjscaled maps
-		// and we gotta respawn it locally to avoid desynchs...
-		if (mapobjectscale != FRACUNIT)
-		{
-			// hide the normal dust!
-			dust->flags2 |= MF2_DONTDRAW;
-
-			// now spawn our dust locally
-			dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST);
-
-			if (P_MobjWasRemovedCompat(dust))
-				return;
-
-			dust->momx = FixedMul(spawner->momx + (momxrand * spawner->scale), 3*FRACUNIT/4);
-			dust->momy = FixedMul(spawner->momy + (momyrand * spawner->scale), 3*FRACUNIT/4);
-			dust->momz = P_MobjFlip(spawner) * (momzrand * (spawner->scale));
-			P_SetScale(dust, spawner->scale/2);
-			dust->destscale = spawner->scale * 3;
-			dust->scalespeed = spawner->scale/12;
-			dust->islocal = true; // Keep this local!
-
-			K_MatchGenericExtraFlags(dust, spawner);
-		}
-#endif
 	}
 }
 
@@ -4346,6 +4331,7 @@ static void K_DoShrink(player_t *user)
 	}
 }
 
+
 void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound)
 {
 	if (mo->player && mo->player->spectator)
@@ -4408,7 +4394,8 @@ void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source)
 	mobj_t *cachenext;
 
 killnext:
-	if (P_MobjWasRemovedCompat(banana))
+
+	if (!banana)
 		return;
 
 	cachenext = banana->hnext;
@@ -4447,21 +4434,10 @@ void K_UpdateHnextList(player_t *player, boolean clean)
 		nextwork = work->hnext;
 
 		if (!clean && (!work->movedir || work->movedir <= (UINT16)player->kartstuff[k_itemamount]))
-		{
 			continue;
-		}
 
 		P_RemoveMobj(work);
 	}
-
-#ifdef PHOBOS_BUILD
-	if (P_MobjWasRemoved(player->mo->hnext))
-	{
-		// Like below, try to clean up the pointer if it's NULL.
-		// Maybe this was a cause of the shrink/eggbox fails?
-		P_SetTarget(&player->mo->hnext, NULL);
-	}
-#endif
 }
 
 // For getting hit!
@@ -4526,9 +4502,7 @@ void K_DropHnextList(player_t *player)
 		}
 
 		dropwork = P_SpawnMobj(work->x, work->y, work->z, type);
-
 		P_SetTarget(&dropwork->target, player->mo);
-
 		dropwork->angle = work->angle;
 		dropwork->flags2 = work->flags2;
 		dropwork->flags |= MF_NOCLIPTHING;
@@ -4596,13 +4570,10 @@ void K_DropHnextList(player_t *player)
 
 	// we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic...
 	P_SetTarget(&player->mo->hnext, NULL);
-
 	player->kartstuff[k_bananadrag] = 0;
 
 	if (player->kartstuff[k_eggmanheld])
-	{
 		player->kartstuff[k_eggmanheld] = 0;
-	}
 	else if (player->kartstuff[k_itemheld]
 		&& (dropall || (--player->kartstuff[k_itemamount] <= 0)))
 	{
@@ -4903,9 +4874,7 @@ static void K_MoveHeldObjects(player_t *player)
 		player->kartstuff[k_bananadrag] = 0;
 
 		if (player->kartstuff[k_eggmanheld])
-		{
 			player->kartstuff[k_eggmanheld] = 0;
-		}
 		else if (player->kartstuff[k_itemheld])
 		{
 			player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
@@ -4922,9 +4891,7 @@ static void K_MoveHeldObjects(player_t *player)
 		player->kartstuff[k_bananadrag] = 0;
 
 		if (player->kartstuff[k_eggmanheld])
-		{
 			player->kartstuff[k_eggmanheld] = 0;
-		}
 		else if (player->kartstuff[k_itemheld])
 		{
 			player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
@@ -4940,12 +4907,7 @@ static void K_MoveHeldObjects(player_t *player)
 		case MT_JAWZ_SHIELD:
 			{
 				mobj_t *cur = player->mo->hnext;
-				fixed_t speed = 0;
-
-				if (cur == NULL)
-					return;
-
-				speed = ((8 - min(4, player->kartstuff[k_itemamount])) * cur->info->speed) / 7;
+				fixed_t speed = ((8 - min(4, player->kartstuff[k_itemamount])) * cur->info->speed) / 7;
 
 				player->kartstuff[k_bananadrag] = 0; // Just to make sure
 
@@ -4992,13 +4954,8 @@ static void K_MoveHeldObjects(player_t *player)
 					cur->flags &= ~MF_NOCLIPTHING;
 
 					if (!P_TryMove(cur, player->mo->x + cur->momx, player->mo->y + cur->momy, true))
-					{
 						P_SlideMove(cur, true);
 
-						if (P_MobjWasRemovedCompat(cur))
-							continue;
-					}
-
 					if (P_IsObjectOnGround(player->mo))
 					{
 						if (P_MobjFlip(cur) > 0)

src/lua_baselib.c

@@ -1766,8 +1766,6 @@ static int lib_rSetPlayerSkin(lua_State *L)
 		INT32 i = luaL_checkinteger(L, 2);
 		if (i < 0 || i >= MAXSKINS)
 			return luaL_error(L, "skin number (argument #2) %d out of range (0 - %d)", i, MAXSKINS-1);
-		if (i >= numskins)
-			return 0;
 		SetPlayerSkinByNum(player-players, i);
 	}
 	else // skin name
@@ -2633,7 +2631,7 @@ static int lib_kLossSound(lua_State *L)
 	if (!mobj->player)
 		return luaL_error(L, "K_PlayLossSound: mobj_t isn't a player object.");
 
-	sfx_id = R_GetMobjSkin(mobj)->soundsid[S_sfx[sfx_klose].skinsound];
+	sfx_id = ((skin_t *)mobj->skin)->soundsid[S_sfx[sfx_klose].skinsound];
 	S_StartSound(mobj, sfx_id);
 	return 0;
 }
@@ -3089,8 +3087,6 @@ static int lib_gPlayerDeviceRumble(lua_State *L)
 	if (!player)
 		return LUA_ErrInvalid(L, "player_t");
 
-	if (demo.playback) return 0;
-
 	pnum = P_GetLocalPlayerNumForPlayer(player);
 
 	// Not a local player

src/lua_hooklib.c

@@ -25,7 +25,6 @@
 #include "lua_libs.h"
 #include "lua_hook.h"
 #include "lua_hud.h" // hud_running errors
-#include "lua_profile.h"
 
 /* =========================================================================
                                   ABSTRACTION
@@ -446,54 +445,11 @@ FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n)
 	lua_getref(gL, hookRefs[hook->id]);
 }
 
-static int pcall(Hook_State *hook)
-{
-	return lua_pcall(gL, hook->values, hook->results, EINDEX);
-}
-
-static const char *hook_name(Hook_State *hook)
-{
-	if (hud_running)
-	{
-		return hudHookNames[hook->hook_type];
-	}
-	else if (hook->string)
-	{
-		return stringHookNames[hook->hook_type];
-	}
-	//else if (hook->mobj_type > 0)
-	else if (hook->mobj_type != NONMOHOOK)
-	{
-		return mobjHookNames[hook->hook_type];
-	}
-	else
-	{
-		return hookNames[hook->hook_type];
-	}
-}
-
-static int pcall_timed_or_untimed(Hook_State *hook)
-{
-	if (!hud_running && cv_lua_profile.value > 0)
-	{
-		lua_timer_t *timer = LUA_BeginFunctionTimer(gL, -1 - hook->values, hook_name(hook));
-		int k = pcall(hook);
-		LUA_EndFunctionTimer(timer);
-
-		return k;
-	}
-	else
-	{
-		return pcall(hook);
-	}
-}
-
 static int call_single_hook_no_copy(Hook_State *hook)
 {
 	hook_important = hook->important;
 
-	//if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
-	if (pcall_timed_or_untimed(hook) == 0)
+	if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
 	{
 		if (hook->results > 0)
 		{
@@ -579,16 +535,16 @@ FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype
 	static UINT8 seen = 0; // so we dont have to check all this shit constantly
 	int numCalls = call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
 
-	if (!seen && numCalls > 0 && mobj_type == MT_NULL &&
-	(      hook->hook_type == MOBJ_HOOK(MobjThinker    )
+	if (!seen && numCalls > 0 && mobj_type == MT_NULL && (
+		   hook->hook_type == MOBJ_HOOK(MobjThinker    )
 		|| hook->hook_type == MOBJ_HOOK(MobjCollide    )
 		|| hook->hook_type == MOBJ_HOOK(MobjMoveCollide)
 		|| hook->hook_type == MOBJ_HOOK(MobjFuse       )
+		|| hook->hook_type == MOBJ_HOOK(MobjThinker    )
 		|| hook->hook_type == MOBJ_HOOK(BossThinker    )
 	))
 	{
 		seen = 1;
-
 		CONS_Alert(
 			CONS_WARNING, "%s\n", va(
 			"%s hooks not attached to a specific mobj type may cause performance issues!",
@@ -610,10 +566,12 @@ FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype
 	return numCalls;
 }
 
-/*FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
+/*
+FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
 {
 	return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
-}*/
+}
+*/
 
 static int call_hooks
 (
@@ -802,7 +760,7 @@ static void hook_think_frame(int type)
 	const hook_t * map = &hookIds[type];
 	int k;
 
-	const boolean perfstats = (cv_perfstats.value >= PS_THINKFRAME);
+	const boolean perfstats = (cv_perfstats.value >= 3);
 
 	if (prepare_hook(&hook, 0, type))
 	{
@@ -898,7 +856,7 @@ int LUA_HookShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT3
 int LUA_HookMobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
 {
 	return damage_hook(target, inflictor, source, damage,
-					MOBJ_HOOK(MobjDamage), res_true);
+					   MOBJ_HOOK(MobjDamage), res_true);
 }
 
 int LUA_HookMobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source)
@@ -962,7 +920,7 @@ static void res_botai(Hook_State *hook)
 
 int LUA_HookBotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
 {
-	const char *skin = tails->skin->name;
+	const char *skin = ((skin_t *)tails->skin)->name;
 
 	Hook_State hook = {};
 	BotAI_State botai = {};
@@ -987,7 +945,7 @@ void LUA_HookLinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
 {
 	Hook_State hook = {};
 	if (prepare_string_hook
-		(&hook, 0, STRING_HOOK(LinedefExecute), line->text))
+			(&hook, 0, STRING_HOOK(LinedefExecute), line->text))
 	{
 		LUA_PushUserdata(gL, line, META_LINE);
 		LUA_PushUserdata(gL, mo, META_MOBJ);
@@ -1060,9 +1018,6 @@ void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save)
 		lua_pushcclosure(gL, archFunc, 2);
 		// stack: tables, savebuffer_t, archFunc
 
-		// Manually set the hook's variables here since we don't call prepare_hook
-		hook.hook_type = HOOK(NetVars);
-		hook.mobj_type = NONMOHOOK; // Force mobj_type to be NONMOHOOK so the mobj_type check get skipped
 		init_hook_call(&hook, 0, res_none);
 		call_mapped(&hook, map);
 

src/lua_hud.h

@@ -53,6 +53,4 @@ boolean LUA_HudEnabled(enum hud option);
 
 void LUA_SetHudHook(int hook, huddrawlist_h list);
 
-#define LOCALSKINIMMERSION (hud_running && cv_luaimmersion.value)
-
 #endif // __LUA_HUD_H__

src/lua_hudlib.c

@@ -487,7 +487,7 @@ static int libd_getSpritePatch(lua_State *L)
 		{
 			const char *name = luaL_checkstring(L, 1);
 			for (skn = 0; skn < numskins; skn++)
-				if (fastcmp(skins[skn]->name, name))
+				if (fastcmp(skins[skn].name, name))
 					break;
 			if (skn >= numskins)
 				return 0;
@@ -527,9 +527,9 @@ static int libd_getSpritePatch(lua_State *L)
 	}
 	else // player skin
 	{
-		sprdef = &skins[skn]->spritedef;
+		sprdef = &skins[skn].spritedef;
 #ifdef ROTSPRITE
-		sprinfo = &skins[skn]->sprinfo;
+		sprinfo = &skins[skn].sprinfo;
 #endif
 	}
 
@@ -1056,8 +1056,6 @@ static int libd_getColormap(lua_State *L)
 		skinnum = (INT32)luaL_checkinteger(L, 1);
 		if (skinnum < TC_BLINK || skinnum >= MAXSKINS)
 			return luaL_error(L, "skin number %d is out of range (%d - %d)", skinnum, TC_BLINK, MAXSKINS-1);
-		if (skinnum >= numskins)
-			return 0;
 	}
 	else // skin name
 	{

src/lua_infolib.c

@@ -22,8 +22,7 @@
 #include "lua_script.h"
 #include "lua_libs.h"
 #include "lua_hud.h" // hud_running errors
-#include "lua_hook.h" // hook_cmd_running errors
-#include "lua_profile.h"
+#include "lua_hook.h"	// cmd errors
 
 boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor);
 state_t *astate = NULL;
@@ -111,10 +110,7 @@ static void A_Lua(mobj_t *actor)
 	LUA_PushUserdata(gL, actor, META_MOBJ);
 	lua_pushinteger(gL, var1);
 	lua_pushinteger(gL, var2);
-
-	lua_timer_t *timer = LUA_BeginFunctionTimer(gL, -4, "A_Lua");
 	LUA_Call(gL, 3, 0, 1);
-	LUA_EndFunctionTimer(timer);
 
 	lua_pop(gL, 1); // pop error handler
 

src/lua_mobjlib.c

@@ -392,14 +392,12 @@ int mobj_skin_getter(lua_State *L)
         return 0;
 
     // HUD ONLY!!!!!!!!!!
-    if LOCALSKINIMMERSION
+    if (hud_running && cv_luaimmersion.value)
     {
-        lua_pushstring(L, R_GetMobjSkin(mo)->name);
+        lua_pushstring(L, K_GetMobjSkin(mo)->name);
     }
     else
-    {
-        lua_pushstring(L, mo->skin->name);
-    }
+        lua_pushstring(L, ((skin_t *)mo->skin)->name);
 
     return 1;
 }
@@ -414,9 +412,9 @@ int mobj_skin_setter(lua_State *L)
     strlwr(skin); // all skin names are lowercase
     for (i = 0; i < numskins; i++)
     {
-        if (fastcmp(skins[i]->name, skin))
+        if (fastcmp(skins[i].name, skin))
         {
-            mo->skin = skins[i];
+            mo->skin = &skins[i];
             return 0;
         }
     }
@@ -429,7 +427,7 @@ int mobj_localskin_getter(lua_State *L)
 	mobj_t *mo = GETMO();
 
 	if (mo->localskin)
-		lua_pushstring(L, mo->localskin->name);
+		lua_pushstring(L, ((skin_t *)mo->localskin)->name);
 	else
 		lua_pushnil(L);
 
@@ -456,9 +454,9 @@ int mobj_localskin_setter(lua_State *L)
 			// Try localskins
 			for (i = 0; i < numlocalskins; i++)
 			{
-				if (fasticmp(localskins[i]->name, skin))
+				if (fasticmp(localskins[i].name, skin))
 				{
-					mo->localskin = localskins[i];
+					mo->localskin = &localskins[i];
 					mo->skinlocal = true;
 					return 0;
 				}
@@ -467,9 +465,9 @@ int mobj_localskin_setter(lua_State *L)
 			// Try other skins
 			for (i = 0; i < numskins; i++)
 			{
-				if (fasticmp(skins[i]->name, skin))
+				if (fasticmp(skins[i].name, skin))
 				{
-					mo->localskin = skins[i];
+					mo->localskin = &skins[i];
 					mo->skinlocal = false;
 					return 0;
 				}

src/lua_playerlib.c

@@ -296,7 +296,7 @@ int player_localskin_getter(lua_State *L)
 	player_t *plr = GETPLAYER();
 
 	if (plr->localskin)
-		lua_pushstring(L, R_GetPlayerSkin(plr)->name);
+		lua_pushstring(L, K_GetPlayerSkin(plr)->name);
 	else
 		lua_pushnil(L);
 

src/lua_profile.cpp

@@ -1,264 +0,0 @@
-// DR. ROBOTNIK'S RING RACERS
-//-----------------------------------------------------------------------------
-// Copyright (C) 2025 by James Robert Roman
-// Copyright (C) 2025 by Kart Krew
-//
-// This program is free software distributed under the
-// terms of the GNU General Public License, version 2.
-// See the 'LICENSE' file for more details.
-//-----------------------------------------------------------------------------
-
-#include "screen.h"
-#include <algorithm>
-#include <cstddef>
-#include <unordered_map>
-#include <string>
-#include <string_view>
-#include <vector>
-
-extern "C" {
-#include "blua/lua.h"
-};
-
-#include "v_video.h"
-
-#include "command.h"
-#include "doomtype.h"
-#include "i_system.h"
-#include "lua_profile.h"
-#include "m_perfstats.h"
-
-extern "C" consvar_t cv_lua_profile;
-
-namespace
-{
-
-precise_t g_time_reference;
-int g_tics_counted;
-
-double g_running_tic_time;
-double g_avg_tic_time;
-
-bool g_invalid;
-
-}; // namespace
-
-struct lua_timer_t
-{
-	struct Stat
-	{
-		double calls = 0;
-		double time = 0.0;
-	};
-
-	Stat running, avg;
-};
-
-namespace
-{
-
-std::unordered_map<std::string, lua_timer_t> g_tic_timers;
-
-}; // namespace
-
-lua_timer_t* LUA_BeginFunctionTimer(lua_State* L, int fn_idx, const char* name)
-{
-	lua_Debug ar;
-
-	lua_pushvalue(L, fn_idx);
-	lua_getinfo(L, ">S", &ar);
-
-	auto label = [&]
-	{
-		using sv = std::string_view;
-		sv view{ar.source};
-
-		switch (view.front())
-		{
-		case '@': // file
-			if (std::size_t p = view.rfind('/'); p != sv::npos) // lump or base
-			{
-				return view.substr(p + 1);
-			}
-			break;
-
-		case '=': // ??
-			view.remove_prefix(1);
-			break;
-		}
-
-		return view;
-	};
-
-	// i sure hope this std::string mess is fine...
-	auto [it, ins] = g_tic_timers.try_emplace(std::string(va("%s:%d (%s)", std::string(label()).c_str(), ar.linedefined, name)));
-	auto& [key, timer] = *it;
-
-	g_time_reference = I_GetPreciseTime();
-
-	return &timer;
-}
-
-void LUA_EndFunctionTimer(lua_timer_t* timer)
-{
-	precise_t t = I_GetPreciseTime() - g_time_reference;
-	double precision = I_GetPrecisePrecision();
-
-	timer->running.time += t / precision;
-	timer->running.calls += 1.0;
-}
-
-void LUA_ResetTicTimers(void)
-{
-	if (cv_lua_profile.value <= 0)
-	{
-		return;
-	}
-
-	if (g_tics_counted < cv_lua_profile.value)
-	{
-		g_tics_counted++;
-
-		double precision = I_GetPrecisePrecision();
-		g_running_tic_time += ps_prevtictime.value.p / precision;
-	}
-	else
-	{
-		double counted = g_tics_counted;
-
-		for (auto& [key, timer] : g_tic_timers)
-		{
-			timer.avg = {timer.running.calls / counted, timer.running.time / counted};
-			timer.running = {};
-		}
-
-		g_avg_tic_time = g_running_tic_time / counted;
-		g_running_tic_time = 0.0;
-
-		g_tics_counted = 1;
-
-		g_invalid = false;
-	}
-}
-
-void LUA_RenderTimers(void)
-{
-	constexpr int kRowHeight = 4;
-	float row_y = kRowHeight;
-
-	// pretty much what the whole srb2::Draw does lol
-	auto draw_row = [](float x, float y, INT32 flags, const char *str)
-	{
-		V_DrawSmallStringAtFixed(
-			FloatToFixed(x),
-			FloatToFixed(y),
-			V_MONOSPACE|V_ALLOWLOWERCASE|flags,
-			str
-		);
-	};
-
-	draw_row(0.f, 0.f, 0, va("-- AVERAGES PER TIC (over %d tics) --", cv_lua_profile.value));
-
-	if (g_invalid)
-	{
-		draw_row(0.f, row_y, V_GRAYMAP, "  <Data pending>");
-		return;
-	}
-
-	std::vector<decltype(g_tic_timers)::iterator> view;
-	view.reserve(g_tic_timers.size());
-
-	auto color_flag = [](double t)
-	{
-		if (t < 10.0)
-		{
-			return V_GRAYMAP;
-		}
-		else if (t >= 100.0)
-		{
-			return V_YELLOWMAP;
-		}
-		else
-		{
-			return 0;
-		}
-	};
-
-	{
-		double cum = 0.0;
-
-		for (auto it = g_tic_timers.begin(); it != g_tic_timers.end(); ++it)
-		{
-			auto& [key, timer] = *it;
-
-			cum += timer.avg.time;
-
-			if (timer.avg.time > 0.0)
-			{
-				view.push_back(it);
-			}
-		}
-
-		{
-			const INT32 tally_flags = color_flag(cum * 1'000'000.0);
-
-			draw_row(0.f, row_y, tally_flags, va("%8.2f us - TOTAL", cum * 1'000'000.0));
-			draw_row(0.f, row_y + kRowHeight, tally_flags, va("%8.2f ms", cum * 1000.0));
-
-			// dont need to show this if we didnt capture over time
-			// this would just show nan or inf anyways
-			if (std::fpclassify(g_avg_tic_time) != FP_ZERO)
-			{
-				draw_row(0.f, row_y + kRowHeight * 2, tally_flags, va(
-				"%8.2f%% overhead (%.2f / %.2f) <-- not counting rendering time",
-																		(cum / g_avg_tic_time) * 100.0,
-																		(cum * (double)TICRATE),
-																		(g_avg_tic_time * (double)TICRATE)
-				));
-			}
-		}
-
-		row_y += kRowHeight * 4;
-	}
-
-	std::sort(
-		view.rbegin(),
-		view.rend(),
-		[](auto a, auto b)
-		{
-			auto& [k1, t1] = *a;
-			auto& [k2, t2] = *b;
-			return t1.avg.time < t2.avg.time;
-		}
-	);
-
-	for (auto it : view)
-	{
-		auto& [key, timer] = *it;
-
-		double t = timer.avg.time * 1'000'000.0;
-
-		draw_row(0.f, row_y, color_flag(t), va(
-			"%8.2f us %8.2f calls - %s",
-			t,
-			timer.avg.calls,
-			key.c_str()
-		));
-
-		row_y += kRowHeight;
-
-		// FIXME this is all ugly and sucks
-		if (row_y >= BASEVIDHEIGHT)
-			break;
-	}
-}
-
-extern "C" void lua_profile_OnChange(void)
-{
-	g_invalid = true;
-
-	if (cv_lua_profile.value == 0)
-	{
-		g_tic_timers = {};
-	}
-}

src/lua_profile.h

@@ -1,38 +0,0 @@
-// DR. ROBOTNIK'S RING RACERS
-//-----------------------------------------------------------------------------
-// Copyright (C) 2025 by James Robert Roman
-// Copyright (C) 2025 by Kart Krew
-//
-// This program is free software distributed under the
-// terms of the GNU General Public License, version 2.
-// See the 'LICENSE' file for more details.
-//-----------------------------------------------------------------------------
-
-#ifndef lua_profile_h
-#define lua_profile_h
-
-#include "blua/lua.h"
-#include "doomtype.h"
-//#include "typedef.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct lua_timer_t;
-typedef struct lua_timer_t lua_timer_t;
-
-void LUA_ResetTicTimers(void);
-
-lua_timer_t *LUA_BeginFunctionTimer(lua_State *L, int fn_idx, const char *name);
-void LUA_EndFunctionTimer(lua_timer_t *timer);
-
-void LUA_RenderTimers(void);
-
-void lua_profile_OnChange(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif/*lua_profile_h*/

src/lua_script.c

@@ -62,6 +62,14 @@ static lua_CFunction liblist[] = {
 	NULL
 };
 
+// Lua asks for memory using this.
+static void *LUA_Alloc(void *ud, void *ptr, size_t osize, size_t nsize)
+{
+	(void)ud;
+	(void)osize;
+	return Z_Realloc(ptr, nsize, PU_LUA, NULL);
+}
+
 // Panic function Lua calls when there's an unprotected error.
 // This function cannot return. Lua would kill the application anyway if it did.
 FUNCNORETURN static int LUA_Panic(lua_State *L)
@@ -189,7 +197,7 @@ void LUA_ClearState(void)
 	CONS_Printf(M_GetText("Pardon me while I initialize the Lua scripting interface...\n"));
 
 	// allocate state
-	L = luaL_newstate();
+	L = lua_newstate(LUA_Alloc, NULL);
 	lua_atpanic(L, LUA_Panic);
 
 	// open base libraries
@@ -269,19 +277,20 @@ void LUA_LoadLump(UINT16 wad, UINT16 lump)
 
 	if (wadfiles[wad]->type == RET_LUA)
 	{
-		name = malloc(len + 1);
-		snprintf(name, len + 1, "%s", wadfiles[wad]->filename);
+		name = malloc(len+1);
+		strcpy(name, wadfiles[wad]->filename);
 	}
 	else // If it's not a .lua file, copy the lump name in too.
 	{
 		lumpinfo_t *lump_p = &wadfiles[wad]->lumpinfo[lump];
 		len += 1 + strlen(lump_p->fullname); // length of file name, '|', and lump name
-		name = malloc(len + 1);
+		name = malloc(len+1);
 
 		if (!name)
 			I_Error("LUA_LoadLump: Out of memory!\n");
 
-		snprintf(name, len + 1, "%s|%s", wadfiles[wad]->filename, lump_p->fullname);
+		sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->fullname);
+		name[len] = '\0';
 	}
 
 	LUA_LoadFile(&f, name); // actually load file!
@@ -365,7 +374,7 @@ void LUA_DumpFile(const char *filename)
 
 static void createMathLibState(void)
 {
-	mL = luaL_newstate();
+	mL = lua_newstate(LUA_Alloc, NULL);
 	lua_atpanic(mL, LUA_Panic);
 
 	// open only enum lib
@@ -583,7 +592,6 @@ void LUA_InvalidateLevel(void)
 
 	for (i = 0; i < numsubsectors; i++)
 		LUA_InvalidateUserdata(&subsectors[i]);
-
 	for (i = 0; i < numsectors; i++)
 	{
 		LUA_InvalidateUserdata(&sectors[i]);
@@ -604,7 +612,6 @@ void LUA_InvalidateLevel(void)
 
 	for (i = 0; i < numsides; i++)
 		LUA_InvalidateUserdata(&sides[i]);
-
 	for (i = 0; i < numvertexes; i++)
 		LUA_InvalidateUserdata(&vertexes[i]);
 
@@ -615,10 +622,6 @@ void LUA_InvalidateLevel(void)
 		LUA_InvalidateUserdata(&slope->o);
 		LUA_InvalidateUserdata(&slope->d);
 	}
-
-	// We invalidated a lot of userdata objects, a lot of them probably ended up unreachable so they can be
-	// GC'd right away
-	lua_gc(gL, LUA_GCCOLLECT, 0);
 }
 
 void LUA_InvalidateMapthings(void)
@@ -1457,16 +1460,3 @@ int Lua_CreateFieldTable(lua_State *L, const char *const lst[])
 
 	return luaL_ref(L, LUA_REGISTRYINDEX);
 }
-
-size_t LUA_MemoryUsage(void)
-{
-	size_t usage = 0;
-
-	if (gL)
-		usage += lua_gc(gL, LUA_GCCOUNT, 0);
-
-	if (mL)
-		usage += lua_gc(mL, LUA_GCCOUNT, 0);
-
-	return usage;
-}

src/lua_script.h

@@ -82,9 +82,6 @@ int Lua_optoption(lua_State *L, int narg, int def, int list_ref);
 int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
 void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save);
 
-// Returns lua memory usage in kbytes
-size_t LUA_MemoryUsage(void);
-
 // Console wrapper
 void COM_Lua_f(void);
 

src/lua_skinlib.c

@@ -18,10 +18,6 @@
 
 #include "lua_script.h"
 #include "lua_libs.h"
-#include "lua_hud.h" // hud_running errors
-
-#define SKINARR (LOCALSKINIMMERSION ? allskins : skins)
-#define NSKINS (LOCALSKINIMMERSION ? numallskins : numskins)
 
 enum skin {
 	skin_valid = 0,
@@ -154,15 +150,13 @@ static int skin_num(lua_State *L)
 	// skins are always valid, only added, never removed
 	I_Assert(skin != NULL);
 
-	lua_pushinteger(L, LOCALSKINIMMERSION ? skin->allskinnum : skin->skinnum);
+	lua_pushinteger(L, skin-skins);
 	return 1;
 }
 
 static int lib_iterateSkins(lua_State *L)
 {
 	INT32 i;
-	skin_t **skinar = SKINARR;
-	const INT32 nskins = NSKINS;
 
 	if (lua_gettop(L) < 2)
 	{
@@ -175,17 +169,14 @@ static int lib_iterateSkins(lua_State *L)
 	lua_remove(L, 1); // state is unused.
 
 	if (!lua_isnil(L, 1))
-	{
-		skin_t *skin = (*((skin_t **)luaL_checkudata(L, 1, META_SKIN)));
-		i = (INT32)(LOCALSKINIMMERSION ? skin->allskinnum : skin->skinnum) + 1;
-	}
+		i = (INT32)(*((skin_t **)luaL_checkudata(L, 1, META_SKIN)) - allskins) + 1;
 	else
 		i = 0;
 
 	// skins are always valid, only added, never removed
-	if (i < nskins)
+	if (i < numallskins)
 	{
-		LUA_PushUserdata(L, skinar[i], META_SKIN);
+		LUA_PushUserdata(L, &allskins[i], META_SKIN);
 		return 1;
 	}
 
@@ -197,40 +188,32 @@ static int lib_getSkin(lua_State *L)
 	const char *field;
 	INT32 i;
 
-	skin_t **skinar = SKINARR;
-	const INT32 nskins = NSKINS;
-
 	// find skin by number
 	if (lua_type(L, 2) == LUA_TNUMBER)
 	{
-		const INT32 skinmax = LOCALSKINIMMERSION ? numallskins : MAXSKINS;
-
 		i = luaL_checkinteger(L, 2);
-
-		if (i < 0 || i >= skinmax)
-			return luaL_error(L, "skins[] index %d out of range (0 - %d)", i, skinmax-1);
-		if (i >= nskins)
+		if (i < 0 || i >= MAXSKINS)
+			return luaL_error(L, "skins[] index %d out of range (0 - %d)", i, MAXSKINS-1);
+		if (i >= numallskins)
 			return 0;
-
-		LUA_PushUserdata(L, skinar[i], META_SKIN);
-
+		LUA_PushUserdata(L, &allskins[i], META_SKIN);
 		return 1;
 	}
 
 	field = luaL_checkstring(L, 2);
 
 	// special function iterate
-	if (fastcmp(field, "iterate"))
+	if (fastcmp(field,"iterate"))
 	{
 		lua_pushcfunction(L, lib_iterateSkins);
 		return 1;
 	}
 
 	// find skin by name
-	for (i = 0; i < nskins; i++)
-		if (fastcmp(skinar[i]->name, field))
+	for (i = 0; i < numallskins; i++)
+		if (fastcmp(allskins[i].name, field))
 		{
-			LUA_PushUserdata(L, skinar[i], META_SKIN);
+			LUA_PushUserdata(L, &allskins[i], META_SKIN);
 			return 1;
 		}
 
@@ -239,7 +222,7 @@ static int lib_getSkin(lua_State *L)
 
 static int lib_numSkins(lua_State *L)
 {
-	lua_pushinteger(L, NSKINS);
+	lua_pushinteger(L, numallskins);
 	return 1;
 }
 

src/m_curl.c

@@ -11,7 +11,7 @@
 
 #include "m_curl.h"
 #include "doomtype.h"
-#include "doomdef.h" // I_OutputMsg
+#include "i_system.h" // I_OutputMsg
 #include "m_argv.h" // M_CheckParm, M_GetNextParm
 
 static boolean curl_args_init = false;

src/m_menu.c

@@ -616,7 +616,7 @@ void Nextmap_OnChange(void)
 		if (!gpath)
 			return;
 
-		snprintf(gpath, glen, "%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
+		sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
 
 		CV_StealthSetValue(&cv_dummystaff, 0);
 
@@ -735,7 +735,7 @@ static void Dummystaff_OnChange(void)
 		while (*temp)
 			temp++;
 
-		snprintf(temp, sizeof(dummystaffname) - (size_t)(temp - dummystaffname), " - %d", cv_dummystaff.value);
+		sprintf(temp, " - %d", cv_dummystaff.value);
 	}
 }
 
@@ -809,7 +809,7 @@ static void M_ChangeCvar(INT32 choice)
 		{
 			INT32 skinno = R_SkinAvailable(cv_chooseskin.string);
 			if (skinno != -1)
-				CV_SetValue(cv,skins[skinno]->prefcolor);
+				CV_SetValue(cv,skins[skinno].prefcolor);
 			return;
 		}
 
@@ -825,8 +825,7 @@ static void M_ChangeCvar(INT32 choice)
 		float increment;
 
 		increment = FIXED_TO_FLOAT(cv->value)+(choice)*((currentMenu->menuitems[itemOn].status & IT_CV_BIGFLOAT) ? 0.5f : (1.0f/16.0f));
-		snprintf(s, sizeof(s), "%ld%s", (long)increment, M_Ftrim(increment));
-
+		sprintf(s,"%ld%s",(long)increment,M_Ftrim(increment));
 		CV_Set(cv, s);
 	}
 	else
@@ -2851,11 +2850,11 @@ static void M_PatchSkinNameTable(void)
 
 	memset(skins_cons_t, 0, sizeof (skins_cons_t));
 
-	for (j = 0; j < numskins; j++)
+	for (j = 0; j < MAXSKINS; j++)
 	{
-		if (skins[j]->name[0] != '\0')
+		if (skins[j].name[0] != '\0')
 		{
-			skins_cons_t[j].strvalue = skins[j]->name;
+			skins_cons_t[j].strvalue = skins[j].name;
 			skins_cons_t[j].value = j+1;
 		}
 		else
@@ -4186,12 +4185,12 @@ static void PrepReplayList(boolean reset)
 		if (dirmenu[i][DIR_TYPE] == EXT_UP)
 		{
 			demolist_all[i].type = MD_SUBDIR;
-			snprintf(demolist_all[i].title, sizeof(demolist_all[i].title), "UP");
+			sprintf(demolist_all[i].title, "UP");
 		}
 		else if (dirmenu[i][DIR_TYPE] == EXT_FOLDER)
 		{
 			demolist_all[i].type = MD_SUBDIR;
-			snprintf(demolist_all[i].title, sizeof(demolist_all[i].title), "%s", dirmenu[i] + DIR_STRING);
+			strncpy(demolist_all[i].title, dirmenu[i] + DIR_STRING, 64);
 		}
 		else
 		{
@@ -4199,7 +4198,7 @@ static void PrepReplayList(boolean reset)
 			snprintf(demolist_all[i].filepath, sizeof(demolist_all[i].filepath),
 					 // 255 = UINT8 limit. dirmenu entries are restricted to this length (see DIR_LEN).
 					 "%s%.255s", menupath, dirmenu[i] + DIR_STRING);
-			snprintf(demolist_all[i].title, sizeof(demolist_all[i].title), ".....");
+			sprintf(demolist_all[i].title, ".....");
 		}
 	}
 
@@ -4543,9 +4542,9 @@ static void DrawReplayHutReplayInfo(void)
 			}
 
 			// Character face!
-			if (replaydemolist->standings[0].skin < numskins && W_CheckNumForName(skins[replaydemolist->standings[0].skin]->facewant) != LUMPERROR)
+			if (replaydemolist->standings[0].skin < numskins && W_CheckNumForName(skins[replaydemolist->standings[0].skin].facewant) != LUMPERROR)
 			{
-				patch = skins[replaydemolist->standings[0].skin]->facewantprefix;
+				patch = facewantprefix[replaydemolist->standings[0].skin];
 				colormap = R_GetTranslationColormap(
 					replaydemolist->standings[0].skin,
 					replaydemolist->standings[0].color,
@@ -4766,9 +4765,9 @@ static void M_DrawReplayStartMenu(void)
 			V_DrawString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d", timeorscore));
 
 		// Character face!
-		if (replaydemolist->standings[i].skin < numskins && W_CheckNumForName(skins[replaydemolist->standings[i].skin]->facerank) != LUMPERROR)
+		if (replaydemolist->standings[i].skin < numskins && W_CheckNumForName(skins[replaydemolist->standings[i].skin].facerank) != LUMPERROR)
 		{
-			patch = skins[replaydemolist->standings[i].skin]->facerankprefix;
+			patch = facerankprefix[replaydemolist->standings[i].skin];
 			colormap = R_GetTranslationColormap(
 				replaydemolist->standings[i].skin,
 				replaydemolist->standings[i].color,
@@ -4957,15 +4956,13 @@ static void M_DrawPlaybackMenu(void)
 
 		if (i >= playback_view1 && i <= playback_view4)
 		{
-			if (modeattacking)
-				continue;
+			if (modeattacking) continue;
 
 			if (splitscreen >= i - playback_view1)
 			{
 				INT32 ply = displayplayers[i - playback_view1];
 
-				icon = skins[players[ply].skin]->facerankprefix;
-
+				icon = facerankprefix[players[ply].skin];
 				if (i != itemOn)
 					inactivemap = R_GetTranslationColormap(players[ply].skin, players[ply].skincolor, GTC_MENUCACHE);
 			}
@@ -5769,8 +5766,7 @@ static void M_DrawMusicTest(void)
 		x = 24;
 		y = 64;
 
-		if (renderisnewtic)
-			st_musictime++;
+		if (renderisnewtic) st_musictime++;
 
 		while (t <= b)
 		{
@@ -5779,11 +5775,11 @@ static void M_DrawMusicTest(void)
 
 			{
 				const musicdef_t *def = S_GetMusicCredit(t);
+				const size_t MAXLENGTH = 34;
 				const char *songname = def->title[0] ? def->title : def->source;
 
 				size_t namelength = strlen(songname);
 
-#define MAXLENGTH 34
 				char buf[MAXLENGTH+1];
 
 				if (t == st_sel && namelength > MAXLENGTH)
@@ -5792,14 +5788,11 @@ static void M_DrawMusicTest(void)
 					strlcpy(buf, songname, MAXLENGTH);
 
 				V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf);
-
 				if (curplaying == def)
 				{
 					V_DrawFill(20+280-9, y-4, 8, 16, 230);
 				}
-#undef MAXLENGTH
 			}
-
 			t++;
 			y += 16;
 		}
@@ -5986,8 +5979,7 @@ static void M_DrawStatsMaps(void)
 
 	V_DrawString(20, 42, highlightflags|MENUCAPS, "Combined time records:");
 
-	snprintf(beststr, sizeof(beststr), "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime));
-
+	sprintf(beststr, "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime));
 	V_DrawRightAlignedString(BASEVIDWIDTH-16, 42, (mapsunfinished ? warningflags : 0), beststr);
 
 	if (mapsunfinished)
@@ -6251,17 +6243,17 @@ void M_DrawTimeAttackMenu(void)
 	SHOWMODDEDGAME
 
 	const INT32 skinnum = max(cv_chooseskin.value-1, 0); // dont think its needed but better safe than sorry!
-	const skin_t *skin = skins[skinnum];
+	const skin_t *skin = &skins[skinnum];
 
 	// Character face!
 	if (W_CheckNumForName(skin->facewant) != LUMPERROR)
 	{
-		const INT32 charx = (BASEVIDWIDTH-x - skins[skinnum]->facewantprefix->width);
+		const INT32 charx = (BASEVIDWIDTH-x - facewantprefix[skinnum]->width);
 
 		UINT8 *colormap = NULL;
 
 		colormap = R_GetTranslationColormap(skinnum, cv_playercolor.value, GTC_MENUCACHE);
-		V_DrawMappedPatch(charx, y, 0, skins[skinnum]->facewantprefix, colormap);
+		V_DrawMappedPatch(charx, y, 0, facewantprefix[skinnum], colormap);
 
 		// draw stats
 		// speed
@@ -6453,7 +6445,7 @@ static void M_ChooseTimeAttack(INT32 choice)
 	else
 		G_RecordDemo(nameofdemo);
 
-	G_DeferedInitNew(false, mapname, (skinnum_t)(cv_chooseskin.value-1), 0, false);
+	G_DeferedInitNew(false, mapname, (UINT8)(cv_chooseskin.value-1), 0, false);
 }
 
 static void M_HandleStaffReplay(INT32 choice)
@@ -7154,7 +7146,7 @@ static void M_CheckMODVersion(int id)
 
 	if (updatecheck)
 	{
-		snprintf(updatestring, sizeof(updatestring), UPDATE_ALERT_STRING, VERSIONSTRING, updatecheck);
+		sprintf(updatestring, UPDATE_ALERT_STRING, VERSIONSTRING, updatecheck);
 #ifdef HAVE_THREADS
 		I_lock_mutex(&m_menu_mutex);
 #endif
@@ -7652,8 +7644,11 @@ static void M_DrawMPMainMenu(void)
 	// use generic drawer for cursor, items and title
 	M_DrawGenericMenu();
 
+#if MAXPLAYERS != 16
+Update the maxplayers label...
+#endif
 	V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[4].alphaKey,
-		((itemOn == 4) ? highlightflags : 0)|MENUCAPS, va("(2-%d Players)", MAXPLAYERS));
+		((itemOn == 4) ? highlightflags : 0)|MENUCAPS, "(2-16 Players)");
 
 	V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[5].alphaKey,
 		((itemOn == 5) ? highlightflags : 0)|MENUCAPS,
@@ -7669,7 +7664,7 @@ static void M_DrawMPMainMenu(void)
 	{
 		char buf[28];
 		strlcpy(buf, setupm_ip, sizeof(buf));
-		V_DrawString(x+8, y+12, V_ALLOWLOWERCASE, buf);
+		V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, buf);
 	}
 	else
 		M_DrawTextInputScroll(x+8, y+12, &setupm_input_ip, 0, SETUPM_IP_MAXSIZE);
@@ -7679,7 +7674,7 @@ static void M_DrawMPMainMenu(void)
 #define iconwidth 32
 #define spacingwidth 32
 #define incrwidth (iconwidth + spacingwidth)
-		UINT16 i = 0, pskin, pcol;
+		UINT8 i = 0, pskin, pcol;
 		// player arrangement width, but there's also a chance i'm a furry, shhhhhh
 		const INT32 paw = iconwidth + 3*incrwidth;
 		INT32 trans = 0;
@@ -7709,7 +7704,7 @@ static void M_DrawMPMainMenu(void)
 					break;
 			}
 
-			if (pskin >= numskins)
+			if (pskin >= MAXSKINS)
 				pskin = 0;
 
 			if (!trans && i > cv_splitplayers.value)
@@ -7717,7 +7712,7 @@ static void M_DrawMPMainMenu(void)
 
 			colmap = R_GetTranslationColormap(pskin, pcol, GTC_MENUCACHE);
 
-			V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, trans, skins[pskin]->facewantprefix, colmap);
+			V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, trans, facewantprefix[pskin], colmap);
 
 			if (itemOn == 2 && i == setupm_pselect)
 			{
@@ -7932,16 +7927,16 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	spritedef_t *sprdef;
 	spriteframe_t *sprframe;
 	patch_t *patch;
-	UINT16 frame;
-	UINT16 speed;
-	UINT16 weight;
-	UINT16 i;
-	UINT16 s, w;
+	UINT8 frame;
+	UINT8 speed;
+	UINT8 weight;
+	UINT8 i;
+	UINT8 s, w;
 	INT32 skinnum = 0;
 	INT32 statx, staty;
 	UINT32 speenframe;
 	INT32 sltw, actw, hetw;
-	skinnum_t skintodisplay;
+	UINT8 skintodisplay;
 	INT32 nameboxaddy = 0;
 
 	const UINT8 *flashcol = V_GetStringColormap(highlightflags);
@@ -7978,12 +7973,12 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	else
 		M_DrawTextInput(mx + 40, my + nameboxaddy, &setupm_input, 0);
 
-#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]]->realname : skins[setupm_fakeskin]->realname)
-#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]]->kartspeed : skins[setupm_fakeskin]->kartspeed)
-#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]]->kartweight : skins[setupm_fakeskin]->kartweight)
+#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].realname : skins[setupm_fakeskin].realname)
+#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartspeed : skins[setupm_fakeskin].kartspeed)
+#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartweight : skins[setupm_fakeskin].kartweight)
 
 	// draw skin string
-	st = V_StringWidth(skins[setupm_fakeskin]->realname, 0);
+	st = V_StringWidth(skins[setupm_fakeskin].realname, 0);
 	switch (cv_skinselectmenu.value)
 	{
 		case SKINMENUTYPE_EXTENDED:
@@ -7998,17 +7993,17 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			break;
 		case SKINMENUTYPE_2D:
 
-			skintodisplay = (skinnum_t)setupm_fakeskin;
+			skintodisplay = setupm_fakeskin;
 			if (setupm_skinlockedselect) //show the skin we are trying to select
 				skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][setupm_skinselect];
 			else if (skinstatscount[setupm_skinxpos][setupm_skinypos] && itemOn == 1)
 				skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][(I_GetTime()/TICRATE)%SELECTEDSTATSCOUNT];
 
 			tw = V_StringWidth("Character", 0);
-			st = V_StringWidth(skins[skintodisplay]->realname, 0);
+			st = V_StringWidth(skins[skintodisplay].realname, 0);
 			V_DrawString((mx+(tw/2)) - (st/2), my + 37,
 				((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0) | highlightflags | V_ALLOWLOWERCASE,
-				skins[skintodisplay]->realname);
+				skins[skintodisplay].realname);
 			// the menu is now 2d, no need for scroll arrows...
 			if (itemOn == 1 && setupm_skinlockedselect)
 			{
@@ -8022,7 +8017,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 		default:
 			V_DrawString(BASEVIDWIDTH - mx - st, my + 16,
 						((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0)|highlightflags|V_ALLOWLOWERCASE,
-						skins[setupm_fakeskin]->realname);
+						skins[setupm_fakeskin].realname);
 			if (itemOn == 1)
 			{
 				V_DrawCharacter(BASEVIDWIDTH - mx - 10 - st - (skullAnimCounter/5), my + 16,
@@ -8128,10 +8123,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
 
 			for (i = 0; i < numskins; i++) // draw the stat dots
 			{
-				if (i != setupm_fakeskin && R_SkinAvailable(skins[i]->name) != -1)
+				if (i != setupm_fakeskin && R_SkinAvailable(skins[i].name) != -1)
 				{
-					speed = skins[i]->kartspeed;
-					weight = skins[i]->kartweight;
+					speed = skins[i].kartspeed;
+					weight = skins[i].kartweight;
 					V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
 				}
 			}
@@ -8187,10 +8182,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
 
 			for (i = 0; i < numskins; i++) // draw the stat dots
 			{
-				if (i != setupm_fakeskin && R_SkinAvailable(skins[i]->name) != -1)
+				if (i != setupm_fakeskin && R_SkinAvailable(skins[i].name) != -1)
 				{
-					speed = skins[i]->kartspeed;
-					weight = skins[i]->kartweight;
+					speed = skins[i].kartspeed;
+					weight = skins[i].kartweight;
 					V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, NULL);
 				}
 			}
@@ -8207,12 +8202,12 @@ static void M_DrawSetupMultiPlayerMenu(void)
 		case SKINMENUTYPE_EXTENDED:
 			for (s = 0; s < SKINGRIDNEWWIDTH*SKINGRIDNEWHEIGHT; s++)
 			{
+				INT32 x = ((s % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
+				INT32 y = ((s / SKINGRIDNEWWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2)) + 10); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
+				INT32 calcs = s + (setupm_skinypos * SKINGRIDNEWWIDTH);
 				INT32 skinn;
 				patch_t *face;
 				UINT8 *cmap;
-				const INT32 x = ((s % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
-				const INT32 y = ((s / SKINGRIDNEWWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2)) + 10); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
-				const INT32 calcs = s + (setupm_skinypos * SKINGRIDNEWWIDTH);
 
 				if (calcs < numskins)
 					skinn = skinsorted[calcs];
@@ -8224,8 +8219,8 @@ static void M_DrawSetupMultiPlayerMenu(void)
 					continue;
 				}
 
-				face = skins[skinn]->facerankprefix;
-				cmap = R_GetTranslationColormap(skinn, skins[skinn]->prefcolor, GTC_MENUCACHE);
+				face = facerankprefix[skinn];
+				cmap = R_GetTranslationColormap(skinn, skins[skinn].prefcolor, GTC_MENUCACHE);
 
 				V_DrawFixedPatch(x << FRACBITS, y << FRACBITS, FRACUNIT, 0, face, cmap);
 			}
@@ -8233,10 +8228,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			if (itemOn == 1) //has to be on skin select part
 			{
 				patch_t *cursor;
-				const INT32 curx = (((setupm_skinselect % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH/2)) + SKINXSHIFT) + 20;
-				const INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ 10);
+				INT32 curx = (((setupm_skinselect % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH/2)) + SKINXSHIFT) + 20;
+				INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ 10);
 
-				const UINT8 cursorframe = (I_GetTime() / 4) % 7;
+				UINT8 cursorframe = (I_GetTime() / 4) % 7;
 				cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
 				V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
 			}
@@ -8245,9 +8240,9 @@ static void M_DrawSetupMultiPlayerMenu(void)
 		case SKINMENUTYPE_GRID:
 			for (s = 0; s < SKINGRIDWIDTH*SKINGRIDHEIGHT; s++)
 			{
-				const INT32 x = ((s % SKINGRIDWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
-				const INT32 y = ((s / SKINGRIDWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDWIDTH/2))); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
-				const INT32 calcs = s + (setupm_skinypos * SKINGRIDWIDTH);
+				INT32 x = ((s % SKINGRIDWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
+				INT32 y = ((s / SKINGRIDWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDWIDTH/2))); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
+				INT32 calcs = s + (setupm_skinypos * SKINGRIDWIDTH);
 				INT16 skinn;
 				patch_t *face;
 				UINT8 *cmap;
@@ -8262,8 +8257,8 @@ static void M_DrawSetupMultiPlayerMenu(void)
 					continue;
 				}
 
-				face = skins[skinn]->facerankprefix;
-				cmap = R_GetTranslationColormap(skinn, skins[skinn]->prefcolor, GTC_MENUCACHE);
+				face = facerankprefix[skinn];
+				cmap = R_GetTranslationColormap(skinn, skins[skinn].prefcolor, GTC_MENUCACHE);
 
 				V_DrawFixedPatch(x << FRACBITS, y << FRACBITS, FRACUNIT, 0, face, cmap);
 			}
@@ -8271,44 +8266,36 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			if (itemOn == 1) //has to be on skin select part
 			{
 				patch_t *cursor;
-				const INT32 curx = (((setupm_skinselect % SKINGRIDWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDWIDTH/2)) + SKINXSHIFT) + 20;
-				const INT32 cury = (((setupm_skinselect / SKINGRIDWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDWIDTH/2)));
+				INT32 curx = (((setupm_skinselect % SKINGRIDWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDWIDTH/2)) + SKINXSHIFT) + 20;
+				INT32 cury = (((setupm_skinselect / SKINGRIDWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDWIDTH/2)));
 
 				if (setupm_skinselect < numskins)
 				{
-					const UINT8 *cmap = R_GetTranslationColormap(setupm_skinselect, setupm_fakecolor, GTC_MENUCACHE);
-					cursor = skins[skinsorted[setupm_skinselect]]->facewantprefix;
+					UINT8 *cmap = R_GetTranslationColormap(setupm_skinselect, setupm_fakecolor, GTC_MENUCACHE);
+					cursor = facewantprefix[skinsorted[setupm_skinselect]];
 					V_DrawFixedPatch(((curx-8) << FRACBITS), ((cury-8) << FRACBITS), FRACUNIT, 0, cursor, cmap);
 				}
 				else
 				{
-					const UINT8 cursorframe = (I_GetTime() / 4) % 7;
+					UINT8 cursorframe = (I_GetTime() / 4) % 7;
 					cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
 					V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
 				}
 			}
 
 			{ // stat dot
-				const INT32 selectedskin = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
-
-				speed = skins[selectedskin]->kartspeed;
-				weight = skins[selectedskin]->kartweight;
-
-				const INT32 x = (((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1);
-				const INT32 y = (((staty+71) + (weight*4))<<FRACBITS);
-
+				INT32 selectedskin = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
+				speed = skins[selectedskin].kartspeed;
+				weight = skins[selectedskin].kartweight;
 				statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
-
 				if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
-					V_DrawFixedPatch(x, y, FRACUNIT>>1, 0, statdot, flashcol);
+					V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, flashcol);
 				else
-					V_DrawFixedPatch(x, y, FRACUNIT>>1, 0, statdot, NULL);
+					V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
 
+				statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
 				if (setupm_fakecolor)
-				{
-					statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
-					V_DrawFixedPatch(x, y, FRACUNIT>>1, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
-				}
+					V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
 			}
 			break;
 		case SKINMENUTYPE_2D:
@@ -8317,13 +8304,12 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			{
 				for (w = 0; w < MAXSTAT; w++)
 				{
+					INT32 x = ((s * 18) + ((BASEVIDWIDTH / 2) - (18 * 4)) - 8 + SKINXSHIFT); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
+					INT32 y = ((w * 18) + ((BASEVIDHEIGHT / 2) - (18 * 4)) - 8); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
 					INT32 skinn;
 					patch_t *face;
 					UINT8 *cmap;
 
-					const INT32 x = ((s * 18) + ((BASEVIDWIDTH / 2) - (18 * 4)) - 8 + SKINXSHIFT); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
-					const INT32 y = ((w * 18) + ((BASEVIDHEIGHT / 2) - (18 * 4)) - 8); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
-
 					if (!skinstatscount[s][w])
 					{
 						V_DrawFill(x, y, 16, 16, 239);
@@ -8331,8 +8317,8 @@ static void M_DrawSetupMultiPlayerMenu(void)
 					}
 
 					skinn = skinstats[s][w][(I_GetTime() / TICRATE) % skinstatscount[s][w]];
-					face = skins[skinn]->facerankprefix;
-					cmap = R_GetTranslationColormap(skinn, skins[skinn]->prefcolor, GTC_MENUCACHE);
+					face = facerankprefix[skinn];
+					cmap = R_GetTranslationColormap(skinn, skins[skinn].prefcolor, GTC_MENUCACHE);
 
 					V_DrawFixedPatch(x << FRACBITS, y << FRACBITS, FRACUNIT, 0, face, cmap);
 				}
@@ -8341,20 +8327,20 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			if (itemOn == 1) //has to be on skin select part
 			{
 				patch_t *cursor;
-				const INT32 curx = ((setupm_skinxpos * 18) + ((BASEVIDWIDTH / 2) - (18 * 4)) - 8 + SKINXSHIFT);
-				const INT32 cury = ((setupm_skinypos * 18) + ((BASEVIDHEIGHT / 2) - (18 * 4)) - 8);
+				INT32 curx = ((setupm_skinxpos * 18) + ((BASEVIDWIDTH / 2) - (18 * 4)) - 8 + SKINXSHIFT);
+				INT32 cury = ((setupm_skinypos * 18) + ((BASEVIDHEIGHT / 2) - (18 * 4)) - 8);
 
 				if (skinstatscount[setupm_skinxpos][setupm_skinypos])
 				{
-					const UINT8 *cmap = R_GetTranslationColormap(setupm_skinselect, setupm_fakecolor, GTC_MENUCACHE);
-					const INT32 skinn = skinstats[setupm_skinxpos][setupm_skinypos][(I_GetTime() / TICRATE) % skinstatscount[setupm_skinxpos][setupm_skinypos]];
+					UINT8 *cmap = R_GetTranslationColormap(setupm_skinselect, setupm_fakecolor, GTC_MENUCACHE);
+					INT32 skinn = skinstats[setupm_skinxpos][setupm_skinypos][(I_GetTime() / TICRATE) % skinstatscount[setupm_skinxpos][setupm_skinypos]];
 
-					cursor = skins[skinn]->facewantprefix;
+					cursor = facewantprefix[skinn];
 					V_DrawFixedPatch(((curx-8) << FRACBITS), ((cury-8) << FRACBITS), FRACUNIT, 0, cursor, cmap);
 				}
 				else
 				{
-					const UINT8 cursorframe = (I_GetTime() / 4) % 7;
+					UINT8 cursorframe = (I_GetTime() / 4) % 7;
 					cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
 					V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
 				}
@@ -8362,26 +8348,18 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			break;
 #undef SKINXSHIFT
 		default:
-			{
-				speed = skins[setupm_fakeskin]->kartspeed;
-				weight = skins[setupm_fakeskin]->kartweight;
+			speed = skins[setupm_fakeskin].kartspeed;
+			weight = skins[setupm_fakeskin].kartweight;
 
-				const INT32 x = ((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS;
-				const INT32 y = ((my+76) + ((weight-1)*8))<<FRACBITS;
+			statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
+			if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
+				V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, flashcol);
+			else
+				V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, NULL);
 
-				statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
-
-				if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
-					V_DrawFixedPatch(x, y, FRACUNIT, 0, statdot, flashcol);
-				else
-					V_DrawFixedPatch(x, y, FRACUNIT, 0, statdot, NULL);
-
-				if (setupm_fakecolor)
-				{
-					statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
-					V_DrawFixedPatch(x, y, FRACUNIT, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
-				}
-			}
+			statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
+			if (setupm_fakecolor)
+				V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
 			break;
 	}
 
@@ -8395,7 +8373,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			colwidth = colwidth - 10;
 
 		INT32 j = -colwidth;
-		INT32 col = setupm_fakecolor - colwidth;
+		INT16 col = setupm_fakecolor - colwidth;
 		INT32 x = mx;
 		INT32 cw = indexwidth;
 		UINT8 ch;
@@ -8408,13 +8386,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				cw = charw;
 			else
 				cw = indexwidth;
-
 			for (ch = 0; ch < 16; ch++)
 				V_DrawFill(x, my+(cv_skinselectmenu.value?176:162)+ch, cw, 1, colortranslations[col][ch]);
-
 			if (++col >= MAXSKINCOLORS)
 				col -= MAXSKINCOLORS-1;
-
 			x += cw;
 		}
 	}
@@ -8426,7 +8401,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	{
 		const INT32 icons = 4;
 		INT32 k = -icons;
-		INT32 col = setupm_fakeskin - icons;
+		INT16 col = setupm_fakeskin - icons;
 		INT32 x = BASEVIDWIDTH/2 - ((icons+1)*24) - 4;
 		fixed_t scale = FRACUNIT/2;
 		INT32 offx = 8, offy = 8;
@@ -8442,33 +8417,28 @@ static void M_DrawSetupMultiPlayerMenu(void)
 
 		if (col < 0)
 			col += numskins;
-
 		while (k <= icons)
 		{
 			if (!(k++))
 			{
 				scale = FRACUNIT;
-				face = skins[col]->facewantprefix;
+				face = facewantprefix[col];
 				offx = 12;
 				offy = 0;
 			}
 			else
 			{
 				scale = FRACUNIT/2;
-				face = skins[col]->facerankprefix;
+				face = facerankprefix[col];
 				offx = 8;
 				offy = 8;
 			}
-
 			colmap =  R_GetTranslationColormap(col, setupm_fakecolor, GTC_MENUCACHE);
 			V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, face, colmap);
-
 			if (scale == FRACUNIT) // bit of a hack
 				V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, cursor, colmap);
-
 			if (++col >= numskins)
 				col -= numskins;
-
 			x += FixedMul(iconwidth<<FRACBITS, 3*scale/2)/FRACUNIT;
 		}
 	}
@@ -8494,7 +8464,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	switch (cv_skinselectmenu.value)
 	{
 		case SKINMENUTYPE_2D:
-			skintodisplay = (skinnum_t)setupm_fakeskin;
+			skintodisplay = (UINT8)setupm_fakeskin;
 			if (setupm_skinlockedselect) // show the skin we are trying to select
 				skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][setupm_skinselect];
 			else if (skinstatscount[setupm_skinxpos][setupm_skinypos] && itemOn == 1)
@@ -8502,22 +8472,22 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			break;
 		case SKINMENUTYPE_EXTENDED:
 		case SKINMENUTYPE_GRID:
-			skintodisplay = ((itemOn == 1 && (setupm_skinselect < numskins)) ? skinsorted[setupm_skinselect] : (skinnum_t)setupm_fakeskin);
+			skintodisplay = ((itemOn == 1 && (setupm_skinselect < numskins)) ? skinsorted[setupm_skinselect] : (UINT8)setupm_fakeskin);
 			break;
 		default:
-			skintodisplay = (skinnum_t)setupm_fakeskin;
+			skintodisplay = (UINT8)setupm_fakeskin;
 			break;
 	}
 
-	if (skintodisplay >= numskins)
+	if (skintodisplay >= MAXSKINS)
 		skintodisplay = 0;
 
-	skinnum = R_SkinAvailable(skins[skintodisplay]->name);
+	skinnum = R_SkinAvailable(skins[skintodisplay].name);
 
-	if (skinnum < 0 || skinnum >= numskins)
+	if (skinnum < 0 || skinnum >= MAXSKINS)
 		skinnum = 0;
 
-	sprdef = &skins[skinnum]->spritedef;
+	sprdef = &skins[skinnum].spritedef;
 
 	if (!sprdef->numframes) // No frames ??
 		return; // Can't render!
@@ -8535,7 +8505,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	{
 		UINT8 *colormap = R_GetTranslationColormap(skintodisplay, setupm_fakecolor, GTC_MENUCACHE);
 #ifdef HWRENDER
-		md2_t *md2 = &skins[skinnum]->playermodel;
+		md2_t *md2 = &md2_playermodels[skinnum];
 #endif
 		mx += 36;
 		my += 131;
@@ -8566,11 +8536,11 @@ static void M_DrawSetupMultiPlayerMenu(void)
 
 			patch = (patch_t *)W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
 
-			if (skins[skintodisplay]->flags & SF_HIRES)
+			if (skins[skintodisplay].flags & SF_HIRES)
 			{
 				V_DrawFixedPatch(mx<<FRACBITS,
 								 my<<FRACBITS,
-								 skins[skintodisplay]->highresscale,
+								 skins[skintodisplay].highresscale,
 								 flags, patch, colormap);
 			}
 			else
@@ -8609,7 +8579,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				}
 				else
 					M_NextOpt();
-
 				S_StartSound(NULL, sfx_menu1); // Tails
 				break;
 			}
@@ -8636,7 +8605,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 					{
 						M_NextOpt();
 					}
-
 					S_StartSound(NULL, sfx_menu1);
 				}
 				else if (itemOn == 0)
@@ -8647,11 +8615,9 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				}
 				else
 					M_NextOpt();
-
 				S_StartSound(NULL, sfx_menu1); // Tails
 				break;
 			}
-
 			M_NextOpt();
 			S_StartSound(NULL, sfx_menu1); // Tails
 			break;
@@ -8669,7 +8635,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				}
 				else
 					M_PrevOpt();
-
 				S_StartSound(NULL, sfx_menu1); // Tails
 				break;
 			}
@@ -8688,7 +8653,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 					{
 						M_PrevOpt();
 					}
-
 					S_StartSound(NULL, sfx_menu1);
 				}
 				else if (itemOn == 2)
@@ -8708,11 +8672,9 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				}
 				else
 					M_PrevOpt();
-
 				S_StartSound(NULL, sfx_menu1); // Tails
 				break;
 			}
-
 			M_PrevOpt();
 			S_StartSound(NULL, sfx_menu1); // Tails
 			break;
@@ -8731,7 +8693,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 						setupm_skinselect--;
 					else
 						setupm_skinselect = SELECTEDSTATSCOUNT - 1;
-
 					S_StartSound(NULL, sfx_menu1);
 				}
 				else       //player skin
@@ -8764,7 +8725,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 					else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
 						setupm_skinypos = (((roundedskins/8) - SKINGRIDHEIGHT-2) > 0 ? (roundedskins/8) - SKINGRIDHEIGHT-2 : 0);
 				}
-
 				S_StartSound(NULL, sfx_menu1);
 				break;
 			}
@@ -8795,7 +8755,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 						setupm_skinselect++;
 					else
 						setupm_skinselect = 0;
-
 					S_StartSound(NULL, sfx_menu1);
 				}
 				else       //player skin
@@ -8830,7 +8789,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 					setupm_skinselect = 0;
 					setupm_skinypos = 0;
 				}
-
 				S_StartSound(NULL, sfx_menu1);
 				break;
 			}
@@ -8853,14 +8811,12 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				setupm_skinlockedselect = false;
 				break;
 			}
-
 			exitmenu = true;
 			break;
 
 		case KEY_BACKSPACE:
 			if (cv_skinselectmenu.value)
 				BREAKWHENLOCKED
-
 			if (itemOn == 0)
 			{
 				M_TextInputHandle(&setupm_input, choice);
@@ -8877,7 +8833,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 			}
 			else if (itemOn == 2)
 			{
-				UINT8 col = skins[setupm_fakeskin]->prefcolor;
+				UINT8 col = skins[setupm_fakeskin].prefcolor;
 				if (setupm_fakecolor != col)
 				{
 					S_StartSound(NULL, sfx_menu1); // Tails
@@ -8890,7 +8846,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 		case KEY_DEL:
 			if (cv_skinselectmenu.value)
 				BREAKWHENLOCKED
-
 			if (itemOn == 0)
 			{
 				M_TextInputHandle(&setupm_input, choice);
@@ -9100,7 +9055,7 @@ static boolean M_QuitMultiPlayerMenu(void)
 	}
 
 	// you know what? always putting these in the buffer won't hurt anything.
-	COM_BufAddText(va("%s \"%s\"\n", setupm_cvskin->name, skins[setupm_fakeskin]->name));
+	COM_BufAddText(va("%s \"%s\"\n", setupm_cvskin->name, skins[setupm_fakeskin].name));
 	COM_BufAddText(va("%s %d\n", setupm_cvcolor->name, setupm_fakecolor));
 
 	return true;
@@ -9207,7 +9162,7 @@ static void M_DrawJoystick(void)
 		compareval4 = cv_usejoystick[3].value;
 		compareval3 = cv_usejoystick[2].value;
 		compareval2 = cv_usejoystick[1].value;
-		compareval  = cv_usejoystick[0].value;
+		compareval = cv_usejoystick[0].value;
 #endif
 
 		if    ((setupcontrolplayer == 4 && (i == compareval4))
@@ -9246,13 +9201,14 @@ void M_SetupJoystickMenu(INT32 choice)
 		//
 		// Update cv_usejoystick.string here so that the user can
 		// properly change this value.
-		for (INT32 f = 0; f < MAXSPLITSCREENPLAYERS; f++)
-		{
-			if (i == cv_usejoystick[f].value)
-			{
-				CV_SetValue(&cv_usejoystick[f], i);
-			}
-		}
+		if (i == cv_usejoystick[0].value)
+			CV_SetValue(&cv_usejoystick[0], i);
+		if (i == cv_usejoystick[1].value)
+			CV_SetValue(&cv_usejoystick[1], i);
+		if (i == cv_usejoystick[2].value)
+			CV_SetValue(&cv_usejoystick[2], i);
+		if (i == cv_usejoystick[3].value)
+			CV_SetValue(&cv_usejoystick[3], i);
 #endif
 	}
 
@@ -9291,11 +9247,9 @@ static void M_Setup4PJoystickMenu(INT32 choice)
 static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
 {
 	INT32 oldchoice, oldstringchoice;
+	const int joynum = atoi(cv_usejoystick[pnum].string);
 
-#define joystrnum (atoi(cv_usejoystick[pnum].string))
-#define joyoldchoice ((joystrnum > numcontrollers) ? joystrnum : cv_usejoystick[pnum].value)
-
-	oldchoice = oldstringchoice = joyoldchoice;
+	oldchoice = oldstringchoice = joynum > numcontrollers ? joynum : cv_usejoystick[pnum].value;
 	CV_SetValue(&cv_usejoystick[pnum], choice);
 
 	// Just in case last-minute changes were made to cv_usejoystick.value,
@@ -9305,37 +9259,59 @@ static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
 	{
 		CV_SetValue(&cv_usejoystick[pnum], cv_usejoystick[pnum].value);
 
-		// reset this so the comparison is valid
-		if (oldchoice > numcontrollers)
+		if (oldchoice > numcontrollers)  /* reset this so the comparison is valid*/
 			oldchoice = cv_usejoystick[pnum].value;
 
 		if (oldchoice != choice)
 		{
 			if (choice && oldstringchoice > numcontrollers) // if we did not select "None", we likely selected a used device
-			{
-				CV_SetValue(&cv_usejoystick[pnum], ((oldstringchoice > numcontrollers) ? oldstringchoice : oldchoice));
-			}
+				CV_SetValue(&cv_usejoystick[pnum], (oldstringchoice > numcontrollers ? oldstringchoice : oldchoice));
 
-			if (oldstringchoice == joyoldchoice)
-			{
+			if (oldstringchoice ==
+				(joynum > numcontrollers ? joynum : cv_usejoystick[pnum].value))
 				M_StartMessage("This joystick is used by another\n"
 				"player. Reset the joystick\n"
 				"for that player first.\n\n"
 				"(Press a key)\n", NULL, MM_NOTHING);
-			}
 		}
 	}
-#undef joystrnum
-#undef joyoldchoice
 }
 #endif
 
 static void M_AssignJoystick(INT32 choice)
 {
 #ifdef JOYSTICK_HOTPLUG
-	M_DoAssignJoystick((setupcontrolplayer-1), choice);
+	switch (setupcontrolplayer)
+	{
+		case 4:
+			M_DoAssignJoystick(3, choice);
+			break;
+		case 3:
+			M_DoAssignJoystick(2, choice);
+			break;
+		case 2:
+			M_DoAssignJoystick(1, choice);
+			break;
+		case 1:
+			M_DoAssignJoystick(0, choice);
+			break;
+	}
 #else
-	CV_SetValue(&cv_usejoystick[(setupcontrolplayer-1)], choice);
+	switch (setupcontrolplayer)
+	{
+		case 4:
+			CV_SetValue(&cv_usejoystick[3], choice);
+			break;
+		case 3:
+			CV_SetValue(&cv_usejoystick[2], choice);
+			break;
+		case 2:
+			CV_SetValue(&cv_usejoystick[1], choice);
+			break;
+		case 1:
+			CV_SetValue(&cv_usejoystick[0], choice);
+			break;
+	}
 #endif
 }
 
@@ -9373,7 +9349,7 @@ static void M_SetupControlsMenu(UINT8 pnum)
 	{
 		// Hide P1-only controls
 		OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // Chat
-		OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Rankings
+		OP_AllControlsMenu[10].status = IT_GRAYEDOUT2; // Rankings
 		OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Pause
 		OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // Screenshot
 		OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // GIF
@@ -9385,7 +9361,7 @@ static void M_SetupControlsMenu(UINT8 pnum)
 	{
 		// Unhide P1-only controls
 		OP_AllControlsMenu[19].status = IT_CONTROL; // Chat
-		OP_AllControlsMenu[20].status = IT_CONTROL; // Rankings
+		OP_AllControlsMenu[10].status = IT_CONTROL; // Rankings
 		OP_AllControlsMenu[21].status = IT_CONTROL; // Pause
 		OP_AllControlsMenu[22].status = IT_CONTROL; // Screenshot
 		OP_AllControlsMenu[23].status = IT_CONTROL; // GIF
@@ -9622,13 +9598,11 @@ static void M_ChangecontrolResponse(event_t *ev)
 		menu_t *prev = currentMenu->prevMenu;
 
 		if (controltochange == gc_pause)
-		{
-			snprintf(tmp, sizeof(tmp), M_GetText("The \x82Pause Key \x80is enabled, but \nyou may select another key. \n\nHit another key for\n%s\nESC for Cancel"), controltochangetext);
-		}
+			sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nyou may select another key. \n\nHit another key for\n%s\nESC for Cancel"),
+				controltochangetext);
 		else
-		{
-			snprintf(tmp, sizeof(tmp), M_GetText("The \x82Pause Key \x80is enabled, but \nit is not configurable. \n\nHit another key for\n%s\nESC for Cancel"), controltochangetext);
-		}
+			sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nit is not configurable. \n\nHit another key for\n%s\nESC for Cancel"),
+				controltochangetext);
 
 		M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER);
 		currentMenu->prevMenu = prev;
@@ -9649,7 +9623,8 @@ static void M_ChangeControl(INT32 choice)
 	static char tmp[68];
 
 	controltochange = currentMenu->menuitems[choice].alphaKey;
-	snprintf(tmp, sizeof(tmp), M_GetText("Hit the new key for\n%s\nESC for Cancel"), currentMenu->menuitems[choice].text);
+	sprintf(tmp, M_GetText("Hit the new key for\n%s\nESC for Cancel"),
+		currentMenu->menuitems[choice].text);
 	strlcpy(controltochangetext, currentMenu->menuitems[choice].text, 33);
 
 	M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER);
@@ -9876,7 +9851,7 @@ static void M_DrawLocalSkinMenu(void)
 	UINT8 frame;
 	INT32 skintodisplay = 0;
 	UINT32 speenframe;
-	skin_t *displayskin;
+	skin_t displayskin;
 
 	mx = OP_ForkedBirdDef.x;
 	my = OP_ForkedBirdDef.y;
@@ -9918,7 +9893,7 @@ static void M_DrawLocalSkinMenu(void)
 
 	displayskin = allskins[skintodisplay];
 
-	sprdef = &displayskin->spritedef;
+	sprdef = &displayskin.spritedef;
 
 	if (!sprdef->numframes) // No frames ??
 		return; // Can't render!
@@ -9931,25 +9906,24 @@ static void M_DrawLocalSkinMenu(void)
 	V_DrawFill(mx + 220 - (charw/2), my+54, charw, 84, 239);
 #undef charw
 
-	// FIXME: is using just "skins" array even correct?
-	UINT8 *colormap = R_GetLocalTranslationColormap(skins[displayskin->skinnum], (displayskin->localskin ? localskins[displayskin->skinnum] : NULL), cv_playercolor.value, GTC_MENUCACHE, displayskin->localskin);
+	UINT8 *colormap = R_GetLocalTranslationColormap(&skins[displayskin.localnum], (displayskin.localskin ? &localskins[displayskin.localnum] : NULL), cv_playercolor.value, GTC_MENUCACHE, displayskin.localskin);
 
-	V_DrawMappedPatch(mx, my+50, 0, (patch_t *)W_CachePatchName(displayskin->facewant, PU_PATCH), colormap);
-	V_DrawMappedPatch(mx+8, my+85, 0, (patch_t *)W_CachePatchName(displayskin->facerank, PU_PATCH), colormap);
+	V_DrawMappedPatch(mx, my+50, 0, (patch_t *)W_CachePatchName(displayskin.facewant, PU_PATCH), colormap);
+	V_DrawMappedPatch(mx+8, my+85, 0, (patch_t *)W_CachePatchName(displayskin.facerank, PU_PATCH), colormap);
 
 	V_DrawString(mx, my+108, V_ALLOWLOWERCASE, "Character");
 
-	if (strlen(displayskin->realname) > 10)
-		V_DrawThinString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, displayskin->realname);
+	if (strlen(displayskin.realname) > 10)
+		V_DrawThinString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, displayskin.realname);
 	else
-		V_DrawString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, displayskin->realname);
+		V_DrawString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, displayskin.realname);
 
 	// draw player sprite
 	mx += 220;
 	my += 120;
 
 #ifdef HWRENDER
-	md2_t *md2 = &displayskin->playermodel;
+	md2_t *md2 = (displayskin.localskin ? &md2_localplayermodels[skintodisplay] : &md2_playermodels[skintodisplay]);
 
 	// if we have 3d models enabled and a model exists
 	// try to show it instead of the sprite
@@ -9977,9 +9951,9 @@ static void M_DrawLocalSkinMenu(void)
 
 		patch = (patch_t *)W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
 
-		if (displayskin->flags & SF_HIRES)
+		if (displayskin.flags & SF_HIRES)
 		{
-			V_DrawFixedPatch(mx<<FRACBITS, my<<FRACBITS, displayskin->highresscale, flags, patch, colormap);
+			V_DrawFixedPatch(mx<<FRACBITS, my<<FRACBITS, displayskin.highresscale, flags, patch, colormap);
 		}
 		else
 		{
@@ -10082,7 +10056,7 @@ static void M_DrawColorMenu(void)
 
 	for (max = currentMenu->numitems; max > 0; max--)
 	{
-		if (currentMenu->menuitems[max-1].status != IT_DISABLED && currentMenu->menuitems[max-1].alphaKey*2 + tempcentery <= (currentMenu->y + 2*scrollareaheight))
+		if (currentMenu->menuitems[max].status != IT_DISABLED && currentMenu->menuitems[max-1].alphaKey*2 + tempcentery <= (currentMenu->y + 2*scrollareaheight))
 			break;
 	}
 

src/m_menu.h

@@ -230,8 +230,8 @@ typedef struct
 	char levelname[32];
 	UINT8 actnum;
 	UINT8 skincolor;
-	skinnum_t skinnum;
-	skinnum_t botskin;
+	UINT8 skinnum;
+	UINT8 botskin;
 	UINT8 botcolor;
 	UINT8 numemeralds;
 	INT32 lives;

src/m_misc.c

@@ -515,8 +515,8 @@ static boolean M_BackupConfig(const char *filename)
 {
 	char backupfile[MAX_WADPATH+4];
 
-	snprintf(backupfile, sizeof(backupfile), "%s.bak", filename);
-	backupfile[sizeof(backupfile) - 1] = '\0';
+	snprintf(backupfile, sizeof backupfile, "%s.bak", filename);
+	backupfile[sizeof backupfile - 1] = '\0';
 
 	FILE *config = fopen(filename, "r");
 
@@ -766,27 +766,27 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
 	}
 
 	if (gamestate == GS_LEVEL)
-		snprintf(maptext, sizeof(maptext), "%s", G_BuildMapName(gamemap));
+		snprintf(maptext, 8, "%s", G_BuildMapName(gamemap));
 	else
-		snprintf(maptext, sizeof(maptext), "Unknown");
+		snprintf(maptext, 8, "Unknown");
 
 	if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->lvlttl[0] != '\0')
-		snprintf(lvlttltext, sizeof(lvlttltext), "%s%s%s",
+		snprintf(lvlttltext, 48, "%s%s%s",
 			mapheaderinfo[gamemap-1]->lvlttl,
 			(strlen(mapheaderinfo[gamemap-1]->zonttl) > 0) ? va(" %s",mapheaderinfo[gamemap-1]->zonttl) : // SRB2kart
 			((mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE) ? "" : " ZONE"),
 			(strlen(mapheaderinfo[gamemap-1]->actnum) > 0) ? va(" %s",mapheaderinfo[gamemap-1]->actnum) : "");
 	else
-		snprintf(lvlttltext, sizeof(lvlttltext), "Unknown");
+		snprintf(lvlttltext, 48, "Unknown");
 
 	if (gamestate == GS_LEVEL && players[displayplayers[0]].mo)
-		snprintf(locationtxt, sizeof(locationtxt), "X:%d Y:%d Z:%d A:%d",
+		snprintf(locationtxt, 40, "X:%d Y:%d Z:%d A:%d",
 			players[displayplayers[0]].mo->x>>FRACBITS,
 			players[displayplayers[0]].mo->y>>FRACBITS,
 			players[displayplayers[0]].mo->z>>FRACBITS,
 			FixedInt(AngleFixed(players[displayplayers[0]].mo->angle)));
 	else
-		snprintf(locationtxt, sizeof(locationtxt), "Unknown");
+		snprintf(locationtxt, 40, "Unknown");
 
 	memset(png_infotext, 0x00, sizeof(png_infotext));
 
@@ -1253,6 +1253,7 @@ boolean M_ScreenshotResponder(event_t *ev)
 	return true;
 }
 
+
 void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen, tic_t timer)
 {
 	// How much should we scroll. Not sure why +1 is needed, but without it this function skips 2
@@ -1260,7 +1261,7 @@ void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen,
 	const size_t amount = len - maxlen + 1;
 
 	// Note: anything above 17 will cause zero division
-	static const size_t MAXSPEED = 6;
+	const size_t MAXSPEED = 6;
 	const tic_t t = timer / (35/min(amount, MAXSPEED));
 
 	const size_t state = (t / amount) % 4;
@@ -1295,7 +1296,7 @@ void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen,
 	}
 
 	// Technically not necessary, since it gets set again after function call, but just in case
-	result[maxlen-1] = '\0';
+	result[maxlen] = 0;
 }
 
 void M_MinimapGenerate(void)
@@ -1393,7 +1394,7 @@ char *va(const char *format, ...)
 	static char string[1024];
 
 	va_start(argptr, format);
-	vsnprintf(string, sizeof(string), format, argptr);
+	vsnprintf(string, 1024, format, argptr);
 	va_end(argptr);
 
 	return string;
@@ -1707,7 +1708,7 @@ const char * M_Ftrim(double f)
 	int i;
 
 	/* I know I said it's the default, but just in case... */
-	snprintf(dig, sizeof(dig), "%.6f", fabs(modf(f, &f)));
+	sprintf(dig, "%.6f", fabs(modf(f, &f)));
 
 	/* trim trailing zeroes */
 	for (i = strlen(dig)-1; dig[i] == '0'; --i)
@@ -1735,7 +1736,6 @@ UINT8 M_CountBits(UINT32 num, UINT8 size)
 const char *GetRevisionString(void)
 {
 	static char rev[9] = {0};
-
 	if (rev[0])
 		return rev;
 
@@ -1743,7 +1743,6 @@ const char *GetRevisionString(void)
 		strncpy(rev, comprevision, 7);
 	else
 		snprintf(rev, 7, "r%s", comprevision);
-
 	rev[7] = '\0';
 
 	return rev;
@@ -1815,35 +1814,35 @@ TMatrix *RotateZMatrix(angle_t rad)
 char *sizeu1(size_t num)
 {
 	static char sizeu1_buf[28];
-	snprintf(sizeu1_buf, sizeof(sizeu1_buf), "%" PRIdS, num);
+	sprintf(sizeu1_buf, "%"PRIdS, num);
 	return sizeu1_buf;
 }
 
 char *sizeu2(size_t num)
 {
 	static char sizeu2_buf[28];
-	snprintf(sizeu2_buf, sizeof(sizeu2_buf), "%" PRIdS, num);
+	sprintf(sizeu2_buf, "%"PRIdS, num);
 	return sizeu2_buf;
 }
 
 char *sizeu3(size_t num)
 {
 	static char sizeu3_buf[28];
-	snprintf(sizeu3_buf, sizeof(sizeu3_buf), "%" PRIdS, num);
+	sprintf(sizeu3_buf, "%"PRIdS, num);
 	return sizeu3_buf;
 }
 
 char *sizeu4(size_t num)
 {
 	static char sizeu4_buf[28];
-	snprintf(sizeu4_buf, sizeof(sizeu4_buf), "%" PRIdS, num);
+	sprintf(sizeu4_buf, "%"PRIdS, num);
 	return sizeu4_buf;
 }
 
 char *sizeu5(size_t num)
 {
 	static char sizeu5_buf[28];
-	snprintf(sizeu5_buf, sizeof(sizeu5_buf), "%" PRIdS, num);
+	sprintf(sizeu5_buf, "%"PRIdS, num);
 	return sizeu5_buf;
 }
 

src/m_perfstats.c

@@ -47,7 +47,6 @@ struct perfstatrow {
 static ps_metric_t ps_frametime = {0};
 
 ps_metric_t ps_tictime = {0};
-ps_metric_t ps_prevtictime = {0};
 
 ps_metric_t ps_playerthink_time = {0};
 ps_metric_t ps_thinkertime = {0};
@@ -169,14 +168,14 @@ perfstatrow_t gamelogic_rows[] = {
 };
 
 perfstatrow_t thinkercount_rows[] = {
-	{"thnkers"  , "Thinkers:       ", &ps_thinkercount, PS_LEVEL},
-	{" mobjs  " , " Mobjs:          ", &ps_mobjcount, PS_LEVEL},
+	{"thnkers", "Thinkers:       ", &ps_thinkercount, PS_LEVEL},
+	{" mobjs  ", " Mobjs:          ", &ps_mobjcount, PS_LEVEL},
 	{"  regular", "  Regular:        ", &ps_regularcount, PS_LEVEL},
 	{"  scenery", "  Scenery:        ", &ps_scenerycount, PS_LEVEL},
 	{"  nothink", "  Nothink:        ", &ps_nothinkcount, PS_HIDE_ZERO|PS_LEVEL},
-	{" precip " , " Precipitation:  ", &ps_precipcount, PS_LEVEL},
-	{" other  " , " Other:          ", &ps_otherthcount, PS_LEVEL},
-	{" remove " , " Pending removal:", &ps_removecount, PS_LEVEL},
+	{" precip ", " Precipitation:  ", &ps_precipcount, PS_LEVEL},
+	{" other  ", " Other:          ", &ps_otherthcount, PS_LEVEL},
+	{" remove ", " Pending removal:", &ps_removecount, PS_LEVEL},
 	{}
 };
 
@@ -606,9 +605,7 @@ static void PS_CountThinkers(void)
 		else if (thinker->function == (actionf_p1)P_MobjThinker)
 		{
 			mobj_t *mobj = (mobj_t*)thinker;
-
 			ps_mobjcount.value.i++;
-
 			if (mobj->flags & MF_NOTHINK)
 				ps_nothinkcount.value.i++;
 			else if (mobj->flags & MF_SCENERY)
@@ -627,17 +624,49 @@ static void PS_CountThinkers(void)
 
 		ps_precipcount.value.i++;
 	}
+
+	/*for (i = 0; i < NUM_THINKERLISTS; i++)
+	{
+		for (thinker = thlist[i].next; thinker != &thlist[i]; thinker = thinker->next)
+		{
+			ps_thinkercount.value.i++;
+			if (thinker->function == (actionf_p1)P_RemoveThinkerDelayed)
+				ps_removecount.value.i++;
+			else if (i == THINK_POLYOBJ)
+				ps_polythcount.value.i++;
+			else if (i == THINK_MAIN)
+				ps_mainthcount.value.i++;
+			else if (i == THINK_MOBJ)
+			{
+				if (thinker->function == (actionf_p1)P_MobjThinker)
+				{
+					mobj_t *mobj = (mobj_t*)thinker;
+					ps_mobjcount.value.i++;
+					if (mobj->flags & MF_NOTHINK)
+						ps_nothinkcount.value.i++;
+					else if (mobj->flags & MF_SCENERY)
+						ps_scenerycount.value.i++;
+					else
+						ps_regularcount.value.i++;
+				}
+			}
+			else if (i == THINK_DYNSLOPE)
+				ps_dynslopethcount.value.i++;
+			else if (i == THINK_PRECIP)
+				ps_precipcount.value.i++;
+		}
+	}*/
 }
 
 // Update all metrics that are calculated on every tick.
 void PS_UpdateTickStats(void)
 {
-	if (cv_perfstats.value == PS_RENDER && cv_ps_samplesize.value > 1)
+	if (cv_perfstats.value == 1 && cv_ps_samplesize.value > 1)
 	{
 		PS_UpdateRowHistories(gamelogicbrief_row, false);
 	}
 
-	if (cv_perfstats.value == PS_LOGIC)
+	if (cv_perfstats.value == 2)
 	{
 		if (PS_IsLevelActive())
 		{
@@ -662,25 +691,25 @@ void PS_UpdateTickStats(void)
 
 	if (cv_ps_samplesize.value > 1)
 	{
-		if (cv_perfstats.value >= PS_THINKFRAME && PS_IsLevelActive())
+		if (cv_perfstats.value >= 3 && PS_IsLevelActive())
 		{
 			int i;
 
 			switch (cv_perfstats.value)
 			{
-				case PS_THINKFRAME:
+				case 3:
 					for (i = 0; i < thinkframe_hooks_length; i++)
 					{
 						PS_UpdateMetricHistory(&thinkframe_hooks[i].time_taken, true, false);
 					}
 					break;
-				case PS_PRETHINKFRAME:
+				case 4:
 					for (i = 0; i < prethinkframe_hooks_length; i++)
 					{
 						PS_UpdateMetricHistory(&prethinkframe_hooks[i].time_taken, true, false);
 					}
 					break;
-				case PS_POSTTHINKFRAME:
+				case 5:
 					for (i = 0; i < postthinkframe_hooks_length; i++)
 					{
 						PS_UpdateMetricHistory(&postthinkframe_hooks[i].time_taken, true, false);
@@ -690,7 +719,6 @@ void PS_UpdateTickStats(void)
 					break;
 			}
 		}
-
 		if (cv_perfstats.value)
 		{
 			ps_tick_index++;
@@ -721,7 +749,7 @@ static void PS_DrawDescriptorHeader(void)
 		int samples_left = max(ps_frame_samples_left, ps_tick_samples_left);
 		int x, y;
 
-		if (cv_perfstats.value >= PS_THINKFRAME)
+		if (cv_perfstats.value >= 3)
 		{
 			x = 2;
 			y = 0;
@@ -837,19 +865,20 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 	last_mod_name[0] = '\0';
 	INT32 total = 0;
 
-	// Decide page length based and drawn text on choosen thinker type
+	//Decide page length based and drawn text on choosen thinker type
 	switch (cv_perfstats.value)
 	{
-		case PS_THINKFRAME:
+		case 3:
 			{
 				maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
 				page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
 				pagestart = min((page - 1)*PAGE_ENTRIES, thinkframe_hooks_length);
 				pageend   = min(pagestart + PAGE_ENTRIES, thinkframe_hooks_length);
+
 				V_DrawSmallString(MAX_X-50, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "ThinkFrame");
 			}
 			break;
-		case PS_PRETHINKFRAME:
+		case 4:
 			{
 				maxpage = prethinkframe_hooks_length/PAGE_ENTRIES + 1;
 				page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
@@ -858,7 +887,7 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 				V_DrawSmallString(MAX_X-60, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "PreThinkFrame");
 			}
 			break;
-		case PS_POSTTHINKFRAME:
+		case 5:
 			{
 				maxpage = postthinkframe_hooks_length/PAGE_ENTRIES + 1;
 				page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
@@ -946,22 +975,7 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 
 void PS_ThinkFrame_Page_OnChange(void)
 {
-	int maxpage = 0;
-
-	switch (cv_perfstats.value)
-	{
-		case PS_THINKFRAME:
-			maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
-			break;
-		case PS_PRETHINKFRAME:
-			maxpage = prethinkframe_hooks_length/PAGE_ENTRIES + 1;
-			break;
-		case PS_POSTTHINKFRAME:
-			maxpage = postthinkframe_hooks_length/PAGE_ENTRIES + 1;
-			break;
-		default:
-			break;
-	}
+	int maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
 
 	if (cv_ps_thinkframe_page.value > maxpage)
 		CV_StealthSetValue(&cv_ps_thinkframe_page, maxpage);
@@ -994,18 +1008,18 @@ static void PS_DrawPostThinkFrameStats(void)
 
 void M_DrawPerfStats(void)
 {
-	if (cv_perfstats.value == PS_RENDER) // rendering
+	if (cv_perfstats.value == 1) // rendering
 	{
 		PS_UpdateFrameStats();
 		PS_DrawRenderStats();
 	}
-	else if (cv_perfstats.value == PS_LOGIC) // logic
+	else if (cv_perfstats.value == 2) // logic
 	{
 		// PS_UpdateTickStats is called in TryRunTics, since otherwise it would miss
 		// tics when frame skips happen
 		PS_DrawGameLogicStats();
 	}
-	else if (cv_perfstats.value >= PS_THINKFRAME) // lua thinkframe
+	else if (cv_perfstats.value >= 3) // lua thinkframe
 	{
 		if (!PS_IsLevelActive())
 			return;
@@ -1022,13 +1036,13 @@ void M_DrawPerfStats(void)
 
 		switch (cv_perfstats.value)
 		{
-			case PS_THINKFRAME:
+			case 3:
 				PS_DrawThinkFrameStats();
 				break;
-			case PS_PRETHINKFRAME:
+			case 4:
 				PS_DrawPreThinkFrameStats();
 				break;
-			case PS_POSTTHINKFRAME:
+			case 5:
 				PS_DrawPostThinkFrameStats();
 				break;
 			default:

src/m_perfstats.h

@@ -26,16 +26,6 @@ typedef struct
 	void *history;
 } ps_metric_t;
 
-typedef enum
-{
-	PS_OFF = 0,
-	PS_RENDER,
-	PS_LOGIC,
-	PS_THINKFRAME,
-	PS_PRETHINKFRAME,
-	PS_POSTTHINKFRAME
-} ps_types_t;
-
 typedef struct
 {
 	ps_metric_t time_taken;
@@ -46,7 +36,6 @@ typedef struct
 #define PS_STOP_TIMING(metric) metric.value.p = I_GetPreciseTime() - metric.value.p
 
 extern ps_metric_t ps_tictime;
-extern ps_metric_t ps_prevtictime;
 
 extern ps_metric_t ps_playerthink_time;
 extern ps_metric_t ps_thinkertime;

src/m_textinput.c

@@ -238,8 +238,8 @@ void M_TextInputClear(textinput_t *input)
 
 void M_TextInputSetString(textinput_t *input, const char *c)
 {
-	strncpy(input->buffer, c, input->buffer_size-1);
-	input->buffer[input->buffer_size-1] = '\0';
+	memset(input->buffer, 0, input->buffer_size);
+	strncpy(input->buffer, c, input->buffer_size);
 	input->cursor = input->select = input->length = strlen(input->buffer);
 }
 

src/p_inter.c

@@ -107,9 +107,6 @@ void P_DoNightsScore(player_t *player)
 
 	dummymo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z+player->mo->height/2, MT_NIGHTSCORE);
 
-	if (P_MobjWasRemovedCompat(dummymo))
-		return;
-
 	if (player->bot)
 		player = &players[consoleplayer];
 
@@ -2016,7 +2013,7 @@ static inline void P_NiGHTSDamage(mobj_t *target, mobj_t *source)
 	}
 }
 
-static boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
+static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
 {
 	player_t *player = target->player;
 	(void)damage; //unused parm
@@ -2635,7 +2632,6 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
 			if (i & 1)
 				P_SetObjectMomZ(mo, ns, true);
 		}
-
 		if (player->mo->eflags & MFE_VERTICALFLIP)
 			mo->momz *= -1;
 	}

src/p_local.h

@@ -295,10 +295,10 @@ FUNCINLINE static ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj)
 // so can only check if its not NULL in vanilla compat mode
 FUNCINLINE static ATTRINLINE boolean P_MobjWasRemovedCompat(const mobj_t *mobj)
 {
-#ifdef PHOBOS_BUILD
-	return P_MobjWasRemoved(mobj);
+#ifdef COMPAT_VANILLA
+	return (!mobj);
 #else
-	return !mobj;
+	return P_MobjWasRemoved(mobj);
 #endif
 }
 
@@ -418,7 +418,6 @@ boolean P_CheckSector(sector_t *sector, boolean crunch);
 void P_DelSeclist(msecnode_t *node);
 
 void P_CreateSecNodeList(mobj_t *thing, fixed_t x, fixed_t y);
-void P_Initsecnode(void);
 
 void P_RadiusAttack(mobj_t *spot, mobj_t *source, fixed_t damagedist);
 

src/p_map.c

@@ -245,12 +245,12 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 
 static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
 {
-	player_t *player = object->player; // will be NULL if not a player
+	player_t *p = object->player; // will be NULL if not a player
 	fixed_t zdist; // distance between bottoms
 	fixed_t speed = spring->info->mass; // conveniently, both fans and gas jets use this for the vertical thrust
 	SINT8 flipval = P_MobjFlip(spring); // virtually everything here centers around the thruster's gravity, not the object's!
 
-	if (player && object->state == &states[object->info->painstate]) // can't use fans and gas jets when player is in pain!
+	if (p && object->state == &states[object->info->painstate]) // can't use fans and gas jets when player is in pain!
 		return;
 
 	// is object's top below thruster's position? if not, calculate distance between their bottoms
@@ -276,7 +276,7 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
 				break;
 			if (flipval*object->momz >= FixedMul(speed, spring->scale)) // if object's already moving faster than your best, don't bother
 				break;
-			if (player && (player->climbing || player->pflags & PF_GLIDING)) // doesn't affect Knux when he's using his abilities!
+			if (p && (p->climbing || p->pflags & PF_GLIDING)) // doesn't affect Knux when he's using his abilities!
 				break;
 
 			object->momz += flipval*FixedMul(speed/4, spring->scale);
@@ -2026,7 +2026,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 
 	mapcampointer = thiscam;
 
-	if (newsec->flags & SF_NOCLIPCAMERA)
+	if (UNLIKELY(GETSECSPECIAL(newsec->special, 4) == 12))
 	{ // Camera noclip on entire sector.
 		tmfloorz = tmdropoffz = thiscam->z;
 		tmceilingz = tmdrpoffceilz = thiscam->z + thiscam->height;
@@ -2068,7 +2068,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 			fixed_t topheight, bottomheight, midheight;
 
 			if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL)
-			   || rover->master->frontsector->flags & SF_NOCLIPCAMERA)
+			   || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 				continue;
 
 			topheight    = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL);
@@ -2144,7 +2144,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 						// We're inside it! Yess...
 						polysec = po->lines[0]->backsector;
 
-						if (polysec->flags & SF_NOCLIPCAMERA)
+						if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
 						{ // Camera noclip polyobj.
 							plink = (polymaplink_t *)(plink->link.next);
 							continue;
@@ -3983,51 +3983,19 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
  Lots of new Boom functions that work faster and add functionality.
 */
 
-#ifndef PHOBOS_BUILD
-static msecnode_t *headsecnode = NULL;
-#endif
-
-void P_Initsecnode(void)
-{
-#ifndef PHOBOS_BUILD
-	headsecnode = NULL;
-#endif
-}
-
 // P_GetSecnode() retrieves a node from the freelist. The calling routine
 // should make sure it sets all fields properly.
 
 static msecnode_t *P_GetSecnode(void)
 {
-#ifdef PHOBOS_BUILD
 	return Z_LevelPoolCalloc(sizeof(msecnode_t));
-#else
-	msecnode_t *node;
-
-	if (headsecnode)
-	{
-		// vanilla does not clear this
-		// so for compat reasons we also dont
-		// means we just reuse stale data which causes weird interactions with orbiting items in some cases
-		node = headsecnode;
-		headsecnode = headsecnode->m_thinglist_next;
-	}
-	else
-		node = Z_LevelPoolCalloc(sizeof(msecnode_t));
-
-	return node;
-#endif
 }
 
 // P_PutSecnode() returns a node to the freelist.
+
 static inline void P_PutSecnode(msecnode_t *node)
 {
-#ifdef PHOBOS_BUILD
 	Z_LevelPoolFree(node, sizeof(msecnode_t));
-#else
-	node->m_thinglist_next = headsecnode;
-	headsecnode = node;
-#endif
 }
 
 // P_AddSecnode() searches the current list to see if this sector is

src/p_maputl.cpp

@@ -328,7 +328,7 @@ void P_CameraLineOpening(line_t *linedef)
 			{
 				fixed_t topheight, bottomheight, midheight;
 
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
@@ -358,7 +358,7 @@ void P_CameraLineOpening(line_t *linedef)
 			{
 				fixed_t topheight, bottomheight, midheight;
 
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
@@ -466,7 +466,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 		// Check for collision with front side's midtexture if Effect 4 is set
 		if (linedef->flags & ML_EFFECT4
 				  && !linedef->polyobj) // don't do anything for polyobjects! ...for now
-		{
+			{
 			side_t *side = &sides[linedef->sidenum[0]];
 			fixed_t textop, texbottom, texheight;
 			fixed_t texmid, delta1, delta2;

src/p_mobj.h

@@ -113,7 +113,7 @@ typedef enum
 	// Don't use the blocklinks (inert but displayable)
 	MF_NOBLOCKMAP       = 1<<4,
 	// Thin, paper-like collision bound (for visual equivalent, see FF_PAPERSPRITE)
-	MF_PAPERCOLLISION   = 1<<5,
+	MF_PAPERCOLLISION            = 1<<5,
 	// You can push this object. It can activate switches and things by pushing it on top.
 	MF_PUSHABLE         = 1<<6,
 	// Object is a boss.
@@ -266,8 +266,15 @@ typedef enum {
 	PCF_THUNK     = 1<<5, // Ran the thinker this tic.
 } precipflag_t;
 
-
-typedef struct skin_s skin_t;
+typedef struct salty_s
+{
+	bool init;
+	bool ready;
+	bool tapping;
+	fixed_t zoffset;
+	fixed_t momz;
+	bool jump;
+} salty_t;
 
 // Map Object definition.
 typedef struct mobj_s
@@ -344,9 +351,9 @@ typedef struct mobj_s
 	struct mobj_s *hnext;
 	struct mobj_s *hprev;
 
-	skin_t *skin; // overrides 'sprite' when non-NULL (for player bodies to 'remember' the skin)
-	skin_t *localskin;
-	boolean skinlocal; // if the skin is from a LOCALLY loaded skin
+	void *skin; // overrides 'sprite' when non-NULL (for player bodies to 'remember' the skin)
+	void *localskin;
+	boolean skinlocal;
 
 	// Player and mobj sprites in multiplayer modes are modified
 	//  using an internal color lookup table for re-indexing.
@@ -405,6 +412,9 @@ typedef struct mobj_s
 
 	tic_t slamsoundtimer; // Funni slam sound when landing
 
+	// saltyhop! hardcode edition
+	salty_t salty;
+
 	// WARNING: New fields must be added separately to savegame and Lua.
 	boolean islocal; // BEWARE: islocal does not exist in vanilla, strictly to be used for locally loaded addons to not cause desynchs with the mobj linedef trigger check. DO NOT USE THIS IN ACTUAL ADDONS YOU INTEND TO USE ON YOUR SERVER
 } mobj_t;

src/p_saveg.c

@@ -69,7 +69,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save)
 		pllives = 3; // has less than that.
 
 	WRITEUINT8(save->p, player->skincolor);
-	WRITESKIN(save->p, player->skin);
+	WRITEUINT8(save->p, player->skin);
 
 	WRITEUINT32(save->p, player->score);
 	WRITEINT32(save->p, pllives);
@@ -77,7 +77,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save)
 
 	if (botskin)
 	{
-		WRITESKIN(save->p, botskin);
+		WRITEUINT8(save->p, botskin);
 		WRITEUINT8(save->p, botcolor);
 	}
 }
@@ -88,7 +88,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save)
 FUNCINLINE static ATTRINLINE void P_UnArchivePlayer(savebuffer_t *save)
 {
 	savedata.skincolor = READUINT8(save->p);
-	savedata.skin = READSKIN(save->p);
+	savedata.skin = READUINT8(save->p);
 
 	savedata.score = READINT32(save->p);
 	savedata.lives = READINT32(save->p);
@@ -96,11 +96,9 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePlayer(savebuffer_t *save)
 
 	if (savedata.botcolor)
 	{
-		savedata.botskin = READSKIN(save->p);
-
+		savedata.botskin = READUINT8(save->p);
 		if (savedata.botskin-1 >= numskins)
 			savedata.botskin = 0;
-
 		savedata.botcolor = READUINT8(save->p);
 	}
 	else
@@ -119,9 +117,7 @@ static void P_NetArchivePlayers(savebuffer_t *save, boolean resending)
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-#ifndef PHOBOS_BUILD
 		if (resending)
-#endif
 			WRITESINT8(save->p, (SINT8)adminplayers[i]);
 
 		if (!playeringame[i])
@@ -131,9 +127,7 @@ static void P_NetArchivePlayers(savebuffer_t *save, boolean resending)
 
 		// no longer send ticcmds
 
-#ifndef PHOBOS_BUILD
 		if (resending)
-#endif
 			WRITESTRINGN(save->p, player_names[i], MAXPLAYERNAME);
 
 		const player_t *player = &players[i];
@@ -162,16 +156,11 @@ static void P_NetArchivePlayers(savebuffer_t *save, boolean resending)
 		WRITEUINT16(save->p, player->flashpal);
 		WRITEUINT16(save->p, player->flashcount);
 
-#ifdef PHOBOS_BUILD
-		WRITEUINT8(save->p, player->skincolor);
-		WRITEINT32(save->p, player->skin);
-#else
 		if (resending)
 		{
 			WRITEUINT8(save->p, player->skincolor);
 			WRITEINT32(save->p, player->skin);
 		}
-#endif
 
 		WRITEUINT32(save->p, player->score);
 		WRITEFIXED(save->p, player->dashspeed);
@@ -320,9 +309,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-#ifndef PHOBOS_BUILD
 		if (reloading)
-#endif
 			adminplayers[i] = (INT32)READSINT8(save->p);
 
 		// Do NOT memset player struct to 0
@@ -333,9 +320,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
 
 		// NOTE: sending tics should (hopefully) no longer be necessary
 
-#ifndef PHOBOS_BUILD
 		if (reloading)
-#endif
 			READSTRINGN(save->p, player_names[i], MAXPLAYERNAME);
 
 		player_t *player = &players[i];
@@ -364,16 +349,11 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
 		player->flashpal = READUINT16(save->p);
 		player->flashcount = READUINT16(save->p);
 
-#ifdef PHOBOS_BUILD
-		player->skincolor = READUINT8(save->p);
-		player->skin = READINT32(save->p);
-#else
 		if (reloading)
 		{
 			player->skincolor = READUINT8(save->p);
 			player->skin = READINT32(save->p);
 		}
-#endif
 
 		player->score = READUINT32(save->p);
 		player->dashspeed = READFIXED(save->p); // dashing speed
@@ -1109,10 +1089,6 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
 	if (mobj->type == MT_HOOPCENTER && mobj->threshold == 4242)
 		return;
 
-	// do not send over locally spawned mobjs
-	if (mobj->islocal)
-		return;
-
 	if (mobj->spawnpoint && mobj->info->doomednum != -1)
 	{
 		// spawnpoint is not modified but we must save it since it is an identifier
@@ -1132,23 +1108,11 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
 	diff2 = 0;
 
 	// not the default but the most probable
-#ifdef PHOBOS_BUILD
-	if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0 || mobj->pmomz !=0)
-#else
 	if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0)
-#endif
 		diff |= MD_MOM;
-#ifdef PHOBOS_BUILD
-	if (mobj->radius != FixedMul(mapobjectscale, mobj->info->radius))
-#else
 	if (mobj->radius != mobj->info->radius)
-#endif
 		diff |= MD_RADIUS;
-#ifdef PHOBOS_BUILD
-	if (mobj->height != FixedMul(mapobjectscale, mobj->info->height))
-#else
 	if (mobj->height != mobj->info->height)
-#endif
 		diff |= MD_HEIGHT;
 	if (mobj->flags != mobj->info->flags)
 		diff |= MD_FLAGS;
@@ -1191,19 +1155,11 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
 		diff |= MD_MOVEFACTOR;
 	if (mobj->fuse)
 		diff |= MD_FUSE;
-#ifdef PHOBOS_BUILD
-	if (mobj->watertop != INT32_MAX)
-#else
 	if (mobj->watertop)
-#endif
 		diff |= MD_WATERTOP;
 	if (mobj->waterbottom)
 		diff |= MD_WATERBOTTOM;
-#ifdef PHOBOS_BUILD
-	if (mobj->scale != mapobjectscale)
-#else
 	if (mobj->scale != FRACUNIT)
-#endif
 		diff |= MD_SCALE;
 	if (mobj->destscale != mobj->scale)
 		diff |= MD_DSCALE;
@@ -1280,9 +1236,6 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
 		WRITEFIXED(save->p, mobj->momx);
 		WRITEFIXED(save->p, mobj->momy);
 		WRITEFIXED(save->p, mobj->momz);
-#ifdef PHOBOS_BUILD
-		WRITEFIXED(save->p, mobj->pmomz);
-#endif
 	}
 	if (diff & MD_RADIUS)
 		WRITEFIXED(save->p, mobj->radius);
@@ -1344,7 +1297,7 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
 	if (diff2 & MD2_CVMEM)
 		WRITEINT32(save->p, mobj->cvmem);
 	if (diff2 & MD2_SKIN)
-		WRITESKIN(save->p, (skinnum_t)mobj->skin->skinnum);
+		WRITEUINT8(save->p, (UINT8)((skin_t *)mobj->skin - skins));
 	if (diff2 & MD2_COLOR)
 		WRITEUINT8(save->p, mobj->color);
 	if (diff2 & MD2_EXTVAL1)
@@ -2102,27 +2055,16 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 		mobj->momx = READFIXED(save->p);
 		mobj->momy = READFIXED(save->p);
 		mobj->momz = READFIXED(save->p);
-#ifdef PHOBOS_BUILD
-		mobj->pmomz = READFIXED(save->p);
-#endif
 	} // otherwise they're zero, and the memset took care of it
 
 	if (diff & MD_RADIUS)
 		mobj->radius = READFIXED(save->p);
 	else
-#ifdef PHOBOS_BUILD
-		mobj->radius = FixedMul(mobj->info->radius, mapobjectscale);
-#else
 		mobj->radius = mobj->info->radius;
-#endif
 	if (diff & MD_HEIGHT)
 		mobj->height = READFIXED(save->p);
 	else
-#ifdef PHOBOS_BUILD
-		mobj->height = FixedMul(mobj->info->height, mapobjectscale);
-#else
 		mobj->height = mobj->info->height;
-#endif
 	if (diff & MD_FLAGS)
 		mobj->flags = READUINT32(save->p);
 	else
@@ -2194,20 +2136,12 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 		mobj->fuse = READINT32(save->p);
 	if (diff & MD_WATERTOP)
 		mobj->watertop = READFIXED(save->p);
-#ifdef PHOBOS_BUILD
-	else
-		mobj->watertop = INT32_MAX;
-#endif
 	if (diff & MD_WATERBOTTOM)
 		mobj->waterbottom = READFIXED(save->p);
 	if (diff & MD_SCALE)
 		mobj->scale = READFIXED(save->p);
 	else
-#ifdef PHOBOS_BUILD
-		mobj->scale = mapobjectscale;
-#else
 		mobj->scale = FRACUNIT;
-#endif
 	if (diff & MD_DSCALE)
 		mobj->destscale = READFIXED(save->p);
 	else
@@ -2221,7 +2155,7 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 	if (diff2 & MD2_CVMEM)
 		mobj->cvmem = READINT32(save->p);
 	if (diff2 & MD2_SKIN)
-		mobj->skin = skins[READSKIN(save->p)];
+		mobj->skin = &skins[READUINT8(save->p)];
 	if (diff2 & MD2_COLOR)
 		mobj->color = READUINT8(save->p);
 	if (diff2 & MD2_EXTVAL1)

src/p_saveg.h

@@ -24,8 +24,8 @@
 typedef struct
 {
 	UINT8 skincolor;
-	skinnum_t skin;
-	skinnum_t botskin;
+	UINT8 skin;
+	UINT8 botskin;
 	UINT8 botcolor;
 	INT32 score;
 	INT32 lives;

src/p_setup.c

@@ -180,7 +180,7 @@ FUNCNORETURN static ATTRNORETURN void CorruptMapError(const char *msg)
 	// don't use va() because the calling function probably uses it
 	char mapnum[10];
 
-	snprintf(mapnum, sizeof(mapnum), "%hd", gamemap);
+	sprintf(mapnum, "%hd", gamemap);
 	CON_LogMessage("Map ");
 	CON_LogMessage(mapnum);
 	CON_LogMessage(" is corrupt: ");
@@ -266,8 +266,8 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
 	mapheaderinfo[num]->actnum[0] = '\0';
 	mapheaderinfo[num]->typeoflevel = 0;
 	mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
-	snprintf(mapheaderinfo[num]->musname, sizeof(mapheaderinfo[num]->musname), "%sM", G_BuildMapName(i));
-	mapheaderinfo[num]->musname[sizeof(mapheaderinfo[num]->musname)-1] = 0;
+	snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
+	mapheaderinfo[num]->musname[6] = 0;
 	mapheaderinfo[num]->mustrack = 0;
 	mapheaderinfo[num]->muspos = 0;
 	mapheaderinfo[num]->forcecharacter[0] = '\0';
@@ -318,15 +318,15 @@ void P_AllocMapHeader(INT16 i)
 // Loads the vertexes for a level.
 FUNCINLINE static ATTRINLINE void P_LoadVertices(UINT8 *data)
 {
-	mapvertex_t *mv = (mapvertex_t *)data;
-	vertex_t *v = vertexes;
+	mapvertex_t *ml = (mapvertex_t *)data;
+	vertex_t *li = vertexes;
 	size_t i;
 
 	// Copy and convert vertex coordinates, internal representation as fixed.
-	for (i = 0; i < numvertexes; i++, v++, mv++)
+	for (i = 0; i < numvertexes; i++, li++, ml++)
 	{
-		v->x = SHORT(mv->x)<<FRACBITS;
-		v->y = SHORT(mv->y)<<FRACBITS;
+		li->x = SHORT(ml->x)<<FRACBITS;
+		li->y = SHORT(ml->y)<<FRACBITS;
 	}
 }
 
@@ -479,30 +479,65 @@ static void P_SetupDirectionalLight(void)
 static void P_LoadSegs(UINT8 *data)
 {
 	INT32 rawlinedef, rawside;
-	mapseg_t *ms = (mapseg_t*)data;
-	seg_t *seg = segs;
+	mapseg_t *ml = (mapseg_t*)data;
+	seg_t *li = segs;
 	line_t *ldef;
 	size_t i;
 
 	// Set map lighting settings.
 	P_SetupDirectionalLight();
 
-	for (i = 0; i < numsegs; i++, seg++, ms++)
+	for (i = 0; i < numsegs; i++, li++, ml++)
 	{
 		INT16 v1, v2;
 
-		v1 = SHORT(ms->v1);
-		v2 = SHORT(ms->v2);
+		v1 = SHORT(ml->v1);
+		v2 = SHORT(ml->v2);
 
 		// e6y
-		// moved down for additional checks to avoid overflow
-		// if wrong vertexe's indexes are in SEGS lump
-		// see below for more detailed information
+		// check and fix wrong references to non-existent vertexes
+		// see e1m9 @ NIVELES.WAD
+		// http://www.doomworld.com/idgames/index.php?id=12647
+		if ((unsigned)v1 >= numvertexes || (unsigned)v2 >= numvertexes)
+		{
+			if ((unsigned)v1 >= numvertexes)
+				CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v1));
+			if ((unsigned)v2 >= numvertexes)
+				CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v2));
 
-		seg->angle  = (SHORT(ms->angle)) << FRACBITS;
-		seg->offset = (SHORT(ms->offset)) << FRACBITS;
+			if (li->sidedef == &sides[li->linedef->sidenum[0]])
+			{
+				li->v1 = lines[ml->linedef].v1;
+				li->v2 = lines[ml->linedef].v2;
+			}
+			else
+			{
+				li->v1 = lines[ml->linedef].v2;
+				li->v2 = lines[ml->linedef].v1;
+			}
+		}
+		else
+		{
+			li->v1 = &vertexes[v1];
+			li->v2 = &vertexes[v2];
+		}
 
-		rawlinedef = SHORT(ms->linedef);
+#ifdef HWRENDER
+		if (rendermode == render_opengl)
+		{
+			li->fv1.x = FixedToFloat(li->v1->x);
+			li->fv1.y = FixedToFloat(li->v1->y);
+			//li->fv1.z = FixedToFloat(li->v1->z); // z is unused in gl
+
+			li->fv2.x = FixedToFloat(li->v2->x);
+			li->fv2.y = FixedToFloat(li->v2->y);
+			//li->fv2.z = FixedToFloat(li->v2->z);
+		}
+#endif
+		li->length = P_SegLength(li);
+		li->angle = (SHORT(ml->angle))<<FRACBITS;
+		li->offset = (SHORT(ml->offset))<<FRACBITS;
+		rawlinedef = SHORT(ml->linedef);
 
 		//e6y: check for wrong indexes
 		if ((unsigned)rawlinedef >= numlines)
@@ -511,8 +546,8 @@ static void P_LoadSegs(UINT8 *data)
 		}
 
 		ldef = &lines[rawlinedef];
-		seg->linedef = ldef;
-		rawside = SHORT(ms->side);
+		li->linedef = ldef;
+		rawside = SHORT(ml->side);
 
 		//e6y: fix wrong side index
 		if (rawside != 0 && rawside != 1)
@@ -527,9 +562,9 @@ static void P_LoadSegs(UINT8 *data)
 			I_Error("P_LoadSegs: linedef %d for seg %s references a non-existent sidedef %d", rawlinedef, sizeu1(i), ldef->sidenum[rawside]);
 		}
 
-		seg->side = rawside;
+		li->side = rawside;
 
-		seg->sidedef = &sides[ldef->sidenum[rawside]];
+		li->sidedef = &sides[ldef->sidenum[rawside]];
 
 		/* cph 2006/09/30 - our frontsector can be the second side of the
 		 * linedef, so must check for NO_INDEX in case we are incorrectly
@@ -537,11 +572,11 @@ static void P_LoadSegs(UINT8 *data)
 		if (ldef->sidenum[rawside] == NO_INDEX)
 		{
 			CorruptMapWarning(va("P_LoadSegs: front of seg %s has no sidedef\n", sizeu1(i)));
-			seg->frontsector = NULL;
+			li->frontsector = NULL;
 		}
 		else
 		{
-			seg->frontsector = sides[ldef->sidenum[rawside]].sector;
+			li->frontsector = sides[ldef->sidenum[rawside]].sector;
 		}
 
 		if (ldef->flags & ML_TWOSIDED)
@@ -549,58 +584,15 @@ static void P_LoadSegs(UINT8 *data)
 			if (ldef->sidenum[rawside^1] == NO_INDEX)
 			{
 				CorruptMapWarning(va("P_LoadSegs: back of seg %s has no sidedef while being marked as double sided\n", sizeu1(i)));
-				seg->backsector = NULL;
+				li->backsector = NULL;
 			}
 			else
 			{
-				seg->backsector = sides[ldef->sidenum[rawside^1]].sector;
+				li->backsector = sides[ldef->sidenum[rawside^1]].sector;
 			}
 		}
 
-		// e6y
-		// check and fix wrong references to non-existent vertexes
-		// see e1m9 @ NIVELES.WAD
-		// http://www.doomworld.com/idgames/index.php?id=12647
-		if ((unsigned)v1 >= numvertexes || (unsigned)v2 >= numvertexes)
-		{
-			if ((unsigned)v1 >= numvertexes)
-				CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v1));
-			if ((unsigned)v2 >= numvertexes)
-				CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v2));
-
-			if (seg->sidedef == &sides[seg->linedef->sidenum[0]])
-			{
-				seg->v1 = lines[ms->linedef].v1;
-				seg->v2 = lines[ms->linedef].v2;
-			}
-			else
-			{
-				seg->v1 = lines[ms->linedef].v2;
-				seg->v2 = lines[ms->linedef].v1;
-			}
-		}
-		else
-		{
-			seg->v1 = &vertexes[v1];
-			seg->v2 = &vertexes[v2];
-		}
-
-#ifdef HWRENDER
-		if (rendermode == render_opengl)
-		{
-			seg->fv1.x = FixedToFloat(seg->v1->x);
-			seg->fv1.y = FixedToFloat(seg->v1->y);
-			//seg->fv1.z = FixedToFloat(seg->v1->z); // z is unused in gl
-
-			seg->fv2.x = FixedToFloat(seg->v2->x);
-			seg->fv2.y = FixedToFloat(seg->v2->y);
-			//seg->fv2.z = FixedToFloat(seg->v2->z);
-		}
-#endif
-
-		seg->length = P_SegLength(seg);
-
-		P_UpdateSegLightOffset(seg);
+		P_UpdateSegLightOffset(li);
 	}
 }
 
@@ -618,6 +610,10 @@ FUNCINLINE static ATTRINLINE void P_LoadSubsectors(void *data)
 	}
 }
 
+//
+// P_LoadSectors
+//
+
 //
 // levelflats
 //
@@ -669,17 +665,13 @@ static void P_CheckCyanFlat(levelflat_t *levelflat)
 	const char *flatname = W_CheckNameForNum(levelflat->lumpnum);
 
 	// hack for gba rainbow roads cyan floors
-	if (UNLIKELY(flatname && memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
+	if (UNLIKELY(memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
 	{
 		levelflat->cyan = false;
 		return;
 	}
 
 	const UINT8 *flat = R_GetFlat(levelflat->lumpnum);
-
-	if (!flat)
-		return;
-
 	const size_t size = W_LumpLength(levelflat->lumpnum);
 
 	for (size_t steppy = 0; steppy < size; steppy++)
@@ -799,10 +791,6 @@ INT32 P_CheckLevelFlat(const char *flatname)
 	return (INT32)i;
 }
 
-//
-// P_LoadSectors
-//
-
 static const sector_t sector_default = {
 	.nexttag = -1,
 	.firsttag = -1,
@@ -1906,7 +1894,7 @@ static void P_ReadBlockMapLump(INT16 *wadblockmaplump, size_t count)
 // because making both the WAD and PK3 loading code use
 // the same functions is trickier than it looks for blockmap
 // -- Monster Iestyn 09/01/18
-static boolean P_LoadBlockMap(UINT8 *data, size_t count)
+static boolean P_LoadRawBlockMap(UINT8 *data, size_t count)
 {
 	if (!count || count >= 0x20000)
 		return false;
@@ -2074,14 +2062,14 @@ static void P_LoadReject(UINT8 *data, size_t rejectsize)
 		if (rejectsize < neededsize)
 		{
 			CorruptMapWarning(va("P_LoadReject: REJECT is %s byte%s too small. REJECT might be invalid!\n", sizeu1(neededsize - rejectsize), (neededsize - rejectsize) == 1 ? "" : "s"));
-#ifdef PHOBOS_BUILD
-			rejectmatrix = NULL;
-			return;
-#else
+#ifdef COMPAT_VANILLA
 			// we can pad this and somewhat prevent desyncs
 			// probs not cool if the reject is from a completely different map
 			// but whatever
 			allocsize = neededsize;
+#else
+			rejectmatrix = NULL;
+			return;
 #endif
 		}
 
@@ -2132,7 +2120,7 @@ static void P_LoadMapLUT(const virtres_t* virt)
 		rejectmatrix = NULL;
 	}
 
-	if (!(virtblockmap && P_LoadBlockMap(virtblockmap->data, virtblockmap->size)))
+	if (!(virtblockmap && P_LoadRawBlockMap(virtblockmap->data, virtblockmap->size)))
 		P_CreateBlockMap();
 }
 
@@ -2205,7 +2193,7 @@ void P_SetupLevelSky(INT32 skynum, boolean global)
 {
 	char skytexname[12];
 
-	snprintf(skytexname, sizeof(skytexname), "SKY%d", skynum);
+	sprintf(skytexname, "SKY%d", skynum);
 	skytexture = R_TextureNumForName(skytexname);
 	levelskynum = skynum;
 
@@ -2425,8 +2413,7 @@ static void P_RunLevelScript(const char *scriptname)
 		lumpnum_t lumpnum;
 		char newname[9];
 
-		strncpy(newname, scriptname, sizeof(newname)-1);
-		newname[sizeof(newname)-1] = '\0';
+		strlcpy(newname, scriptname, sizeof(newname));
 
 		lumpnum = W_CheckNumForName(newname);
 
@@ -2436,7 +2423,7 @@ static void P_RunLevelScript(const char *scriptname)
 			return;
 		}
 
-		COM_BufInsertTextEx(W_CacheLumpNum(lumpnum, PU_CACHE), W_LumpLength(lumpnum));
+		COM_BufInsertText(W_CacheLumpNum(lumpnum, PU_CACHE));
 	}
 	else
 	{
@@ -2451,26 +2438,23 @@ static void P_ForceCharacter(const char *forcecharskin)
 	if (netgame)
 	{
 		char skincmd[33];
-
 		if (splitscreen)
 		{
-			snprintf(skincmd, sizeof(skincmd), "skin2 %s\n", forcecharskin);
+			sprintf(skincmd, "skin2 %s\n", forcecharskin);
 			CV_Set(&cv_skin2, forcecharskin);
-
 			if (splitscreen > 1)
 			{
-				snprintf(skincmd, sizeof(skincmd), "skin3 %s\n", forcecharskin);
+				sprintf(skincmd, "skin3 %s\n", forcecharskin);
 				CV_Set(&cv_skin3, forcecharskin);
-
 				if (splitscreen > 2)
 				{
-					snprintf(skincmd, sizeof(skincmd), "skin4 %s\n", forcecharskin);
+					sprintf(skincmd, "skin4 %s\n", forcecharskin);
 					CV_Set(&cv_skin4, forcecharskin);
 				}
 			}
 		}
 
-		snprintf(skincmd, sizeof(skincmd), "skin %s\n", forcecharskin);
+		sprintf(skincmd, "skin %s\n", forcecharskin);
 		COM_BufAddText(skincmd);
 	}
 	else
@@ -2478,28 +2462,28 @@ static void P_ForceCharacter(const char *forcecharskin)
 		if (splitscreen)
 		{
 			SetPlayerSkin(displayplayers[1], forcecharskin);
-			if ((unsigned)cv_playercolor2.value != skins[players[displayplayers[1]].skin]->prefcolor && !modeattacking)
+			if ((unsigned)cv_playercolor2.value != skins[players[displayplayers[1]].skin].prefcolor && !modeattacking)
 			{
-				CV_StealthSetValue(&cv_playercolor2, skins[players[displayplayers[1]].skin]->prefcolor);
-				players[displayplayers[1]].skincolor = skins[players[displayplayers[1]].skin]->prefcolor;
+				CV_StealthSetValue(&cv_playercolor2, skins[players[displayplayers[1]].skin].prefcolor);
+				players[displayplayers[1]].skincolor = skins[players[displayplayers[1]].skin].prefcolor;
 			}
 
 			if (splitscreen > 1)
 			{
 				SetPlayerSkin(displayplayers[2], forcecharskin);
-				if ((unsigned)cv_playercolor3.value != skins[players[displayplayers[2]].skin]->prefcolor && !modeattacking)
+				if ((unsigned)cv_playercolor3.value != skins[players[displayplayers[2]].skin].prefcolor && !modeattacking)
 				{
-					CV_StealthSetValue(&cv_playercolor3, skins[players[displayplayers[2]].skin]->prefcolor);
-					players[displayplayers[2]].skincolor = skins[players[displayplayers[2]].skin]->prefcolor;
+					CV_StealthSetValue(&cv_playercolor3, skins[players[displayplayers[2]].skin].prefcolor);
+					players[displayplayers[2]].skincolor = skins[players[displayplayers[2]].skin].prefcolor;
 				}
 
 				if (splitscreen > 2)
 				{
 					SetPlayerSkin(displayplayers[3], forcecharskin);
-					if ((unsigned)cv_playercolor4.value != skins[players[displayplayers[3]].skin]->prefcolor && !modeattacking)
+					if ((unsigned)cv_playercolor4.value != skins[players[displayplayers[3]].skin].prefcolor && !modeattacking)
 					{
-						CV_StealthSetValue(&cv_playercolor4, skins[players[displayplayers[3]].skin]->prefcolor);
-						players[displayplayers[3]].skincolor = skins[players[displayplayers[3]].skin]->prefcolor;
+						CV_StealthSetValue(&cv_playercolor4, skins[players[displayplayers[3]].skin].prefcolor);
+						players[displayplayers[3]].skincolor = skins[players[displayplayers[3]].skin].prefcolor;
 					}
 				}
 			}
@@ -2507,10 +2491,10 @@ static void P_ForceCharacter(const char *forcecharskin)
 
 		SetPlayerSkin(consoleplayer, forcecharskin);
 		// normal player colors in single player
-		if ((unsigned)cv_playercolor.value != skins[players[consoleplayer].skin]->prefcolor && !modeattacking)
+		if ((unsigned)cv_playercolor.value != skins[players[consoleplayer].skin].prefcolor && !modeattacking)
 		{
-			CV_StealthSetValue(&cv_playercolor, skins[players[consoleplayer].skin]->prefcolor);
-			players[consoleplayer].skincolor = skins[players[consoleplayer].skin]->prefcolor;
+			CV_StealthSetValue(&cv_playercolor, skins[players[consoleplayer].skin].prefcolor);
+			players[consoleplayer].skincolor = skins[players[consoleplayer].skin].prefcolor;
 		}
 	}
 }
@@ -2527,7 +2511,7 @@ static void P_LoadRecordGhosts(void)
 
 	const char *mapname = G_BuildMapName(gamemap);
 
-	snprintf(gpath, glen, "%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, mapname);
+	sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, mapname);
 
 	// Best Time ghost
 	if (cv_ghost_besttime.value)
@@ -2537,8 +2521,8 @@ static void P_LoadRecordGhosts(void)
 			if (cv_ghost_besttime.value == 1 && players[consoleplayer].skin != i)
 				continue;
 
-			if (FIL_FileExists(va("%s-%s-time-best.lmp", gpath, skins[i]->name)))
-				G_AddGhost(va("%s-%s-time-best.lmp", gpath, skins[i]->name));
+			if (FIL_FileExists(va("%s-%s-time-best.lmp", gpath, skins[i].name)))
+				G_AddGhost(va("%s-%s-time-best.lmp", gpath, skins[i].name));
 		}
 	}
 
@@ -2550,8 +2534,8 @@ static void P_LoadRecordGhosts(void)
 			if (cv_ghost_bestlap.value == 1 && players[consoleplayer].skin != i)
 				continue;
 
-			if (FIL_FileExists(va("%s-%s-lap-best.lmp", gpath, skins[i]->name)))
-				G_AddGhost(va("%s-%s-lap-best.lmp", gpath, skins[i]->name));
+			if (FIL_FileExists(va("%s-%s-lap-best.lmp", gpath, skins[i].name)))
+				G_AddGhost(va("%s-%s-lap-best.lmp", gpath, skins[i].name));
 		}
 	}
 
@@ -2563,8 +2547,8 @@ static void P_LoadRecordGhosts(void)
 			if (cv_ghost_last.value == 1 && players[consoleplayer].skin != i)
 				continue;
 
-			if (FIL_FileExists(va("%s-%s-last.lmp", gpath, skins[i]->name)))
-				G_AddGhost(va("%s-%s-last.lmp", gpath, skins[i]->name));
+			if (FIL_FileExists(va("%s-%s-last.lmp", gpath, skins[i].name)))
+				G_AddGhost(va("%s-%s-last.lmp", gpath, skins[i].name));
 		}
 	}
 
@@ -2883,8 +2867,7 @@ static void P_SetupPlayer(void)
 	if (!demo.playback && multiplayer && D_NumPlayers())
 	{
 		static char buf[256];
-
-		snprintf(buf, sizeof(buf), "replay"PATHSEP"online"PATHSEP"%d-%s", (int)(time(NULL)), G_BuildMapName(gamemap));
+		sprintf(buf, "replay"PATHSEP"online"PATHSEP"%d-%s", (int)(time(NULL)), G_BuildMapName(gamemap));
 
 		I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755);
 		I_mkdir(va("%s"PATHSEP"replay"PATHSEP"online", srb2home), 0755);
@@ -3001,9 +2984,6 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
 	CON_Drawer(); // let the user know what we are going to do
 	I_FinishUpdate(); // page flip or blit buffer
 
-	// Initialize sector node list.
-	P_Initsecnode();
-
 	if (netgame || multiplayer)
 		cv_debug = botskin = 0;
 
@@ -3069,7 +3049,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
 		// Don't include these in the fade!
 		char tx[64];
 		V_DrawSmallString(1, 191, V_ALLOWLOWERCASE, M_GetText("Speeding off to..."));
-		snprintf(tx, sizeof(tx)-1, "%s%s%s",
+		snprintf(tx, 63, "%s%s%s",
 			mapheader->lvlttl,
 			(strlen(mapheader->zonttl) > 0) ? va(" %s",mapheader->zonttl) : // SRB2kart
 			((mapheader->levelflags & LF_NOZONE) ? "" : " Zone"),
@@ -3331,7 +3311,6 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
 
 	return false;
 }
-
 //
 // P_CheckReplacMapReplacements
 //
@@ -3424,13 +3403,7 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 	{
 		// check if someone tries to load maps locally lol
 		// do this here so we can skip loading the file anyways
-		int retmap = W_CheckAutoLoadContainsMap(wadfilename);
-		if (retmap == -1)
-		{
-			CONS_Alert(CONS_WARNING, "addilelocal: file %s was not found or not valid.\n", wadfilename);
-			return UINT16_MAX;
-		}
-		if (retmap > 0)
+		if (W_CheckAutoLoadContainsMap(wadfilename))
 		{
 			CONS_Alert(CONS_WARNING, "addilelocal: locally added file %s contains map data, this WILL cause crashes and desynchs! not added.\n", wadfilename);
 			return UINT16_MAX;

src/p_spec.c

@@ -2161,7 +2161,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 				newname[1] = 'C';
 				newname[2] = 'R';
 
-				scrnum = sides[line->sidenum[0]].textureoffset >> FRACBITS;
+				scrnum = sides[line->sidenum[0]].textureoffset>>FRACBITS;
 				if (scrnum < 0 || scrnum > 999)
 				{
 					scrnum = 0;
@@ -2169,9 +2169,9 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 				}
 				else
 				{
-					newname[5] = (char)('0' + (char)((scrnum / 100)));
-					newname[6] = (char)('0' + (char)((scrnum % 100) / 10));
-					newname[7] = (char)('0' + (char)(scrnum % 10));
+					newname[5] = (char)('0' + (char)((scrnum/100)));
+					newname[6] = (char)('0' + (char)((scrnum%100)/10));
+					newname[7] = (char)('0' + (char)(scrnum%10));
 				}
 				newname[8] = '\0';
 
@@ -2184,7 +2184,14 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 				else
 				{
 					// W_CacheLumpNum may not have null terminator, so we need to do this :blobcatgooglyholditsheadinitshands:
-					COM_BufInsertTextEx(W_CacheLumpNum(lumpnum, PU_CACHE), W_LumpLength(lumpnum));
+					size_t len = W_LumpLength(lumpnum);
+					char *script = Z_Malloc(len+1, PU_STATIC, NULL);
+					memcpy(script, W_CacheLumpNum(lumpnum, PU_CACHE), len);
+					script[len] = 0;
+
+					COM_BufInsertText(script);
+
+					Z_Free(script);
 				}
 			}
 			break;
@@ -3394,7 +3401,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
 			break;
 		case 12: // SRB2kart: Invert Encore Remap
 			break;
-		case 15: // also Invert Encore Remap....
+		case 15: // no idea but keep it dont want anything to break
 			break;
 	}
 DoneSection2:
@@ -4604,7 +4611,7 @@ void P_UpdateSpecials(void)
 	// POINT LIMIT
 	P_CheckPointLimit();
 
-#ifndef PHOBOS_BUILD
+#ifdef COMPAT_VANILLA
 	// Dynamic slopeness
 	// we run this here only when not joined midrace
 	// for vanilla compat reasons :chaosleep:
@@ -5368,11 +5375,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 			case 11: // Custom global gravity!
 				gravity = sector->floorheight/1000;
 				break;
-
-			case 12: // SRB2kart: Invert Encore Remap
-			case 15: // NOTE: vanilla kart checks only for this for some reason!
-				sector->flags |= SF_INVERTENCORE;
-				break;
 		}
 
 		// Process Section 4
@@ -5382,10 +5384,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 				if (G_RaceGametype())
 					circuitmap = true;
 				break;
-
-			case 12: // Camera noclip
-				sector->flags |= SF_NOCLIPCAMERA;
-				break;
 		}
 	}
 
@@ -5470,11 +5468,11 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 					sectors[s].gravity = &sectors[sec].floorheight; // This allows it to change in realtime!
 
 					if (lines[i].flags & ML_NOCLIMB)
-						sectors[s].flags |= SF_GRAVITYFLIP;
+						sectors[s].verticalflip = true;
 					else
-						sectors[s].flags &= ~SF_GRAVITYFLIP;
+						sectors[s].verticalflip = false;
 
-					CheckForReverseGravity = (boolean)(sectors[s].flags & SF_GRAVITYFLIP);
+					CheckForReverseGravity = sectors[s].verticalflip;
 				}
 				break;
 
@@ -5567,11 +5565,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 					sectors[s].cullheight = &lines[i]; // This allows it to change in realtime!
 				break;
 
-			case 13: // Heat wave effect
-				for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
-					sectors[s].flags |= SF_HEATWAVE;
-				break;
-
 			case 50: // Insta-Lower Sector
 				EV_DoFloor(&lines[i], instantLower);
 				break;

src/p_tick.c

@@ -38,8 +38,6 @@
 #include "i_video.h" // rendermode
 #include "m_perfstats.h"
 
-#include "lua_profile.h"
-
 // Object place
 #include "m_cheat.h"
 
@@ -624,8 +622,6 @@ void P_Ticker(boolean run)
 			}
 		}
 
-		LUA_ResetTicTimers();
-
 		ps_lua_mobjhooks.value.i = 0;
 		ps_checkposition_calls.value.i = 0;
 
@@ -633,7 +629,6 @@ void P_Ticker(boolean run)
 		LUA_HookPreThinkFrame();
 		PS_STOP_TIMING(ps_lua_prethinkframe_time);
 
-		// OK! Now that we got all of that sorted, players can think!
 		PS_START_TIMING(ps_playerthink_time);
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
@@ -651,7 +646,7 @@ void P_Ticker(boolean run)
 	if (run)
 	{
 		// Dynamic slopeness
-#ifndef PHOBOS_BUILD
+#ifdef COMPAT_VANILLA
 		if (midgamejoin) // only run here if we joined midgame to fix some desynchs
 #endif
 			P_RunDynamicSlopes();
@@ -680,7 +675,6 @@ void P_Ticker(boolean run)
 		PS_STOP_TIMING(ps_lua_thinkframe_time);
 	}
 
-	// Run shield positioning
 	P_RunOverlays();
 	P_RunShadows();
 
@@ -802,7 +796,7 @@ void P_Ticker(boolean run)
 				if (!player->mo)
 					continue;
 
-				const boolean skybox = (skyboxmo[0] && cv_skybox.value); // True if there's a skybox object and skyboxes are on
+				const boolean skybox = (skyboxmo[0] && cv_skybox.value);
 
 				if (skyVisiblePerPlayer[i] && skybox)
 				{

src/p_user.c

@@ -498,7 +498,7 @@ void P_PlayRinglossSound(mobj_t *source, mobj_t *damager)
 
 			// I HATE LOCALSKINS! I HATE LOCALSKINS! :AAAAAAAAAA:
 			if (source->player)
-				sfx = R_GetPlayerSkin(source->player)->soundsid[SKSKPAN1 + key];
+				sfx = K_GetPlayerSkin(source->player)->soundsid[SKSKPAN1 + key];
 
 			S_StartSound(NULL, sfx);
 		}
@@ -625,23 +625,15 @@ boolean P_EndingMusic(player_t *player)
 	}
 
 	if (G_RaceGametype() && bestlocalpos == MAXPLAYERS+1)
-	{
-		snprintf(buffer, sizeof(buffer), "k*fail"); // F-Zero death results theme
-	}
+		sprintf(buffer, "k*fail"); // F-Zero death results theme
 	else
 	{
 		if (bestlocalpos == 1)
-		{
-			snprintf(buffer, sizeof(buffer), "k*win");
-		}
+			sprintf(buffer, "k*win");
 		else if (isPlayerLosing(bestlocalplayer))
-		{
-			snprintf(buffer, sizeof(buffer), "k*lose");
-		}
+			sprintf(buffer, "k*lose");
 		else
-		{
-			snprintf(buffer, sizeof(buffer), "k*ok");
-		}
+			sprintf(buffer, "k*ok");
 	}
 
 	S_SpeedMusic(1.0f);
@@ -1017,7 +1009,7 @@ boolean P_IsLocalPlayer(const player_t *player)
 }
 
 //
-// P_IsLocalPlayerNum
+// P_IsLocalPlayer
 //
 // Returns true if playernum is
 // on the local machine.
@@ -1271,7 +1263,7 @@ void P_DoPlayerExit(player_t *player)
 
 			if (islocalplayer)
 			{
-				sfxenum_t sfx_id = R_GetMobjSkin(player->mo)->soundsid[S_sfx[soundid].skinsound];
+				sfxenum_t sfx_id = K_GetMobjSkin(player->mo)->soundsid[S_sfx[soundid].skinsound];
 				S_StartSound(NULL, sfx_id);
 			}
 			else
@@ -3561,7 +3553,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
 			for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
 			{
 				fixed_t topheight, bottomheight;
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -3626,7 +3618,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
 							// We're inside it! Yess...
 							polysec = po->lines[0]->backsector;
 
-							if (polysec->flags & SF_NOCLIPCAMERA)
+							if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
 							{ // Camera noclip polyobj.
 								plink = (polymaplink_t *)(plink->link.next);
 								continue;
@@ -3682,8 +3674,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
 			for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
 			{
 				fixed_t topheight, bottomheight;
-
-				if ((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
+				if (UNLIKELY((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 				{
 					topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
 					bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -4263,7 +4254,7 @@ boolean P_SpectatorJoinGame(player_t *player)
 
 static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector, fixed_t pviewheight)
 {
-	if (sector->flags & SF_HEATWAVE)
+	if (P_FindSpecialLineFromTag(13, sector->tag, -1) != -1)
 		return true;
 
 	if (sector->ffloors)
@@ -4281,7 +4272,7 @@ static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector,
 			if (pviewheight <= P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y))
 				continue;
 
-			if (rover->master->frontsector->flags & SF_HEATWAVE)
+			if (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
 				return true;
 		}
 	}
@@ -4517,33 +4508,27 @@ static void DoABarrelRoll(player_t *player)
 static void P_DoFunnyDance(player_t *player)
 {
 	fixed_t bpm; // 140bpm ish
-	fixed_t work, ang, bounce; // hehe squishy
 
-	I_Assert(player != NULL);
-	I_Assert(!P_MobjWasRemoved(player->mo));
-
-	if (player->spectator)
+	if (player->spectator || !player->mo || player->kartstuff[k_respawn] || player->mo->salty.jump) // this looks jank as hell during hop
 		return;
 
-	// this looks jank as hell during hop or respawn
-	if (player->kartstuff[k_respawn] || player->salty.jump)
-		return;
+	player->squishdance.bounce = 0;
 
 	// bpm = FixedDiv((60*TICRATE)<<FRACBITS, FLOAT_TO_FIXED(mapmusic.bpm)); << maybe can get the tempo and beat detection lib to work for bpm autodetection
-	bpm = ((60*TICRATE) / (cv_squishdancespeed.value)) << FRACBITS;
+	bpm = FixedDiv((60*TICRATE)<<FRACBITS, FLOAT_TO_FIXED((float)cv_squishdancespeed.value));
 
-	work = (player->squishdance.time << FRACBITS) % bpm;
+	player->squishdance.work = (player->squishdance.time << FRACBITS) % bpm;
 
 	if (player->squishdance.time >= (FRACUNIT >> 1)) // prevent overflow jump - takes about 15 minutes
-		player->squishdance.time = (work >> FRACBITS);
+		player->squishdance.time = (player->squishdance.work >> FRACBITS);
 
-	work = FixedDiv(work*180, bpm);
+	player->squishdance.work = FixedDiv(player->squishdance.work*180, bpm);
 
-	ang = ((FixedAngle(work) >> ANGLETOFINESHIFT) & FINEMASK);
-	bounce = ((FINESINE(ang) - FRACUNIT/2) / 2);
+	player->squishdance.ang = ((FixedAngle(player->squishdance.work) >> ANGLETOFINESHIFT) & FINEMASK);
+	player->squishdance.bounce = ((FINESINE(player->squishdance.ang) - FRACUNIT/2) / 2);
 
-	player->mo->spritexscale -= bounce;
-	player->mo->spriteyscale += bounce;
+	player->mo->spritexscale -= player->squishdance.bounce;
+	player->mo->spriteyscale += player->squishdance.bounce;
 
 	player->squishdance.time++;
 }

src/r_bsp.cpp

@@ -48,7 +48,8 @@ boolean g_walloffscreen = false;
 
 boolean R_NoEncore(sector_t *sector, boolean ceiling)
 {
-	const boolean invertEncore = (sector->flags & SF_INVERTENCORE);
+	const INT32 invspecial = GETSECSPECIAL(sector->special, 2);
+	boolean invertencore = (invspecial == 12 || invspecial == 15); // keeping this incase its used
 
 #if 0 // perfect implementation
 	const INT32 sprnspecial = GETSECSPECIAL(sector->special, 3);
@@ -58,10 +59,10 @@ boolean R_NoEncore(sector_t *sector, boolean ceiling)
 #endif
 		&& GETSECSPECIAL(sector->special, 4) != 6) // sneaker panel
 	{
-		return invertEncore;
+		return invertencore;
 	}
 
-	if (invertEncore)
+	if (invertencore)
 	{
 		return false;
 	}
@@ -394,7 +395,7 @@ static void R_AddLine(seg_t *line)
 			// Find the other side!
 			INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, -1);
 
-			if (line2 >= 0 && line->linedef == &lines[line2])
+			if (line->linedef == &lines[line2])
 				line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, line2);
 
 			if (line2 >= 0) // found it!

src/r_defs.h

@@ -307,19 +307,10 @@ typedef struct pslope_s
 
 typedef enum
 {
-	// flipspecial - planes with effect
-	SF_FLIPSPECIAL_FLOOR       =  1,
-	SF_FLIPSPECIAL_CEILING     =  1<<1,
-	SF_FLIPSPECIAL_BOTH        =  (SF_FLIPSPECIAL_FLOOR|SF_FLIPSPECIAL_CEILING),
-	// triggerspecial - conditions under which plane touch causes effect
-	SF_TRIGGERSPECIAL_TOUCH    =  1<<2,
-
-	SF_GRAVITYFLIP             =  1<<3,
-	SF_HEATWAVE                =  1<<4,
-	SF_NOCLIPCAMERA            =  1<<5,
-
-	// invert encore color remap status
-	SF_INVERTENCORE            =  1<<6,
+	SF_FLIPSPECIAL_FLOOR    =  1,
+	SF_FLIPSPECIAL_CEILING  =  2,
+	SF_FLIPSPECIAL_BOTH     =  3,
+	SF_TRIGGERSPECIAL_TOUCH =  4,
 } sectorflags_t;
 
 //
@@ -400,6 +391,7 @@ typedef struct sector_s
 
 	// This points to the master's floorheight, so it can be changed in realtime!
 	fixed_t *gravity; // per-sector gravity
+	boolean verticalflip; // If gravity < 0, then allow flipped physics
 	sectorflags_t flags;
 
 	// Sprite culling feature

src/r_draw.cpp

@@ -94,18 +94,19 @@ spandrawfunc_t *spanfuncs[SPANDRAWFUNC_MAX] = {};
 //                   TRANSLATION COLORMAP CODE
 // =========================================================================
 
-#define DEFAULT_TT_CACHE_INDEX 0
-#define BOSS_TT_CACHE_INDEX 1
-#define METALSONIC_TT_CACHE_INDEX 2
-#define ALLWHITE_TT_CACHE_INDEX 3
-#define RAINBOW_TT_CACHE_INDEX 4
-#define BLINK_TT_CACHE_INDEX 5
-#define TT_CACHE_SIZE 6
+#define DEFAULT_TT_CACHE_INDEX MAXSKINS
+#define BOSS_TT_CACHE_INDEX (MAXSKINS + 1)
+#define METALSONIC_TT_CACHE_INDEX (MAXSKINS + 2)
+#define ALLWHITE_TT_CACHE_INDEX (MAXSKINS + 3)
+#define RAINBOW_TT_CACHE_INDEX (MAXSKINS + 4)
+#define BLINK_TT_CACHE_INDEX (MAXSKINS + 5)
+#define TT_CACHE_SIZE (MAXSKINS + 6)
 #define SKIN_RAMP_LENGTH 16
 #define DEFAULT_STARTTRANSCOLOR 160
 #define NUM_PALETTE_ENTRIES 256
 
-static UINT8 **specialtranslationtablecache[TT_CACHE_SIZE] = {};
+static UINT8 **translationtablecache[TT_CACHE_SIZE] = {};
+static UINT8 **localtranslationtablecache[MAXLOCALSKINS] = {};
 
 CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1] = {};
 
@@ -173,10 +174,15 @@ static void BlendTab_Translucent(UINT8 *table, int style, UINT8 blendamt)
 		{
 			frontrgba = pGammaCorrectedPalette[fg];
 
+#if 0 // perfect implementation
+			result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
+			result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
+			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+#else // performance scrabbler
 			result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
 			result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
-
 			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut_corrected, result.s.red, result.s.green, result.s.blue); // pGammaCorrectedPalette
+#endif
 		}
 	}
 }
@@ -184,7 +190,6 @@ static void BlendTab_Translucent(UINT8 *table, int style, UINT8 blendamt)
 static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
 {
 	INT16 bg, fg;
-	RGBA_t backrgba, frontrgba, result;
 
 	if (table == NULL)
 		I_Error("BlendTab_Subtractive: input table was NULL!");
@@ -197,11 +202,11 @@ static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
 
 	for (bg = 0; bg < 0x100; bg++)
 	{
-		backrgba = pLocalPalette[bg]; // intentionally uses pLocalPalette
-
 		for (fg = 0; fg < 0x100; fg++)
 		{
-			frontrgba = pLocalPalette[fg];
+			RGBA_t backrgba = V_GetColor(bg);
+			RGBA_t frontrgba = V_GetColor(fg);
+			RGBA_t result;
 
 			result.rgba    = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
 			result.s.red   = std::max(0, result.s.red - blendamt);
@@ -216,19 +221,17 @@ static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
 static void BlendTab_Modulative(UINT8 *table)
 {
 	INT16 bg, fg;
-	RGBA_t backrgba, frontrgba, result;
 
 	if (table == NULL)
 		I_Error("BlendTab_Modulative: input table was NULL!");
 
 	for (bg = 0; bg < 0x100; bg++)
 	{
-		backrgba = pGammaCorrectedPalette[bg];
-
 		for (fg = 0; fg < 0x100; fg++)
 		{
-			frontrgba = pGammaCorrectedPalette[fg];
-
+			RGBA_t backrgba = V_GetColor(bg);
+			RGBA_t frontrgba = V_GetColor(fg);
+			RGBA_t result;
 			result.rgba = ASTBlendPixel(backrgba, frontrgba, AST_MODULATE, 0);
 			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut_corrected, result.s.red, result.s.green, result.s.blue);
 		}
@@ -377,60 +380,38 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f
 {
 	UINT8 ***tt;
 	UINT8* ret;
+	INT32 skintableindex;
 
 	if (local)
 	{
-		I_Assert(skinnum >= 0 && skinnum < numlocalskins);
-		tt = &localskins[skinnum]->translationtablecache;
+		tt = localtranslationtablecache;
+		skintableindex = skinnum;
 	}
 	else
 	{
+		tt = translationtablecache;
+
 		// Adjust if we want the default colormap
-		if (skinnum < 0)
+		switch (skinnum)
 		{
-			INT32 skintableindex;
-
-			switch (skinnum)
-			{
-				case TC_DEFAULT:
-					skintableindex = DEFAULT_TT_CACHE_INDEX;
-					break;
-				case TC_BOSS:
-					skintableindex = BOSS_TT_CACHE_INDEX;
-					break;
-				case TC_METALSONIC:
-					skintableindex = METALSONIC_TT_CACHE_INDEX;
-					break;
-				case TC_ALLWHITE:
-					skintableindex = ALLWHITE_TT_CACHE_INDEX;
-					break;
-				case TC_RAINBOW:
-					skintableindex = RAINBOW_TT_CACHE_INDEX;
-					break;
-				case TC_BLINK:
-					skintableindex = BLINK_TT_CACHE_INDEX;
-					break;
-				default:
-					return NULL;
-			}
-
-			tt = &specialtranslationtablecache[skintableindex];
-		}
-		else
-		{
-			I_Assert(skinnum >= 0 && skinnum < numskins);
-			tt = &skins[skinnum]->translationtablecache;
+			case TC_DEFAULT:    skintableindex = DEFAULT_TT_CACHE_INDEX; break;
+			case TC_BOSS:       skintableindex = BOSS_TT_CACHE_INDEX; break;
+			case TC_METALSONIC: skintableindex = METALSONIC_TT_CACHE_INDEX; break;
+			case TC_ALLWHITE:   skintableindex = ALLWHITE_TT_CACHE_INDEX; break;
+			case TC_RAINBOW:    skintableindex = RAINBOW_TT_CACHE_INDEX; break;
+			case TC_BLINK:      skintableindex = BLINK_TT_CACHE_INDEX; break;
+			default:            skintableindex = skinnum; break;
 		}
 	}
 
 	if (flags & GTC_CACHE)
 	{
 		// Allocate table for skin if necessary
-		if (!*tt)
-			*tt = static_cast<UINT8**>(Z_Calloc(MAXTRANSLATIONS * sizeof(UINT8**), PU_STATIC, NULL));
+		if (!tt[skintableindex])
+			tt[skintableindex] = static_cast<UINT8**>(Z_Calloc(MAXTRANSLATIONS * sizeof(UINT8**), PU_STATIC, NULL));
 
 		// Get colormap
-		ret = (*tt)[color];
+		ret = tt[skintableindex][color];
 	}
 	else
 		ret = NULL;
@@ -439,11 +420,11 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f
 	if (!ret)
 	{
 		ret = static_cast<UINT8*>(Z_Malloc(NUM_PALETTE_ENTRIES, PU_STATIC, NULL));
-		K_GenerateKartColormap(ret, skinnum, color, local); // R_GenerateTranslationColormap(ret, skinnum, color);		// SRB2kart
+		K_GenerateKartColormap(ret, skinnum, color, local); //R_GenerateTranslationColormap(ret, skinnum, color);		// SRB2kart
 
 		// Cache the colormap if desired
 		if (flags & GTC_CACHE)
-			(*tt)[color] = ret;
+			tt[skintableindex][color] = ret;
 	}
 
 	return ret;
@@ -456,26 +437,46 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags)
 
 UINT8* R_GetLocalTranslationColormap(skin_t *skin, skin_t *localskin, skincolors_t color, UINT8 flags, boolean local)
 {
-	const INT32 skinnum = (INT32)((localskin && local) ? localskin->skinnum : (skin != NULL ? skin->skinnum : 0));
-	return RGetTranslationColormap(skinnum, color, flags, (localskin && local));
+	return RGetTranslationColormap(K_GetMobjLocalSkinNum(skin, localskin, local), color, flags, (localskin && local));
 }
 
-patch_t* R_GetSkinFaceRank(player_t* player)
+patch_t* R_GetSkinFaceRank(player_t* ply)
 {
-	const skin_t *skin = R_GetPlayerSkin(player);
-	return skin->facerankprefix;
+	if (ply->localskin)
+	{
+		if (ply->skinlocal)
+			return localfacerankprefix[ply->localskin - 1];
+
+		return facerankprefix[ply->localskin - 1];
+	}
+
+	return facerankprefix[ply->skin];
 }
 
-patch_t* R_GetSkinFaceWant(player_t* player)
+patch_t* R_GetSkinFaceWant(player_t* ply)
 {
-	const skin_t *skin = R_GetPlayerSkin(player);
-	return skin->facewantprefix;
+	if (ply->localskin)
+	{
+		if (ply->skinlocal)
+			return localfacewantprefix[ply->localskin - 1];
+
+		return facewantprefix[ply->localskin - 1];
+	}
+
+	return facewantprefix[ply->skin];
 }
 
-patch_t* R_GetSkinFaceMini(player_t* player)
+patch_t* R_GetSkinFaceMini(player_t* ply)
 {
-	const skin_t *skin = R_GetPlayerSkin(player);
-	return skin->facemmapprefix;
+	if (ply->localskin)
+	{
+		if (ply->skinlocal)
+			return localfacemmapprefix[ply->localskin - 1];
+
+		return facemmapprefix[ply->localskin - 1];
+	}
+
+	return facemmapprefix[ply->skin];
 }
 
 /**	\brief	Flushes cache of translation colormaps.
@@ -494,20 +495,13 @@ void R_FlushTranslationColormapCache(void)
 {
 	INT32 i;
 
-	// skin cache
-	for (i = 0; i < (INT32)numskins; i++)
-		if (skins[i]->translationtablecache)
-			memset(skins[i]->translationtablecache, 0, MAXTRANSLATIONS * sizeof(UINT8**));
+	for (i = 0; i < (INT32)(sizeof(translationtablecache) / sizeof(translationtablecache[0])); i++)
+		if (translationtablecache[i])
+			memset(translationtablecache[i], 0, MAXTRANSLATIONS * sizeof(UINT8**));
 
-	// localskin cache
-	for (i = 0; i < (INT32)numlocalskins; i++)
-		if (localskins[i]->translationtablecache)
-			memset(localskins[i]->translationtablecache, 0, MAXTRANSLATIONS * sizeof(UINT8**));
-
-	// special cache
-	for (i = 0; i < (INT32)(sizeof(specialtranslationtablecache) / sizeof(specialtranslationtablecache[0])); i++)
-		if (specialtranslationtablecache[i])
-			memset(specialtranslationtablecache[i], 0, MAXTRANSLATIONS * sizeof(UINT8**));
+	for (i = 0; i < (INT32)(sizeof(localtranslationtablecache) / sizeof(localtranslationtablecache[0])); i++)
+		if (localtranslationtablecache[i])
+			memset(localtranslationtablecache[i], 0, MAXTRANSLATIONS * sizeof(UINT8**));
 }
 */
 

src/r_draw_flush.cpp

@@ -6,7 +6,7 @@
 // Copyright (C) 1996 by id Software, Inc.
 // Copyright (C) 1999 by Chi Hoang, Lee Killough, Jim Flynn, Rand Phares, Ty Halderman
 // Copyright (C) 1999-2000 by Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze
-// Copyright (C) 2005, 2006 by Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko
+// Copyright (C) Copyright 2005, 2006 by Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko
 // Copyright (C) 2013 by James Haley, Stephen McGranahan, et al.
 //
 // This program is free software distributed under the

src/r_fps.cpp

@@ -340,14 +340,18 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out)
 		return;
 	}
 
-	out->x = R_LerpFixed(mobj->old_x, mobj->x, frac);
-	out->y = R_LerpFixed(mobj->old_y, mobj->y, frac);
-	out->z = R_LerpFixed(mobj->old_z, mobj->z, frac);
+	const boolean doreset = mobj->resetinterp && (mobj->type != MT_GHOST) && (mobj->type != MT_PLAYERRETICULE) && (mobj->type != MT_SHADOW);
+
+	out->x = doreset ? mobj->x : R_LerpFixed(mobj->old_x, mobj->x, frac);
+	out->y = doreset ? mobj->y : R_LerpFixed(mobj->old_y, mobj->y, frac);
+	out->z = doreset ? mobj->z : R_LerpFixed(mobj->old_z, mobj->z, frac);
+
+	out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac);
 	out->spritexscale = mobj->resetinterp ? mobj->spritexscale : R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac);
 	out->spriteyscale = mobj->resetinterp ? mobj->spriteyscale : R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac);
 	out->spritexoffset = mobj->resetinterp ? mobj->spritexoffset : R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac);
 	out->spriteyoffset = mobj->resetinterp ? mobj->spriteyoffset : R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac);
-	out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac);
+
 	//out->subsector = R_PointInSubsector(out->x, out->y); // this is unused
 
 	if (mobj->player)

src/r_main.cpp

@@ -389,7 +389,7 @@ angle_t R_PlayerSliptideAngle(player_t *player)
 
 	if (mo->skin && mo->sprite == SPR_PLAY)
 	{
-		sprdef = &mo->skin->spritedef;
+		sprdef = &((skin_t *)mo->skin)->spritedef;
 
 		if (rot >= sprdef->numframes)
 			sprdef = &sprites[mo->sprite];

src/r_patch.cpp

@@ -129,8 +129,8 @@ static void R_ParseSpriteInfo(boolean spr2)
 	spritenum_t sprnum = NUMSPRITES;
 	//playersprite_t spr2num = NUMPLAYERSPRITES;
 	INT32 i;
+	INT32 skinnumbers[MAXSKINS]; // >variable 'skinnumbers' set but not used >compile error when commented out
 	INT32 foundskins = 0;
-	CLEANUP(pfree) INT32 *skinnumbers = (INT32 *)calloc(1, numallskins); // could realloc this for foundskins but this is simpler
 
 	// Sprite name
 	sprinfoToken = M_GetToken(NULL);
@@ -236,10 +236,10 @@ static void R_ParseSpriteInfo(boolean spr2)
 					{
 						size_t skinnum = skinnumbers[i];
 						skin_t *skin;
-						if (allskins[skinnum]->localskin)
-							skin = localskins[allskins[skinnum]->skinnum];
+						if (allskins[skinnum].localskin)
+							skin = &localskins[allskins[skinnum].localnum];
 						else
-							skin = skins[allskins[skinnum]->skinnum];
+							skin = &skins[allskins[skinnum].localnum];
 						memcpy(&skin->sprinfo, info, sizeof(spriteinfo_t));
 					}
 				}

src/r_segs.cpp

@@ -61,6 +61,7 @@ fixed_t rw_distance = 0;
 static INT32 rw_x, rw_stopx;
 static angle_t rw_centerangle;
 static fixed_t rw_offset;
+static fixed_t rw_offset2; // for splats
 static fixed_t rw_scale, rw_scalestep;
 static fixed_t rw_midtexturemid, rw_toptexturemid, rw_bottomtexturemid;
 static INT32 worldtop, worldbottom, worldhigh, worldlow;
@@ -263,7 +264,12 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
 		else if (P_ApplyLightOffset(lightnum, frontsector))
 			lightnum += curline->lightOffset;
 
-		walllights = R_GetWallLight(lightnum);
+		if (lightnum < 0)
+			walllights = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			walllights = scalelight[LIGHTLEVELS - 1];
+		else
+			walllights = scalelight[lightnum];
 	}
 
 	if (frontsector->heightsec != -1)
@@ -365,7 +371,12 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
 
 					lightnum = rlight->lightnum;
 
-					xwalllights = R_GetWallLight(lightnum);
+					if (lightnum < 0)
+						xwalllights = scalelight[0];
+					else if (lightnum >= LIGHTLEVELS)
+						xwalllights = scalelight[LIGHTLEVELS-1];
+					else
+						xwalllights = scalelight[lightnum];
 
 					pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
 
@@ -813,7 +824,12 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 		else if (P_ApplyLightOffset(lightnum, frontsector))
 			lightnum += curline->lightOffset;
 
-		walllights = R_GetWallLight(lightnum);
+		if (lightnum < 0)
+			walllights = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			walllights = scalelight[LIGHTLEVELS-1];
+		else
+			walllights = scalelight[lightnum];
 	}
 
 	maskedtexturecol = drawseg->thicksidecol;
@@ -955,7 +971,12 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 
 				lightnum = rlight->lightnum;
 
-				xwalllights = R_GetWallLight(lightnum);
+				if (lightnum < 0)
+					xwalllights = scalelight[0];
+				else if (lightnum >= LIGHTLEVELS)
+					xwalllights = scalelight[LIGHTLEVELS-1];
+				else
+					xwalllights = scalelight[lightnum];
 
 				pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
 
@@ -1446,7 +1467,12 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
 				else if (P_ApplyLightOffset(lightnum, curline->frontsector))
 					lightnum += curline->lightOffset;
 
-				xwalllights = R_GetWallLight(lightnum);
+				if (lightnum < 0)
+					xwalllights = scalelight[0];
+				else if (lightnum >= LIGHTLEVELS)
+					xwalllights = scalelight[LIGHTLEVELS-1];
+				else
+					xwalllights = scalelight[lightnum];
 
 				pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
 
@@ -1856,7 +1882,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 	// big room fix
 	if (longboi)
-		rw_distance = (fixed_t)R_CalcSegDist(curline, viewx, viewy);
+		rw_distance = (fixed_t)R_CalcSegDist(curline,viewx,viewy);
 
 	ds_p->x1 = rw_x = start;
 	ds_p->x2 = stop;
@@ -2525,6 +2551,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			rw_offset = -rw_offset;
 
 		/// don't use texture offset for splats
+		rw_offset2 = rw_offset + curline->offset;
 		rw_offset += sidedef->textureoffset + curline->offset;
 		rw_centerangle = ANGLE_90 + viewangle - rw_normalangle;
 
@@ -2537,7 +2564,12 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		if (P_ApplyLightOffset(lightnum, frontsector))
 			lightnum += curline->lightOffset;
 
-		walllights = R_GetWallLight(lightnum);
+		if (lightnum < 0)
+			walllights = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			walllights = scalelight[LIGHTLEVELS - 1];
+		else
+			walllights = scalelight[lightnum];
 	}
 
 	// if a floor / ceiling plane is on the wrong side

src/r_segs.h

@@ -22,11 +22,6 @@ extern "C" {
 #pragma interface
 #endif
 
-FUNCINLINE static ATTRINLINE lighttable_t** R_GetWallLight(INT32 llevel)
-{
-	return scalelight[CLAMP(llevel, 0, LIGHTLEVELS-1)];
-}
-
 void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2);
 void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pffloor);
 void R_StoreWallRange(INT32 start, INT32 stop);

src/r_skins.c

@@ -40,12 +40,10 @@ CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2] = {}; // huehuehuehuehue
 INT32 numskins = 0;
 INT32 numallskins = 0;
 INT32 numlocalskins = 0;
-skin_t **skins = NULL;
-skin_t **localskins = NULL;
-skin_t **allskins = NULL;
+skin_t skins[MAXSKINS];
 
-skinnum_t skinstats[9][9][MAXSKINS];
-skinnum_t skinstatscount[9][9] = {
+UINT8 skinstats[9][9][MAXSKINS];
+UINT8 skinstatscount[9][9] = {
 	{0, 0, 0, 0, 0, 0, 0, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -57,9 +55,18 @@ skinnum_t skinstatscount[9][9] = {
 	{0, 0, 0, 0, 0, 0, 0, 0, 0}
 };
 
-skinnum_t skinsorted[MAXSKINS] = {};
+UINT8 skinsorted[MAXSKINS] = {};
+skin_t localskins[MAXLOCALSKINS] = {};
+skin_t allskins[MAXSKINS+MAXLOCALSKINS] = {};
 
-static void Sk_SetDefaultValue(skin_t *skin)
+// FIXTHIS: don't work because it must be inistilised before the config load
+//#define SKINVALUES
+#ifdef SKINVALUES
+CV_PossibleValue_t skin_cons_t[MAXSKINS+1] = {};
+CV_PossibleValue_t localskin_cons_t[MAXLOCALSKINS+1] = {};
+#endif
+
+static void Sk_SetDefaultValue(skin_t *skin, boolean local)
 {
 	INT32 i;
 	//
@@ -67,7 +74,7 @@ static void Sk_SetDefaultValue(skin_t *skin)
 	//
 	memset(skin, 0, sizeof(skin_t));
 
-	snprintf(skin->name, sizeof skin->name, "skin %u", skin->skinnum); // this will always be "skin 0" cause of the memset above lmao
+	snprintf(skin->name, sizeof skin->name, "skin %u", K_GetMobjSkinNum(skin, local));
 	skin->name[sizeof skin->name - 1] = '\0';
 
 	skin->wadnum = INT16_MAX;
@@ -105,22 +112,35 @@ static void Sk_SetDefaultValue(skin_t *skin)
 void R_InitSkins(void)
 {
 	skin_t *skin;
+#ifdef SKINVALUES
+	INT32 i;
 
-	skins = Z_Calloc(sizeof(skin_t *), PU_STATIC, NULL);
-	//localskins = Z_Calloc(sizeof(skin_t *), PU_STATIC, NULL);
-	allskins = Z_Calloc(sizeof(skin_t *), PU_STATIC, NULL);
+	for (i = 0; i <= MAXSKINS; i++)
+	{
+		skin_cons_t[i].value = 0;
+		skin_cons_t[i].strvalue = NULL;
+	}
+	for (i = 0; i <= MAXLOCALSKINS; i++)
+	{
+		localskin_cons_t[i].value = 0;
+		localskin_cons_t[i].strvalue = NULL;
+	}
+#endif
 
 	// skin[0] = Sonic skin
-	skin = skins[0] = Z_Calloc(sizeof(skin_t), PU_STATIC, NULL);
-
-	Sk_SetDefaultValue(skin);
-	skin->skinnum = 0;
+	skin = &skins[0];
+	numskins = 1;
+	Sk_SetDefaultValue(skin, false);
 
 	memset(skinstats, 0, sizeof(skinstats));
 	memset(skinsorted, 0, sizeof(skinsorted));
 
 	// Hardcoded S_SKIN customizations for Sonic.
 	strcpy(skin->name,       DEFAULTSKIN);
+#ifdef SKINVALUES
+	skin_cons_t[0].strvalue = skins[0].name;
+#endif
+
 	strcpy(skin->realname,   "Sonic");
 	strcpy(skin->hudname,    "SONIC");
 
@@ -133,6 +153,7 @@ void R_InitSkins(void)
 	skin->wadnum = 0; // god what have you brought to this world
 	skin->prefcolor = SKINCOLOR_BLUE;
 	skin->localskin = false;
+	skin->localnum = 0;
 
 	// SRB2kart
 	skin->kartspeed = 8;
@@ -142,7 +163,7 @@ void R_InitSkins(void)
 	skin->spritedef.numframes = sprites[SPR_PLAY].numframes;
 	skin->spritedef.spriteframes = sprites[SPR_PLAY].spriteframes;
 	skin->sprinfo = spriteinfo[SPR_PLAY];
-	ST_LoadFaceGraphics(skin);
+	ST_LoadFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, 0);
 
 	// Set values for Sonic skin
 	Forceskin_cons_t[1].value = 0;
@@ -156,8 +177,6 @@ void R_InitSkins(void)
 
 	// lets set it
 	allskins[0] = skins[0];
-
-	numskins = 1;
 	numallskins = 1;
 }
 
@@ -169,7 +188,7 @@ INT32 R_SkinAvailable(const char *name)
 
 	for (i = 0; i < numskins; i++)
 	{
-		if (fasticmp(skins[i]->name, name))
+		if (fasticmp(skins[i].name, name))
 			return i;
 	}
 
@@ -184,7 +203,7 @@ INT32 R_AnySkinAvailable(const char *name)
 
 	for (i = 0; i < numallskins; i++)
 	{
-		if (fasticmp(allskins[i]->name, name))
+		if (fasticmp(allskins[i].name, name))
 			return i;
 	}
 
@@ -199,7 +218,7 @@ INT32 R_LocalSkinAvailable(const char *name, boolean local)
 	{
 		for (i = 0; i < numlocalskins; i++)
 		{
-			if (fasticmp(localskins[i]->name, name))
+			if (fasticmp(localskins[i].name, name))
 				return i;
 		}
 
@@ -217,7 +236,7 @@ boolean SetPlayerSkin(INT32 playernum, const char *skinname)
 	for (i = 0; i < numskins; i++)
 	{
 		// search in the skin list
-		if (fasticmp(skins[i]->name, skinname))
+		if (fasticmp(skins[i].name, skinname))
 		{
 			SetPlayerSkinByNum(playernum, i);
 			return true;
@@ -243,14 +262,14 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
 		for (i = 0; i < numlocalskins; i++)
 		{
 			// search in the localskin list
-			if (fasticmp(localskins[i]->name, skinname))
+			if (fasticmp(localskins[i].name, skinname))
 			{
 				player->localskin = 1 + i;
 				player->skinlocal = true;
 
 				if (player->mo)
 				{
-					player->mo->localskin = localskins[i];
+					player->mo->localskin = &localskins[i];
 					player->mo->skinlocal = true;
 				}
 
@@ -261,14 +280,14 @@ 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 (fasticmp(skins[i].name, skinname))
 			{
 				player->localskin = 1 + i;
 				player->skinlocal = false;
 
 				if (player->mo)
 				{
-					player->mo->localskin = skins[i];
+					player->mo->localskin = &skins[i];
 					player->mo->skinlocal = false;
 				}
 
@@ -293,9 +312,9 @@ setcvar:
 	{
 		if (player->localskin > 0)
 		{
-			skin_t *lskin = R_GetSkinArray(player->skinlocal)[player->localskin-1];
-			CV_StealthSet(&cv_fakelocalskin, lskin->name);
-			CV_StealthSet(cvar, lskin->name);
+			CV_StealthSet(&cv_fakelocalskin, K_GetSkinArray(player->skinlocal)[player->localskin-1].name);
+			CV_StealthSet(cvar, K_GetSkinArray(player->skinlocal)[player->localskin-1].name);
+
 		}
 		else
 		{
@@ -310,12 +329,10 @@ setcvar:
 void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
 {
 	player_t *player = &players[playernum];
-	skin_t *skin;
+	skin_t *skin = &skins[skinnum];
 
 	if (skinnum >= 0 && skinnum < numskins) // Make sure it exists!
 	{
-		skin = skins[skinnum];
-
 		player->skin = skinnum;
 
 		if (player->mo)
@@ -381,10 +398,10 @@ static UINT16 W_CheckForSkinMarkerInPwad(UINT16 wadid, UINT16 startlump)
 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 skinnum_t val_a = *(const skinnum_t *)a;
-	const skinnum_t val_b = *(const skinnum_t *)b;
-	const skin_t *in1 = skins[val_a];
-	const skin_t *in2 = skins[val_b];
+	const UINT8 val_a = *(const UINT8 *)a;
+	const UINT8 val_b = *(const UINT8 *)b;
+	const skin_t *in1 = &skins[val_a];
+	const skin_t *in2 = &skins[val_b];
 
 	// return (strcmp(in1->realname, in2->realname) < 0) || (strcmp(in1->realname, in2->realname) ==);
 
@@ -457,7 +474,7 @@ static int skinSortFunc(const void *a, const void *b) // tbh i have no clue what
 void sortSkinGrid(void)
 {
 	//CONS_Printf("Sorting skin list (%d)...\n", cv_skinselectgridsort.value);
-	qs22j(skinsorted, numskins, sizeof(skinnum_t), skinSortFunc);
+	qs22j(skinsorted, numskins, sizeof(UINT8), skinSortFunc);
 }
 
 //
@@ -471,7 +488,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 	char *stoken;
 	char *value;
 	size_t size;
-	skin_t *skin = NULL;
+	skin_t *skin;
 	boolean hudname, realname;
 
 #define lnumskins (local ? numlocalskins : numskins)
@@ -485,18 +502,16 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 		// advance by default
 		lastlump = lump + 1;
 
-		// gotta keep this for vanilla compat reasons
 		if (!local && numskins >= MAXSKINS)
 		{
 			CONS_Alert(CONS_WARNING, M_GetText("Unable to add skin, too many characters are loaded (%d maximum)\n"), MAXSKINS);
 			continue; // so we know how many skins couldn't be added
 		}
-
-		/* if (local && numlocalskins >= MAXLOCALSKINS)
+		if (local && numlocalskins >= MAXLOCALSKINS)
 		{
 			CONS_Alert(CONS_WARNING, M_GetText("Unable to add localskin, too many localskins are loaded (%d maximum)\n"), MAXLOCALSKINS);
 			continue; // so we know how many skins couldn't be added
-		} */
+		}
 
 		buf = W_CacheLumpNumPwad(wadnum, lump, PU_CACHE);
 		size = W_LumpLengthPwad(wadnum, lump);
@@ -509,19 +524,8 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 		buf2[size] = '\0';
 
 		// set defaults
-		if (!local)
-		{
-			skins = Z_Realloc(skins, sizeof(skin_t *) * (numskins + 1), PU_STATIC, NULL);
-		}
-		else
-		{
-			localskins = Z_Realloc(localskins, sizeof(skin_t *) * (numlocalskins + 1), PU_STATIC, NULL);
-		}
-
-		skin = R_GetSkinArray(local)[lnumskins] = Z_Calloc(sizeof(skin_t), PU_STATIC, NULL);
-		Sk_SetDefaultValue(skin);
-		skin->skinnum = lnumskins;
-		skin->allskinnum = numallskins;
+		skin = &K_GetSkinArray(local)[lnumskins];
+		Sk_SetDefaultValue(skin, local);
 		skin->wadnum = wadnum;
 		hudname = realname = false;
 
@@ -773,19 +777,24 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 		//R_FlushTranslationColormapCache();
 
 		CONS_Printf(M_GetText("Added skin '%s'\n"), skin->name);
-
+#ifdef SKINVALUES
+		(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
 			Forceskin_cons_t[numskins+1].value = numskins;
-			Forceskin_cons_t[numskins+1].strvalue = skins[numskins]->name;
+			Forceskin_cons_t[numskins+1].strvalue = skins[numskins].name;
 			skin->localskin = false;
-			ST_LoadFaceGraphics(skin);
+			skin->localnum = numskins;
+			ST_LoadFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, numskins);
 		}
 		else
 		{
 			skin->localskin = true;
-			ST_LoadFaceGraphics(skin);
+			skin->localnum = numlocalskins;
+			ST_LoadLocalFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, numlocalskins);
 		}
 
 #ifdef HWRENDER
@@ -801,8 +810,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 			skinsorted[numskins] = numskins;
 		}
 
-		allskins = Z_Realloc(allskins, sizeof(skin_t*) * (numallskins + 1), PU_STATIC, NULL);
-		allskins[numallskins] = R_GetSkinArray(local)[lnumskins];
+		allskins[numallskins] = K_GetSkinArray(local)[lnumskins];
 
 		local ? numlocalskins++ : numskins++;
 		numallskins++;
@@ -812,50 +820,3 @@ void R_AddSkins(UINT16 wadnum, boolean local)
 
 	return;
 }
-
-// Helper functions for skin stuff
-
-//
-// returns the skin array to use
-// accounts for localskins
-//
-skin_t **R_GetSkinArray(boolean local)
-{
-	return local ? localskins : skins;
-}
-
-//
-// returns the players skinnumber
-// accounts for localskins
-//
-INT32 R_GetPlayerSkinNum(player_t *player)
-{
-	return player->localskin ? (player->localskin - 1) : player->skin;
-}
-
-//
-// returns the players skin
-// accounts for localskins
-//
-skin_t *R_GetPlayerSkin(player_t *player)
-{
-	return R_GetSkinArray(player->skinlocal)[R_GetPlayerSkinNum(player)];
-}
-
-//
-// returns the mobj skinnumber
-// accounts for localskins
-//
-INT32 R_GetMobjSkinNum(const mobj_t *mobj)
-{
-	return mobj->localskin ? mobj->localskin->skinnum : mobj->skin->skinnum;
-}
-
-//
-// returns the mobjs skin
-// accounts for localskins
-//
-skin_t *R_GetMobjSkin(const mobj_t *mobj)
-{
-	return mobj->localskin ? mobj->localskin : mobj->skin;
-}

src/r_skins.h

@@ -16,7 +16,6 @@
 #ifndef __R_SKINS__
 #define __R_SKINS__
 
-#include "doomtype.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -25,10 +24,6 @@ extern "C" {
 #include "sounds.h"
 #include "r_patch.h"
 
-#ifdef HWRENDER
-#include "hardware/hw_md2.h"
-#endif
-
 // "Left" and "Right" character symbols for additional rotation functionality
 #define ROT_L ('L' - '0')
 #define ROT_R ('R' - '0')
@@ -40,7 +35,7 @@ extern "C" {
 #define DEFAULTSKIN3 "knuckles" // third player
 #define DEFAULTSKIN4 "eggman" // fourth player
 
-typedef struct skin_s
+typedef struct
 {
 	char name[SKINNAMESIZE+1]; // INT16 descriptive name of the skin
 	spritedef_t spritedef;
@@ -53,17 +48,12 @@ typedef struct skin_s
 	char hudname[SKINNAMESIZE+1]; // HUD name to display (officially exactly 5 characters long)
 	char facerank[9], facewant[9], facemmap[9]; // Arbitrarily named patch lumps
 
-	patch_t *facerankprefix; // ranking
-	patch_t *facewantprefix; // wanted
-	patch_t *facemmapprefix; // minimap
-
 	// SRB2kart
 	UINT8 kartspeed;
 	UINT8 kartweight;
 	//
 
 	// Definable color translation table
-	UINT8 **translationtablecache;
 	UINT8 starttranscolor;
 	UINT8 prefcolor;
 	fixed_t highresscale; // scale of highres, default is 0.5
@@ -71,13 +61,8 @@ typedef struct skin_s
 	// specific sounds per skin
 	sfxenum_t soundsid[NUMSKINSOUNDS]; // sound # in S_sfx table
 
-#ifdef HWRENDER
-	md2_t playermodel;
-#endif
-
 	boolean localskin;
-	skinnum_t skinnum;
-	UINT16 allskinnum;
+	INT32 localnum;
 } skin_t;
 
 extern CV_PossibleValue_t Forceskin_cons_t[];
@@ -85,13 +70,13 @@ extern CV_PossibleValue_t Forceskin_cons_t[];
 extern INT32 numskins;
 extern INT32 numlocalskins;
 extern INT32 numallskins;
-extern skin_t **skins;
-extern skin_t **localskins;
-extern skin_t **allskins;
+extern skin_t skins[MAXSKINS];
+extern UINT8 skinstats[9][9][MAXSKINS];
+extern UINT8 skinstatscount[9][9];
+extern UINT8 skinsorted[MAXSKINS];
 
-extern skinnum_t skinstats[9][9][MAXSKINS];
-extern skinnum_t skinstatscount[9][9];
-extern skinnum_t skinsorted[MAXSKINS];
+extern skin_t localskins[MAXLOCALSKINS];
+extern skin_t allskins[MAXSKINS+MAXLOCALSKINS];
 
 //faB: find sprites in wadfile, replace existing, add new ones
 //     (only sprites from namelist are added or replaced)
@@ -105,11 +90,13 @@ INT32 R_AnySkinAvailable(const char *name);
 INT32 R_LocalSkinAvailable(const char *name, boolean local);
 
 // had to move those here Zzz...
-skin_t **R_GetSkinArray(boolean local);
-skin_t *R_GetPlayerSkin(player_t *player);
-INT32 R_GetPlayerSkinNum(player_t *player);
-INT32 R_GetMobjSkinNum(const mobj_t *mobj);
-skin_t *R_GetMobjSkin(const mobj_t *mobj);
+INT32 K_GetSkinNum(player_t *player);
+INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local);
+INT32 K_GetMobjLocalSkinNum(const skin_t *skin, const skin_t *localskin, boolean local);
+skin_t *K_GetPlayerSkin(player_t *player);
+skin_t *K_GetMobjSkin(const mobj_t *mobj);
+patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum);
+skin_t *K_GetSkinArray(boolean local);
 
 void sortSkinGrid(void);
 

src/r_things.cpp

@@ -1062,7 +1062,12 @@ static void R_SplitSprite(vissprite_t *sprite)
 		{
 			INT32 lightnum = R_GetSoftLightlevel(*sector->lightlist[i].lightlevel);
 
-			spritelights = R_GetWallLight(lightnum);
+			if (lightnum < 0)
+				spritelights = scalelight[0];
+			else if (lightnum >= LIGHTLEVELS)
+				spritelights = scalelight[LIGHTLEVELS-1];
+			else
+				spritelights = scalelight[lightnum];
 
 			newsprite->extra_colormap = sector->lightlist[i].extra_colormap;
 
@@ -1276,7 +1281,7 @@ static void R_ProjectSprite(mobj_t *thing)
 	const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || thing->temprollangle || sliprollrotate);
 #endif
 
-	sprskin = R_GetMobjSkin(thing);
+	sprskin = K_GetMobjSkin(thing);
 
 	//Fab : 02-08-98: 'skin' override spritedef currently used for skin
 	if (sprskin && thing->sprite == SPR_PLAY)
@@ -1740,7 +1745,12 @@ static void R_ProjectSprite(mobj_t *thing)
 			}
 		}
 
-		lights_array = R_GetWallLight(lightnum);
+		if (lightnum < 0)
+			lights_array = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			lights_array = scalelight[LIGHTLEVELS-1];
+		else
+			lights_array = scalelight[lightnum];
 	}
 
 	// store information in a vissprite
@@ -2077,11 +2087,16 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 
 	if (!sec->numlights)
 	{
-		if (sec->heightsec == -1)
-			lightlevel = sec->lightlevel;
+		if (sec->heightsec == -1) lightlevel = sec->lightlevel;
 
 		lightnum = R_GetSoftLightlevel(lightlevel);
-		spritelights = R_GetWallLight(lightnum);
+
+		if (lightnum < 0)
+			spritelights = scalelight[0];
+		else if (lightnum >= LIGHTLEVELS)
+			spritelights = scalelight[LIGHTLEVELS-1];
+		else
+			spritelights = scalelight[lightnum];
 	}
 
 	// Handle all things in sector.