Merge branch 'Saturn-Next' into mac-ci-test

This reverts commit 8433d04a12.

.github/workflows/macos.yml

@@ -0,0 +1,62 @@
+name: macOS
+
+on:
+  push:
+    branches: [ "mac-ci-test"]
+  pull_request:
+    branches: [ "mac-ci-test"]
+
+jobs:
+  build:
+    continue-on-error: true
+    strategy:
+      matrix:
+        arch:
+          - runner: macos-latest
+            name: aarch64
+          - runner: macos-15-intel
+            name: x86_64
+
+    name: ${{ matrix.arch.name }}
+    runs-on: ${{ matrix.arch.runner }}
+
+    steps:
+    - uses: actions/checkout@v6.0.1
+
+    - name: Install dependencies
+      run: brew install --formula sdl2 sdl2_mixer game-music-emu libopenmpt
+
+    - name: Download Kart assets
+      run: |
+        curl -L \
+        -o AssetsLinuxOnly.zip \
+        "https://github.com/STJr/Kart-Public/releases/download/v1.6/AssetsLinuxOnly.zip"
+
+    - name: Extract Kart assets
+      run: |
+        mkdir -p assets/installer
+        unzip -q AssetsLinuxOnly.zip -d assets/installer
+
+    - name: Configure CMake
+      run: cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
+
+    - name: Build SRB2Kart-Saturn
+      run: ninja -C build
+
+      #idk what im doing here tbh i pray this works
+    - name: Package DMG
+      run: |
+        cd build
+        cpack -G DragNDrop
+
+    #- name: Upload build artifact
+    #  uses: actions/upload-artifact@v6.0.0
+    #  with:
+    #    name: srb2kartsaturn-macOS-${{ matrix.arch.name }}-${{ github.sha }}
+    #    path: build/bin
+
+    - name: Upload DMG
+      uses: actions/upload-artifact@v6.0.0
+      with:
+        name: srb2kartsaturn-macOS-${{ matrix.arch.name }}-${{ github.sha }}
+        path: build/*.dmg

CMakeLists.txt

@@ -29,7 +29,7 @@ if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
 	elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
 		set(SRB2_CPACK_GENERATOR "TGZ")
 	elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
-		set(SRB2_CPACK_GENERATOR "TGZ")
+		set(SRB2_CPACK_GENERATOR "DragNDrop")
 	endif()
 endif()
 

src/CMakeLists.txt

@@ -246,8 +246,6 @@ set(SRB2_CONFIG_ASAN OFF CACHE BOOL
 	"Compile with AddressSanitizer (libasan).")
 set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
 	"Compile with UndefinedBehaviorSanitizer (libubsan).")
-set(SRB2_CONFIG_TSAN OFF CACHE BOOL
-	"Compile with ThreadSanitizer (libtsan).")
 
 set(SRB2_CONFIG_MUMBLE ON CACHE BOOL
 	"Enable Mumble support")
@@ -259,9 +257,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)
@@ -292,6 +287,7 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_script.c
 		lua_skinlib.c
 		lua_thinkerlib.c
+		lua_udatalib.c
 		lua_glib.c
 	)
 	set(SRB2_LUA_HEADERS
@@ -301,6 +297,7 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_profile.h
 		lua_libs.h
 		lua_script.h
+		lua_udatalib.h
 		lua_glib.h
 	)
 
@@ -586,10 +583,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,17 +65,12 @@
 # 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.
 # PROFILEMODE=1 - Enable performance profiling (gprof).
 # USEASAN=1 - Enable building with Address Sanitizer.
 # USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer.
-# USETSAN=1 - Enable building with Thread Sanitizer.
 # NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
 #
 # General flags for building:
@@ -262,35 +257,23 @@ debug_opts=-D_DEBUG
 else # build a normal optimized version
 debug_opts=-DNDEBUG
 opts+=-O3
+ifndef NOLTO
+# compile with LTO
+opts+=-flto=auto
+libs+=-flto=auto
+endif
 endif
 
 ifdef USEASAN
 # compile with asan
 opts+=-O1 -fsanitize=address -fno-omit-frame-pointer -fno-common
 libs+=-fsanitize=address
-NOLTO=1
 endif
 
 ifdef USEUBSAN
 # compile with ubsan
 opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
 libs+=-fsanitize=undefined
-NOLTO=1
-endif
-
-ifdef USETSAN
-# compile with tsan
-opts+=-O1 -fsanitize=thread -fno-omit-frame-pointer
-libs+=-fsanitize=thread
-NOLTO=1
-endif
-
-ifndef DEBUGMODE
-ifndef NOLTO
-# compile with LTO
-opts+=-flto=auto
-libs+=-flto=auto
-endif
 endif
 
 ifdef USEJEMALLOC

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

src/Sourcefile

@@ -97,5 +97,6 @@ lua_playerlib.c
 lua_script.c
 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);
 }
 
@@ -1739,7 +1719,6 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 		// send the value of the variable
 		UINT8 buf[128];
 		UINT8 *p = buf;
-
 		if (!(server || (IsPlayerAdmin(consoleplayer))))
 		{
 			CONS_Alert(CONS_NOTICE, "Only the server or admin can change: %s %s\n", var->name, var->string);
@@ -1803,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);
 }
 
@@ -1823,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);
 }
 
@@ -2221,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];
@@ -2230,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/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)
 {
@@ -1773,7 +1772,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 +1817,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 +1927,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 +1946,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 +1961,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 +1968,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 +2097,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 +2135,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 +2214,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 +2950,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 +3338,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 +3356,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 +3372,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 +3449,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 +3457,6 @@ void CL_ClearPlayer(INT32 playernum)
 		P_RemoveMobj(players[playernum].mo);
 	}
 
-	// Wipe the struct.
 	memset(&players[playernum], 0, sizeof(player_t));
 }
 
@@ -3542,7 +3513,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 +4099,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 +4475,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 +5165,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 +5414,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 +5438,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 +5465,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 +5481,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 +5534,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)
@@ -7273,7 +7238,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

@@ -1149,19 +1149,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 +1245,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

@@ -147,11 +147,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 +435,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};
@@ -621,7 +608,7 @@ void D_RegisterServerCommands(void)
 	// 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);
+		sprintf(player_names[i], "Player %d", 1 + i);
 
 	RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor);
 	RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref);
@@ -871,11 +858,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);
@@ -1043,8 +1025,6 @@ void D_RegisterClientCommands(void)
 
 		CV_RegisterVar(&cv_rumble[i]);
 		CV_RegisterVar(&cv_rumble_strength[i]);
-
-		CV_RegisterVar(&cv_rumble_wallbonk[i]);
 		CV_RegisterVar(&cv_rumble_spinout[i]);
 		CV_RegisterVar(&cv_rumble_sneakerboost[i]);
 		CV_RegisterVar(&cv_rumble_offroad[i]);
@@ -1176,14 +1156,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;
 		}
 	}
@@ -1191,7 +1171,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)
 	{
@@ -1205,7 +1185,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;
@@ -1220,7 +1200,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");
@@ -1308,8 +1288,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;
 			}
@@ -1555,13 +1534,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);
 		}
 	}
 }
@@ -1615,8 +1594,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);
 	}
@@ -1627,7 +1606,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)
@@ -1656,12 +1635,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);
 		}
@@ -1686,7 +1665,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)
@@ -1694,15 +1673,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);
 }
 
@@ -1710,8 +1688,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)
@@ -1733,7 +1710,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)
@@ -1782,13 +1759,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);
@@ -2365,12 +2342,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 */
@@ -2784,11 +2760,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");
 	}
@@ -4346,49 +4322,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];
@@ -4428,15 +4361,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])
@@ -5268,10 +5201,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
@@ -5634,7 +5565,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;
 	}
 
@@ -5643,7 +5574,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);
 	}
 }
 
@@ -5664,7 +5595,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);
 	}
 }
 
@@ -5680,7 +5611,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);
 	}
 }
 
@@ -5696,7 +5627,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);
 	}
 }
 
@@ -5739,7 +5670,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;
@@ -5747,7 +5678,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",
@@ -5777,7 +5708,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)))
 			{
@@ -5801,7 +5732,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_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");
 		}
 	}

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/dedicated/CMakeLists.txt

@@ -119,25 +119,20 @@ target_compile_definitions(SRB2SDL2 PRIVATE
 	-DHAVE_THREADS
 )
 
-if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE AND NOT SRB2_CONFIG_ASAN AND NOT SRB2_CONFIG_UBSAN AND NOT SRB2_CONFIG_TSAN)
+if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE)
 	set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif()
 
 if(SRB2_CONFIG_ASAN)
-	target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=address -fno-omit-frame-pointer -fno-common)
+	target_compile_options(SRB2SDL2 PRIVATE -fsanitize=address)
 	target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
 endif()
 
 if(SRB2_CONFIG_UBSAN)
-	target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=undefined -fno-omit-frame-pointer)
+	target_compile_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
 	target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
 endif()
 
-if(SRB2_CONFIG_TSAN)
-	target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=thread -fno-omit-frame-pointer)
-	target_link_options(SRB2SDL2 PRIVATE -fsanitize=thread)
-endif()
-
 ## strip debug symbols into separate file when using gcc
 # if(CMAKE_COMPILER_IS_GNUCC)
 # 	if(${CMAKE_BUILD_TYPE} MATCHES Debug)

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);
 }
 
 /*--------------------------------------------------
@@ -474,7 +474,6 @@ void DRPC_UpdatePresence(void)
 	char charname[11+SKINNAMESIZE+1];
 
 	boolean joinSecretSet = false;
-	char *clientJoinSecret = NULL;
 
 	DiscordRichPresence discordPresence;
 	memset(&discordPresence, 0, sizeof(discordPresence));
@@ -531,8 +530,7 @@ void DRPC_UpdatePresence(void)
 			// Grab the host's IP for joining.
 			if ((join = DRPC_GetServerIP()) != NULL)
 			{
-				clientJoinSecret = DRPC_XORIPString(join);
-				discordPresence.joinSecret = clientJoinSecret;
+				discordPresence.joinSecret = DRPC_XORIPString(join);
 				joinSecretSet = true;
 			}
 		}
@@ -686,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;
@@ -703,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
 	}
 
@@ -714,7 +712,6 @@ void DRPC_UpdatePresence(void)
 	}
 
 	Discord_UpdatePresence(&discordPresence);
-	free(clientJoinSecret);
 }
 
 #endif // HAVE_DISCORDRPC

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

@@ -63,6 +63,7 @@
 
 // for replay dates
 #include <time.h>
+#include <locale.h>
 
 // menu demo things
 UINT32 demoDelayTime = 15*TICRATE;
@@ -202,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)
 		{
@@ -265,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;
@@ -395,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)
@@ -1722,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));
@@ -1806,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;
 
@@ -1820,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
@@ -1877,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;
 
@@ -2211,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;
 	}
 
@@ -2221,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;
 	}
 
@@ -2246,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;
 	}
 
@@ -2266,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;
 	}
 
@@ -2287,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
@@ -2334,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);
 
@@ -2344,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;
@@ -2359,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++)
@@ -2386,9 +2385,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 #if defined (_WIN32)
 // return the file creation time
 // useful for demos that were renamed
-// windows only, as file creation times are
-// very unreliable (or non existant depending on fs) on linux
-static time_t G_GetCreationTime(char *filepath)
+static long G_GetCreationTime(char *filepath)
 {
 	struct stat fileinfo;
 
@@ -2399,24 +2396,35 @@ static time_t G_GetCreationTime(char *filepath)
 }
 #endif
 
-static char *G_GetDemoDate(menudemo_t *pdemo, const char *dateformat)
+static char *G_GetDemoDate(menudemo_t *pdemo)
 {
 	char *endPos = NULL;
-	char *datetime;
+	static char datetime[11];
 	time_t file_time = 0;
-	struct tm tm_buf;
+	const char *format = NULL;
+	struct tm *tm_buf = NULL;
 	CLEANUP(pfree) char *filename = NULL;
 
 	// get le filepath
 	filename = strdup(pdemo->filepath);
 
 	if (!filename)
+	{
+#if defined (_WIN32)
+		// if we cant get a filename try just getting the file creation time
+		file_time = G_GetCreationTime(pdemo->filepath);
+		goto skipfilenametime;
+#else
 		return NULL;
+#endif
+	}
 
 	// get the actual filename Zzz...
 	nameonly(filename);
 
-	// the first 10 characters of a replay name is a unix timestamp
+	// the first 10 characters of a replay name usually is a unix timestamp
+
+	// not long enough to contain a valid timestamp
 	if (strlen(filename) < 10)
 	{
 #if defined (_WIN32)
@@ -2448,55 +2456,73 @@ static char *G_GetDemoDate(menudemo_t *pdemo, const char *dateformat)
 #endif
 	}
 
-	// then throw it into localtime to get an actual human readable format lmao
-#if defined(_WIN32)
+#if defined (_WIN32)
 skipfilenametime:
-	if ((localtime_s(&tm_buf, &file_time) != 0) ||
-		(tm_buf.tm_year <= 110)) // cant believe we ended up in 1970
+#endif
+
+	// then throw it into localtime to get an actual human readable format lmao
+	tm_buf = localtime(&file_time);
+
+	// cant believe we ended up in 1970
+	if (tm_buf == NULL || tm_buf->tm_year <= 110)
 	{
+#if defined (_WIN32)
 		// uh ohh, we got an invalid time
 		// try one more time getting the creation time
 		file_time = G_GetCreationTime(pdemo->filepath);
+		tm_buf = localtime(&file_time);
 
-		if ((localtime_s(&tm_buf, &file_time) != 0) ||
-			(tm_buf.tm_year <= 110))
+		if (tm_buf == NULL || tm_buf->tm_year <= 110)
 			return NULL;
-	}
+
+		goto gotcreationtime;
 #else
-	if ((localtime_r(&file_time, &tm_buf) == NULL) ||
-		(tm_buf.tm_year <= 110)) // cant believe we ended up in 1970
 		return NULL;
 #endif
+	}
 
-	datetime = malloc(sizeof(pdemo->date)); // mallocma balls
+#if defined (_WIN32)
+gotcreationtime:
+#endif
 
-	// no mallocma balls... :c
-	if (!datetime)
-		return NULL;
+	// US ppl are special (:
+	if (cv_demodateformat.value == 2)
+		format = "%m.%d.%Y";
+	else if (cv_demodateformat.value == 1)
+		format = "%d.%m.%Y";
+	else
+	{
+		const char *locale = setlocale(LC_TIME, NULL);
 
-	if (strftime(datetime, sizeof(pdemo->date), dateformat, &tm_buf) == 0)
+		if (locale == NULL)
+			format = "%d.%m.%Y"; // fallback to non US format
+		else if (strstr(locale, "en_US"))
+			format = "%m.%d.%Y";
+		else
+			format = "%d.%m.%Y";
+	}
+
+	if (strftime(datetime, sizeof(datetime), format, tm_buf) == 0)
 	{
-		free(datetime);
 		return NULL;
 	}
 
 	return datetime;
 }
 
-void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat)
+void G_LoadDemoTitle(menudemo_t *pdemo)
 {
 	UINT8 infobuffer[96], *info_p;
 	UINT16 pdemoversion;
+	char *demodate = NULL;
 	size_t count;
 
-	memset(pdemo->date, 0, sizeof(pdemo->date));
-
 	FILE *handle = fopen(pdemo->filepath, "rb");
 
 	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;
 	}
 
@@ -2508,7 +2534,7 @@ void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat)
 	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;
 	}
 
@@ -2518,6 +2544,8 @@ void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat)
 
 	pdemoversion = READUINT16(info_p);
 
+	memset(pdemo->date, 0, sizeof(pdemo->date));
+
 	switch (pdemoversion)
 	{
 		case DEMOVERSION: // latest always supported
@@ -2525,22 +2553,23 @@ void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat)
 			memcpy(pdemo->title, info_p, 64);
 
 			// demo date
-			char *demodate = G_GetDemoDate(pdemo, dateformat);
+			demodate = G_GetDemoDate(pdemo);
+
 			if (demodate)
 			{
 				strlcpy(pdemo->date, demodate, sizeof(pdemo->date));
-				free(demodate);
 			}
+
 			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");
 	}
 }
 
@@ -2604,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);
@@ -2616,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);
@@ -2637,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();
@@ -2663,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();
@@ -2674,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();
@@ -2691,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();
@@ -2718,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;
@@ -2792,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();
@@ -2824,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();
@@ -2834,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();
@@ -2857,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();
@@ -2895,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();
@@ -2944,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();
@@ -2956,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();
@@ -2998,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
@@ -3075,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';
@@ -3282,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;
 		}
 	}
@@ -3292,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;
@@ -98,7 +97,7 @@ void G_SetDemoTime(UINT32 ptime, UINT32 plap);
 UINT8 G_CmpDemoTime(char *oldname, char *newname);
 
 void G_LoadDemoInfo(menudemo_t *pdemo);
-void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat); // For use in replay search feature
+void G_LoadDemoTitle(menudemo_t *pdemo); // For use in replay search feature
 void G_DeferedPlayDemo(const char *demo);
 
 typedef enum

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
@@ -604,18 +604,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 +2626,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 +3766,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 +3778,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 +3844,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 +3863,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 +3925,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 +4093,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

@@ -17,9 +17,14 @@
 #include "g_game.h"
 #include "keys.h"
 #include "hu_stuff.h" // need HUFONT start & end
+#include "d_net.h"
 #include "console.h"
 
+#include "m_menu.h"
+
 #include "i_system.h"
+#include "i_video.h"
+#include "r_draw.h"
 #include "v_video.h"
 
 #define MAXMOUSESENSITIVITY 100 // sensitivity steps
@@ -31,11 +36,10 @@ static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "
 // mouse values are used once
 consvar_t cv_mousexsens = {"mousexsens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS] = {
-	{"turnsmoothing",  "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"turnsmoothing2", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"turnsmoothing3", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"turnsmoothing4", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
@@ -77,7 +81,6 @@ consvar_t cv_rumble_##type [MAXSPLITSCREENPLAYERS] = {\
 	{"rumble4_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}\
 };
 
-IMPL_RUMBLE_TYPE(wallbonk);
 IMPL_RUMBLE_TYPE(spinout);
 IMPL_RUMBLE_TYPE(sneakerboost);
 IMPL_RUMBLE_TYPE(offroad);
@@ -86,6 +89,7 @@ IMPL_RUMBLE_TYPE(stairjank);
 IMPL_RUMBLE_TYPE(brakedrift);
 IMPL_RUMBLE_TYPE(driftcharge);
 
+
 static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
 consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
 	{"gamepadled",  "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
@@ -191,6 +195,7 @@ void G_MapEventsToControls(event_t *ev)
 			{
 				CONS_Debug(DBG_GAMELOGIC, "Bad downkey input %d\n",ev->data1);
 			}
+
 #endif
 			break;
 
@@ -946,15 +951,16 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)
 
 	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
 
-	if (cv_gamepadled[playernum].value == 0 ||
-	   (window_notinfocus && cv_gamepadledifunfocused.value == 0) ||
-		color >= MAXTRANSLATIONS)
+	if (cv_gamepadled[playernum].value == 0 || (window_notinfocus && cv_gamepadledifunfocused.value == 0)
+	 || color >= MAXTRANSLATIONS)
 	{
 		return;
 	}
 
 	if (!I_GamepadHasLED(playernum))
+	{
 		return;
+	}
 
 	// so we can override this
 	skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
@@ -984,21 +990,29 @@ void G_DeviceLEDTick(void)
 	UINT8 i, newcolor;
 
 	if (numcontrollers == 0)
+	{
 		return;
+	}
 
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
+		{
 			continue;
+		}
 
 		// does not have a configurable led! :c
 		if (!I_GamepadHasLED(i))
+		{
 			continue;
+		}
 
 		newcolor = G_GetSkinColorForGamepad(i);
 
 		if (curcolor[i] == newcolor) // dont update if same colour
+		{
 			continue;
+		}
 
 		G_SetPlayerGamepadIndicatorColor(i, newcolor);
 		curcolor[i] = newcolor;
@@ -1032,7 +1046,9 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
 	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
 
 	if (cv_rumble[playernum].value == 0 || (window_notinfocus && cv_rumbleifunfocused.value == 0))
+	{
 		return;
+	}
 
 	// doesent need to be super precise
 	// but ensure this is within range (0-65535)
@@ -1061,34 +1077,46 @@ void G_DeviceRumbleTick(void)
 	UINT8 i;
 
 	if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL || demo.playback)
+	{
 		return;
+	}
 
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (!cv_usejoystick[i].value || !cv_rumble[i].value)
+		{
 			continue;
+		}
 
 		// does not support rumble! :c
 		if (!I_GamepadHasRumble(i))
+		{
 			continue;
+		}
 
 		if (camera[i].freecam)
+		{
 			continue;
+		}
 
 		// SDL rumble strength goes from a range or 0-65535 respectively
 		// the higher, the stronger it is
 		UINT16 low = 0, high = 0;
 		// for how long the action should rumble, in ms
-		UINT16 length = 57; // 57ms is a short pulse, matches super well with this updating once per tic
+		UINT16 lenght = 57; // 57ms is a short pulse, matches super well with this updating once per tic
 
 		const player_t *player = P_GetLocalPlayerForNum(i);
 
 		if (!player)
+		{
 			continue;
+		}
 
 		// allow lua to do some crap for spectators
 		if (player->spectator || !player->mo)
+		{
 			continue;
+		}
 
 		// reset the rumble if you exit or are ded lel
 		if (player->exiting ||
@@ -1099,28 +1127,21 @@ void G_DeviceRumbleTick(void)
 			continue;
 		}
 
-		if (cv_rumble_wallbonk[i].value &&
-			(player->mo->eflags & MFE_JUSTBOUNCEDWALL))
-		{
-			high = RUMBLE_STRONG;
-			low = RUMBLE_MODERATE;
-		}
-		else if (cv_rumble_spinout[i].value &&
-				 player->kartstuff[k_spinouttimer])
+		if (cv_rumble_spinout[i].value
+			&& player->kartstuff[k_spinouttimer])
 		{
 			//low = high = FRACUNIT / 6;
-			// try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
-			low = high = FixedMul(RUMBLE_VERYSTRONG, FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)));
+			low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
 		}
-		else if (cv_rumble_sneakerboost[i].value &&
-				(player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))))
+		else if (cv_rumble_sneakerboost[i].value
+			&& (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))))
 		{
 			low = high = RUMBLE_STRONG;
 		}
-		else if (cv_rumble_offroad[i].value &&
-				(player->kartstuff[k_offroad]) &&
-				(player->speed != 0) &&
-				 P_IsObjectOnGround(player->mo))
+		else if (cv_rumble_offroad[i].value
+			&& (player->kartstuff[k_offroad])
+			&& (player->speed != 0)
+			&& P_IsObjectOnGround(player->mo))
 		{
 			// weaken this depending on if you got hyu or invinc
 			if (player->kartstuff[k_hyudorotimer])
@@ -1136,48 +1157,50 @@ void G_DeviceRumbleTick(void)
 				low = high = RUMBLE_MODERATE;
 			}
 		}
-		else if (cv_rumble_bananadrag[i].value &&
-				(player->kartstuff[k_bananadrag] > TICRATE) &&
-				(player->speed != 0) &&
-				 P_IsObjectOnGround(player->mo))
+		else if (cv_rumble_bananadrag[i].value
+			&& (player->kartstuff[k_bananadrag] > TICRATE)
+			&& (player->speed != 0)
+			&& P_IsObjectOnGround(player->mo))
 		{
 			if (leveltime & 1) // this is actually funny lel
 				high = RUMBLE_MODERATE;
 		}
-		else if (cv_rumble_stairjank[i].value &&
-				(player->stairjank > 8) &&
-				(player->speed != 0) &&
-				 P_IsObjectOnGround(player->mo))
+		else if (cv_rumble_stairjank[i].value
+			&& (player->stairjank > 8)
+			&& (player->speed != 0)
+			&& P_IsObjectOnGround(player->mo))
 		{
 			low = high = RUMBLE_VERYWEAK;
 		}
 
-		if (cv_rumble_brakedrift[i].value &&
-			player->kartstuff[k_brakedrift])
+		if (cv_rumble_brakedrift[i].value
+			&& player->kartstuff[k_brakedrift])
 		{
 			high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
 		}
 
 		// pulse when gettin new driftlevel
 		// let this come last
-		if (cv_rumble_driftcharge[i].value &&
-			player->kartstuff[k_driftcharge] &&
-			player->driftlevel)
+		if (cv_rumble_driftcharge[i].value
+			&& player->kartstuff[k_driftcharge]
+			&& player->driftlevel)
 		{
 			high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
 
 			// make it rumble slightly longer the higher your driftlevel!
 			if (player->driftlevel == 2)
-				length = 114;
+				lenght = 114;
 			else if (player->driftlevel == 3)
-				length = 174;
+				lenght = 174;
 		}
 
 		// hack alert! i just dont want this thing constantly resetting the rumble lol
 		if (low == 0 && high == 0)
+		{
 			continue;
+		}
 
-		G_PlayerDeviceRumble(i, low, high, length);
+		G_PlayerDeviceRumble(i, low, high, lenght);
 	}
 }
 
@@ -1227,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_input.h

@@ -118,8 +118,6 @@ extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
 
 extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS];
-// rumble types
-extern consvar_t cv_rumble_wallbonk[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumble_spinout[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumble_sneakerboost[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumble_offroad[MAXSPLITSCREENPLAYERS];

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

@@ -54,6 +54,10 @@ typedef struct {
 // if no portals are found, the portal scanning phase can be skipped while rendering, saving a bit of time.
 boolean gl_maphasportals = false;
 
+// Determine on mapload if current map has any Horizonlines present
+// avoids doing a bunch of work during rendering
+boolean gl_maphashorizonlines = false;
+
 // ==========================================================================
 //                                    FLOOR & CEILING CONVEX POLYS GENERATION
 // ==========================================================================
@@ -92,7 +96,7 @@ static void HWR_FreePoly(poly_t *poly)
 // divfrac = how far along partline vector is crossing pt
 static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t *v2)
 {
-	double frac;
+	double frac1, frac2;
 	double num; // numerator
 	double den; // denominator
 	double v1x, v1y, v1dx, v1dy; // polygon side vector, v1->v2
@@ -118,23 +122,24 @@ static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t
 	// first check the frac along the polygon segment,
 	// (do not accept hit with the extensions)
 	num = (v3x - v1x)*v3dy + (v1y - v3y)*v3dx;
-	frac = num / den;
+	frac1 = num / den;
 
 	// 0= cross at v1, 1.0= cross at v2
-	if (frac < 0.0 || frac > 1.0)  // double
+	if (frac1 < 0.0 || frac1 > 1.0)  // double
 		return false;  // not within the polygon side
 
 	// now get the frac along the BSP line
 	// which is useful to determine what is left, what is right
 	num = (v3x - v1x)*v1dy + (v1y - v3y)*v1dx;
+	frac2 = num / den;
 
-	partline->divfrac = num / den;  // how far along partline vector
+	partline->divfrac = frac2;  // how far along partline vector
 
 	// [WDJ] find the interception point along the segment.
 	// It should be slightly more accurate because it is always closer to the
 	// crossing point than arbitrary positions on the partition line.
-	partline->divpt.x = v1x + v1dx*frac;
-	partline->divpt.y = v1y + v1dy*frac;
+	partline->divpt.x = v1x + v1dx*frac1;
+	partline->divpt.y = v1y + v1dy*frac1;
 
 	return true;
 }
@@ -156,71 +161,6 @@ static boolean SameVertex(polyvertex_t *p1, polyvertex_t *p2)
 	return true;
 }
 
-// Adapted from function in prboom.
-// Point is to rightside of divline when result > 0,
-// but result is multiplied by length of divline.
-// Returns near 0, when point is on, or nearly on, the divline.
-static inline double point_rightside(fdivline_t *dl, polyvertex_t *v4)
-{
-	// Cross product of dl and vector dl->(x,y) to v4,
-	// is > 0 when v4 is to right side of divline.
-	// Viewed along divline from vertex, looking towards positive dx,dy.
-	// If divline is rotated until dy>0 and dx = 0, then true when rotated
-	// vertex position is to the right of the divline (v4->x > dl->x).
-	return ((((double)(v4->x) - (double)(dl->x)) * (double)(dl->dy))
-		 - (((double)(v4->y) - (double)(dl->y)) * (double)(dl->dx)));
-}
-
-// [WDJ] The front and back MUST match the BSP determination, else it will assign
-// this poly to the wrong sector.
-// May have 1 point on the line, and other points might be very close to the line.
-// Can only trust a test of a point that is NOT on the line.
-// Using a tstdist = 0.5f worked, but it might break on very small poly.
-// Avactor.wad had polys with d = 9.09, 5552, 1.64, 1011, 14252, 0.0136, 0.00634, 14655, 3,
-// -0.3044, 7, 1.53, etc..,
-// and one poly with d = -0.023 with the rest of the points d > 0.
-// One 14 point poly with divline len=8, had to test 9 points to find d = 36.
-// Typical: divline len=70 d=6828, divline len=1.0 d=35, divline len=1.414 d=5.
-// The result of point_rightside is proportional to the length of divline.
-// The divline length can be from 1.414 to 14000.
-static void UnsplitPoly(fdivline_t *dlnp, poly_t *poly,
-						poly_t **frontpoly, poly_t **backpoly)
-{
-	int32_t i;
-	double d;
-	const double tstd = hypot((double)dlnp->dx, (double)dlnp->dy) / 2.0;
-	double sumd = 0; // accumulated left or rightness.
-
-	for (i = 0; i < poly->numpts; i++)
-	{
-		// Look for a point that is obviously to the left or right.
-		d = point_rightside(dlnp, &poly->pts[i]);  // d > 0 is right
-		sumd += d;
-
-		if (d > tstd)
-			goto poly_rightside;
-
-		if (d < -tstd)
-			goto poly_leftside;
-	}
-
-	// Did not find an obvious left or right point, then
-	if (sumd < 0)
-		goto poly_leftside;
-
-poly_rightside:
-	// poly is to rightside of divline.
-	*frontpoly = poly;
-	*backpoly = NULL;
-	return;
-
-poly_leftside:
-	// poly is to leftside of divline.
-	*frontpoly = NULL;
-	*backpoly = poly;
-	return;
-}
-
 // split a _CONVEX_ polygon in two convex polygons
 // outputs:
 //   frontpoly : polygon on right side of bsp line
@@ -323,7 +263,10 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 		// linedefs where each side point the same sector, that is:
 		// the deep water effect with the original Doom
 
-		UnsplitPoly(dlnp, poly, frontpoly, backpoly);
+		//TODO: make sure front poly is to front of partition line?
+
+		*frontpoly = poly;
+		*backpoly  = NULL;
 		return;
 	}
 
@@ -331,14 +274,16 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 	if (pe < 0)
 	{
 		//I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe);
-		UnsplitPoly(dlnp, poly, frontpoly, backpoly);
+		*frontpoly = poly;
+		*backpoly  = NULL;
 		return;
 	}
 
 	if (pe <= ps)
 	{
 		//I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe);
-		UnsplitPoly(dlnp, poly, frontpoly, backpoly);
+		*frontpoly = poly;
+		*backpoly  = NULL;
 		return;
 	}
 
@@ -401,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, subsector_t *sub)
+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!
@@ -417,8 +362,8 @@ static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_
 	}
 
 	// horizonline check
-	if (line->special == HORIZONSPECIAL)
-		sub->hashorizon = true;
+	if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
+		gl_maphashorizonlines = true;
 }
 
 // Use each seg of the poly as a partition line, keep only the
@@ -431,7 +376,7 @@ static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_
 //  segcount : number of seg in the array
 // Return frontpoly, which may be new or ptr to poly.
 // Called from: HWR_SubsecPoly
-static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly, subsector_t *sub)
+static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
 {
 	INT32 i, j;
 	poly_t* frontpoly = poly;  // default, return same poly
@@ -452,7 +397,7 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly, subse
 		if (!line)
 			continue;
 
-		CheckForPortalsAndHorizonLines(lseg->side == 0, line, sub);
+		CheckForPortalsAndHorizonLines(lseg, line);
 
 		if (line->sidenum[1] != NO_INDEX)
 		{
@@ -544,23 +489,6 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly, subse
 			// need 2 points
 			if (pe >= 0)
 			{
-				// Cuts that miss the polygon.
-				if (ps_frac < 0.0 && cutseg.divfrac < 0.0)
-					continue;
-
-				if (ps_frac > 1.0 && cutseg.divfrac > 1.0)
-					continue;
-#define FRAC_EP 0.01f
-				// Reject cuts that could make the polygon non-convex.
-
-				// Cannot make normal cut, ps_frac end is loose.
-				if ((ps_frac < (0.0 - FRAC_EP)) || (ps_frac > (1.0f + FRAC_EP)))
-					continue;
-
-				// Cannot make normal cut, cutseg.divfrac end is loose.
-				if ((cutseg.divfrac < (0.0 - FRAC_EP)) || (cutseg.divfrac > (1.0f + FRAC_EP)))
-					continue;
-#undef FRAC_EP
 				// generate FRONT poly
 				frontpoly = HWR_AllocPoly(poly_num_pts);
 
@@ -615,7 +543,7 @@ static inline void HWR_SubsecPoly(INT32 ssindex, poly_t *poly)
 
 	if (poly)
 	{
-		poly = CutOutSubsecPoly(lseg, segcount, poly, sub);
+		poly = CutOutSubsecPoly(lseg, segcount, poly);
 #ifdef DEBUG_HWBSP
 		totalsubsecpolys++;
 #endif
@@ -653,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
@@ -744,7 +671,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 #endif
 
 	// Recursively divide front space.
-	if (frontpoly)
+	if (LIKELY(frontpoly))
 	{
 		WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
 
@@ -752,11 +679,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 		memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
 	}
 	else
-	{
-		// [WDJ] Having no front poly is as likely as no back poly, since
-		// logic in Split Poly was changed to check poly direction.
-		// I_Error("HWR_WalkBSPNode: no front poly, bspnum= %d\n", bspnum);
-	}
+		I_Error("WalkBSPNode: no front poly?");
 
 	// Recursively divide back space.
 	if (backpoly)
@@ -871,9 +794,7 @@ static boolean PointInSeg(polyvertex_t *va, polyvertex_t *v1, polyvertex_t *v2)
 #endif
 }
 
-#ifdef DEBUG_HWBSP
 static INT32 numsplitpoly;
-#endif
 
 static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
 {
@@ -912,9 +833,8 @@ static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
 
 					for (n = k+1; n < newpoly->numpts; n++)
 						newpoly->pts[n] = q->pts[n-1];
-#ifdef DEBUG_HWBSP
+
 					numsplitpoly++;
-#endif
 					extrasubsectors[bspnum].planepoly = newpoly;
 					HWR_FreePoly(q);
 					return;
@@ -960,9 +880,7 @@ static void SolveTProblem(void)
 	I_FinishUpdate(); // page flip or blit buffer
 #endif
 
-#ifdef DEBUG_HWBSP
 	numsplitpoly = 0;
-#endif
 
 	for (ssnum = 0; ssnum < num_extra_subsector; ssnum++)
 	{
@@ -999,8 +917,8 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 	I_FinishUpdate(); // page flip or blit buffer
 #endif
 
-	// reset the portal flag
-	gl_maphasportals = false;
+	// reset the portal and horizonline flag
+	gl_maphasportals = gl_maphashorizonlines = false;
 
 	// find min/max boundaries of map
 #ifdef DEBUG_HWBSP

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);
 }
 
@@ -614,28 +613,29 @@ void HWR_FreeMapTextures(void)
 	gl_numtextures = 0;
 }
 
+#define NAME    flatcheck
+#define KEY_TY  UINT32
+#define HASH_FN vt_hash_integer
+#define CMPR_FN vt_cmpr_integer
+#include "../verstable.h"
+
 static void HWR_PrecacheLevelFlats(void)
 {
-	size_t i;
+	// lookup for flats that may´ve been already loaded
+	flatcheck flatpresent;
+	size_t i, j;
 	INT32 k;
 
-	// FIXME: this needs to account for FOFs to properly work
-#ifdef GLENCORE
-	if (encoremap)
-	{
-		return;
-	}
-#endif
+	flatcheck_init(&flatpresent);
+	flatcheck_reserve(&flatpresent, numlevelflats);
 
 	// special case for encore
-#if 0
 #ifdef GLENCORE
 	if (encoremap)
 	{
 		// go through all sectors to determine if it should be remapped for encore
 		for (i = 0; i < numsectors; i++)
 		{
-			size_t j;
 			sector_t *sec = &sectors[i];
 
 			// gotta check sector floor and ceiling
@@ -669,7 +669,6 @@ static void HWR_PrecacheLevelFlats(void)
 		}
 	}
 	else
-#endif
 #endif
 	{
 		// on non encore we have it simple
@@ -678,7 +677,11 @@ static void HWR_PrecacheLevelFlats(void)
 		{
 			const levelflat_t *levelflat = &levelflats[i];
 
-			HWR_GetFlat(levelflat->lumpnum, false);
+			if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
+			{
+				HWR_GetFlat(levelflat->lumpnum, false);
+				flatcheck_insert(&flatpresent, levelflat->lumpnum);
+			}
 
 			if (levelflat->speed) // is it an animated flat ?
 			{
@@ -686,11 +689,17 @@ static void HWR_PrecacheLevelFlats(void)
 				for (k = 0; k < levelflat->numpics; k++)
 				{
 					lumpnum_t lump = levelflat->baselumpnum + k;
-					HWR_GetFlat(lump, false);
+					if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
+					{
+						HWR_GetFlat(lump, false);
+						flatcheck_insert(&flatpresent, lump);
+					}
 				}
 			}
 		}
 	}
+
+	flatcheck_cleanup(&flatpresent);
 }
 
 static void HWR_PrecacheLevelTextures(void)
@@ -714,7 +723,7 @@ static void HWR_PrecacheLevelTextures(void)
 	{
 		const line_t *line = &lines[i];
 #ifdef GLENCORE
-		const boolean noencoremap = (encoremap && (line->flags & ML_TFERLINE));
+		const int noencoremap = ((encoremap && (line->flags & ML_TFERLINE)) ? 2 : 1);
 #endif
 		// two sides
 		for (j = 0; j < 2; j++)
@@ -731,27 +740,25 @@ static void HWR_PrecacheLevelTextures(void)
 			{
 				const INT32 texnum = sidetex[f];
 
-				if (texnum <= 0 || (unsigned)texnum >= gl_numtextures)
+				if (texnum < 0 || texnum >= (signed)gl_numtextures)
 					continue;
 
-				if (!(texturepresent[texnum] & 1))
-				{
-					texturepresent[texnum] |= 1;
-					HWR_GetTexture(texnum, false);
-				}
+				if (texturepresent[texnum])
+					continue;
 #ifdef GLENCORE
-				if (noencoremap
-					&& !(texturepresent[texnum] & 2))
-				{
-					texturepresent[texnum] |= 2;
+				texturepresent[texnum] = 1|noencoremap;
+#else
+				texturepresent[texnum] = 1;
+#endif
+				HWR_GetTexture(texnum, false);
+#ifdef GLENCORE
+				if (noencoremap & 2)
 					HWR_GetTexture(texnum, true);
-				}
 #endif
 			}
 		}
 	}
 
-	// check for animated textures
 	for (anim = anims; anim < lastanim; anim++)
 	{
 		if (!anim->istexture)
@@ -770,7 +777,6 @@ static void HWR_PrecacheLevelTextures(void)
 			{
 				HWR_GetTexture(animtexnum, false);
 			}
-
 #ifdef GLENCORE
 			if (texpresent & 2)
 			{
@@ -892,7 +898,7 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
 	GLMapTexture_t *gltex;
 	GLMipmap_t *glMipmap;
 
-	if (tex < 0 || (unsigned)tex >= gl_numtextures)
+	if (tex < 0 || tex >= (signed)gl_numtextures)
 	{
 #ifdef PARANOIA
 		I_Error("HWR_GetTexture: Invalid texture ID %d", tex);
@@ -1308,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
@@ -1386,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++)
 		{
@@ -1395,7 +1399,6 @@ void HWR_SetMapPalette(void)
 			RGBA_converted[i].s.blue = *(RGB_data++);
 			RGBA_converted[i].s.alpha = 255;
 		}
-
 		palette = RGBA_converted;
 	}
 
@@ -1403,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

@@ -16,7 +16,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "../d_main.h"
 #include "../doomstat.h"
 #include "../doomdef.h"
 
@@ -121,7 +120,7 @@ ps_metric_t ps_hw_batchdrawtime = {};
 static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, boolean noencore, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor, FBITFIELD polyflags);
 static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
 
-static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap, subsector_t *subsector);
+static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap);
 static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 texnum, boolean noencore, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
 static void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap);
 
@@ -205,8 +204,7 @@ static CV_PossibleValue_t glpalettedepth_cons_t[] = {{16, "16 bits"}, {24, "24 b
 consvar_t cv_glscreentextures = {"gr_screentextures", "All", CV_CALL|CV_SAVE, glscreentextures_cons_t, CV_screentextures_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 #ifdef USE_FBO_OGL
-static CV_PossibleValue_t glframebuffer_cons_t[] = {{0, "Off"}, {1, "Downsample"}, {2, "Always"}, {0, NULL}};
-consvar_t cv_glframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL, glframebuffer_cons_t, CV_glframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, CV_glframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL};
 #endif
 
 consvar_t cv_glmdls = {"gr_mdls", "Off", CV_SAVE|CV_CALL, CV_OnOff, M_UpdateOGLMenu, 0, NULL, NULL, 0, 0, NULL};
@@ -257,7 +255,6 @@ static void CV_screentextures_OnChange(void)
 #endif
 		intermissionbginit = false;
 	}
-
 	GL_SetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_glscreentextures.value);
 	M_UpdateOGLMenu();
 }
@@ -266,11 +263,12 @@ static void CV_screentextures_OnChange(void)
 static void CV_glframebuffer_OnChange(void)
 {
 	ONLY_IF_GL_LOADED
-	// screen FBO needs screen textures currently
-	if (cv_glframebuffer.value != 0 && ((cv_glscreentextures.value != 2) || !supportFBO))
-		CV_StealthSetValue(&cv_glframebuffer, 0); // dont recursively call this lul
-	if (loaded_config) // dont do this crap on startup, this is handled elsewhere
-		I_CheckDownSampleState(true);
+	if ((cv_glframebuffer.value != 0 && cv_glscreentextures.value != 2)
+	|| (!supportFBO && cv_glframebuffer.value != 0)) // screen FBO needs screen textures
+		CV_SetValue(&cv_glframebuffer, 0);
+
+	I_DownSample();
+	RefreshOGLSDLSurface();
 	M_UpdateOGLMenu();
 	intermissionbginit = false;
 }
@@ -516,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;
@@ -534,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;
@@ -612,7 +610,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 			fflatsize = 1024.0f;
 			flatflag = 1023;
 			break;
-		case 262144: // 512x512 lump
+		case 262144:// 512x512 lump
 			fflatsize = 512.0f;
 			flatflag = 511;
 			break;
@@ -723,7 +721,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 
 	HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, PolyFlags, shader, false);
 
-	if (subsector && subsector->hashorizon && cv_glhorizonlines.value)
+	if (gl_maphashorizonlines && subsector && cv_glhorizonlines.value)
 	{
 		// Horizon lines
 		FOutVector horizonpts[6];
@@ -744,6 +742,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 
 			line_t* ld = line->linedef;
 
+			// this check sucks and is a hotspot lel
 			if (LIKELY(ld->special != HORIZONSPECIAL))
 				continue;
 
@@ -808,268 +807,6 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 #undef SETUP3DVERT
 }
 
-static void HWR_RenderFOFHorizonPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
-{
-	FSurfaceInfo Surf = {};
-	polyvertex_t *pv;
-	pslope_t *slope = NULL;
-	INT32 shader = SHADER_NONE;
-
-	size_t nrPlaneVerts;
-	INT32 i;
-
-	float height; // constant y for all points on the convex flat polygon
-	static float flatxref = 0.0f, flatyref = 0.0f;
-	static float fflatsize = 64.0f;
-	static INT32 flatflag = 63;
-	size_t len;
-
-	float tempxsow, tempytow;
-	float scrollx = 0.0f, scrolly = 0.0f;
-	float anglef  = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
-	angle_t angle = 0;
-
-	static FOutVector *planeVerts = NULL;
-	static UINT16 numAllocedPlaneVerts = 0;
-
-	poly_t *planepoly = xsub->planepoly;
-
-	if (!cv_glhorizonlines.value)
-		return;
-
-	if (!subsector || !subsector->hashorizon)
-		return;
-
-	// no convex poly were generated for this subsector
-	if (!planepoly)
-		return;
-
-	nrPlaneVerts = planepoly->numpts;
-
-	if (nrPlaneVerts < 3) // not even a triangle ?
-		return;
-
-	const sector_t *sec = FOFsector;
-
-	if (!(PolyFlags & PF_NoTexture))
-	{
-		HWR_GetFlat(lumpnum, R_NoEncore(FOFsector, !isceiling));
-	}
-
-	// Get the slope pointer to simplify future code
-	if (!isceiling && sec->f_slope)
-		slope = sec->f_slope;
-	else if (isceiling && sec->c_slope)
-		slope = sec->c_slope;
-
-	height = FixedToFloat(fixedheight);
-
-	// Allocate plane-vertex buffer if we need to
-	if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts)
-	{
-		numAllocedPlaneVerts = (UINT16)nrPlaneVerts;
-		Z_Free(planeVerts);
-		Z_Malloc(numAllocedPlaneVerts * sizeof (FOutVector), PU_LEVEL, &planeVerts);
-	}
-
-	len = W_LumpLength(lumpnum);
-
-	switch (len)
-	{
-		case 4194304: // 2048x2048 lump
-			fflatsize = 2048.0f;
-			flatflag = 2047;
-			break;
-		case 1048576: // 1024x1024 lump
-			fflatsize = 1024.0f;
-			flatflag = 1023;
-			break;
-		case 262144: // 512x512 lump
-			fflatsize = 512.0f;
-			flatflag = 511;
-			break;
-		case 65536: // 256x256 lump
-			fflatsize = 256.0f;
-			flatflag = 255;
-			break;
-		case 16384: // 128x128 lump
-			fflatsize = 128.0f;
-			flatflag = 127;
-			break;
-		case 1024: // 32x32 lump
-			fflatsize = 32.0f;
-			flatflag = 31;
-			break;
-		default: // 64x64 lump
-			fflatsize = 64.0f;
-			flatflag = 63;
-			break;
-	}
-
-	pv = planepoly->pts;
-
-	// reference point for flat texture coord for each vertex around the polygon
-	flatxref = static_cast<float>(static_cast<fixed_t>(pv->x) & (~flatflag)) / fflatsize;
-	flatyref = static_cast<float>(static_cast<fixed_t>(pv->y) & (~flatflag)) / fflatsize;
-
-	if (!isceiling) // it's a floor
-	{
-		scrollx = FixedToFloat(sec->floor_xoffs)/fflatsize;
-		scrolly = FixedToFloat(sec->floor_yoffs)/fflatsize;
-		angle = sec->floorpic_angle;
-	}
-	else // it's a ceiling
-	{
-		scrollx = FixedToFloat(sec->ceiling_xoffs)/fflatsize;
-		scrolly = FixedToFloat(sec->ceiling_yoffs)/fflatsize;
-		angle = sec->ceilingpic_angle;
-	}
-
-	if (angle) // Only needs to be done if there's an altered angle
-	{
-		// This needs to be done so that it scrolls in a different direction after rotation like software
-		tempxsow = flatxref;
-		tempytow = flatyref;
-		anglef   = ANG2RAD(InvAngle(angle));
-
-		// This needs to be done so everything aligns after rotation
-		// It would be done so that rotation is done, THEN the translation, but I couldn't get it to rotate AND scroll like software does
-		cosangf = cosf(anglef);
-		sinangf = sinf(anglef);
-		flatxref = (tempxsow * cosangf) - (tempytow * sinangf);
-		flatyref = (tempxsow * sinangf) + (tempytow * cosangf);
-	}
-
-#define SETUP3DVERT(vert, vx, vy) {\
-		/* Hurdler: add scrolling texture on floor/ceiling */\
-		vert->s = (float)(((vx) / fflatsize) - flatxref + scrollx);\
-		vert->t = (float)(flatyref - ((vy) / fflatsize) + scrolly);\
-\
-		/* Need to rotate before translate */\
-		if (angle) /* Only needs to be done if there's an altered angle */\
-		{\
-			tempxsow = vert->s;\
-			tempytow = vert->t;\
-			vert->s = (tempxsow * cosangf) - (tempytow * sinangf);\
-			vert->t = (tempxsow * sinangf) + (tempytow * cosangf);\
-		}\
-\
-		if (slope)\
-		{\
-			fixedheight = P_GetSlopeZAt(slope, FloatToFixed((vx)), FloatToFixed((vy)));\
-			height = FixedToFloat(fixedheight);\
-		}\
-\
-		vert->x = (vx);\
-		vert->y = height;\
-		vert->z = (vy);\
-\
-}
-
-	HWR_Lighting(&Surf, lightlevel, planecolormap, false);
-
-	if (PolyFlags & (PF_Translucent|PF_Fog|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
-	{
-		Surf.PolyColor.s.alpha = (UINT8)alpha;
-		PolyFlags |= PF_Modulated;
-	}
-	else
-		PolyFlags |= PF_Masked|PF_Modulated;
-
-	if (HWR_UseShader())
-	{
-		if (PolyFlags & PF_Fog)
-			shader = SHADER_FOG;
-		else if (cv_ripplewater.value && (PolyFlags & PF_Ripple))
-			shader = SHADER_WATER;
-		else
-			shader = SHADER_FLOOR;
-
-		PolyFlags |= PF_ColorMapped;
-	}
-
-	// Horizon lines
-	FOutVector horizonpts[6];
-	float dist, vx, vy;
-	float x1, y1, xd, yd;
-	UINT8 numplanes, j;
-	vertex_t v; // For determining the closest distance from the line to the camera, to split render planes for minimum distortion;
-
-	static constexpr float renderdist    = 27000.0f; // How far out to properly render the plane
-	static constexpr float farrenderdist = 32768.0f; // From here, raise plane to horizon level to fill in the line with some texture distortion
-
-	const seg_t *line = &segs[subsector->firstline];
-
-	for (i = 0; i < subsector->numlines; i++, line++)
-	{
-		if (line->polyseg)
-			continue;
-
-		line_t* ld = line->linedef;
-
-		if (LIKELY(ld->special != HORIZONSPECIAL))
-			continue;
-
-		if (R_PointOnSegSide(viewx, viewy, line) != 0)
-			continue;
-
-		P_ClosestPointOnLine(viewx, viewy, ld, &v);
-		dist = FixedToFloat(R_PointToDist(v.x, v.y));
-
-		x1 = (line->fv1.x);
-		y1 = (line->fv1.y);
-
-		xd = (line->fv2.x) - x1;
-		yd = (line->fv2.y) - y1;
-
-		// Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion
-		dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f;
-
-		if (dist > 100.0f)
-			numplanes = 100;
-		else
-			numplanes = (UINT8)dist + 1;
-
-		for (j = 0; j < numplanes; j++)
-		{
-			// Left side
-			vx = x1 + xd * j / numplanes;
-			vy = y1 + yd * j / numplanes;
-			SETUP3DVERT((&horizonpts[1]), vx, vy);
-
-			dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
-			vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
-			vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
-			SETUP3DVERT((&horizonpts[0]), vx, vy);
-
-			// Right side
-			vx = x1 + xd * (j+1) / numplanes;
-			vy = y1 + yd * (j+1) / numplanes;
-			SETUP3DVERT((&horizonpts[2]), vx, vy);
-
-			dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
-			vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
-			vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
-			SETUP3DVERT((&horizonpts[3]), vx, vy);
-
-			// Horizon fills
-			vx = (horizonpts[0].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
-			vy = (horizonpts[0].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
-			SETUP3DVERT((&horizonpts[5]), vx, vy);
-			horizonpts[5].y = gl_viewz;
-
-			vx = (horizonpts[3].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
-			vy = (horizonpts[3].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
-			SETUP3DVERT((&horizonpts[4]), vx, vy);
-			horizonpts[4].y = gl_viewz;
-
-			// Draw
-			HWR_ProcessPolygon(&Surf, horizonpts, 6, PolyFlags, shader, true);
-		}
-	}
-#undef SETUP3DVERT
-}
-
 #ifdef WALLSPLATS
 static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
 {
@@ -1499,48 +1236,50 @@ 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;
 
-	// check if linedef alpha is within range
-	const boolean linealpha = (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT);
-
-	// set alpha for transparent walls
-	switch (gl_linedef->special)
+	if (LIKELY(!gl_curline->polyseg))
 	{
-		// Translucent linedef types
-		case 102:
-		case 121 ... 125:
-		case 141 ... 145:
-		case 174:
-		case 175:
-		case 192:
-		case 195:
-		case 221:
-		case 253:
-		case 256:
-			if (gl_linedef->blendmode && linealpha)
-				blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
-			else
-				blendmode = PF_Translucent;
-			break;
-		default:
-			if (gl_linedef->blendmode)
-			{
-				if (linealpha)
+		// check if linedef alpha is within range
+		const boolean linealpha = (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT);
+
+		// set alpha for transparent walls
+		switch (gl_linedef->special)
+		{
+			// Translucent linedef types
+			case 102:
+			case 121 ... 125:
+			case 141 ... 145:
+			case 174:
+			case 175:
+			case 192:
+			case 195:
+			case 221:
+			case 253:
+			case 256:
+				if (gl_linedef->blendmode && linealpha)
 					blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
 				else
-					blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode);
-			}
-			else if (linealpha)
-				blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
-			else
-				blendmode = PF_Masked;
-			break;
+					blendmode = PF_Translucent;
+				break;
+			default:
+				if (gl_linedef->blendmode)
+				{
+					if (linealpha)
+						blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
+					else
+						blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode);
+				}
+				else if (linealpha)
+					blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
+				else
+					blendmode = PF_Masked;
+				break;
+		}
 	}
-
-	if (gl_curline->polyseg && gl_curline->polyseg->translucency > 0)
+	else if (gl_curline->polyseg->translucency > 0)
 	{
 		// Polyobject translucency is shared between all of its lines
 		if (gl_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn
@@ -1647,8 +1386,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 	// two sided line
 	if (gl_backsector)
 	{
-		const INT32 gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
-		const INT32 gl_bottomtexture = R_GetTextureNum(gl_sidedef->bottomtexture);
+		INT32 gl_toptexture = 0, gl_bottomtexture = 0;
 
 		fixed_t texturevpeg;
 
@@ -1659,7 +1397,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		if (!gl_curline->polyseg) // Don't do it for polyobjects
 		{
 			// Sky Ceilings
-			wallVerts[2].y = wallVerts[3].y = FLOATMAX; // draw to top of map space
+			wallVerts[3].y = wallVerts[2].y = FLOATMAX;
 
 			auto draw_sky_walls = []
 			(int vert1, int vert2, fixed_t world, fixed_t worldslope, auto& wwallVerts, auto& sSurf) FUNCINLINE
@@ -1669,9 +1407,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				HWR_DrawSkyWall(wwallVerts, &sSurf);
 			};
 
-			// worldtop = front ceiling
-			// worldhigh = back ceiling
-
 			if (gl_frontsector->ceilingpic == skyflatnum)
 			{
 				if (gl_backsector->ceilingpic == skyflatnum)
@@ -1690,17 +1425,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 					worldtop = worldhigh;
 					worldtopslope = worldhighslope;
 				}
-				else if (!gl_toptexture &&
-						 (worldhigh <= worldtop && worldhighslope <= worldtopslope) && // Assuming ESLOPE is always on with my changes
-						 (worldhigh != worldtop || worldhighslope != worldtopslope))
-				{
-					// Only the frontsector is sky.
-					// If there's no upper texture, extend the sky wall
-					// down to the lower of the two ceilings.
-					fixed_t top = std::min(worldtop, worldhigh);
-					fixed_t topslope = std::min(worldtopslope, worldhighslope);
-					draw_sky_walls(0, 1, top, topslope, wallVerts, Surf);
-				}
 				else
 				{
 					// Only the frontsector is sky, just draw a skywall from the front ceiling
@@ -1713,11 +1437,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				draw_sky_walls(0, 1, worldtop, worldtopslope, wallVerts, Surf);
 			}
 
-			// worldbottom = front floor
-			// worldlow = back floor
-
 			// Sky Floors
-			wallVerts[0].y = wallVerts[1].y = FLOATMIN; // draw to bottom of map space
+			wallVerts[0].y = wallVerts[1].y = FLOATMIN;
 
 			if (gl_frontsector->floorpic == skyflatnum)
 			{
@@ -1729,7 +1450,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 					if ((worldlow >= worldbottom && worldlowslope >= worldbottomslope)
 					&& (worldlow != worldbottom || worldlowslope != worldbottomslope)
 					// Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
-					&& !(gl_bottomtexture))
+					&& !(gl_sidedef->bottomtexture))
 					{
 						draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
 					}
@@ -1740,25 +1461,15 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 					draw_sky_walls(3, 2, worldbottom, worldbottomslope, wallVerts, Surf);
 				}
 			}
-			else if ((gl_backsector->floorpic == skyflatnum) && !(gl_bottomtexture))
+			else if ((gl_backsector->floorpic == skyflatnum) && !(gl_sidedef->bottomtexture))
 			{
 				// Only the backsector has sky, just draw a skywall from the back floor if there's no bottomtexture
 				draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
 			}
-			else if (gl_frontsector->ceilingpic == skyflatnum &&
-					 gl_backsector->ceilingpic == skyflatnum &&
-					 (worldlow >= worldbottom && worldlowslope >= worldbottomslope)
-					 && (worldlow != worldbottom || worldlowslope != worldbottomslope)
-					 // Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
-					 && !(gl_bottomtexture))
-			{
-				// Both ceilings are sky, but neither floor is sky.
-				// If there's a lower wall gap without a bottom texture,
-				// draw a skywall from the backsector's higher floor.
-				draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
-			}
 		}
 
+		gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
+
 		// check TOP TEXTURE
 		if (gl_toptexture && (worldhighslope < worldtopslope || worldhigh < worldtop))
 		{
@@ -1822,6 +1533,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
 		}
 
+		gl_bottomtexture = R_GetTextureNum(gl_sidedef->bottomtexture);
+
 		// check BOTTOM TEXTURE
 		if (gl_bottomtexture && (worldlowslope > worldbottomslope || worldlow > worldbottom))
 		{
@@ -2593,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!
@@ -2949,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)
 			{
@@ -2963,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)
 			{
@@ -2988,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));
 			}
 		}
 	}
@@ -3224,14 +2933,16 @@ static void HWR_Subsector(size_t num)
 						UINT8 alpha;
 
 						light = R_GetPlaneLight(gl_frontsector, centerHeight, underside);
+
 						alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
+
 						HWR_AddTransparentFloor(0,
 												&extrasubsectors[num],
 												!bottom,
 												roverheight,
 												*gl_frontsector->lightlist[light].lightlevel,
 												alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
-												true, rover->master->frontsector->extra_colormap, sub);
+												true, rover->master->frontsector->extra_colormap);
 					}
 					else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient
 					{
@@ -3243,12 +2954,13 @@ static void HWR_Subsector(size_t num)
 												roverheight,
 												*gl_frontsector->lightlist[light].lightlevel,
 												CLAMP(rover->alpha, 0, 255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent)),
-												false, gl_frontsector->lightlist[light].extra_colormap, sub);
+												false, gl_frontsector->lightlist[light].extra_colormap);
 					}
 					else
 					{
-						HWR_GetFlat(flatlump, R_NoEncore(rover->master->frontsector, bottom));
+						HWR_GetFlat(flatlump, R_NoEncore(gl_frontsector, !bottom));
 						light = R_GetPlaneLight(gl_frontsector, centerHeight, underside);
+
 						HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flatlump,
 										rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
 					}
@@ -3580,7 +3292,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);
 
@@ -3744,12 +3456,8 @@ static inline void HWR_ApplyDispoffset(gl_vissprite_t *spr, FOutVector *wallVert
 {
 	HWR_RotateSpritePolyToAim(spr, wallVerts, false, papersprite);
 
-	const float f_xdiff = (spr->x1 - gl_viewx);
-	const float f_ydiff = (spr->z1 - gl_viewy);
-	const float f_zdiff = (spr->gzt - gl_viewz);
-
-	const float sprdist = sqrtf((f_xdiff*f_xdiff) + (f_ydiff*f_ydiff) + (f_zdiff*f_zdiff));
-	const float distfact = ((2.0f * spr->dispoffset) + 20.0f) / sprdist;
+	const float sprdist = sqrtf((spr->x1 - gl_viewx)*(spr->x1 - gl_viewx) + (spr->z1 - gl_viewy)*(spr->z1 - gl_viewy) + (spr->gzt - gl_viewz)*(spr->gzt - gl_viewz));
+	const float distfact = ((2.0f*spr->dispoffset) + 20.0f) / sprdist;
 
 	for (size_t i = 0; i < 4; i++)
 	{
@@ -4009,7 +3717,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;
@@ -4036,7 +3744,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
 }
 
 // -----------------+
@@ -4452,7 +4160,7 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I
 	wallinfo->wallcolormap = wallcolormap;
 }
 
-static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap, subsector_t *subsector)
+static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap)
 {
 	planeinfo_t *planeinfo = static_cast<planeinfo_t*>(HWR_CreateDrawNode(DRAWNODE_PLANE));
 
@@ -4466,9 +4174,6 @@ static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, b
 	planeinfo->blend = blend;
 	planeinfo->fogplane = fogplane;
 	planeinfo->planecolormap = planecolormap;
-
-	// horizonplanes need to be drawn BEFORE skywalls, so lets hope this works without too many issues....
-	HWR_RenderFOFHorizonPlane(subsector, planeinfo->xsub, planeinfo->isceiling, planeinfo->fixedheight, planeinfo->blend, planeinfo->lightlevel, planeinfo->lumpnum, planeinfo->FOFSector, (UINT8)planeinfo->alpha, planeinfo->planecolormap);
 }
 
 // Adding this for now until I can create extrasubsector info for polyobjects
@@ -4578,10 +4283,7 @@ static void HWR_RenderDrawNodes(void)
 					gl_frontsector = NULL;
 
 					if (!(plane->blend & PF_NoTexture))
-					{
-						const boolean ceiling = plane->FOFSector ? !plane->isceiling : plane->isceiling; // match software!
-						HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, ceiling));
-					}
+						HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, plane->isceiling));
 
 					HWR_RenderPlane(NULL, plane->xsub, plane->isceiling, plane->fixedheight, plane->blend, plane->lightlevel,
 									plane->lumpnum, plane->FOFSector, plane->alpha, plane->planecolormap);
@@ -4655,8 +4357,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])
@@ -4878,7 +4589,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)
@@ -6154,7 +5865,7 @@ void HWR_Startup(void)
 		HWR_TogglePaletteRendering();
 
 		if (msaa)
-			GL_SetSpecialState(HWD_SET_MSAA, 1);
+			GL_SetSpecialState(HWD_SET_MSAA, a2c ? 2 : 1);
 
 		HWR_RegisterCommands();
 	}
@@ -6242,7 +5953,7 @@ void HWR_Shutdown(void)
 	GL_FlushScreenTextures();
 	HWR_ClearAllTextures();
 #ifdef USE_FBO_OGL
-	GL_FBO_Disable();
+	GL_Framebuffer_Disable();
 #endif
 }
 
@@ -6410,7 +6121,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_main.h

@@ -43,6 +43,7 @@ void HWR_Startup(void);
 void HWR_Shutdown(void);
 
 extern unsigned msaa;
+extern boolean a2c;
 
 extern FTransform atransform;
 extern float gl_viewsin, gl_viewcos;
@@ -171,6 +172,7 @@ void HWR_ProcessSeg(void); // Sort of like GLWall::Process in GZDoom
 // hw_bsp.c
 void HWR_CreatePlanePolygons(INT32 bspnum);
 extern boolean gl_maphasportals;
+extern boolean gl_maphashorizonlines;
 
 // Console variables
 extern CV_PossibleValue_t glanisotropicmode_cons_t[];

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/hw_shaders.h

@@ -193,6 +193,26 @@
 	"}\n" \
 	"#endif\0"
 
+#define GLSL_SOFTWARE_FRAGMENT_SHADER_NOPAL \
+	"uniform sampler2D tex;\n" \
+	"uniform vec4 poly_color;\n" \
+	"uniform vec4 tint_color;\n" \
+	"uniform vec4 fade_color;\n" \
+	"uniform float lighting;\n" \
+	"uniform float fade_start;\n" \
+	"uniform float fade_end;\n" \
+	GLSL_DOOM_COLORMAP \
+	GLSL_DOOM_LIGHT_EQUATION \
+	"void main(void) {\n" \
+		"vec4 texel = texture2D(tex, gl_TexCoord[0].st);\n" \
+		"vec4 base_color = texel * poly_color;\n" \
+		"vec4 final_color = base_color;\n" \
+		GLSL_SOFTWARE_TINT_EQUATION \
+		GLSL_SOFTWARE_FADE_EQUATION \
+		"final_color.a = texel.a * poly_color.a;\n" \
+		"gl_FragColor = final_color;\n" \
+	"}\n" \
+
 // hand tuned adjustments for light level calculation
 #define GLSL_FLOOR_FUDGES \
 	"#define STARTMAP_FUDGE 1.06\n" \

src/hardware/r_opengl/r_opengl.c

@@ -136,61 +136,32 @@ enum
 {
 	FBO_NONE,
 	FBO_ARB,
-	FBO_EXT
+	FBO_EXT,
+	FBO_EXT_STENCIL // supports stencil attachment
 };
 
 typedef struct
 {
-	GLuint fboobj;           // normal single sample fbo
-	GLuint rboobj;           // normal single sample rbo for depth and stencil stuff
-	GLuint tex;              // fbo texture for color
-	GLuint msaa_fboobj;      // msaa fbo
-	GLuint msaa_rboobj;      // msaa rbo for color this time
-	GLuint msaa_depthrboobj; // msaa rbo for depth and stencil stuff
+	GLuint fboobj; // actual Framebuffer Object
+	GLuint rboobj; // Renderbuffer Object
+	GLuint tex;    // Framebuffer texture
 	boolean init;
-	boolean msaa;            // true if the msaa fbo is the render target ugh
-	boolean bound;           // true if the fbo is currently bound as the framebuffer
 } fboobj_t;
 
-// this is a little messy but less messy than having two of those tbh
 static fboobj_t framebufferobject = {};
 
 int supportFBO = FBO_NONE;
 
 // older gl versions might not have these, so prevent compile errors
-#ifndef GL_DEPTH_COMPONENT
-#define GL_DEPTH_COMPONENT 0x1902
-#endif
-#ifndef GL_DEPTH_ATTACHMENT_EXT
-#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
-#endif
+// this should still give a simple depth only rbo
 #ifndef GL_DEPTH24_STENCIL8
-#define GL_DEPTH24_STENCIL8 0x88F0
+GL_DEPTH24_STENCIL8 GL_DEPTH_COMPONENT_EXT
 #endif
 #ifndef GL_DEPTH_STENCIL_ATTACHMENT
-#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
-#endif
-#ifndef GL_COLOR_ATTACHMENT0_EXT
-#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
-#endif
-#ifndef GL_READ_FRAMEBUFFER_EXT
-#define GL_READ_FRAMEBUFFER_EXT 0x8CA8
-#endif
-#ifndef GL_DRAW_FRAMEBUFFER_EXT
-#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
-#endif
-#ifndef GL_FRAMEBUFFER_EXT
-#define GL_FRAMEBUFFER_EXT 0x8D40
-#endif
-#ifndef GL_RENDERBUFFER_EXT
-#define GL_RENDERBUFFER_EXT 0x8D41
-#endif
-#ifndef GL_FRAMEBUFFER_COMPLETE_EXT
-#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
+GL_DEPTH_STENCIL_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
 #endif
 
-static void GL_FBO_DeleteAttachments(void);
-static void GL_FBO_Resolve(GLbitfield mask);
+static void GL_Framebuffer_DeleteAttachments(void);
 #endif
 
 // needed for glportals
@@ -508,10 +479,6 @@ typedef void (APIENTRY * PFNglRenderbufferStorage) (GLenum target, GLenum intern
 static PFNglRenderbufferStorage pglRenderbufferStorage;
 typedef void (APIENTRY * PFNglFramebufferRenderbuffer) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLenum renderbuffer);
 static PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer;
-typedef void (APIENTRY * PFNglRenderbufferStorageMultisample) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-static PFNglRenderbufferStorageMultisample pglRenderbufferStorageMultisample;
-typedef void (APIENTRY * PFNglBlitFramebuffer) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-static PFNglBlitFramebuffer pglBlitFramebuffer;
 
 /* 2.1 extension functions for framebuffers and renderbuffers */
 typedef void (APIENTRY * PFNglGenFramebuffersEXT) (GLsizei n, GLuint *ids);
@@ -802,22 +769,28 @@ static GLRGBAFloat shader_defaultcolor = {1.0f, 1.0f, 1.0f, 1.0f};
 #ifdef USE_FBO_OGL
 static int GLFramebuffer_CheckExt(void)
 {
-	// check for the standard arb extensions
-	// these should be there from version 3.0 onwards
+	// in opengl 3.0 and up fbos are standart and always supported
+	if (majorGL >= 3)
+		return FBO_ARB;
+
+	// gl versions from 2.1 may still support framebuffer objects
+
+	// maybe, just maybe, we support the standart extensions
 	if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) &&
 		GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) &&
 		GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions))
-	{
 		return FBO_ARB;
-	}
 
-	// gl versions from 2.1 and older may still support framebuffer objects
-	// depending on vendor and driver support
+	// nope, try the older 2.1 extensions
 	if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions) &&
 		GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions) &&
-		GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions) &&
-		GL_isExtAvailable("GL_EXT_packed_depth_stencil", gl_extensions)) // we use the stencil buffer for stuff like portals, so its better to make stencil extension a requirement
+		GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions))
 	{
+		// perhaps we may even support a stencil attachment
+		if (GL_isExtAvailable("GL_EXT_packed_depth_stencil", gl_extensions))
+			return FBO_EXT_STENCIL;
+
+		// no stencil support, sad
 		return FBO_EXT;
 	}
 
@@ -933,69 +906,38 @@ void SetupGLFunc4(void)
 			GetGLfunc(glRenderbufferStorage);
 			GetGLfunc(glFramebufferRenderbuffer);
 
-			// multisample support, this should be in core per gl 3.0 and newer
-			pglRenderbufferStorageMultisample = GetGLFunc("glRenderbufferStorageMultisample");
-			pglBlitFramebuffer = GetGLFunc("glBlitFramebuffer");
-
-			if (!pglRenderbufferStorageMultisample || !pglBlitFramebuffer)
-			{
-				pglRenderbufferStorageMultisample = NULL;
-				pglBlitFramebuffer = NULL;
-				GL_DBG_Printf("\nFBO: No multisample support\n");
-			}
-
 			GL_DBG_Printf("\nFBO: ARB extensions found\n");
 		}
-		else if (fbocheck == FBO_EXT) // uh oh only support old fbo extensions...
+		else if (fbocheck == FBO_EXT || fbocheck == FBO_EXT_STENCIL) // uh oh only support for EXT prefix fbos...
 		{
+			GetGLfunc(glGenFramebuffersEXT);
+			GetGLfunc(glBindFramebufferEXT);
+			GetGLfunc(glDeleteFramebuffersEXT);
+			GetGLfunc(glFramebufferTexture2DEXT);
+			GetGLfunc(glCheckFramebufferStatusEXT);
+			GetGLfunc(glGenRenderbuffersEXT);
+			GetGLfunc(glBindRenderbufferEXT);
+			GetGLfunc(glDeleteRenderbuffersEXT);
+			GetGLfunc(glRenderbufferStorageEXT);
+			GetGLfunc(glFramebufferRenderbufferEXT);
+
 			// remapping galore huehue
 			// do this so we dont have to dupe half our code
-			GetGLfunc(glGenFramebuffersEXT);
 			pglGenFramebuffers = pglGenFramebuffersEXT;
-
-			GetGLfunc(glBindFramebufferEXT);
 			pglBindFramebuffer = pglBindFramebufferEXT;
-
-			GetGLfunc(glDeleteFramebuffersEXT);
 			pglDeleteFramebuffers  = pglDeleteFramebuffersEXT;
-
-			GetGLfunc(glFramebufferTexture2DEXT);
 			pglFramebufferTexture2D = pglFramebufferTexture2DEXT;
-
-			GetGLfunc(glCheckFramebufferStatusEXT);
 			pglCheckFramebufferStatus = pglCheckFramebufferStatusEXT;
-
-			GetGLfunc(glGenRenderbuffersEXT);
 			pglGenRenderbuffers = pglGenRenderbuffersEXT;
-
-			GetGLfunc(glBindRenderbufferEXT);
 			pglBindRenderbuffer = pglBindRenderbufferEXT;
-
-			GetGLfunc(glDeleteRenderbuffersEXT);
 			pglDeleteRenderbuffers = pglDeleteRenderbuffersEXT;
-
-			GetGLfunc(glRenderbufferStorageEXT);
 			pglRenderbufferStorage = pglRenderbufferStorageEXT;
-
-			GetGLfunc(glFramebufferRenderbufferEXT);
 			pglFramebufferRenderbuffer = pglFramebufferRenderbufferEXT;
 
-			// multisample support needs the EXT multisample and blit extensions
-			if (GL_isExtAvailable("GL_EXT_framebuffer_multisample", gl_extensions) &&
-				GL_isExtAvailable("GL_EXT_framebuffer_blit", gl_extensions))
-			{
-				pglRenderbufferStorageMultisample = GetGLFunc("glRenderbufferStorageMultisampleEXT");
-				pglBlitFramebuffer = GetGLFunc("glBlitFramebufferEXT");
-			}
-
-			if (!pglRenderbufferStorageMultisample || !pglBlitFramebuffer)
-			{
-				pglRenderbufferStorageMultisample = NULL;
-				pglBlitFramebuffer = NULL;
-				GL_DBG_Printf("\nFBO: No multisample support\n");
-			}
-
-			GL_DBG_Printf("\nFBO: EXT extensions with packed depth-stencil\n");
+			if (fbocheck == FBO_EXT)
+				GL_DBG_Printf("\nFBO: EXT extensions found, no stencil\n");
+			else if (fbocheck == FBO_EXT_STENCIL)
+				GL_DBG_Printf("\nFBO: EXT extensions with packed depth-stencil\n");
 		}
 
 		supportFBO = fbocheck;
@@ -1209,7 +1151,7 @@ void GL_SetModelView(GLint w, GLint h)
 		GL_FlushScreenTextures();
 
 #ifdef USE_FBO_OGL
-		GL_FBO_DeleteAttachments();
+		GL_Framebuffer_DeleteAttachments();
 #endif
 	}
 
@@ -1515,15 +1457,6 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
 	const INT32 stride = (screen_width/scale)*3;
 	INT32 scanlines = screen_height;
 	GLubyte * restrict image;
-#ifdef USE_FBO_OGL
-	const boolean msaa_fbo = (framebufferobject.bound && framebufferobject.msaa);
-#endif
-
-#ifdef USE_FBO_OGL
-	// cant read from the msaa fbo, so gotta blit it first into either the single sample fbo or the screen framebuffer....
-	if (msaa_fbo)
-		GL_FBO_Resolve(GL_COLOR_BUFFER_BIT);
-#endif
 
 	// at the time this function is called, generic2 can be found drawn on the framebuffer
 	// if some other screen texture is needed, draw it to the framebuffer
@@ -1565,16 +1498,9 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
 			memcpy(dest + i, image + i*scale, 3);
 		dest += stride;
 	}
-	// this probably could be done with fbos, might mess around with that some time :3
 
 	// ...yet still, restrict doesn't make the inner loop any faster
 	free(image - ((screen_height % scale) * screen_width*3));
-
-#ifdef USE_FBO_OGL
-	// this´ll reenable the msaa fbo....
-	if (msaa_fbo)
-		GL_FBO_Enable();
-#endif
 }
 
 // -----------------+
@@ -2005,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;
@@ -2328,7 +2253,7 @@ static void GL_Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRG
 
 		UNIFORM_1(shader->uniforms[gluniform_leveltime], shader_leveltime, pglUniform1f);
 
-		UNIFORM_2(shader->uniforms[gluniform_scr_resolution], (GLfloat)screen_width, (GLfloat)screen_height, pglUniform2f);
+		UNIFORM_2(shader->uniforms[gluniform_scr_resolution], (GLfloat)vid.width, (GLfloat)vid.height, pglUniform2f);
 
 		#undef UNIFORM_1
 		#undef UNIFORM_2
@@ -2715,7 +2640,11 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value)
 
 		case HWD_SET_MSAA:
 			if (Value)
+			{
 				pglEnable(GL_MULTISAMPLE);
+				if (Value == 2)
+					pglEnable(GL_SAMPLE_ALPHA_TO_COVERAGE);
+			}
 			break;
 
 		case HWD_SET_TEXTUREANISOTROPICMODE:
@@ -3316,9 +3245,9 @@ void GL_SetTransform(FTransform *stransform)
 }
 
 #ifdef USE_FBO_OGL
-static void GL_FBO_DeleteAttachments(void)
+static void GL_Framebuffer_DeleteAttachments(void)
 {
-	if (supportFBO == FBO_NONE)
+	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
 
 	// Unbind the framebuffer
@@ -3331,45 +3260,14 @@ static void GL_FBO_DeleteAttachments(void)
 	if (framebufferobject.rboobj)
 		pglDeleteRenderbuffers(1, &framebufferobject.rboobj);
 
-	if (framebufferobject.msaa_rboobj)
-		pglDeleteRenderbuffers(1, &framebufferobject.msaa_rboobj);
-
-	if (framebufferobject.msaa_depthrboobj)
-		pglDeleteRenderbuffers(1, &framebufferobject.msaa_depthrboobj);
-
 	framebufferobject.tex = 0;
 	framebufferobject.rboobj = 0;
-	framebufferobject.msaa_rboobj = 0;
-	framebufferobject.msaa_depthrboobj = 0;
 	framebufferobject.init = false;
-	framebufferobject.bound = false;
 }
 
-// blit the msaa fbo into the normal single sample fbo
-// so we can use it to copy from and stuff
-static void GL_FBO_Resolve(GLbitfield mask)
+static void GL_Framebuffer_Generate(void)
 {
-	if (supportFBO == FBO_NONE || !framebufferobject.init || !framebufferobject.msaa)
-		return;
-
-	if (!pglBlitFramebuffer)
-		return;
-
-	pglBindFramebuffer(GL_READ_FRAMEBUFFER_EXT, framebufferobject.msaa_fboobj);
-	pglBindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, framebufferobject.fboobj);
-
-	pglBlitFramebuffer(0, 0, screen_width, screen_height,
-						0, 0, screen_width, screen_height,
-						mask, GL_NEAREST);
-
-	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
-}
-
-static void GL_FBO_Generate(void)
-{
-	GLint msaasamples;
-
-	if (supportFBO == FBO_NONE || framebufferobject.init)
+	if (supportFBO == FBO_NONE || framebufferobject.init || !UseScreenFBO())
 		return;
 
 	// Generate the framebuffer
@@ -3384,7 +3282,7 @@ static void GL_FBO_Generate(void)
 	{
 		pglGenTextures(1, &framebufferobject.tex);
 		pglBindTexture(GL_TEXTURE_2D, framebufferobject.tex);
-		pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 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);
@@ -3407,13 +3305,18 @@ static void GL_FBO_Generate(void)
 			pglRenderbufferStorage(GL_RENDERBUFFER_EXT, GL_DEPTH24_STENCIL8, screen_width, screen_height);
 			pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
 		}
-		else if (supportFBO == FBO_EXT)
+		else if (supportFBO == FBO_EXT || supportFBO == FBO_EXT_STENCIL)
 		{
-			pglRenderbufferStorage(GL_RENDERBUFFER_EXT, GL_DEPTH_STENCIL_EXT, screen_width, screen_height);
-			// attach the renderbuffer to depth attachment point
+			pglRenderbufferStorage(GL_RENDERBUFFER_EXT, (supportFBO == FBO_EXT_STENCIL) ? GL_DEPTH_STENCIL_EXT : GL_DEPTH_COMPONENT, screen_width, screen_height);
+
+			// attach a renderbuffer to depth attachment point
 			pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
-			// attach the renderbuffer to stencil attachment point
-			pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
+
+			if (supportFBO == FBO_EXT_STENCIL)
+			{
+				// attach a renderbuffer to stencil attachment point
+				pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
+			}
 		}
 
 		// Clear the renderbuffer
@@ -3425,124 +3328,48 @@ static void GL_FBO_Generate(void)
 	if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT)
 	{
 		//pglGetError(); TODO:implement this or smth
-		GL_MSG_Error("GL_FBO_Generate: Failed to create Framebuffer Object");
+		GL_MSG_Error("GL_Framebuffer_Generate: Failed to create Framebuffer Object");
 
 		// if this fails, dont retry it a gazillion times
-		// this probably wouldnt recover and we dont want any more black screens...
+		// this wouldnt recover
 		supportFBO = FBO_NONE;
 		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 		return;
 	}
 
-	// Try to set up a multisampled render target for MSAA
-	framebufferobject.msaa = false;
-	msaasamples = (GLint)msaa;
-
-	// maybe should just make more "supportFBO" cases or smth but :chaosleep:
-	if (msaasamples > 1 && pglRenderbufferStorageMultisample && pglBlitFramebuffer)
-	{
-		if (!framebufferobject.msaa_fboobj)
-			pglGenFramebuffers(1, &framebufferobject.msaa_fboobj);
-
-		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.msaa_fboobj);
-
-		// Generate the multisampled color renderbuffer
-		if (!framebufferobject.msaa_rboobj)
-		{
-			pglGenRenderbuffers(1, &framebufferobject.msaa_rboobj);
-			pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.msaa_rboobj);
-			pglRenderbufferStorageMultisample(GL_RENDERBUFFER_EXT, msaasamples, GL_RGBA8, screen_width, screen_height);
-			pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_rboobj);
-		}
-
-		// Generate the multisampled depth/stencil renderbuffer
-		if (!framebufferobject.msaa_depthrboobj)
-		{
-			pglGenRenderbuffers(1, &framebufferobject.msaa_depthrboobj);
-			pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
-
-			if (supportFBO == FBO_ARB)
-			{
-				pglRenderbufferStorageMultisample(GL_RENDERBUFFER_EXT, msaasamples, GL_DEPTH24_STENCIL8, screen_width, screen_height);
-				pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
-			}
-			else if (supportFBO == FBO_EXT)
-			{
-				pglRenderbufferStorageMultisample(GL_RENDERBUFFER_EXT, msaasamples, GL_DEPTH_STENCIL_EXT, screen_width, screen_height);
-				// attach a renderbuffer to depth attachment point
-				pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
-				// attach a renderbuffer to stencil attachment point
-				pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
-			}
-		}
-
-		pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
-
-		if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) == GL_FRAMEBUFFER_COMPLETE_EXT)
-		{
-			framebufferobject.msaa = true;
-			GL_ClearBuffer(true, true, true, NULL);
-			GL_DBG_Printf("\nGL_FBO_Generate: Multisampled framebuffer created with %d samples\n", msaasamples);
-		}
-		else
-		{
-			GL_MSG_Warning("GL_FBO_Generate: Failed to create multisampled Framebuffer Object, falling back to no MSAA");
-
-			if (framebufferobject.msaa_rboobj)
-				pglDeleteRenderbuffers(1, &framebufferobject.msaa_rboobj);
-			if (framebufferobject.msaa_depthrboobj)
-				pglDeleteRenderbuffers(1, &framebufferobject.msaa_depthrboobj);
-
-			framebufferobject.msaa_rboobj = 0;
-			framebufferobject.msaa_depthrboobj = 0;
-		}
-	}
-
 	// Unbind the framebuffer
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 
 	framebufferobject.init = true;
 }
 
-void GL_FBO_BindMainFrameBuffer(void)
+void GL_Framebuffer_Unbind(void)
 {
-	if (supportFBO == FBO_NONE)
+	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
 
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 	pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
-
-	framebufferobject.bound = false;
 }
 
-void GL_FBO_Enable(void)
+void GL_Framebuffer_Enable(void)
 {
-	if (supportFBO == FBO_NONE)
+	if (supportFBO == FBO_NONE || !UseScreenFBO())
 		return;
 
-	GL_FBO_Generate();
+	GL_Framebuffer_Generate();
 
 	// failed
-	if (!framebufferobject.init)
+	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
 
-	if (framebufferobject.msaa)
-	{
-		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.msaa_fboobj);
-		pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.msaa_rboobj);
-	}
-	else
-	{
-		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
-		pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
-	}
-
-	framebufferobject.bound = true;
+	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
+	pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
 }
 
-void GL_FBO_Disable(void)
+void GL_Framebuffer_Disable(void)
 {
-	if (supportFBO == FBO_NONE)
+	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
 
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
@@ -3553,14 +3380,7 @@ void GL_FBO_Disable(void)
 		pglDeleteFramebuffers(1, &framebufferobject.fboobj);
 	framebufferobject.fboobj = 0;
 
-	if (framebufferobject.msaa_fboobj)
-		pglDeleteFramebuffers(1, &framebufferobject.msaa_fboobj);
-	framebufferobject.msaa_fboobj = 0;
-
-	GL_FBO_DeleteAttachments();
-
-	framebufferobject.msaa = false;
-	framebufferobject.bound = false;
+	GL_Framebuffer_DeleteAttachments();
 }
 #endif
 
@@ -3911,20 +3731,10 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8
 void GL_MakeScreenTexture(int tex)
 {
 	boolean firstTime;
-	static GLint lastfiltermode[NUMSCREENTEXTURES] = {-1, -1, -1, -1, -1};
-#ifdef USE_FBO_OGL
-	const boolean msaa_fbo = (framebufferobject.bound && framebufferobject.msaa);
-#endif
 
 	if (!gl_enable_screen_textures)
 		return;
 
-#ifdef USE_FBO_OGL
-	// cant read from the msaa fbo, so gotta blit it first into either the single sample fbo or the screen framebuffer....
-	if (msaa_fbo)
-		GL_FBO_Resolve(GL_COLOR_BUFFER_BIT);
-#endif
-
 	firstTime = (screenTextures[tex] == 0);
 
 	// Create screen texture
@@ -3933,36 +3743,18 @@ void GL_MakeScreenTexture(int tex)
 
 	pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
 
-	// if were downsampling, choose to do that with linear filter instead of nearest neighbor
-	// otherwise well get ugly mixels
-	GLint filtermode = I_IsDownsampling() ? GL_LINEAR : GL_NEAREST;
-
-	// avoid redundant calls to this, prob doesent really matter tbh
-	if (filtermode != lastfiltermode[tex] || firstTime)
-	{
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtermode);
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtermode);
-
-		lastfiltermode[tex] = filtermode;
-	}
-
 	if (firstTime)
 	{
+		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 		Clamp2D(GL_TEXTURE_WRAP_S);
 		Clamp2D(GL_TEXTURE_WRAP_T);
 		pglCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, screen_texsizew, screen_texsizeh, 0);
 	}
 	else
-	{
 		pglCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, screen_texsizew, screen_texsizeh);
-	}
 
 	tex_downloaded = screenTextures[tex];
-
-#ifdef USE_FBO_OGL
-	if (msaa_fbo)
-		GL_FBO_Enable();
-#endif
 }
 
 void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)

src/hardware/r_opengl/r_opengl.h

@@ -98,9 +98,9 @@ extern PFNglGetString pglGetString;
 #endif
 
 #ifdef USE_FBO_OGL
-void GL_FBO_BindMainFrameBuffer(void);
-void GL_FBO_Enable(void);
-void GL_FBO_Disable(void);
+void GL_Framebuffer_Unbind(void);
+void GL_Framebuffer_Enable(void);
+void GL_Framebuffer_Disable(void);
 extern int supportFBO;
 #endif
 

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/i_video.h

@@ -118,14 +118,19 @@ void I_UpdateNoVsync(void);
 */
 void I_ReadScreen(UINT8 * restrict scr, INT32 scale);
 
+
 UINT32 I_GetRefreshRate(void);
 
+boolean I_CheckNativeRes(void);
+
 void I_SetBorderlessWindow(void);
 
 #ifdef USE_FBO_OGL
-void I_CheckDownSampleState(boolean forcerefresh);
-boolean I_IsDownsampling(void);
+
+void RefreshOGLSDLSurface(void);
+void I_DownSample(void);
 boolean UseScreenFBO(void);
+extern boolean downsample;
 #endif
 
 // So we can call this from i_video event loop

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,12 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
 	INT32 rot = 0;
 #endif
 
-	skin = R_GetMobjSkin(mo);
+	skin = K_GetMobjSkin(mo);
 
 	if (!skin)
 		return;
 
-	minimaphead = skin->facemmapprefix;
+	minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)];
 
 	if (minimaphead == NULL)
 		return;
@@ -3827,8 +3815,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 +4893,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;
@@ -3289,10 +3326,10 @@ static void K_StretchPlayerGravity(player_t *player)
 
 	mobj_t *pmo = player->mo;
 
-	const fixed_t tempxscale = pmo->realxscale;
-	const fixed_t tempyscale = pmo->realyscale;
+	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;
@@ -3344,16 +3381,16 @@ static void K_SaltySquish(player_t *player)
 
 	mobj_t *pmo = player->mo;
 
-	const fixed_t tempxscale = pmo->realxscale;
-	const fixed_t tempyscale = pmo->realyscale;
+	fixed_t tempxscale = pmo->realxscale;
+	fixed_t tempyscale = pmo->realyscale;
 
 	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;
 }

src/lua_consolelib.c

@@ -182,19 +182,14 @@ void COM_Lua_f(void)
 			len = (argc+1)*256;
 
 		buf = malloc(len);
-		if (buf == NULL)
-			I_Error("Failed to allocate buffer for COM_Lua_f");
-
 		p = buf;
 		WRITEUINT8(p, argc);
 		for (i = 0; i < argc; i++)
 			WRITESTRINGN(p, COM_Argv(i), 255);
-
-		if (flags & COM_SPLITSCREEN)
+		if (flags & 2)
 			SendNetXCmdForPlayer(1, XD_LUACMD, buf, p-buf);
 		else
 			SendNetXCmd(XD_LUACMD, buf, p-buf);
-
 		free(buf);
 		return;
 	}

src/lua_hooklib.c

@@ -579,8 +579,8 @@ 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       )
@@ -588,7 +588,6 @@ FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype
 	))
 	{
 		seen = 1;
-
 		CONS_Alert(
 			CONS_WARNING, "%s\n", va(
 			"%s hooks not attached to a specific mobj type may cause performance issues!",
@@ -610,10 +609,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
 (
@@ -898,7 +899,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 +963,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 +988,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);

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

@@ -18,6 +18,7 @@
 #include "p_slopes.h"
 #include "r_main.h"
 
+#include "lua_udatalib.h"
 #include "lua_script.h"
 #include "lua_libs.h"
 #include "lua_hud.h" // hud_running errors
@@ -255,6 +256,15 @@ static const char *const vector_opt[] = {
 static const char *const array_opt[] ={"iterate",NULL};
 static const char *const valid_opt[] ={"valid",NULL};
 
+#define pushsubsector(L, subsector) LUA_PushUserdata(L, subsector, META_SUBSECTOR)
+int udatalib_getter_subsector(lua_State *L)
+UDATALIB_SIMPLE_GETTER(subsector_t*, pushsubsector)
+#undef pushsubsector
+
+#define pushslope(L, slope) LUA_PushUserdata(L, slope, META_SLOPE)
+int udatalib_getter_slope(lua_State *L)
+UDATALIB_SIMPLE_GETTER(pslope_t*, pushslope)
+#undef pushslope
 // iterates through a sector's thinglist!
 static int lib_iterateSectorThinglist(lua_State *L)
 {

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/lua_udatalib.c

@@ -0,0 +1,137 @@
+// SONIC ROBO BLAST 2 KART SATURN
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by Indev.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  lua_udatalib.c
+/// \brief Implementation of lua userdata object metatables based on getter/setter functions
+
+#include "doomtype.h"
+#include "m_fixed.h"
+#include "lua_udatalib.h"
+
+// Getters
+int udatalib_getter_fixed(lua_State *L)
+UDATALIB_SIMPLE_GETTER(fixed_t, lua_pushinteger)
+
+int udatalib_getter_angle(lua_State *L)
+UDATALIB_SIMPLE_GETTER(angle_t, lua_pushangle)
+
+int udatalib_getter_uint8(lua_State *L)
+UDATALIB_SIMPLE_GETTER(UINT8, lua_pushinteger)
+
+int udatalib_getter_sint8(lua_State *L)
+UDATALIB_SIMPLE_GETTER(SINT8, lua_pushinteger)
+
+int udatalib_getter_uint16(lua_State *L)
+UDATALIB_SIMPLE_GETTER(UINT16, lua_pushinteger)
+
+int udatalib_getter_int16(lua_State *L)
+UDATALIB_SIMPLE_GETTER(INT16, lua_pushinteger)
+
+int udatalib_getter_uint32(lua_State *L)
+UDATALIB_SIMPLE_GETTER(UINT32, lua_pushinteger)
+
+int udatalib_getter_int32(lua_State *L)
+UDATALIB_SIMPLE_GETTER(INT32, lua_pushinteger)
+
+int udatalib_getter_uint64(lua_State *L)
+UDATALIB_SIMPLE_GETTER(UINT64, lua_pushinteger)
+
+int udatalib_getter_int64(lua_State *L)
+UDATALIB_SIMPLE_GETTER(INT64, lua_pushinteger)
+
+int udatalib_getter_string(lua_State *L)
+UDATALIB_SIMPLE_GETTER(const char*, lua_pushstring)
+
+int udatalib_getter_boolean(lua_State *L)
+UDATALIB_SIMPLE_GETTER(boolean, lua_pushboolean)
+
+int udatalib_getter_spritenum(lua_State *L)
+UDATALIB_SIMPLE_GETTER(spritenum_t, lua_pushinteger)
+
+int udatalib_getter_tic(lua_State *L)
+UDATALIB_SIMPLE_GETTER(tic_t, lua_pushinteger)
+
+// Setters
+int udatalib_setter_fixed(lua_State *L)
+UDATALIB_SIMPLE_SETTER(fixed_t, luaL_checkfixed)
+
+int udatalib_setter_angle(lua_State *L)
+UDATALIB_SIMPLE_SETTER(angle_t, luaL_checkangle)
+
+int udatalib_setter_uint8(lua_State *L)
+UDATALIB_SIMPLE_SETTER(UINT8, (UINT8)luaL_checkinteger)
+
+int udatalib_setter_sint8(lua_State *L)
+UDATALIB_SIMPLE_SETTER(SINT8, luaL_checkinteger)
+
+int udatalib_setter_uint16(lua_State *L)
+UDATALIB_SIMPLE_SETTER(UINT16, (UINT16)luaL_checkinteger)
+
+int udatalib_setter_int16(lua_State *L)
+UDATALIB_SIMPLE_SETTER(INT16, luaL_checkinteger)
+
+int udatalib_setter_uint32(lua_State *L)
+UDATALIB_SIMPLE_SETTER(UINT32, (UINT32)luaL_checkinteger)
+
+int udatalib_setter_int32(lua_State *L)
+UDATALIB_SIMPLE_SETTER(INT32, luaL_checkinteger)
+
+int udatalib_setter_uint64(lua_State *L)
+UDATALIB_SIMPLE_SETTER(UINT64, (UINT64)luaL_checkinteger)
+
+int udatalib_setter_int64(lua_State *L)
+UDATALIB_SIMPLE_SETTER(INT64, luaL_checkinteger)
+
+int udatalib_setter_string(lua_State *L)
+UDATALIB_SIMPLE_SETTER(const char*, luaL_checkstring)
+
+int udatalib_setter_boolean(lua_State *L)
+UDATALIB_SIMPLE_SETTER(boolean, luaL_checkboolean)
+
+// ffs
+int udatalib_setter_boolean_nocheck(lua_State *L)
+UDATALIB_SIMPLE_SETTER(boolean, lua_toboolean)
+
+int udatalib_setter_spritenum(lua_State *L)
+UDATALIB_SIMPLE_SETTER(spritenum_t, luaL_checkinteger)
+
+int udatalib_setter_tic(lua_State *L)
+UDATALIB_SIMPLE_SETTER(tic_t, (tic_t)luaL_checkinteger)
+
+
+void udatalib_addfield(lua_State *L, int mt, udata_field_t field)
+{
+    int idx = abs_index(L, mt);
+
+    lua_createtable(L, 2, 0); // Push table
+
+    lua_pushinteger(L, field.offset); // Push offset
+    lua_pushcclosure(L, field.getter, 1); // Pop offset, push closure
+
+    lua_rawseti(L, -2, UDATALIB_GETTER); // Pop closure, add to table
+
+    lua_pushinteger(L, field.offset); // Push offset
+    lua_pushcclosure(L, field.setter, 1); // Pop offset, push closure
+
+    lua_rawseti(L, -2, UDATALIB_SETTER); // Pop closure, add to table
+
+    lua_pushstring(L, field.name); // Push field name
+    lua_pushvalue(L, -2); // Copy table
+    lua_rawset(L, idx); // Pop field name and table, add to metatable
+
+    lua_pop(L, 1); // Pop field table
+}
+
+void udatalib_addfields(lua_State *L, int mt, const udata_field_t fields[])
+{
+    for (unsigned i = 0; fields[i].name != NULL; ++i)
+    {
+        udatalib_addfield(L, mt, fields[i]);
+        //CONS_Printf("Add field name=%s, offset=%d, getter=%p, setter=%p\n", fields[i].name, fields[i].offset, fields[i].getter, fields[i].setter);
+    }
+}

src/lua_udatalib.h

@@ -0,0 +1,114 @@
+// SONIC ROBO BLAST 2 KART SATURN
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by Indev.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  lua_udatalib.h
+/// \brief Implementation of lua userdata object metatables based on getter/setter functions
+
+#ifndef __LUA_UDATALIB_H__
+#define __LUA_UDATALIB_H__
+
+#include "doomdef.h"
+#include "lua_script.h"
+#include "lua_libs.h"
+#include "fastcmp.h"
+
+// Indices in getter/setter tables for fields
+#define UDATALIB_GETTER 1
+#define UDATALIB_SETTER 2
+
+typedef struct udata_field_s {
+    const char *name;
+    size_t offset;
+    lua_CFunction getter;
+    lua_CFunction setter;
+} udata_field_t;
+
+// Simple setters and getters, for situations where getter is simply
+// "return obj.field" and setter is "obj.field = value"
+int udatalib_getter_fixed(lua_State *L);
+int udatalib_getter_angle(lua_State *L);
+int udatalib_getter_uint8(lua_State *L);
+int udatalib_getter_sint8(lua_State *L);
+int udatalib_getter_uint16(lua_State *L);
+int udatalib_getter_int16(lua_State *L);
+int udatalib_getter_uint32(lua_State *L);
+int udatalib_getter_int32(lua_State *L);
+int udatalib_getter_uint64(lua_State *L);
+int udatalib_getter_int64(lua_State *L);
+int udatalib_getter_string(lua_State *L);
+int udatalib_getter_boolean(lua_State *L);
+int udatalib_getter_spritenum(lua_State *L);
+int udatalib_getter_mobj(lua_State *L);
+int udatalib_getter_subsector(lua_State *L);
+int udatalib_getter_mobjtype(lua_State *L);
+int udatalib_getter_player(lua_State *L);
+int udatalib_getter_mapthing(lua_State *L);
+int udatalib_getter_slope(lua_State *L);
+int udatalib_getter_cmd(lua_State *L);
+int udatalib_getter_playerstate(lua_State *L);
+int udatalib_getter_powers(lua_State *L);
+int udatalib_getter_kartstuff(lua_State *L);
+int udatalib_getter_pflags(lua_State *L);
+int udatalib_getter_panim(lua_State *L);
+int udatalib_getter_tic(lua_State *L);
+
+int udatalib_setter_fixed(lua_State *L);
+int udatalib_setter_angle(lua_State *L);
+int udatalib_setter_uint8(lua_State *L);
+int udatalib_setter_sint8(lua_State *L);
+int udatalib_setter_uint16(lua_State *L);
+int udatalib_setter_int16(lua_State *L);
+int udatalib_setter_uint32(lua_State *L);
+int udatalib_setter_int32(lua_State *L);
+int udatalib_setter_uint64(lua_State *L);
+int udatalib_setter_int64(lua_State *L);
+int udatalib_setter_string(lua_State *L);
+int udatalib_setter_boolean(lua_State *L);
+int udatalib_setter_boolean_nocheck(lua_State *L);
+int udatalib_setter_spritenum(lua_State *L);
+int udatalib_setter_mobj(lua_State *L);
+int udatalib_setter_playerstate(lua_State *L);
+int udatalib_setter_pflags(lua_State *L);
+int udatalib_setter_panim(lua_State *L);
+int udatalib_setter_tic(lua_State *L);
+
+// Adds setter and getter for field and stores it as field.name..".get" and
+// field.name..".set" in table at index mt. (metatable, usually)
+void udatalib_addfield(lua_State *L, int mt, udata_field_t field);
+
+// Convinience function to add array of fields at once.
+void udatalib_addfields(lua_State *L, int mt, const udata_field_t fields[]);
+
+// I miss C++ template functons :(
+
+// Get pointer to field value within getter or setter
+#define UDATALIB_GETFIELD(type, field) \
+{ \
+    size_t offset = lua_tointeger(L, lua_upvalueindex(1)); \
+    field = (type*)((uint8_t*)lua_touserdata(L, 1) + offset); \
+}
+
+// Creates implementation for simple getter and setter. Super lazy, yes.
+// Assumes userdata is a pointer to actual data. Maybe not really safe.
+#define UDATALIB_SIMPLE_GETTER(type, pushf) \
+{ \
+    type *field; \
+    UDATALIB_GETFIELD(type, field) \
+    pushf(L, *field); \
+    return 1; \
+}
+
+#define UDATALIB_SIMPLE_SETTER(type, checkf) \
+{ \
+    type *field; \
+    UDATALIB_GETFIELD(type, field) \
+    *field = checkf(L, 2); \
+    return 0; \
+}
+
+#endif

src/m_argv.c

@@ -13,12 +13,6 @@
 
 #include <string.h>
 
-#ifdef HAVE_THREADS
-#define local_for_thread _Thread_local
-#else
-#define local_for_thread
-#endif
-
 #include "doomdef.h"
 #include "command.h"
 #include "m_argv.h"
@@ -37,11 +31,8 @@ char **myargv = NULL;
 boolean myargmalloc = false;
 
 /**	\brief founded the parm
- *
- * thread_local because it can potentially be used from multiple threads (global variables aaaaaa)
- * (myargc and myargv don't have to be thread_local because they are never modified after being set up)
 */
-static local_for_thread INT32 found;
+static INT32 found;
 
 
 /**	\brief	The M_CheckParm function
@@ -100,7 +91,7 @@ INT32 M_CheckProtoParam(const char *check)
 const char *M_GetProtoParam(void)
 {
 	INT32 i;
-	char *string;
+	static char *string;
 
 	for (i = 1; i < myargc; i++)
 	{

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

@@ -1004,7 +1004,7 @@ static menuitem_t OP_ExpOptionsMenu[] =
 #ifdef HWRENDER
 	{IT_STRING | IT_CVAR, 	NULL, "Screen Textures", 				&cv_glscreentextures, 		 95},
 #ifdef USE_FBO_OGL
-	{IT_STRING | IT_CVAR, 	NULL, "FBO support", 					&cv_glframebuffer, 			100},
+	{IT_STRING | IT_CVAR, 	NULL, "FBO Downsampling support", 		&cv_glframebuffer, 			100},
 	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		110},
 	{IT_DISABLED, 			NULL, "", 								NULL,     			 		120}, // dummy text
 #else
@@ -1030,7 +1030,7 @@ static const char* OP_ExpTooltips[] =
 #ifdef HWRENDER
 	"Disabling Screen Textures may result in a performance boost\nbut will break certain effects.\nScreen textures are required at resolutions lower than your desktop resolution!",
 #ifdef USE_FBO_OGL
-	"Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nThis can be set to automatically enable if the game resolution\nis higher than the current Display Resolution\nor enabled at all times.\nThis may improve performance in some cases.\nRequires a GPU with atleast OpenGL 2.1 support.",
+	"Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nRequires a GPU with atleast OpenGL 2.1 support.",
 #endif
 	"Change the bit depth of the Lookup Palette in Palette rendering mode\n 16 bits is like software looks ingame\nwhile 24 bits is how software looks in screenshots.",
 #endif

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
@@ -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_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.
@@ -258,14 +258,23 @@ typedef enum
 // PRECIPITATION flags ?! ?! ?!
 //
 typedef enum {
-	PCF_INVISIBLE = 1,    // Don't draw.
+	PCF_INVISIBLE = 1, // Don't draw.
 	PCF_PIT       = 1<<1, // Above pit.
-	PCF_SPLASH    = 1<<2, // Splashed on the ground, return to the ceiling after the animation's over
-	PCF_THUNK     = 1<<3, // Ran the thinker this tic.
+	PCF_FOF       = 1<<2, // Above FOF.
+	PCF_MOVINGFOF = 1<<3, // Above MOVING FOF (this means we need to keep floorz up to date...)
+	PCF_SPLASH    = 1<<4, // Splashed on the ground, return to the ceiling after the animation's over
+	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
@@ -342,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.
@@ -403,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';
@@ -570,13 +570,13 @@ static void P_LoadSegs(UINT8 *data)
 
 			if (seg->sidedef == &sides[seg->linedef->sidenum[0]])
 			{
-				seg->v1 = lines[rawlinedef].v1;
-				seg->v2 = lines[rawlinedef].v2;
+				seg->v1 = lines[ms->linedef].v1;
+				seg->v2 = lines[ms->linedef].v2;
 			}
 			else
 			{
-				seg->v1 = lines[rawlinedef].v2;
-				seg->v2 = lines[rawlinedef].v1;
+				seg->v1 = lines[ms->linedef].v2;
+				seg->v2 = lines[ms->linedef].v1;
 			}
 		}
 		else
@@ -584,6 +584,7 @@ static void P_LoadSegs(UINT8 *data)
 			seg->v1 = &vertexes[v1];
 			seg->v2 = &vertexes[v2];
 		}
+
 #ifdef HWRENDER
 		if (rendermode == render_opengl)
 		{
@@ -596,6 +597,7 @@ static void P_LoadSegs(UINT8 *data)
 			//seg->fv2.z = FixedToFloat(seg->v2->z);
 		}
 #endif
+
 		seg->length = P_SegLength(seg);
 
 		P_UpdateSegLightOffset(seg);
@@ -2072,14 +2074,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
 		}
 
@@ -2094,13 +2096,6 @@ static void P_LoadMapBSP(const virtres_t* virt)
 	virtlump_t* virtsegs     = vres_Find(virt, "SEGS");
 	virtlump_t* virtnodes    = vres_Find(virt, "NODES");
 
-	if (!virtssectors)
-		I_Error("SSECTORS lump not found");
-	if (!virtsegs)
-		I_Error("SEGS lump not found");
-	if (!virtnodes)
-		I_Error("NODES lump not found");
-
 	numsubsectors = virtssectors->size / sizeof(mapsubsector_t);
 	numnodes      = virtnodes->size    / sizeof(mapnode_t);
 	numsegs       = virtsegs->size     / sizeof(mapseg_t);
@@ -2210,7 +2205,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;
 
@@ -2430,8 +2425,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);
 
@@ -2441,7 +2435,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
 	{
@@ -2456,26 +2450,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
@@ -2483,28 +2474,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;
 					}
 				}
 			}
@@ -2512,10 +2503,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;
 		}
 	}
 }
@@ -2532,7 +2523,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)
@@ -2542,8 +2533,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));
 		}
 	}
 
@@ -2555,8 +2546,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));
 		}
 	}
 
@@ -2568,8 +2559,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));
 		}
 	}
 
@@ -2888,8 +2879,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);
@@ -3006,9 +2996,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;
 
@@ -3074,7 +3061,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"),
@@ -3336,7 +3323,6 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
 
 	return false;
 }
-
 //
 // P_CheckReplacMapReplacements
 //
@@ -3429,13 +3415,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

@@ -1962,19 +1962,13 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 					if (!dest)
 						return;
 
-					const angle_t ang = (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle;
-					const boolean dontstopmove = (line->flags & ML_EFFECT4) == ML_EFFECT4;
-
 					if (bot)
-						P_Teleport(bot, dest->x, dest->y, dest->z, ang, (line->flags & ML_BLOCKMONSTERS) == 0, dontstopmove);
-
+						P_Teleport(bot, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, (line->flags & ML_BLOCKMONSTERS) == 0, (line->flags & ML_EFFECT4) == ML_EFFECT4);
 					if (line->flags & ML_BLOCKMONSTERS)
-					{
-						P_Teleport(mo, dest->x, dest->y, dest->z, ang, false, dontstopmove);
-					}
+						P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, false, (line->flags & ML_EFFECT4) == ML_EFFECT4);
 					else
 					{
-						P_Teleport(mo, dest->x, dest->y, dest->z, ang, true, dontstopmove);
+						P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, true, (line->flags & ML_EFFECT4) == ML_EFFECT4);
 						// Play the 'bowrwoosh!' sound
 						S_StartSound(dest, sfx_mixup);
 					}
@@ -2167,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;
@@ -2175,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';
 
@@ -2190,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;
@@ -3400,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:
@@ -4610,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:
@@ -5374,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
@@ -5388,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;
 		}
 	}
 
@@ -5476,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;
 
@@ -5573,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

@@ -651,7 +651,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();

src/p_user.c

@@ -91,7 +91,7 @@ void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move)
 	mo->momx = FixedMul(move, FINECOSINE(angle));
 
 	if (!twodmo(mo))
-		mo->momy = FixedMul(move, FINESINE(angle));
+		mo->momy = FixedMul(move,FINESINE(angle));
 }
 
 void P_InstaThrustEvenIn2D(mobj_t *mo, angle_t angle, fixed_t move)
@@ -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
@@ -504,9 +496,6 @@ typedef struct subsector_s
 	void *splats; // floorsplat_t list
 #endif
 	size_t validcount;
-#ifdef HWRENDER
-	boolean hashorizon; // not really needed for software, this stuff works differently there
-#endif
 } subsector_t;
 
 // Sector list node showing all sectors an object appears in.

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