point2uint for blua interning string cache

will optimize away or inline the extra loops)

CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
 
-# needed for lto to work for some reason
-cmake_policy(SET CMP0069 NEW)
-
 if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
 	message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
 endif()
@@ -34,7 +31,7 @@ if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
 endif()
 
 set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart Saturn" CACHE STRING "Program name for display purposes")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart" CACHE STRING "Program name for display purposes")
 set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
 #set(CPACK_PACKAGE_DESCRIPTION_FILE )
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")

src/CMakeLists.txt

@@ -54,7 +54,7 @@ set(SRB2_CORE_SOURCES
 	string.c
 	tables.c
 	v_video.c
-	w_wad.c
+	w_wad.cpp
 	y_inter.c
 	z_zone.cpp
 )
@@ -246,11 +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")
 
 set(SRB2_CONFIG_SATURNPAK ON CACHE BOOL
 	"Enable Saturn specific special packet. Required for using the newer resynch system")
@@ -259,9 +254,6 @@ set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
 set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL
 	"Enable hardware renderer (OpenGL) FBO downsampling support")
 
-set(SRB2_CONFIG_PHOBOS OFF CACHE BOOL
-	" Compile the Phobos client. Which contains things not compatible with vanilla, such as raised skinlimits, 32 player support, bugfixes, etc.")
-
 if(${SRB2_CONFIG_DEDICATED})
 	set(SRB2_CONFIG_HAVE_GME NO)
 	set(SRB2_CONFIG_HAVE_OPENMPT NO)
@@ -283,7 +275,6 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_hooklib.c
 		lua_hudlib.c
 		lua_hudlib_drawlist.c
-		lua_profile.cpp
 		lua_infolib.c
 		lua_maplib.c
 		lua_mathlib.c
@@ -292,15 +283,16 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_script.c
 		lua_skinlib.c
 		lua_thinkerlib.c
+		lua_udatalib.c
 		lua_glib.c
 	)
 	set(SRB2_LUA_HEADERS
 		lua_hook.h
 		lua_hud.h
 		lua_hudlib_drawlist.h
-		lua_profile.h
 		lua_libs.h
 		lua_script.h
+		lua_udatalib.h
 		lua_glib.h
 	)
 
@@ -526,7 +518,7 @@ if(${SRB2_CONFIG_HWRENDER})
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_bsp.c
-		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.cpp
@@ -586,10 +578,6 @@ if(${SRB2_CONFIG_SATURNJOIN})
 	add_definitions(-DDOSATURNJOIN)
 endif()
 
-if(${SRB2_CONFIG_PHOBOS})
-	add_definitions(-DPHOBOS_BUILD)
-endif()
-
 # Targets
 
 # Compatibility flag with later versions of GCC

src/Makefile

@@ -65,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:
@@ -251,6 +246,10 @@ ifdef STATIC
 libs+=-static
 endif
 
+ifneq (,$(filter $(CC) $(CXX),gcc g++))
+ opts+=-mno-ms-bitfields
+endif
+
 # build with profiling information
 ifdef PROFILEMODE
 opts+=-pg
@@ -262,35 +261,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
@@ -87,7 +86,7 @@ ifdef VALGRIND
 VALGRIND_PKGCONFIG?=valgrind
 VALGRIND_LDFLAGS=
 $(eval $(call Use_pkg_config,VALGRIND))
-#ZDEBUG=1 we enable this by default
+ZDEBUG=1
 opts+=-DHAVE_VALGRIND
 endif
 

src/Makefile.d/platform.mk

@@ -42,6 +42,8 @@ include Makefile.d/haiku.mk
 else ifdef SOLARIS # FIXME: UNTESTED
 UNIX=1
 platform=solaris
+else ifdef CYGWIN32 # FIXME: UNTESTED
+platform=cygwin
 else ifdef MINGW
 ifdef MINGW64
 NONX86=1

src/Makefile.d/sdl.mk

@@ -15,6 +15,16 @@ sources+=$(call List,sdl/Sourcefile)
 
 NOUPNP=1
 
+# FIXME: UNTESTED
+#ifdef PANDORA
+#include sdl/SRB2Pandora/Makefile.cfg
+#endif #ifdef PANDORA
+
+# FIXME: UNTESTED
+#ifdef CYGWIN32
+#include sdl/MakeCYG.cfg
+#endif #ifdef CYGWIN32
+
 ifndef NOHW
 sources+=sdl/ogl_sdl.c
 endif

src/Sourcefile

@@ -97,5 +97,5 @@ lua_playerlib.c
 lua_script.c
 lua_skinlib.c
 lua_thinkerlib.c
+lua_udatalib.c
 lua_glib.c
-lua_profile.cpp

src/android/i_system.c

@@ -34,8 +34,8 @@ size_t I_GetFreeMem(size_t *total)
   /* return si.freeram; */
   char buf[1024];
   char *memTag;
-  size_t freeKBytes;
-  size_t totalKBytes;
+  UINT32 freeKBytes;
+  UINT32 totalKBytes;
   INT32 n;
   INT32 meminfo_fd = -1;
 
@@ -46,7 +46,7 @@ size_t I_GetFreeMem(size_t *total)
   if (n < 0)
     {
       // Error
-      *total = 0;
+      *total = 0L;
       return 0;
     }
 
@@ -54,7 +54,7 @@ size_t I_GetFreeMem(size_t *total)
   if (NULL == (memTag = strstr(buf, MEMTOTAL)))
     {
       // Error
-      *total = 0;
+      *total = 0L;
       return 0;
     }
 
@@ -64,7 +64,7 @@ size_t I_GetFreeMem(size_t *total)
   if (NULL == (memTag = strstr(buf, MEMFREE)))
     {
       // Error
-      *total = 0;
+      *total = 0L;
       return 0;
     }
 

src/blua/lapi.c

@@ -519,6 +519,22 @@ LUA_API int lua_pushthread (lua_State *L) {
 ** get functions (Lua -> stack)
 */
 
+static void auxgetstr (lua_State *L, TValue *t, const char *k) {
+  TValue *slot;
+  TValue key;
+  TString *str = luaS_new(L, k);
+  api_checkvalidindex(L, t);
+  if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
+    setobj2s(L, L->top, slot);
+  }
+  else {
+    setsvalue(L, &key, str);
+    luaV_finishget(L, t, &key, L->top, slot);
+  }
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
 
 LUA_API void lua_gettable (lua_State *L, int idx) {
   StkId t;
@@ -531,15 +547,8 @@ LUA_API void lua_gettable (lua_State *L, int idx) {
 
 
 LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
-  StkId t;
-  TValue key;
   lua_lock(L);
-  t = index2adr(L, idx);
-  api_checkvalidindex(L, t);
-  setsvalue(L, &key, luaS_new(L, k));
-  luaV_gettable(L, t, &key, L->top);
-  api_incr_top(L);
-  lua_unlock(L);
+  auxgetstr(L, index2adr(L, idx), k);
 }
 
 

src/blua/lgc.c

@@ -544,6 +544,7 @@ static void atomic (lua_State *L) {
   marktmu(g);  /* mark `preserved' userdata */
   udsize += propagateall(g);  /* remark, to propagate `preserveness' */
   cleartable(g->weak);  /* remove collected objects from weak tables */
+  luaS_clearcache(g);
   /* flip current white */
   g->currentwhite = cast_byte(otherwhite(g));
   g->sweepstrgc = 0;

src/blua/llimits.h

@@ -41,6 +41,25 @@ typedef unsigned char lu_byte;
 */
 #define IntPoint(p)  ((unsigned int)(lu_mem)(p))
 
+/*
+** conversion of pointer to unsigned integer: this is for hashing only;
+** there is no problem if the integer cannot hold the whole pointer
+** value. (In strict ISO C this may cause undefined behavior, but no
+** actual machine seems to bother.)
+*/
+#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
+    __STDC_VERSION__ >= 199901L
+#include <stdint.h>
+#if defined(UINTPTR_MAX)  /* even in C99 this type is optional */
+#define L_P2I	uintptr_t
+#else  /* no 'intptr'? */
+#define L_P2I	uintmax_t  /* use the largest available integer */
+#endif
+#else  /* C89 option */
+#define L_P2I	size_t
+#endif
+
+#define point2uint(p)	((unsigned int)((L_P2I)(p) & UINT_MAX))
 
 
 /* type to ensure maximum alignment */
@@ -100,6 +119,17 @@ typedef lu_int32 Instruction;
 #endif
 
 
+/*
+** Size of cache for strings in the API. 'N' is the number of
+** sets (better be a prime) and "M" is the size of each set (M == 1
+** makes a direct cache.)
+*/
+#ifndef STRCACHE_N
+#define STRCACHE_N	53
+#define STRCACHE_M	2
+#endif
+
+
 /* minimum size for string buffer */
 #ifndef LUA_MINBUFFER
 #define LUA_MINBUFFER	32

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
 */
@@ -76,12 +73,9 @@ static void f_luaopen (lua_State *L, void *ud) {
   stack_init(L, L);  /* init stack */
   sethvalue(L, gt(L), luaH_new(L, 0, 2));  /* table of globals */
   sethvalue(L, registry(L), luaH_new(L, 0, 2));  /* registry */
-  luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
+  luaS_init(L);
   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 */
   g->GCthreshold = 4*g->totalbytes;
 }
 

src/blua/lstate.h

@@ -92,6 +92,7 @@ typedef struct global_State {
   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 */
+  TString *strcache[STRCACHE_N][STRCACHE_M];  /* cache for strings in API */
 } global_State;
 
 

src/blua/lstring.c

@@ -18,6 +18,9 @@
 #include "lstring.h"
 
 
+#define MEMERRMSG       "not enough memory"
+
+
 
 void luaS_resize (lua_State *L, int newsize) {
   GCObject **newhash;
@@ -72,6 +75,36 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
 }
 
 
+/*
+** Clear API string cache. (Entries cannot be empty, so fill them with
+** a non-collectable string.)
+*/
+void luaS_clearcache (global_State *g) {
+  int i, j;
+  for (i = 0; i < STRCACHE_N; i++)
+    for (j = 0; j < STRCACHE_M; j++) {
+      if (luaS_iswhite(g->strcache[i][j]))  /* will entry be collected? */
+        g->strcache[i][j] = g->memerrmsg;  /* replace it with something fixed */
+    }
+}
+
+
+/*
+** Initialize the string table and the string cache
+*/
+void luaS_init (lua_State *L) {
+  global_State *g = G(L);
+  int i, j;
+  luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
+  /* pre-create memory-error message */
+  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
+  luaS_fix(g->memerrmsg);  /* it should never be collected */
+  for (i = 0; i < STRCACHE_N; i++)  /* fill cache with valid strings */
+    for (j = 0; j < STRCACHE_M; j++)
+      g->strcache[i][j] = g->memerrmsg;
+}
+
+
 // string hash taken from luaJIT
 
 /* Unaligned load of uint32_t. */
@@ -128,6 +161,10 @@ static inline __attribute__((always_inline)) unsigned luaS_hash (const char *str
 #endif
 }
 
+
+/*
+** new string (with explicit length)
+*/
 TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
   GCObject *o;
   unsigned int h = luaS_hash(str, l);
@@ -147,6 +184,29 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
 }
 
 
+/*
+** Create or reuse a zero-terminated string, first checking in the
+** cache (using the string address as a key). The cache can contain
+** only zero-terminated strings, so it is safe to use 'strcmp' to
+** check hits.
+*/
+TString *luaS_new (lua_State *L, const char *str) {
+  unsigned int i = point2uint(str) % STRCACHE_N;  /* hash */
+  int j;
+  TString **p = G(L)->strcache[i];
+  for (j = 0; j < STRCACHE_M; j++) {
+    if (strcmp(str, getstr(p[j])) == 0)  /* hit? */
+      return p[j];  /* that is it */
+  }
+  /* normal route */
+  for (j = STRCACHE_M - 1; j > 0; j--)
+    p[j] = p[j - 1];  /* move out last element */
+  /* new element is first in the list */
+  p[0] = luaS_newlstr(L, str, strlen(str));
+  return p[0];
+}
+
+
 Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
   Udata *u;
   if (l_unlikely(s > MAX_SIZET - sizeof(Udata)))

src/blua/lstring.h

@@ -17,15 +17,19 @@
 
 #define sizeudata(u)	(sizeof(union Udata)+(u)->len)
 
-#define luaS_new(L, s)	(luaS_newlstr(L, s, strlen(s)))
+//#define luaS_new(L, s)	(luaS_newlstr(L, s, strlen(s)))
 #define luaS_newliteral(L, s)	(luaS_newlstr(L, "" s, \
                                  (sizeof(s)/sizeof(char))-1))
 
-#define luaS_fix(s)	l_setbit((s)->tsv.marked, FIXEDBIT)
+#define luaS_iswhite(x)      test2bits((x)->tsv.marked, WHITE0BIT, WHITE1BIT)
+#define luaS_fix(s)	         l_setbit((s)->tsv.marked, FIXEDBIT)
 
 LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
+LUAI_FUNC void luaS_clearcache (global_State *g);
+LUAI_FUNC void luaS_init (lua_State *L);
 LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
 LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
+LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
 
 
 #endif

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/blua/lvm.c

@@ -105,27 +105,42 @@ static void callTM (lua_State *L, const TValue *f, const TValue *p1,
 }
 
 
-void luaV_gettable (lua_State *L, TValue *t, TValue *key, StkId val) {
-  int loop;
+/*
+** Finish the table access 'val = t[key]'.
+** if 'slot' is NULL, 't' is not a table; otherwise, 'slot' points to
+** t[k] entry (which must be nil).
+*/
+void luaV_finishget (lua_State *L, TValue *t, TValue *key, StkId val,
+                     TValue *slot) {
+  int loop;  /* counter to avoid infinite loops */
+  TValue *tm;  /* metamethod */
   for (loop = 0; loop < MAXTAGLOOP; loop++) {
-    TValue *tm;
-    if (ttistable(t)) {  /* `t' is a table? */
-      Table *h = hvalue(t);
-      const TValue *res = luaH_get(h, key); /* do a primitive get */
-      if (!ttisnil(res) ||  /* result is no nil? */
-          (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
-        setobj2s(L, val, res);
+    if (slot == NULL) {  /* 't' is not a table? */
+      lua_assert(!ttistable(t));
+      tm = luaT_gettmbyobj(L, t, TM_INDEX);
+      if (l_unlikely(ttisnil(tm)))
+        luaG_typeerror(L, t, "index");  /* no metamethod */
+      /* else will try the metamethod */
+    }
+    else {  /* 't' is a table */
+      lua_assert(ttisnil(slot));
+      tm = fasttm(L, hvalue(t)->metatable, TM_INDEX);  /* table's metamethod */
+      if (tm == NULL) {  /* no metamethod? */
+        setnilvalue(val);  /* result is nil */
         return;
       }
-      /* else will try the tag method */
+      /* else will try the metamethod */
     }
-    else if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX))))
-      luaG_typeerror(L, t, "index");
-    if (ttisfunction(tm)) {
-      callTMres(L, val, tm, t, key);
+    if (ttisfunction(tm)) {  /* is metamethod a function? */
+      callTMres(L, val, tm, t, key);  /* call it */
       return;
     }
-    t = tm;  /* else repeat with `tm' */
+    t = tm;  /* else try to access 'tm[key]' */
+    if (luaV_fastget(L, t, key, slot, luaH_get)) {  /* fast track? */
+      setobj2s(L, val, slot);  /* done */
+      return;
+    }
+    /* else repeat (tail call 'luaV_finishget') */
   }
   luaG_runerror(L, "loop in gettable");
 }
@@ -139,8 +154,12 @@ void luaV_settable (lua_State *L, TValue *t, TValue *key, StkId val) {
       Table *h = hvalue(t);
       TValue *oldval = luaH_set(L, h, key); /* do a primitive set */
       /* oldval is nil=> look for newindex, oldval is not nil => look for usedindex */
-      if (!((ttisnil(oldval) && ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) != NULL)) ||
-         ((!ttisnil(oldval)) && ((tm = fasttm(L, h->metatable, TM_USEDINDEX)) != NULL)))) {
+      if (ttisnil(oldval)) {
+        tm = fasttm(L, h->metatable, TM_NEWINDEX); /* get metamethod */
+      } else {
+        tm = fasttm(L, h->metatable, TM_USEDINDEX);
+      }
+      if (tm == NULL) { /* no metamethod? */
         setobj2t(L, oldval, val);
         luaC_barriert(L, h, val);
         return;
@@ -378,6 +397,14 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
       }
 
 
+/*
+** copy of 'luaV_gettable', but protecting call to potential metamethod
+** (which can reallocate the stack)
+*/
+#define gettableProtected(L,t,k,v)  { TValue *slot; \
+  if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
+  else Protect(luaV_finishget(L,t,k,v,slot)); }
+
 
 void luaV_execute (lua_State *L, int nexeccalls) {
   LClosure *cl;
@@ -387,9 +414,9 @@ void luaV_execute (lua_State *L, int nexeccalls) {
  reentry:  /* entry point */
   lua_assert(isLua(L->ci));
   pc = L->savedpc;
-  cl = &clvalue(L->ci->func)->l;
-  base = L->base;
-  k = cl->p->k;
+  cl = &clvalue(L->ci->func)->l;  /* local reference to function's closure */
+  k = cl->p->k;  /* local reference to function's constant table */
+  base = L->base;  /* local copy of function's base */
   /* main loop of interpreter */
   for (;;) {
     const Instruction i = *pc++;
@@ -449,7 +476,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
         StkId ra = RA(i);
         StkId rb = RB(i);
         TValue *rc = RKC(i);
-        Protect(luaV_gettable(L, rb, rc, ra));
+        gettableProtected(L, rb, rc, ra);
         continue;
       }
       case OP_SETGLOBAL: {
@@ -485,8 +512,9 @@ void luaV_execute (lua_State *L, int nexeccalls) {
       case OP_SELF: {
         StkId ra = RA(i);
         StkId rb = RB(i);
-        setobjs2s(L, ra+1, rb);
-        Protect(luaV_gettable(L, rb, RKC(i), ra));
+        TValue *rc = RKC(i);
+        setobjs2s(L, ra + 1, rb);
+        gettableProtected(L, rb, rc, ra);
         continue;
       }
       case OP_ADD: {

src/blua/lvm.h

@@ -22,12 +22,34 @@
 	(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
 
 
+/*
+** fast track for 'gettable': if 't' is a table and 't[k]' is not nil,
+** return 1 with 'slot' pointing to 't[k]' (final result).  Otherwise,
+** return 0 (meaning it will have to check metamethod) with 'slot'
+** pointing to a nil 't[k]' (if 't' is a table) or NULL (otherwise).
+** 'f' is the raw get function to use.
+*/
+#define luaV_fastget(L,t,k,slot,f) \
+  (!ttistable(t)  \
+   ? (slot = NULL, 0)  /* not a table; 'slot' is NULL and result is 0 */  \
+   : (slot = f(hvalue(t), k),  /* else, do raw access */  \
+      !ttisnil(slot)))  /* result not nil? */
+
+/*
+** standard implementation for 'gettable'
+*/
+#define luaV_gettable(L,t,k,v) { TValue *slot; \
+  if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
+  else luaV_finishget(L,t,k,v,slot); }
+
+
+
 LUAI_FUNC int luaV_lessthan (lua_State *L, TValue *l, TValue *r);
 LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
 LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
 LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
-LUAI_FUNC void luaV_gettable (lua_State *L, TValue *t, TValue *key,
-                                            StkId val);
+LUAI_FUNC void luaV_finishget (lua_State *L, TValue *t, TValue *key,
+                               StkId val, TValue *tm);
 LUAI_FUNC void luaV_settable (lua_State *L, TValue *t, TValue *key,
                                             StkId val);
 LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls);

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

@@ -62,7 +62,7 @@ static boolean con_started = false; // console has been initialised
 static boolean con_forcepic = true; // at startup toggle console translucency when first off
        boolean con_recalc = false;  // set true when screen size has changed
 
-static tic_t con_tick; // console ticker for blinking prompt cursor
+static tic_t con_tick; // console ticker for anim or blinking prompt cursor
                         // con_scrollup should use time (currenttime - lasttime)..
 
 static boolean consoletoggle; // true when console key pushed, ticker will handle
@@ -103,7 +103,6 @@ static void CON_InputInit(void);
 static void CON_RecalcSize(void);
 static void CON_ChangeHeight(void);
 
-static void CONS_height_Change(void);
 static void CONS_hudlines_Change(void);
 static void CONS_backcolor_Change(void);
 
@@ -132,7 +131,7 @@ static CV_PossibleValue_t speed_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}};
 static consvar_t cons_speed = {"con_speed", "8", CV_SAVE, speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 // percentage of screen height to use for console
-static consvar_t cons_height = {"con_height", "50", CV_CALL|CV_SAVE, CV_Unsigned, CONS_height_Change, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cons_height = {"con_height", "50", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}};
 // whether to use console background picture, or translucent mode
@@ -174,18 +173,6 @@ consvar_t cons_consoleprintinmenu = {"consoleprintinmenu", "Off", CV_SAVE, CV_On
 
 static void CON_Print(char *msg);
 
-// Change the console height on demand
-//
-static void CONS_height_Change(void)
-{
-	Lock_state();
-
-	if (con_destlines > 0 && !con_startup) // If the console is open (as in, not using "bind")...
-		CON_ChangeHeight(); // ...update its height now, not only when it's closed and re-opened
-
-	Unlock_state();
-}
-
 //
 //
 static void CONS_hudlines_Change(void)
@@ -1450,8 +1437,6 @@ void CONS_Error(const char *msg)
 	// dirty quick hack, but for the good cause
 	while (I_GetKey() != KEY_ENTER)
 	{
-		I_HandleInterrupt();
-
 		// Sleep so we don't take too much of cpu usage
 		I_Sleep(1.f/TICRATE*1000);
 
@@ -1650,54 +1635,53 @@ static void CON_DrawConsole(void)
 	}
 
 	// draw console text lines from top to bottom
-	if (con_curlines >= minheight)
+	if (con_curlines < minheight)
+		return;
+
+	i = con_cy - con_scrollup;
+
+	// skip the last empty line due to the cursor being at the start of a new line
+	i--;
+
+	i -= (con_curlines - minheight) / charheight;
+
+	if (rendermode == render_none) return;
+
+	for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
 	{
-		i = con_cy - con_scrollup;
+		INT32 x;
+		size_t c;
 
-		// skip the last empty line due to the cursor being at the start of a new line
-		i--;
+		p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width];
 
-		i -= (con_curlines - minheight) / charheight;
-
-		if (rendermode == render_none)
-			return;
-
-		for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
+		for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
 		{
-			INT32 x;
-			size_t c;
-
-			p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width];
-
-			for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
+			while (*p & 0x80)
 			{
-				while (*p & 0x80)
-				{
-					charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
-					p++;
-					c++;
-				}
-
-				if (c >= con_width)
-					break;
-
-				int emotelen;
-				emote_t *emote;
-
-				if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
-				{
-					M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
-					p += emotelen-1;
-					c += emotelen-1;
-					continue;
-				}
-				V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+				charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
+				p++;
+				c++;
 			}
+
+			if (c >= con_width)
+				break;
+
+			int emotelen;
+			emote_t *emote;
+
+			if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
+			{
+				M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
+				p += emotelen-1;
+				c += emotelen-1;
+				continue;
+			}
+			V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 		}
 	}
 
 	// draw prompt if enough place (not while game startup)
-	if ((con_curlines >= (minheight-charheight)) && !con_startup)
+	if ((con_curlines == con_destlines) && (con_curlines >= minheight) && !con_startup)
 		CON_DrawInput();
 }
 

src/core/memory.cpp

@@ -1,7 +1,7 @@
-// DR. ROBOTNIK'S RING RACERS
+// BLANKART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Ronald "Eidolon" Kinard
-// Copyright (C) 2025 by Kart Krew
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -114,7 +114,6 @@ void* PoolAllocator::allocate()
 
 	FreeBlock* ret = head_;
 	head_ = head_->next;
-	allocated_blocks_++;
 	return ret;
 }
 
@@ -126,7 +125,6 @@ void PoolAllocator::deallocate(void* p)
 	FreeBlock* block = reinterpret_cast<FreeBlock*>(p);
 	block->next = head_;
 	head_ = block;
-	allocated_blocks_--;
 }
 
 void PoolAllocator::release()
@@ -146,7 +144,6 @@ void PoolAllocator::release()
 
 	first_chunk_ = nullptr;
 	head_ = nullptr;
-	allocated_blocks_ = 0;
 }
 
 static LinearMemory g_frame_memory {4 * 1024 * 1024};

src/core/memory.h

@@ -1,7 +1,7 @@
-// DR. ROBOTNIK'S RING RACERS
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Ronald "Eidolon" Kinard
-// Copyright (C) 2025 by Kart Krew
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -37,7 +37,6 @@ class PoolAllocator final
 	FreeBlock* head_;
 	size_t block_size_;
 	size_t blocks_;
-	size_t allocated_blocks_;
 	int32_t tag_;
 
 	ChunkFooter* allocate_chunk();
@@ -48,7 +47,6 @@ public:
 		, head_(nullptr)
 		, block_size_(block_size)
 		, blocks_(blocks)
-		, allocated_blocks_(0)
 		, tag_(tag)
 	{}
 	PoolAllocator(const PoolAllocator&) = delete;
@@ -61,8 +59,6 @@ public:
 	void* allocate();
 	void deallocate(void* p);
 	constexpr size_t block_size() const noexcept { return block_size_; };
-	constexpr size_t allocated_blocks() const noexcept { return allocated_blocks_; };
-	constexpr size_t allocated_bytes() const noexcept { return allocated_blocks_ * block_size_; };
 
 	void release();
 };

src/core/static_vec.hpp

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

src/core/thread_pool.cpp

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

src/core/thread_pool.h

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

src/d_clisrv.c

@@ -110,7 +110,7 @@ SINT8 joinnode = 0; // used for CL_VIEWSERVER
 boolean player_muted[MAXPLAYERS] = {};
 
 // Server specific vars
-UINT8 playernode[MAXPLAYERS] = {UINT8_MAX};
+UINT8 playernode[MAXPLAYERS] = {};
 
 // Minimum timeout for sending the savegame
 // The actual timeout will be longer depending on the savegame length
@@ -125,7 +125,6 @@ static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the
 UINT16 pingmeasurecount = 1;
 UINT32 realpingtable[MAXPLAYERS] = {}; //the base table of ping where an average will be sent to everyone.
 UINT32 playerpingtable[MAXPLAYERS] = {}; //table of player latency values.
-UINT32 localplayerping = 0;
 
 #define GENTLEMANSMOOTHING (TICRATE)
 static tic_t reference_lag = 0;
@@ -357,13 +356,12 @@ void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_
 
 		if (2+nparam > MAXTEXTCMD)
 		{
-			CONS_Alert(CONS_ERROR, M_GetText("packet too large to fit NetXCmd, cannot add netcmd %s with id %d! (size: %s, max: %d)\n"), netxcmdnames[id-1], id, sizeu1(2+nparam), MAXTEXTCMD);
+			CONS_Alert(CONS_ERROR, M_GetText("packet too large to fit NetXCmd, cannot add netcmd %d! (size: %s, max: %d)\n"), id, sizeu1(2+nparam), MAXTEXTCMD);
 			return;
 		}
 
 		// for future reference: if (cv_debug) != debug disabled.
-		CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %s with id %d... (size: %d, needed: %s)\n"), netxcmdnames[id-1], id, localtextcmd[playerid][0], sizeu1(nparam));
-
+		CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %d... (size: %d, needed: %s)\n"), id, localtextcmd[playerid][0], sizeu1(nparam));
 		if (buf == NULL)
 		{
 			textcmdbuf[playerid] = (textcmdbuf_t*)Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL);
@@ -841,13 +839,11 @@ static void resynch_write_ctf(resynchend_pak *rst)
 				rst->flagplayer[i] = (SINT8)j;
 				break;
 			}
-
 			if (j == MAXPLAYERS) // fine, no I_Error
 			{
 				CONS_Alert(CONS_ERROR, "One of the flags has gone completely missing...\n");
 				rst->flagplayer[i] = -2;
 			}
-
 			continue;
 		}
 
@@ -1125,7 +1121,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;
@@ -1137,7 +1133,6 @@ static void CV_SavePlayerNames(UINT8 **p)
 			WRITEUINT8(*p, 0);
 			continue;
 		}
-
 		WRITESTRING(*p, player_names[i]);
 	}
 }
@@ -1151,17 +1146,13 @@ static void CV_LoadPlayerNames(UINT8 **p)
 	for (; i < MAXPLAYERS; ++i)
 	{
 		READSTRING(*p, tmp_name);
-
 		if (tmp_name[0] == 0)
 			continue;
-
 		if (tmp_name[MAXPLAYERNAME]) // overflow detected
 			I_Error("Received bad server config packet when trying to join");
-
 		memcpy(player_names[i], tmp_name, MAXPLAYERNAME+1);
 	}
 }
-#endif
 
 static void CL_DrawAddonTypes(void)
 {
@@ -1456,7 +1447,6 @@ static void CL_DrawConnectionStatus(void)
 					if (playerinfo[i].node < 255)
 					{
 						strncpy(player_name, playerinfo[i].name, MAXPLAYERNAME);
-						player_name[MAXPLAYERNAME] = '\0';
 
 						// if we get a skin color
 						// try to colourize the player name
@@ -1630,8 +1620,8 @@ static boolean CL_SendJoin(void)
 	netbuffer->u.clientcfg.packetversion = PACKETVERSION;
 	netbuffer->u.clientcfg.version = VERSION;
 	netbuffer->u.clientcfg.subversion = SUBVERSION;
-	strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION, sizeof(netbuffer->u.clientcfg.application)-1);
-	netbuffer->u.clientcfg.application[sizeof(netbuffer->u.clientcfg.application)-1] = '\0';
+	strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION,
+			sizeof(netbuffer->u.clientcfg.application));
 #ifdef SATURNJOIN
 	netbuffer->u.clientcfg.issaturn = ISSATURN;
 #endif
@@ -1656,91 +1646,88 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
-	serverinfo_pak *serverinfo = &netbuffer->u.serverinfo;
-
 	netbuffer->packettype = PT_SERVERINFO;
-	serverinfo->_255 = 255;
-	serverinfo->packetversion = PACKETVERSION;
-	serverinfo->version = VERSION;
-	serverinfo->subversion = SUBVERSION;
-	strncpy(serverinfo->application, SRB2APPLICATION, sizeof(serverinfo->application)-1);
-	serverinfo->application[sizeof(serverinfo->application)-1] = '\0';
+	netbuffer->u.serverinfo._255 = 255;
+	netbuffer->u.serverinfo.packetversion = PACKETVERSION;
+	netbuffer->u.serverinfo.version = VERSION;
+	netbuffer->u.serverinfo.subversion = SUBVERSION;
+	strncpy(netbuffer->u.serverinfo.application, SRB2APPLICATION,
+			sizeof netbuffer->u.serverinfo.application);
 	// return back the time value so client can compute their ping
-	serverinfo->time = (tic_t)LONG(servertime);
-	serverinfo->leveltime = (tic_t)LONG(leveltime);
+	netbuffer->u.serverinfo.time = (tic_t)LONG(servertime);
+	netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime);
 
 	// force 1 player
 	if (UseFakeSeed())
-		serverinfo->numberofplayer = (UINT8)1;
+		netbuffer->u.serverinfo.numberofplayer = (UINT8)1;
 	else
-		serverinfo->numberofplayer = (UINT8)D_NumPlayers();
+		netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
 
-	serverinfo->maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
+	netbuffer->u.serverinfo.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
 
 	// SRB2Kart: Vanilla's gametype constants for MS support
-	serverinfo->gametype = (UINT8)((gt == GT_MATCH) ? VANILLA_GT_MATCH : VANILLA_GT_RACE);
+	netbuffer->u.serverinfo.gametype = (UINT8)((gt == GT_MATCH) ? VANILLA_GT_MATCH : VANILLA_GT_RACE);
 
-	serverinfo->modifiedgame = (UINT8)modifiedgame;
-	serverinfo->cheatsenabled = CV_CheatsEnabled();
+	netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame;
+	netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled();
 
-	serverinfo->kartvars = (UINT8) (
+	netbuffer->u.serverinfo.kartvars = (UINT8) (
 		(cv_kartspeed.value & SV_SPEEDMASK) |
 		(dedicated ? SV_DEDICATED : 0)
 	);
 
-	CopyCaretColors(serverinfo->servername, cv_servername.string, MAXSERVERNAME);
+	CopyCaretColors(netbuffer->u.serverinfo.servername, cv_servername.string,
+		MAXSERVERNAME);
+	strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), sizeof(netbuffer->u.serverinfo.mapname)-1);
 
-	strncpy(serverinfo->mapname, G_BuildMapName(gamemap), sizeof(serverinfo->mapname)-1);
-	serverinfo->mapname[sizeof(serverinfo->mapname)-1] = '\0';
+	memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5));
 
-	memcpy(serverinfo->mapmd5, mapmd5, sizeof(serverinfo->mapmd5));
+	netbuffer->u.serverinfo.iszone = 0;
 
-	serverinfo->iszone = 0;
-
-	memset(serverinfo->maptitle, 0, sizeof(serverinfo->maptitle));
-	memset(serverinfo->httpsource, 0, MAX_MIRROR_LENGTH);
+	memset(netbuffer->u.serverinfo.maptitle, 0, sizeof(netbuffer->u.serverinfo.maptitle));
+	memset(netbuffer->u.serverinfo.httpsource, 0, MAX_MIRROR_LENGTH);
 
 	if (!(mapheaderinfo[gamemap-1]->menuflags & LF2_HIDEINMENU) && mapheaderinfo[gamemap-1]->lvlttl[0])
 	{
-		strncpy(serverinfo->maptitle, mapheaderinfo[gamemap-1]->lvlttl, sizeof(serverinfo->maptitle)-1);
+		strncpy(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->lvlttl, sizeof(netbuffer->u.serverinfo.maptitle)-1);
 
 		if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
 		{
 			if (mapheaderinfo[gamemap-1]->zonttl[0])
 			{
-				strncat(serverinfo->maptitle, " ", sizeof(serverinfo->maptitle)-1);
-				strncat(serverinfo->maptitle, mapheaderinfo[gamemap-1]->zonttl, sizeof(serverinfo->maptitle)-1);
+				strncat(netbuffer->u.serverinfo.maptitle, " ", sizeof(netbuffer->u.serverinfo.maptitle)-1);
+				strncat(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->zonttl,
+						sizeof(netbuffer->u.serverinfo.maptitle)-1);
 			}
 			else
 			{
-				serverinfo->iszone = 1; // ms and clients will append this themselves
+				netbuffer->u.serverinfo.iszone = 1; // ms and clients will append this themselves
 			}
 		}
 
 		if (mapheaderinfo[gamemap-1]->actnum[0])
 		{
-			strncat(serverinfo->maptitle, " ", sizeof(serverinfo->maptitle)-1);
-			strncat(serverinfo->maptitle, mapheaderinfo[gamemap-1]->actnum, sizeof(serverinfo->maptitle)-1);
+			strncat(netbuffer->u.serverinfo.maptitle, " ", sizeof(netbuffer->u.serverinfo.maptitle)-1);
+			strncat(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->actnum,
+					sizeof(netbuffer->u.serverinfo.maptitle)-1);
 		}
 	}
 	else
-	{
-		strncpy(serverinfo->maptitle, "Unknown", sizeof(serverinfo->maptitle)-1);
-	}
+		strncpy(netbuffer->u.serverinfo.maptitle, "Unknown", 33);
 
-	serverinfo->maptitle[sizeof(serverinfo->maptitle)-1] = '\0';
+	netbuffer->u.serverinfo.maptitle[32] = '\0';
 
-	serverinfo->actnum = 0; //mapheaderinfo[gamemap-1]->actnum
+	netbuffer->u.serverinfo.actnum = 0; //mapheaderinfo[gamemap-1]->actnum
 
 	mirror_length = strlen(httpurl);
 	if (mirror_length > MAX_MIRROR_LENGTH)
 		mirror_length = MAX_MIRROR_LENGTH;
 
-	if (snprintf(serverinfo->httpsource, mirror_length+1, "%s", httpurl) < 0)
+	if (snprintf(netbuffer->u.serverinfo.httpsource, mirror_length+1, "%s", httpurl) < 0)
 		// If there's an encoding error, send nothing, we accept that the above may be truncated
-		strncpy(serverinfo->httpsource, "", mirror_length);
+		strncpy(netbuffer->u.serverinfo.httpsource, "", mirror_length);
 
-	serverinfo->httpsource[MAX_MIRROR_LENGTH-1] = '\0';
+	netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = '\0';
 
 	p = PutFileNeeded(0);
 
@@ -1773,7 +1760,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 +1805,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 +1915,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 +1934,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 +1949,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 +1956,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)
@@ -2047,7 +2026,6 @@ static void SV_SendSaveGame(INT32 node, boolean resending)
 	P_SaveNetGame(&save, resending);
 
 	length = save.p - save.buffer;
-
 	if (length > SAVEGAMESIZE)
 	{
 		Z_Free(save.buffer);
@@ -2106,7 +2084,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 +2122,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);
 
@@ -2200,8 +2178,7 @@ static void CL_LoadReceivedSavegame(boolean reloading)
 	if (unlink(tmpsave) == -1)
 		CONS_Alert(CONS_ERROR, M_GetText("Can't delete %s\n"), tmpsave);
 	consistancy[gametic%BACKUPTICS] = Consistancy();
-	if (!reloading)
-		CON_ToggleOff();
+	CON_ToggleOff();
 
 #ifdef SATURNPAK
 	// Tell the server we have received and reloaded the gamestate
@@ -2223,7 +2200,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);
@@ -2879,7 +2856,10 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 	{
 		INT32 key;
 
-		I_HandleInterrupt();
+		if (I_Interrupted())
+		{
+			I_Quit();
+		}
 
 		I_OsPolling();
 
@@ -2959,7 +2939,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 +3327,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 +3345,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 +3361,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,16 +3438,14 @@ static void ResetNode(INT32 node);
 //
 void CL_ClearPlayer(INT32 playernum)
 {
-	// Handle mobj_t pointers.
 	if (players[playernum].mo)
 	{
 		// Don't leave a NiGHTS ghost!
-		if (nightsplayer(&players[playernum]) && players[playernum].mo->tracer)
+		if (UNLIKELY((players[playernum].pflags & PF_NIGHTSMODE) && players[playernum].mo->tracer))
 			P_RemoveMobj(players[playernum].mo->tracer);
 		P_RemoveMobj(players[playernum].mo);
 	}
 
-	// Wipe the struct.
 	memset(&players[playernum], 0, sizeof(player_t));
 }
 
@@ -3538,11 +3498,8 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason)
 	while ((doomcom->numslots > 1) && !playeringame[doomcom->numslots-1])
 		doomcom->numslots--;
 
-	// Unmute slot if player was muted
-	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;
 
@@ -3799,10 +3756,6 @@ static void Command_Ban(void)
 		if (pn == -1 || pn == 0)
 			return;
 
-		// player does not exist
-		if (!playeringame[pn])
-			return;
-
 		WRITEUINT8(p, pn);
 
 		if (COM_Argc() == 2)
@@ -3920,10 +3873,6 @@ static void Command_Kick(void)
 		if (pn == -1 || pn == 0)
 			return;
 
-		// player does not exist
-		if (!playeringame[pn])
-			return;
-
 		// Special case if we are trying to kick a player who is downloading the game state:
 		// trigger a timeout instead of kicking them, because a kick would only
 		// take effect after they have finished downloading
@@ -3973,13 +3922,6 @@ static void Got_KickCmd(const UINT8 **p, INT32 playernum)
 	pnum = READUINT8(*p);
 	msg = READUINT8(*p);
 
-	if (pnum >= MAXPLAYERS)
-	{
-		CONS_Alert(CONS_WARNING, M_GetText("Illegal kick command received from %s for player %d\n"), player_names[playernum], pnum);
-		return;
-	}
-
-	// FIXME: this does not work at all on dedi, servernode == 0 which is prevented from kick/ban command
 	if (pnum == serverplayer && IsPlayerAdmin(playernum))
 	{
 		CONS_Printf(M_GetText("Server is being shut down remotely. Goodbye!\n"));
@@ -4034,16 +3976,6 @@ static void Got_KickCmd(const UINT8 **p, INT32 playernum)
 		msg = KICK_MSG_CON_FAIL;
 	}
 
-	// without this the server will remove itself and thus self destruct on dedicated
-	if (server && (playernode[pnum] == UINT8_MAX || !playeringame[pnum]))
-	{
-		CONS_Alert(CONS_WARNING, M_GetText("Attempting to kick player %d which is not in game received from %s\n"), pnum, player_names[playernum]);
-		return;
-	}
-
-	// make sure we dont read garbage anywhere
-	memset(reason, 0, sizeof(buf));
-
 	if (msg == KICK_MSG_CUSTOM_BAN || msg == KICK_MSG_CUSTOM_KICK)
 	{
 		READSTRINGN(*p, reason, MAX_REASONLENGTH+1);
@@ -4504,7 +4436,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));
@@ -4515,7 +4447,6 @@ void SV_ResetServer(void)
 	pingmeasurecount = 1;
 	memset(realpingtable, 0, sizeof(realpingtable));
 	memset(playerpingtable, 0, sizeof(playerpingtable));
-	localplayerping = 0;
 
 	ClearAdminPlayers();
 
@@ -4864,7 +4795,7 @@ void CL_RemoveSplitscreenPlayer(UINT8 p)
 // is there a game running
 boolean Playing(void)
 {
-	return ((server && serverrunning) || (client && cl_mode == CL_CONNECTED));
+	return (server && serverrunning) || (client && cl_mode == CL_CONNECTED);
 }
 
 boolean SV_SpawnServer(void)
@@ -5194,7 +5125,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 +5374,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?
@@ -5467,12 +5396,10 @@ static void PT_ServerCFG(SINT8 node)
 	{
 		maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
 		if ((gametype = netbuffer->u.servercfg.gametype) >= NUMGAMETYPES)
-			I_Error("Bad gametype %d in cliserv!", gametype);
+			I_Error("Bad gametype in cliserv!");
 		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 +5425,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 +5441,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 +5494,7 @@ static void PT_WillResendGamestate(void)
 
 	CONS_Printf(M_GetText("Reloading game state...\n"));
 
-	snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home);
+	sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
 
 	// Don't get a corrupt savegame error because tmpsave already exists
 	if (FIL_FileExists(tmpsave) && unlink(tmpsave) == -1)
@@ -6911,10 +6836,7 @@ boolean TryRunTics(tic_t realtics)
 			DEBFILE(va("============ Running tic %d (local %d)\n", gametic, leveltime));
 
 			if (update_stats)
-			{
-				ps_prevtictime = ps_tictime;
 				PS_START_TIMING(ps_tictime);
-			}
 
 			G_Ticker((gametic % NEWTICRATERATIO) == 0);
 			ExtraDataTicker();
@@ -7061,12 +6983,10 @@ static void UpdatePingTable(void)
 
 	INT32 i;
 
-	const boolean playing = Playing();
-
 	if (server)
 	{
-		//if (playing && !(gametime % 8)) // Value chosen based on _my vibes man_ << dont do this for v8 atleast, this is placeboeing ppl to hell and back
-		if (playing && !(gametime % 35))	// update once per second.
+		//if (Playing() && !(gametime % 8)) // Value chosen based on _my vibes man_ << dont do this for v8 atleast, this is placeboeing ppl to hell and back
+		if (Playing() && !(gametime % 35))	// update once per second.
 			PingUpdate();
 
 		fastest = 0;
@@ -7125,10 +7045,6 @@ static void UpdatePingTable(void)
 		else
 			lowest_lag = simulated_lag = 0;
 	}
-
-	// this is really dumb but oh well
-	if (playing && !(gametime % 35))
-		localplayerping = playerpingtable[consoleplayer];
 }
 
 #ifdef HOLEPUNCH
@@ -7273,7 +7189,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;
@@ -656,8 +650,6 @@ extern UINT8 playernode[MAXPLAYERS];
 
 extern boolean player_muted[MAXPLAYERS];
 
-extern UINT32 localplayerping;
-
 INT32 D_NumPlayers(void);
 
 void D_ResetTiccmds(void);

src/d_main.c

@@ -79,7 +79,6 @@
 #include "core/memory.h"
 
 #include "lua_script.h"
-#include "lua_profile.h"
 
 /* Manually defined asset hashes for non-CMake builds
  * Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb
@@ -155,7 +154,7 @@ boolean music_disabled = false;
 INT32 debugload = 0;
 #endif
 
-char savegamename[256] = {};
+char savegamename[256];
 
 char srb2home[256] = ".";
 char srb2path[256] = ".";
@@ -276,6 +275,20 @@ static void D_Renderview(void)
 
 	R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL));
 
+	if (rendermode == render_soft && cv_homremoval.value)
+	{
+		if (cv_homremoval.value == 1)
+		{
+			// Clear the software screen buffer to remove HOM
+			memset(vid.screens[0], 31, vid.width * vid.height);
+		}
+		else if (cv_homremoval.value == 2)
+		{
+			//'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
+			memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height);
+		}
+	}
+
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
@@ -645,11 +658,6 @@ static boolean D_Display(void)
 
 	    CON_Drawer(); // Ha, i LIED!
 
-		if (cv_lua_profile.value > 0)
-		{
-			LUA_RenderTimers();
-		}
-
 		PS_START_TIMING(ps_swaptime);
 		I_FinishUpdate(); // page flip or blit buffer
 		PS_STOP_TIMING(ps_swaptime);
@@ -718,7 +726,10 @@ void D_SRB2Loop(void)
 
 		enterprecise = I_GetPreciseTime();
 
-		I_HandleInterrupt();
+		if (I_Interrupted())
+		{
+			I_Quit();
+		}
 
 		memset(&g_dc, 0, sizeof(g_dc));
 		Z_Frame_Reset();
@@ -1149,19 +1160,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)
+		if (W_CheckAutoLoadContainsMap(wadsToAutoload))
 		{
-			CONS_Alert(CONS_WARNING, "Autoload: file %s was not found or not valid.\n", wadsToAutoload);
-			continue;
-		}
-		if (retmap > 0)
-		{
-			CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload);
+			CONS_Printf("Autoload: file %s contains map data! skipping...", 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 +1256,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)
@@ -1351,24 +1356,20 @@ static void IdentifyVersion(void)
 //
 // search for maps
 //
-static void D_CheckMapReplacements(boolean pwad)
+static void D_CheckMaps(boolean checkreplaced)
 {
 	INT32 i;
 	char *name;
 	UINT16 wadnum;
 	lumpinfo_t *lumpinfo;
-	size_t numfiles;
 
-	wadnum = pwad ? (mainwads+1) : 0;
-	numfiles = pwad ? numwadfiles : mainwads;
-
-	for (; wadnum < numfiles; wadnum++)
+	for (wadnum = 0; wadnum < mainwads; wadnum++)
 	{
 		lumpinfo = wadfiles[wadnum]->lumpinfo;
 		for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)
 		{
 			name = lumpinfo->name;
-			P_CheckMapReplacements(name, pwad);
+			P_CheckMapReplacements(name, checkreplaced);
 		}
 	}
 }
@@ -1831,19 +1832,17 @@ void D_SRB2Main(void)
 	// conversion sometimes needs the palette
 	V_ReloadPalette();
 
-	D_CheckMapReplacements(false);
+	D_CheckMaps(false);
 
+	W_InitMultipleFiles(startuppwads, startuppwadcount, true);
+
+	// Only search for pwad maps if we actually have a pwad added
 	if (startuppwadcount > 0)
 	{
-		CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n");
-		W_InitMultipleFiles(startuppwads, startuppwadcount, true);
-
-		// Only search for pwad maps if we actually have a pwad added
-		D_CheckMapReplacements(true);
-
-		D_CleanFile(startuppwads, startuppwadcount);
+		D_CheckMaps(true);
 	}
 
+	D_CleanFile(startuppwads, startuppwadcount);
 	startuppwadcount = 0;
 
 	cht_Init();
@@ -1930,7 +1929,7 @@ void D_SRB2Main(void)
 	CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
 	R_Init();
 
-#if SOUND == SOUND_DUMMY
+#if SOUND==SOUND_DUMMY
 	sound_disabled = true;
 	music_disabled = true;
 #else

src/d_net.c

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

src/d_netcmd.c

@@ -47,7 +47,6 @@
 #include "z_zone.h"
 #include "lua_script.h"
 #include "lua_hook.h"
-#include "lua_profile.h"
 #include "m_cond.h"
 #include "m_anigif.h"
 #include "k_kart.h" // SRB2kart
@@ -147,16 +146,10 @@ 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);
 static void Command_ListUnusedSprites_f(void);
-static void Command_ListUnusedMapSlots_f(void);
 static void Command_RunSOC(void);
 static void Command_Pause(void);
 static void Command_Respawn(void);
@@ -440,18 +433,10 @@ consvar_t cv_pointlimit = {"pointlimit", "0", CV_NETVAR|CV_CALL|CV_NOINIT, point
 static CV_PossibleValue_t timelimit_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL}};
 consvar_t cv_timelimit = {"timelimit", "0", CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t,
 	TimeLimit_OnChange, 0, NULL, NULL, 0, 0, NULL};
-#ifdef PHOBOS_BUILD
-static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, NULL}};
-#else
 static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, NULL}};
-#endif
 consvar_t cv_numlaps = {"numlaps", "3", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_cons_t,
 	NumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
-#ifdef PHOBOS_BUILD
-static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, "Map default"}, {0, NULL}};
-#else
 static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}};
-#endif
 consvar_t cv_basenumlaps = {"basenumlaps", "Map default", CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_forceskin = {"forceskin", "Off", CV_NETVAR|CV_CALL|CV_CHEAT, Forceskin_cons_t, ForceSkin_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -520,9 +505,6 @@ static CV_PossibleValue_t ps_descriptor_cons_t[] = {
 	{1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}};
 consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-//consvar_t cv_lua_profile = {"lua_profile", "0").values(CV_Unsigned).onchange(lua_profile_OnChange).description("Show hook timings over an average of N tics");
-consvar_t cv_lua_profile = {"lua_profile", "0", CV_CALL, CV_Unsigned, lua_profile_OnChange, 0, NULL, NULL, 0, 0, NULL};
-
 // only there to better keep track of it globally
 consvar_t cv_director = {"director", "Off", CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
@@ -583,7 +565,6 @@ const char *netxcmdnames[MAXNETXCMD - 1] =
 	"MODIFYVOTE",
 	"PICKVOTE",
 	"REMOVEPLAYER",
-	"DISCORD",
 	"LUACMD",
 	"LUAVAR"
 };
@@ -617,12 +598,6 @@ void D_RegisterServerCommands(void)
 		Forceskin_cons_t[i].value = 0;
 		Forceskin_cons_t[i].strvalue = NULL;
 	}
-
-	// Set default player names
-	// Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well
-	for (i = 0; i < MAXPLAYERS; i++)
-		snprintf(player_names[i], sizeof(player_names[i]), "Player %d", 1 + i);
-
 	RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor);
 	RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref);
 	RegisterNetXCmd(XD_MAP, Got_Mapcmd);
@@ -670,7 +645,6 @@ void D_RegisterServerCommands(void)
 	COM_AddCommand("locatelump", Command_LocateLump_f);
 	COM_AddCommand("listmapthings", Command_ListDoomednums_f);
 	COM_AddCommand("listunusedsprites", Command_ListUnusedSprites_f);
-	COM_AddCommand("listunusedmapslots", Command_ListUnusedMapSlots_f);
 
 	COM_AddCommand("runsoc", Command_RunSOC);
 	COM_AddCommand("pause", Command_Pause);
@@ -871,11 +845,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);
@@ -959,11 +928,11 @@ void D_RegisterClientCommands(void)
 
 	COM_AddCommand("displayplayer", Command_Displayplayer_f);
 
+	CV_RegisterVar(&cv_audbuffersize);
+
 	CV_RegisterVar(&cv_palette);
 	CV_RegisterVar(&cv_palettenum);
 
-	CV_RegisterVar(&cv_lua_profile);
-
 	// m_menu.c
 	CV_RegisterVar(&cv_chatheight);
 	CV_RegisterVar(&cv_chatwidth);
@@ -971,9 +940,6 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_chatspamprotection);
 	CV_RegisterVar(&cv_consolechat);
 	CV_RegisterVar(&cv_chatnotifications);
-	CV_RegisterVar(&cv_chat_xoffset);
-	CV_RegisterVar(&cv_chat_yoffset);
-	CV_RegisterVar(&cv_chat_showlimit);
 	CV_RegisterVar(&cv_chatbacktint);
 	CV_RegisterVar(&cv_chatcentertext);
 	CV_RegisterVar(&cv_songcredits);
@@ -1039,17 +1005,9 @@ void D_RegisterClientCommands(void)
 
 		CV_RegisterVar(&cv_usejoystick[i]);
 		CV_RegisterVar(&cv_joyscale[i]);
-		CV_RegisterVar(&cv_gamepadled[i]);
-
 		CV_RegisterVar(&cv_rumble[i]);
-		CV_RegisterVar(&cv_rumble_strength[i]);
-		CV_RegisterVar(&cv_rumble_spinout[i]);
-		CV_RegisterVar(&cv_rumble_sneakerboost[i]);
-		CV_RegisterVar(&cv_rumble_offroad[i]);
-		CV_RegisterVar(&cv_rumble_bananadrag[i]);
-		CV_RegisterVar(&cv_rumble_stairjank[i]);
-		CV_RegisterVar(&cv_rumble_brakedrift[i]);
-		CV_RegisterVar(&cv_rumble_driftcharge[i]);
+		CV_RegisterVar(&cv_rumblestrength[i]);
+		CV_RegisterVar(&cv_gamepadled[i]);
 	}
 
 	CV_RegisterVar(&cv_gamepadifunfocused);
@@ -1069,7 +1027,6 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_midimusicvolume);
 #endif
 	CV_RegisterVar(&cv_numChannels);
-	CV_RegisterVar(&cv_audbuffersize);
 
 #ifdef HAVE_OPENMPT
 	CV_RegisterVar(&cv_modfilter);
@@ -1306,8 +1263,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;
 			}
@@ -1592,8 +1548,8 @@ static void SendNameAndColor(UINT8 splitplayer)
 	// TODO: make those cvars arrays
 	consvar_t *playercolor, *playername, *playerskin;
 	consvar_t *colorvars[] = {&cv_playercolor, &cv_playercolor2, &cv_playercolor3, &cv_playercolor4};
-	consvar_t *namevars[]  = {&cv_playername, &cv_playername2, &cv_playername3, &cv_playername4};
-	consvar_t *skinvars[]  = {&cv_skin, &cv_skin2, &cv_skin3, &cv_skin4};
+	consvar_t *namevars[] = {&cv_playername, &cv_playername2, &cv_playername3, &cv_playername4};
+	consvar_t *skinvars[] = {&cv_skin, &cv_skin2, &cv_skin3, &cv_skin4};
 
 	playercolor = colorvars[splitplayer];
 	playername  = namevars[splitplayer];
@@ -1699,8 +1655,7 @@ static void SendNameAndColor(UINT8 splitplayer)
 	// Finally write out the complete packet and send it off.
 	WRITESTRINGN(p, playername->zstring, MAXPLAYERNAME);
 	WRITEUINT8(p, (UINT8)playercolor->value);
-	WRITESKIN(p, (skinnum_t)playerskin->value);
-
+	WRITEUINT8(p, (UINT8)playerskin->value);
 	SendNetXCmdForPlayer(splitplayer, XD_NAMEANDCOLOR, buf, p - buf);
 }
 
@@ -1708,8 +1663,7 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
 {
 	player_t *player;
 	char name[MAXPLAYERNAME+1] = {};
-	UINT8 color;
-	skinnum_t skin;
+	UINT8 color, skin;
 
 #ifdef PARANOIA
 	if (playernum < 0 || playernum > MAXPLAYERS)
@@ -1731,7 +1685,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)
@@ -1839,7 +1793,7 @@ INT32 D_LookupPlayer(const char *s)
 
 	if ((playernum = atoi(s)))
 	{
-		playernum = max(min(playernum, MAXPLAYERS-1), 0); /* not out of range */
+		playernum = max(min(playernum, MAXPLAYERS-1), 0);/* not out of range */
 		return playernum;
 	}
 
@@ -2363,12 +2317,11 @@ static char *ConcatCommandArgv(int start, int end)
 	if (!p)
 		I_Error("ConcatCommandArgv: Out of memory!\n");
 
-	--end; /* handle the final argument separately */
+	--end;/* handle the final argument separately */
 
 	for (i = start; i < end; ++i)
 	{
-		if (size - (p - final) > 0)
-			p += snprintf(p, size - (p - final), "%s ", COM_Argv(i));
+		p += sprintf(p, "%s ", COM_Argv(i));
 	}
 
 	/* at this point "end" is actually the last argument's position */
@@ -2782,11 +2735,11 @@ static void Command_ReplayMarker(void)
 
 		if (title)
 		{
-			snprintf(demo.titlename, sizeof(demo.titlename)-1, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
+			snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
 			Z_Free(title);
 		}
 		else
-			snprintf(demo.titlename, sizeof(demo.titlename)-1, "[%i:%02d/%.5s]", G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
+			snprintf(demo.titlename, 64, "[%i:%02d/%.5s]", G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
 
 		CONS_Printf("Replay will be saved!\n");
 	}
@@ -4344,49 +4297,6 @@ static void Command_GLocalSkin(void)
 	}
 }
 
-static void SetPrefcolor(int splitplayer)
-{
-	// splitscreen
-	if (splitscreen < splitplayer)
-		return;
-
-	const INT32 pnum = P_GetLocalPlayerNumForNum(splitplayer);
-
-	player_t *player = &players[pnum];
-	consvar_t *colorvars[] = {&cv_playercolor, &cv_playercolor2, &cv_playercolor3, &cv_playercolor4};
-	consvar_t *playercolor = colorvars[splitplayer];
-
-	if (skins[player->skin].prefcolor)
-	{
-		CV_SetValue(playercolor, skins[player->skin].prefcolor);
-		CONS_Printf("Set color to %s%s\n", HU_SkinColorToConsoleColor(skins[player->skin].prefcolor), KartColor_Names[skins[player->skin].prefcolor]);
-	}
-	else
-	{
-		CONS_Printf("\x86Your skin has no prefcolor set\n");
-	}
-}
-
-static void Command_UsePrefcolor(void)
-{
-	SetPrefcolor(0);
-}
-
-static void Command_UsePrefcolor2(void)
-{
-	SetPrefcolor(1);
-}
-
-static void Command_UsePrefcolor3(void)
-{
-	SetPrefcolor(2);
-}
-
-static void Command_UsePrefcolor4(void)
-{
-	SetPrefcolor(3);
-}
-
 static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
 {
 	char filename[241];
@@ -4426,15 +4336,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])
@@ -4681,23 +4591,6 @@ void Command_ListUnusedSprites_f(void)
 	}
 }
 
-void Command_ListUnusedMapSlots_f(void)
-{
-	INT32 i;
-
-	CONS_Printf("\x82Printing map slot non-usage...\n");
-
-	for (i = 0; i < NUMMAPS; i++)
-	{
-		// is checking this enough?
-		if (mapheaderinfo[i])
-			continue;
-
-		CONS_Printf("%s\n", G_BuildMapName(i+1));
-	}
-}
-
-
 // =========================================================================
 //                            MISC. COMMANDS
 // =========================================================================
@@ -5266,10 +5159,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
@@ -5580,6 +5471,7 @@ static void Name_OnChange(void)
 	}
 
 	SendNameAndColor(0);
+
 }
 
 static void Name2_OnChange(void)
@@ -5770,22 +5662,19 @@ static void Command_SkinSearch(void)
 	size_t i;
 	UINT16 s;
 	UINT16 ic = 0;
-
-	for (i = 1; i < COM_Argc(); i++)
-	{
-		for (s = 0; s < numskins; s++)
+	//skin_t *skininput = &skins[s];
+	for (i = 1; i < COM_Argc(); i++){
+		for( s = 0 ; s <  numallskins ; s++ )
 		{
 			skin_t *skininput = &skins[s];
-
-			if (strcasestr(skininput->realname, COM_Argv(i)))
+			if (strcasestr(skininput->realname,COM_Argv(i)))
 			{
 				ic++;
-				CONS_Printf("%d. %s%s:\x80 %s\n", ic, HU_SkinColorToConsoleColor(skininput->prefcolor), skininput->realname, skininput->name);
+				CONS_Printf("%d. %s%s:\x80 %s\n", ic,HU_SkinColorToConsoleColor(skininput->prefcolor),skininput->realname,skininput->name);
 			}
 		}
 	}
-
-	CONS_Printf("Total %d skins.\n", ic);
+				CONS_Printf("Total %d skins.\n", ic);
 }
 
 /** Sends a color change for the console player, unless that player is moving.

src/d_netcmd.h

@@ -51,6 +51,10 @@ extern consvar_t cv_mousevisible;
 //WTF
 extern consvar_t cv_mouseturn;
 extern consvar_t cv_usejoystick[4]; //MAXSPLITSCREENPLAYERS
+#ifdef LJOYSTICK
+extern consvar_t cv_joyport;
+extern consvar_t cv_joyport2;
+#endif
 extern consvar_t cv_joyscale[4]; //MAXSPLITSCREENPLAYERS
 
 // normally in p_mobj but the .h is not read
@@ -149,7 +153,6 @@ extern consvar_t cv_showminimapnames;
 extern consvar_t cv_showminimapfinished;
 extern consvar_t cv_minihead;
 extern consvar_t cv_showminimapangle;
-extern consvar_t cv_spinoutroll;
 
 extern consvar_t cv_showlapemblem;
 
@@ -189,8 +192,6 @@ extern consvar_t cv_ps_thinkframe_page;
 extern consvar_t cv_ps_samplesize;
 extern consvar_t cv_ps_descriptor;
 
-extern consvar_t cv_lua_profile;
-
 extern consvar_t cv_director, cv_kartdebugdirector, cv_showdirectorhud;
 
 extern consvar_t cv_showtrackaddon;

src/d_netfil.c

@@ -167,9 +167,7 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
 			continue;
 		}
 
-		strncpy(wadfilename, wadfiles[i]->filename, MAX_WADPATH);
-		wadfilename[MAX_WADPATH-1] = '\0';
-		nameonly(wadfilename);
+		nameonly(strcpy(wadfilename, wadfiles[i]->filename));
 
 		// Look below at the WRITE macros to understand what these numbers mean.
 		const size_t len = strlen(wadfilename) + 1;
@@ -259,10 +257,9 @@ void CL_PrepareDownloadSaveGame(const char *tmpsave)
   */
 boolean CL_CheckDownloadable(void)
 {
-	UINT8 i, dlstatus = 0;
+	UINT8 i,dlstatus = 0;
 
 	for (i = 0; i < fileneedednum; i++)
-	{
 		if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
 		{
 			if (fileneeded[i].willsend == 1)
@@ -273,7 +270,6 @@ boolean CL_CheckDownloadable(void)
 			else //if (fileneeded[i].willsend == 2)
 				dlstatus = 2;
 		}
-	}
 
 	// Downloading locally disabled
 	if (!dlstatus && M_CheckParm("-nodownload"))
@@ -284,31 +280,25 @@ boolean CL_CheckDownloadable(void)
 
 	// not downloadable, put reason in console
 	CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n"));
-
 	for (i = 0; i < fileneedednum; i++)
-	{
 		if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
 		{
 			CONS_Printf(" * \"%s\" (%dK)", fileneeded[i].filename, fileneeded[i].totalsize >> 10);
 
-			if (fileneeded[i].status == FS_MD5SUMBAD)
-				CONS_Printf(M_GetText(" wrong version, md5: "));
-			else
-				CONS_Printf(M_GetText(" not found, md5: "));
+				if (fileneeded[i].status == FS_MD5SUMBAD)
+					CONS_Printf(M_GetText(" wrong version, md5: "));
+				else
+					CONS_Printf(M_GetText(" not found, md5: "));
 
 			{
 				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");
 		}
-	}
 
 	switch (dlstatus)
 	{
@@ -322,7 +312,6 @@ boolean CL_CheckDownloadable(void)
 			CONS_Printf(M_GetText("All files downloadable, but you have chosen to disable downloading locally.\n"));
 			break;
 	}
-
 	return false;
 }
 
@@ -560,7 +549,7 @@ INT32 CL_CheckFiles(void)
 		if (fileneeded[i].status != FS_OPEN)
 			filestoload++;
 
-		if (fileneeded[i].status != FS_NOTCHECKED) // since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
+		if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
 			continue;
 
 		CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
@@ -568,18 +557,14 @@ INT32 CL_CheckFiles(void)
 		// Check in already loaded files
 		for (j = mainwads+1; j < numwadfiles; j++)
 		{
-			if (!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
-			{
-				strncpy(wadfilename, wadfiles[j]->filename, MAX_WADPATH);
-				wadfilename[MAX_WADPATH-1] = '\0';
-				nameonly(wadfilename);
+			nameonly(strcpy(wadfilename, wadfiles[j]->filename));
 
-				if (fasticmp(wadfilename, fileneeded[i].filename))
-				{
-					CONS_Debug(DBG_NETPLAY, "already loaded\n");
-					fileneeded[i].status = FS_OPEN;
-					return 4;
-				}
+			if (fasticmp(wadfilename, fileneeded[i].filename) &&
+				!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
+			{
+				CONS_Debug(DBG_NETPLAY, "already loaded\n");
+				fileneeded[i].status = FS_OPEN;
+				return 4;
 			}
 		}
 
@@ -660,7 +645,7 @@ boolean CL_LoadServerFiles(void)
 		else
 		{
 			const char *s;
-			switch (fileneeded[i].status)
+			switch(fileneeded[i].status)
 			{
 			case FS_NOTFOUND:
 				s = "FS_NOTFOUND";
@@ -703,7 +688,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 
 	char wadfilename[MAX_WADPATH];
 
-	if (cv_noticedownload.value && I_GetNodeAddress)
+	if (cv_noticedownload.value)
 		CONS_Printf("Sending file \"%s\" (id %d) to node %d (%s)\n", filename, fileid, node, I_GetNodeAddress(node));
 
 	// Find the last file in the list and set a pointer to its "next" field
@@ -728,9 +713,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 	// Look for the requested file through all loaded files
 	for (wadnum = 0; wadfiles[wadnum]; wadnum++)
 	{
-		// im a certified strlcpy hater
-		strncpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
-		wadfilename[MAX_WADPATH-1] = '\0';
+		strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
 		nameonly(wadfilename);
 
 		if (fasticmp(wadfilename, p->id.filename))
@@ -1083,7 +1066,7 @@ void Got_Filetxpak(void)
 	{
 		const char *s;
 
-		switch (file->status)
+		switch(file->status)
 		{
 			case FS_NOTFOUND:
 				s = "FS_NOTFOUND";
@@ -1211,7 +1194,7 @@ filestatus_t checkfilemd5(char *filename, const UINT8 *wantedmd5sum)
 	fhandle = fopen(filename, "rb");
 	if (fhandle)
 	{
-		md5_stream(fhandle, md5sum);
+		md5_stream(fhandle,md5sum);
 		fclose(fhandle);
 		if (!memcmp(wantedmd5sum, md5sum, 16))
 			return FS_FOUND;
@@ -1619,7 +1602,8 @@ static void CURLGetFile(void)
 #endif
 }
 
-HTTP_login *CURLGetLogin(const char *url, HTTP_login ***return_prev_next)
+HTTP_login *
+CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
 {
 	HTTP_login  * login;
 	HTTP_login ** prev_next;
@@ -1629,7 +1613,7 @@ HTTP_login *CURLGetLogin(const char *url, HTTP_login ***return_prev_next)
 			( login = (*prev_next));
 			prev_next = &login->next
 	){
-		if (fastcmp(login->url, url))
+		if (fastcmp(login->url, url) != 0)
 		{
 			if (return_prev_next)
 				(*return_prev_next) = prev_next;

src/d_player.h

@@ -361,17 +361,11 @@ typedef struct squishdance_s
 {
 	tic_t   countdown; // hold "custom 3" for 2 seconds to engange le dance
 	tic_t   time;
+	fixed_t work;
+	fixed_t ang;
+	fixed_t bounce;    // hehe squishy
 } squishdance_t;
 
-typedef struct salty_s
-{
-	bool ready;
-	bool tapping;
-	fixed_t zoffset;
-	fixed_t momz;
-	bool jump;
-} salty_t;
-
 // ========================================================================
 //                          PLAYER STRUCTURE
 // ========================================================================
@@ -567,16 +561,11 @@ 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
 
 	SINT8 driftlevel; // just for controller rumble for now
-
-	UINT8 stairjank;
 } player_t;
 
 #endif

src/d_protocol.c

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

src/dedicated/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

@@ -68,12 +68,6 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 #include <time.h>
 #if defined (__linux__)
 #include <sys/vfs.h>
-#elif defined(__APPLE__)
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <mach/mach.h>
 #else
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -162,7 +156,8 @@ const char *wadSearchPaths[] = {
 
 /**	\brief WAD file to look for
 */
-#define WADKEYWORD "srb2.srb"
+#define WADKEYWORD1 "srb2.srb"
+#define WADKEYWORD2 "srb2.wad"
 /**	\brief holds wad path
 */
 static char returnWadPath[256];
@@ -525,24 +520,17 @@ void I_OutputMsg(const char *fmt, ...)
 {
 	size_t len;
 	char *txt;
-	va_list argptr;
+	va_list  argptr;
 
-	if (!fmt)
-		return;
-
-	va_start(argptr, fmt);
+	va_start(argptr,fmt);
 	len = vsnprintf(NULL, 0, fmt, argptr);
 	va_end(argptr);
 	if (len == 0)
 		return;
 
-	txt = (char*)(malloc(len+1));
-
-	if (!txt)
-		I_Error("I_OutputMsg: Out of memory!\n");
-
-	va_start(argptr, fmt);
-	vsnprintf(txt, len+1, fmt, argptr);
+	txt = malloc(len+1);
+	va_start(argptr,fmt);
+	vsprintf(txt, fmt, argptr);
 	va_end(argptr);
 
 #ifdef HAVE_TTF
@@ -550,7 +538,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 +956,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 +1041,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 +1049,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 +1332,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)
@@ -1433,12 +1413,6 @@ static void I_Fork(void)
 }
 #endif/*NEWSIGNALHANDLER*/
 
-int I_OpenURL(const char *url)
-{
-	(void)url;
-	return -1;
-}
-
 INT32 I_StartupSystem(void)
 {
 	I_StartupConsole();
@@ -1538,7 +1512,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 +1525,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 +1746,7 @@ char *I_GetUserName(void)
 				}
 			}
 		}
-
-		snprintf(username, sizeof(username), "%s", p);
+		strncpy(username, p, MAXPLAYERNAME);
 	}
 
 	if (!fastcmp(username, ""))
@@ -1797,24 +1770,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,34 +1802,42 @@ const char *I_ClipboardPaste(void)
 */
 static boolean isWadPathOk(const char *path)
 {
-	char wad3path[256];
+	char *wad3path = malloc(256);
 
-	snprintf(wad3path, sizeof(wad3path), pandf, path, WADKEYWORD);
+	if (!wad3path)
+		return false;
+
+	sprintf(wad3path, pandf, path, WADKEYWORD1);
 
 	if (FIL_ReadFileOK(wad3path))
 	{
+		free(wad3path);
 		return true;
 	}
 
+	sprintf(wad3path, pandf, path, WADKEYWORD2);
+
+	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] == '/'))
 		{
-			if (s[j] == ':')
-				s[j+1] = 0;
-			else
-				s[j] = 0;
-
+			if (s[j] == ':') s[j+1] = 0;
+			else s[j] = 0;
 			return;
 		}
-	}
 }
 
 /**	\brief	search for srb2.srb in the given path
@@ -1890,12 +1853,11 @@ static const char *searchWad(const char *searchDir)
 	static char tempsw[256] = "";
 	filestatus_t fstemp;
 
-	snprintf(tempsw, sizeof(tempsw), "%s", WADKEYWORD);
+	strcpy(tempsw, WADKEYWORD1);
 	fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
-
 	if (fstemp == FS_FOUND)
 	{
-		pathonly(tempsw, sizeof(tempsw));
+		pathonly(tempsw);
 		return tempsw;
 	}
 
@@ -1933,7 +1895,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 +1907,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 +1921,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 +1949,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;
@@ -2011,22 +1974,17 @@ const char *I_LocateWad(void)
 static long get_entry(const char* name, const char* buf)
 {
 	long val;
-	const char* hit = strstr(buf, name);
-
-	if (hit == NULL)
-	{
+	char* hit = strstr(buf, name);
+	if (hit == NULL) {
 		return -1;
 	}
 
 	errno = 0;
 	val = strtol(hit + strlen(name), NULL, 10);
-
-	if (errno != 0)
-	{
+	if (errno != 0) {
 		CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
 		return -1;
 	}
-
 	return val;
 }
 #endif
@@ -2051,13 +2009,13 @@ size_t I_GetFreeMem(size_t *total)
 		*total = 32 << 20;
 	return 32 << 20;
 #elif defined (_WIN32)
-	MEMORYSTATUSEX info;
+	MEMORYSTATUS info;
 
-	info.dwLength = sizeof (MEMORYSTATUSEX);
-	GlobalMemoryStatusEx( &info );
+	info.dwLength = sizeof (MEMORYSTATUS);
+	GlobalMemoryStatus( &info );
 	if (total)
-		*total = (size_t)info.ullTotalPhys;
-	return (size_t)info.ullAvailPhys;
+		*total = (size_t)info.dwTotalPhys;
+	return (size_t)info.dwAvailPhys;
 #elif defined (__OS2__)
 	UINT32 pr_arena;
 
@@ -2090,7 +2048,7 @@ size_t I_GetFreeMem(size_t *total)
 	{
 		// Error
 		if (total)
-			*total = 0;
+			*total = 0L;
 		return 0;
 	}
 
@@ -2099,12 +2057,12 @@ size_t I_GetFreeMem(size_t *total)
 	{
 		// Error
 		if (total)
-			*total = 0;
+			*total = 0L;
 		return 0;
 	}
 
 	memTag += sizeof (MEMTOTAL);
-	totalKBytes = strtoul(memTag, NULL, 10);
+	totalKBytes = (size_t)atoi(memTag);
 
 	if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL)
 	{
@@ -2118,7 +2076,7 @@ size_t I_GetFreeMem(size_t *total)
 		{
 			// Error
 			if (total)
-				*total = 0;
+				*total = 0L;
 			return 0;
 		}
 		freeKBytes = MemAvailable;
@@ -2126,46 +2084,16 @@ size_t I_GetFreeMem(size_t *total)
 	else
 	{
 		memTag += sizeof (MEMAVAILABLE);
-		freeKBytes = strtoul(memTag, NULL, 10);
+		freeKBytes = atoi(memTag);
 	}
 
 	if (total)
 		*total = totalKBytes << 10;
 	return freeKBytes << 10;
-#elif defined(__APPLE__)
-	/* macOS */
-	mach_port_t host = mach_host_self();
-	kern_return_t kr;
-	mach_msg_type_number_t count;
-	vm_size_t v_page_size;
-	struct vm_statistics64 vm_stats;
-	uint64_t total_mem, free_mem;
-	size_t size;
-
-	size = sizeof(total_mem);
-	if (sysctlbyname("hw.memsize", &total_mem, &size, NULL, 0) < 0)
-		total_mem = 0;
-
-	kr = host_page_size(host, &v_page_size);
-	if (kr != KERN_SUCCESS)
-		v_page_size = 4096;
-
-	count = HOST_VM_INFO64_COUNT;
-	kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stats, &count);
-	if (kr == KERN_SUCCESS)
-		free_mem = (uint64_t)(vm_stats.free_count + vm_stats.inactive_count) * v_page_size;
-	else
-		free_mem = 0;
-
-	if (total)
-		*total = (size_t)total_mem;
-	return (size_t)free_mem;
 #else
 	// Guess 48 MB.
 	if (total)
-	{
 		*total = 48<<20;
-	}
 	return 48<<20;
 #endif
 }

src/dehacked.c

@@ -337,14 +337,12 @@ static void readfreeslots(MYFILE *f)
 				{
 					if (used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8)))
 					{
-						if (!sprnames[i][4] && memcmp(sprnames[i], word, 4) == 0)
+						if (!sprnames[i][4] && memcmp(sprnames[i],word,4)==0)
 							sprnames[i][4] = (char)f->wad;
-
 						continue; // Already allocated, next.
 					}
-
 					// Found a free slot!
-					strncpy(sprnames[i], word, 4);
+					strncpy(sprnames[i],word,4);
 					//sprnames[i][4] = 0;
 					CONS_Printf("Sprite SPR_%s allocated.\n",word);
 
@@ -353,26 +351,22 @@ static void readfreeslots(MYFILE *f)
 					used_spr[(i-SPR_FIRSTFREESLOT)/8] |= 1<<(i%8); // Okay, this sprite slot has been named now.
 					break;
 				}
-
 				if (i > SPR_LASTFREESLOT)
 					I_Error("Out of Sprite Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
 			}
 			else if (fastcmp(type, "S"))
 			{
 				for (i = 0; i < NUMSTATEFREESLOTS; i++)
-				{
-					if (!FREE_STATES[i])
-					{
-						CONS_Printf("State S_%s allocated.\n", word);
+					if (!FREE_STATES[i]) {
+						CONS_Printf("State S_%s allocated.\n",word);
 
 						LUA_InvalidateMathlibCache(va("S_%s", word));
 
 						FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
-						strcpy(FREE_STATES[i], word);
+						strcpy(FREE_STATES[i],word);
 						freeslotusage[0][0]++;
 						break;
 					}
-				}
 
 				if (i == NUMSTATEFREESLOTS)
 					I_Error("Out of State Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
@@ -380,19 +374,16 @@ static void readfreeslots(MYFILE *f)
 			else if (fastcmp(type, "MT"))
 			{
 				for (i = 0; i < NUMMOBJFREESLOTS; i++)
-				{
-					if (!FREE_MOBJS[i])
-					{
-						CONS_Printf("MobjType MT_%s allocated.\n", word);
+					if (!FREE_MOBJS[i]) {
+						CONS_Printf("MobjType MT_%s allocated.\n",word);
 
 						LUA_InvalidateMathlibCache(va("MT_%s", word));
 
 						FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
-						strcpy(FREE_MOBJS[i], word);
+						strcpy(FREE_MOBJS[i],word);
 						freeslotusage[1][0]++;
 						break;
 					}
-				}
 
 				if (i == NUMMOBJFREESLOTS)
 					I_Error("Out of Mobj Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
@@ -435,11 +426,8 @@ static void readthing(MYFILE *f, INT32 num)
 				strupr(word2);
 			else
 				break;
-
-			const size_t word2len = strlen(word2);
-
-			if (word2[word2len-1] == '\n')
-				word2[word2len-1] = '\0';
+			if (word2[strlen(word2)-1] == '\n')
+				word2[strlen(word2)-1] = '\0';
 
 			if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM"))
 			{
@@ -746,20 +734,14 @@ static void readlevelheader(MYFILE *f, INT32 num, INT32 wadnum)
 				{
 					UINT16 tol = 0;
 					tmp = strtok(word2,",");
-
 					do {
 						for (i = 0; TYPEOFLEVEL[i].name; i++)
-						{
 							if (fastcmp(tmp, TYPEOFLEVEL[i].name))
 								break;
-						}
-
 						if (!TYPEOFLEVEL[i].name)
 							deh_warning("Level header %d: unknown typeoflevel flag %s\n", num, tmp);
-
 						tol |= TYPEOFLEVEL[i].flag;
 					} while((tmp = strtok(NULL,",")) != NULL);
-
 					mapheaderinfo[num-1]->typeoflevel = tol;
 				}
 			}
@@ -1055,11 +1037,8 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
 			else
 				break;
 
-			const size_t word2len = strlen(word2);
-
-			if (word2[word2len-1] == '\n')
-				word2[word2len-1] = '\0';
-
+			if (word2[strlen(word2)-1] == '\n')
+				word2[strlen(word2)-1] = '\0';
 			i = atoi(word2);
 			usi = (UINT16)i;
 
@@ -1109,14 +1088,12 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
 			else if (fastcmp(word, "MUSICSLOT"))
 			{
 				i = get_mus(word2, true);
-
 				if (i && i <= 1035)
 					snprintf(cutscenes[num]->scene[scenenum].musswitch, 7, "%sM", G_BuildMapName(i));
 				else if (i && i <= 1050)
 					strncpy(cutscenes[num]->scene[scenenum].musswitch, compat_special_music_slots[i - 1036], 7);
 				else
 					cutscenes[num]->scene[scenenum].musswitch[0] = 0; // becomes empty string
-
 				cutscenes[num]->scene[scenenum].musswitch[6] = 0;
 			}
 #endif
@@ -1521,11 +1498,8 @@ static void readframe(MYFILE *f, INT32 num)
 				strupr(word2);
 			else
 				break;
-
-			const size_t word2len = strlen(word2);
-
-			if (word2[word2len-1] == '\n')
-				word2[word2len-1] = '\0';
+			if (word2[strlen(word2)-1] == '\n')
+				word2[strlen(word2)-1] = '\0';
 
 			if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME"))
 			{
@@ -1854,19 +1828,13 @@ static void readextraemblemdata(MYFILE *f, INT32 num)
 			value = atoi(word2); // used for numerical settings
 
 			if (fastcmp(word, "NAME"))
-			{
 				deh_strlcpy(extraemblems[num-1].name, word2,
-							sizeof (extraemblems[num-1].name), va("Extra emblem %d: name", num));
-			}
+					sizeof (extraemblems[num-1].name), va("Extra emblem %d: name", num));
 			else if (fastcmp(word, "OBJECTIVE"))
-			{
 				deh_strlcpy(extraemblems[num-1].description, word2,
-							sizeof (extraemblems[num-1].description), va("Extra emblem %d: objective", num));
-			}
+					sizeof (extraemblems[num-1].description), va("Extra emblem %d: objective", num));
 			else if (fastcmp(word, "CONDITIONSET"))
-			{
 				extraemblems[num-1].conditionset = (UINT8)value;
-			}
 			else if (fastcmp(word, "SPRITE"))
 			{
 				if (word2[0] >= 'A' && word2[0] <= 'Z')
@@ -1938,15 +1906,11 @@ static void readunlockable(MYFILE *f, INT32 num)
 			i = atoi(word2); // used for numerical settings
 
 			if (fastcmp(word, "NAME"))
-			{
 				deh_strlcpy(unlockables[num].name, word2,
-							sizeof (unlockables[num].name), va("Unlockable %d: name", num));
-			}
+					sizeof (unlockables[num].name), va("Unlockable %d: name", num));
 			else if (fastcmp(word, "OBJECTIVE"))
-			{
 				deh_strlcpy(unlockables[num].objective, word2,
-							sizeof (unlockables[num].objective), va("Unlockable %d: objective", num));
-			}
+					sizeof (unlockables[num].objective), va("Unlockable %d: objective", num));
 			else if (fastcmp(word, "SHOWCONDITIONSET"))
 				unlockables[num].showconditionset = (UINT8)i;
 			else if (fastcmp(word, "CONDITIONSET"))
@@ -8138,7 +8102,7 @@ static mobjtype_t get_mobjtype(const char *word)
 	if (*word >= '0' && *word <= '9')
 		return atoi(word);
 
-	if (fastncmp("MT_", word, 3))
+	if (fastncmp("MT_",word,3))
 		word += 3; // take off the MT_
 
 	for (i = 0; i < NUMMOBJFREESLOTS; i++)
@@ -8164,7 +8128,7 @@ static statenum_t get_state(const char *word)
 	if (*word >= '0' && *word <= '9')
 		return atoi(word);
 
-	if (fastncmp("S_", word, 2))
+	if (fastncmp("S_",word,2))
 		word += 2; // take off the S_
 
 	for (i = 0; i < NUMSTATEFREESLOTS; i++)
@@ -8191,11 +8155,11 @@ static spritenum_t get_sprite(const char *word)
 	if (*word >= '0' && *word <= '9')
 		return atoi(word);
 
-	if (fastncmp("SPR_", word, 4))
+	if (fastncmp("SPR_",word,4))
 		word += 4; // take off the SPR_
 
 	for (i = 0; i < NUMSPRITES; i++)
-		if (!sprnames[i][4] && memcmp(word, sprnames[i], 4) == 0)
+		if (!sprnames[i][4] && memcmp(word,sprnames[i],4) == 0)
 			return i;
 
 	deh_warning("Couldn't find sprite named 'SPR_%s'",word);
@@ -8236,15 +8200,14 @@ static UINT16 get_mus(const char *word, UINT8 dehacked_mode)
 	if (!word[2] && toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
 		return (UINT16)M_MapNumber(word[0], word[1]);
 
-	if (fastncmp("MUS_", word, 4))
+	if (fastncmp("MUS_",word,4))
 		word += 4; // take off the MUS_
-	else if (fastncmp("O_", word, 2) || fastncmp("D_", word, 2))
+	else if (fastncmp("O_",word,2) || fastncmp("D_",word,2))
 		word += 2; // take off the O_ or D_
 
 	strncpy(lumptmp, word, 4);
 	lumptmp[3] = 0;
-
-	if (fasticmp("MAP", lumptmp))
+	if (fasticmp("MAP",lumptmp))
 	{
 		word += 3;
 		if (toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
@@ -8357,7 +8320,7 @@ static inline int lib_freeslot(lua_State *L)
 		{
 			sfxenum_t sfx;
 			strlwr(word);
-			CONS_Printf("Sound sfx_%s allocated.\n", word);
+			CONS_Printf("Sound sfx_%s allocated.\n",word);
 			sfx = S_AddSoundFx(word, false, 0, false);
 
 			if (sfx != sfx_None)
@@ -8381,10 +8344,8 @@ static inline int lib_freeslot(lua_State *L)
 				{
 					if (!sprnames[j][4] && memcmp(sprnames[j], word, 4) == 0)
 						sprnames[j][4] = wad;
-
 					continue; // Already allocated, next.
 				}
-
 				// Found a free slot!
 				CONS_Printf("Sprite SPR_%s allocated.\n",word);
 
@@ -8392,7 +8353,7 @@ static inline int lib_freeslot(lua_State *L)
 				lua_pushfstring(L, "SPR_%s", word);
 				lua_call(L, 1, 0);
 
-				strncpy(sprnames[j], word, 4);
+				strncpy(sprnames[j],word,4);
 				//sprnames[j][4] = 0;
 				used_spr[(j-SPR_FIRSTFREESLOT)/8] |= 1<<(j%8); // Okay, this sprite slot has been named now.
 				lua_pushinteger(L, j);
@@ -8410,7 +8371,7 @@ static inline int lib_freeslot(lua_State *L)
 			{
 				if (!FREE_STATES[i])
 				{
-					CONS_Printf("State S_%s allocated.\n", word);
+					CONS_Printf("State S_%s allocated.\n",word);
 
 					lua_pushcfunction(L, lua_glib_invalidate_cache);
 					lua_pushfstring(L, "S_%s", word);
@@ -8435,14 +8396,14 @@ static inline int lib_freeslot(lua_State *L)
 			{
 				if (!FREE_MOBJS[i])
 				{
-					CONS_Printf("MobjType MT_%s allocated.\n", word);
+					CONS_Printf("MobjType MT_%s allocated.\n",word);
 
 					lua_pushcfunction(L, lua_glib_invalidate_cache);
 					lua_pushfstring(L, "MT_%s", word);
 					lua_call(L, 1, 0);
 
 					FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
-					strcpy(FREE_MOBJS[i], word);
+					strcpy(FREE_MOBJS[i],word);
 					freeslotusage[1][0]++;
 					lua_pushinteger(L, i);
 					r++;
@@ -8629,7 +8590,6 @@ static int lua_enumlib_mobjtype_get(lua_State *L)
 	{
 		if (!FREE_MOBJS[i])
 			break;
-
 		if (fastcmp(s+3, FREE_MOBJS[i]))
 		{
 			lua_pushinteger(L, MT_FIRSTFREESLOT+i);
@@ -8718,29 +8678,30 @@ static int lua_enumlib_sfx_get_ds(lua_State *L)
 }
 
 #ifdef MUSICSLOT_COMPATIBILITY
-static int lua_enumlib_mus_get(lua_State *L)
-{
-	const char *name = strchr(lua_tostring(L, 1), '_') + 1;
-	int mus = get_mus(name, false);
 
-	if (mus == 0)
-		return 0;
+	static int lua_enumlib_mus_get(lua_State *L)
+	{
+		const char *name = strchr(lua_tostring(L, 1), '_') + 1;
+		int mus = get_mus(name, false);
 
-	lua_pushinteger(L, mus);
-	return 1;
-}
+		if (mus == 0)
+			return 0;
 
-static int lua_enumlib_mus_get_mathlib(lua_State *L)
-{
-	const char *name = strchr(lua_tostring(L, 1), '_') + 1;
-	int mus = get_mus(name, false);
+		lua_pushinteger(L, mus);
+		return 1;
+	}
 
-	if (mus == 0)
-		return luaL_error(L, "music '%s' could not be found.\n", lua_tostring(L, 1));
+	static int lua_enumlib_mus_get_mathlib(lua_State *L)
+	{
+		const char *name = strchr(lua_tostring(L, 1), '_') + 1;
+		int mus = get_mus(name, false);
 
-	lua_pushinteger(L, mus);
-	return 1;
-}
+		if (mus == 0)
+			return luaL_error(L, "music '%s' could not be found.\n", lua_tostring(L, 1));
+
+		lua_pushinteger(L, mus);
+		return 1;
+	}
 #endif
 
 static int lua_enumlib_power_get(lua_State *L)

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;
 			}
 		}
@@ -714,7 +712,6 @@ void DRPC_UpdatePresence(void)
 	}
 
 	Discord_UpdatePresence(&discordPresence);
-	free(clientJoinSecret);
 }
 
 #endif // HAVE_DISCORDRPC

src/doomdata.h

@@ -81,12 +81,10 @@ typedef struct
 	INT16 flags;
 	INT16 special;
 	INT16 tag;
-	// sidenum[1] will be NO_INDEX if one sided
+	// sidenum[1] will be 0xffff if one sided
 	UINT16 sidenum[2];
 } ATTRPACK maplinedef_t;
 
-#define NO_INDEX 0xffff
-
 //
 // LineDef attributes.
 //

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,21 +602,6 @@ 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
-#endif
-
 //-- SATURN __
 /// Detect if a client is on Saturn in the clientconfig.
 /// To seperately allow them to join or block joining from vanilla clients.

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_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);
@@ -362,7 +361,10 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 	// on for fade-to-black
 	for (;;)
 	{
-		I_HandleInterrupt();
+		if (I_Interrupted())
+		{
+			I_Quit();
+		}
 
 		// get fademask first so we can tell if it exists or not
 		fmask = F_GetFadeMask(wipetype, wipeframe++);

src/g_demo.c

@@ -63,6 +63,7 @@
 
 // for replay dates
 #include <time.h>
+#include <locale.h>
 
 // menu demo things
 UINT32 demoDelayTime = 15*TICRATE;
@@ -446,8 +447,7 @@ void G_WriteDemoExtraData(void)
 	{
 		static UINT8 timeout = 0;
 
-		if (timeout)
-			timeout--;
+		if (timeout) timeout--;
 
 		if (demo_writerng == 1 || (demo_writerng == 2 && timeout == 0))
 		{
@@ -467,7 +467,6 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
 
 	if (!demobuf.p || !demo.deferstart)
 		return;
-
 	ziptic = READUINT8(demobuf.p);
 
 	if (ziptic & ZT_FWD)
@@ -489,12 +488,11 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
 
 	// what in the actual fuck is this???
 	// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
-	const player_t *player = &players[displayplayers[0]];
-	if (((player->mo && player->speed > 0) // Moving
+	if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
 		|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
-		|| (player->kartstuff[k_respawn]) // Respawning
-		|| (player->spectator || objectplacing)) // Not a physical player
-		&& !(player->kartstuff[k_spinouttimer] && player->kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
+		|| (players[displayplayers[0]].kartstuff[k_respawn]) // Respawning
+		|| (players[displayplayers[0]].spectator || objectplacing)) // Not a physical player
+		&& !(players[displayplayers[0]].kartstuff[k_spinouttimer] && players[displayplayers[0]].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
 		localangle[0] += (cmd->angleturn<<16);
 
 	if (!(demoflags & DF_GHOST) && *demobuf.p == DEMOMARKER)
@@ -517,49 +515,49 @@ void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
 
 	if (cmd->forwardmove != oldcmd[playernum].forwardmove)
 	{
-		WRITEUINT8(demobuf.p, cmd->forwardmove);
+		WRITEUINT8(demobuf.p,cmd->forwardmove);
 		oldcmd[playernum].forwardmove = cmd->forwardmove;
 		ziptic |= ZT_FWD;
 	}
 
 	if (cmd->sidemove != oldcmd[playernum].sidemove)
 	{
-		WRITEUINT8(demobuf.p, cmd->sidemove);
+		WRITEUINT8(demobuf.p,cmd->sidemove);
 		oldcmd[playernum].sidemove = cmd->sidemove;
 		ziptic |= ZT_SIDE;
 	}
 
 	if (cmd->angleturn != oldcmd[playernum].angleturn)
 	{
-		WRITEINT16(demobuf.p, cmd->angleturn);
+		WRITEINT16(demobuf.p,cmd->angleturn);
 		oldcmd[playernum].angleturn = cmd->angleturn;
 		ziptic |= ZT_ANGLE;
 	}
 
 	if (cmd->buttons != oldcmd[playernum].buttons)
 	{
-		WRITEUINT16(demobuf.p, cmd->buttons);
+		WRITEUINT16(demobuf.p,cmd->buttons);
 		oldcmd[playernum].buttons = cmd->buttons;
 		ziptic |= ZT_BUTTONS;
 	}
 
 	if (cmd->aiming != oldcmd[playernum].aiming)
 	{
-		WRITEINT16(demobuf.p, cmd->aiming);
+		WRITEINT16(demobuf.p,cmd->aiming);
 		oldcmd[playernum].aiming = cmd->aiming;
 		ziptic |= ZT_AIMING;
 	}
 
 	if (cmd->driftturn != oldcmd[playernum].driftturn)
 	{
-		WRITEINT16(demobuf.p, cmd->driftturn);
+		WRITEINT16(demobuf.p,cmd->driftturn);
 		oldcmd[playernum].driftturn = cmd->driftturn;
 		ziptic |= ZT_DRIFT;
 	}
 
 	if (cmd->latency != oldcmd[playernum].latency)
 	{
-		WRITEUINT8(demobuf.p, cmd->latency);
+		WRITEUINT8(demobuf.p,cmd->latency);
 		oldcmd[playernum].latency = cmd->latency;
 		ziptic |= ZT_LATENCY;
 	}
@@ -715,7 +713,7 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
 	if (!(demoflags & DF_GHOST))
 		return; // No ghost data to write.
 
-	if (ghost->player && nightsplayer(ghost->player) && ghost->tracer)
+	if (ghost->player && ghost->player->pflags & PF_NIGHTSMODE && ghost->tracer)
 	{
 		// We're talking about the NiGHTS thing, not the normal platforming thing!
 		ziptic |= GZT_NIGHTS;
@@ -728,8 +726,8 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
 
 	// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
 	if (abs(ghost->x-oldghost[playernum].x) > MAXMOM
-	||  abs(ghost->y-oldghost[playernum].y) > MAXMOM
-	||  abs(ghost->z-oldghost[playernum].z) > MAXMOM
+	|| abs(ghost->y-oldghost[playernum].y) > MAXMOM
+	|| abs(ghost->z-oldghost[playernum].z) > MAXMOM
 	|| ((UINT8)(leveltime & 255) > 0 && (UINT8)(leveltime & 255) <= (UINT8)cv_netdemosyncquality.value)) // Hack to enable slightly nicer resyncing
 	{
 		oldghost[playernum].x = ghost->x;
@@ -933,7 +931,7 @@ void G_ConsAllGhostTics(void)
 void G_ConsGhostTic(INT32 playernum)
 {
 	UINT8 ziptic;
-	fixed_t px, py, pz, gx, gy, gz;
+	fixed_t px,py,pz,gx,gy,gz;
 	mobj_t *testmo;
 	fixed_t syncleeway;
 	boolean nightsfail = false;
@@ -978,7 +976,7 @@ void G_ConsGhostTic(INT32 playernum)
 
 	if (ziptic & GZT_NIGHTS)
 	{
-		if (!testmo || !testmo->player || !nightsplayer(testmo->player) || !testmo->tracer)
+		if (!testmo || !testmo->player || !(testmo->player->pflags & PF_NIGHTSMODE) || !testmo->tracer)
 			nightsfail = true;
 		else
 			testmo = testmo->tracer;
@@ -1346,7 +1344,7 @@ fadeghost:
 					}
 					else
 					{
-						mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height, 3*FRACUNIT), MT_THOK);
+						mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK);
 						mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
 						mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<<FF_TRANSSHIFT;
 						mobj->tics = -1; // nope.
@@ -1377,7 +1375,7 @@ fadeghost:
 				UINT16 i, health;
 				UINT16 count = READUINT16(g->p);
 				//UINT32 type;
-				fixed_t x, y, z;
+				fixed_t x,y,z;
 				angle_t angle;
 				mobj_t *poof;
 
@@ -1520,9 +1518,7 @@ void G_PreviewRewind(tic_t previewtime)
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		player_t *player = &players[i];
-
-		if (!playeringame[i] || player->spectator)
+		if (!playeringame[i] || players[i].spectator)
 		{
 			if (info->playerinfo[i].player.mo)
 			{
@@ -1534,35 +1530,35 @@ void G_PreviewRewind(tic_t previewtime)
 
 		if (!info->playerinfo[i].ingame || !info->playerinfo[i].player.mo)
 		{
-			if (player->mo)
-				player->mo->flags2 |= MF2_DONTDRAW;
+			if (players[i].mo)
+				players[i].mo->flags2 |= MF2_DONTDRAW;
 
 			continue;
 		}
 
-		if (!player->mo)
+		if (!players[i].mo)
 			continue; //@TODO spawn temp object to act as a player display
 
-		player->mo->flags2 &= ~MF2_DONTDRAW;
+		players[i].mo->flags2 &= ~MF2_DONTDRAW;
 
-		P_UnsetThingPosition(player->mo);
+		P_UnsetThingPosition(players[i].mo);
 #define TWEEN(pr) info->playerinfo[i].mobj.pr + FixedMul((INT32) (next_info->playerinfo[i].mobj.pr - info->playerinfo[i].mobj.pr), tweenvalue)
-		player->mo->x = TWEEN(x);
-		player->mo->y = TWEEN(y);
-		player->mo->z = TWEEN(z);
-		player->mo->angle = TWEEN(angle);
+		players[i].mo->x = TWEEN(x);
+		players[i].mo->y = TWEEN(y);
+		players[i].mo->z = TWEEN(z);
+		players[i].mo->angle = TWEEN(angle);
 #undef TWEEN
-		P_SetThingPosition(player->mo);
+		P_SetThingPosition(players[i].mo);
 
-		player->frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue);
+		players[i].frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue);
 
-		player->mo->sprite = info->playerinfo[i].mobj.sprite;
-		player->mo->frame = info->playerinfo[i].mobj.frame;
+		players[i].mo->sprite = info->playerinfo[i].mobj.sprite;
+		players[i].mo->frame = info->playerinfo[i].mobj.frame;
 
-		player->realtime = info->playerinfo[i].player.realtime;
+		players[i].realtime = info->playerinfo[i].player.realtime;
 
 		for (j = 0; j < NUMKARTSTUFF; j++)
-			player->kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
+			players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
 	}
 
 	for (i = splitscreen; i >= 0; i--)
@@ -1695,7 +1691,7 @@ void G_BeginRecording(void)
 		return;
 	}
 
-	memset(name, 0, sizeof(name));
+	memset(name,0,sizeof(name));
 
 	demobuf.p = demobuf.buffer;
 	demoflags = DF_GHOST|(multiplayer ? DF_MULTIPLAYER : (modeattacking<<DF_ATTACKSHIFT));
@@ -1709,9 +1705,9 @@ void G_BeginRecording(void)
 
 	// Setup header.
 	memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
-	WRITEUINT8(demobuf.p, VERSION);
-	WRITEUINT8(demobuf.p, SUBVERSION);
-	WRITEUINT16(demobuf.p, DEMOVERSION);
+	WRITEUINT8(demobuf.p,VERSION);
+	WRITEUINT8(demobuf.p,SUBVERSION);
+	WRITEUINT16(demobuf.p,DEMOVERSION);
 
 	// Full replay title
 	demobuf.p += 64;
@@ -1722,11 +1718,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));
@@ -1740,7 +1736,7 @@ void G_BeginRecording(void)
 
 	// game data
 	memcpy(demobuf.p, "PLAY", 4); demobuf.p += 4;
-	WRITEINT16(demobuf.p, gamemap);
+	WRITEINT16(demobuf.p,gamemap);
 	memcpy(demobuf.p, mapmd5, 16); demobuf.p += 16;
 
 	WRITEUINT8(demobuf.p, demoflags);
@@ -1772,8 +1768,8 @@ void G_BeginRecording(void)
 			break;
 		case ATTACKING_RECORD: // 1
 			demotime_p = demobuf.p;
-			WRITEUINT32(demobuf.p, UINT32_MAX); // time
-			WRITEUINT32(demobuf.p, UINT32_MAX); // lap
+			WRITEUINT32(demobuf.p,UINT32_MAX); // time
+			WRITEUINT32(demobuf.p,UINT32_MAX); // lap
 			break;
 		default: // 3
 			break;
@@ -1830,9 +1826,9 @@ void G_BeginRecording(void)
 	if (demoflags & DF_LUAVARS)
 		LUA_Archive(&demobuf, false);
 
-	memset(&oldcmd, 0, sizeof(oldcmd));
-	memset(&oldghost, 0, sizeof(oldghost));
-	memset(&ghostext, 0, sizeof(ghostext));
+	memset(&oldcmd,0,sizeof(oldcmd));
+	memset(&oldghost,0,sizeof(oldghost));
+	memset(&ghostext,0,sizeof(ghostext));
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
@@ -1872,19 +1868,19 @@ void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT
 	// Name
 	memset(temp, 0, 16);
 	strncpy(temp, name, 16);
-	memcpy(demobuf.p, temp, 16);
+	memcpy(demobuf.p,temp,16);
 	demobuf.p += 16;
 
 	// Skin
 	memset(temp, 0, 16);
 	strncpy(temp, skins[skinnum].name, 16);
-	memcpy(demobuf.p, temp, 16);
+	memcpy(demobuf.p,temp,16);
 	demobuf.p += 16;
 
 	// Color
 	memset(temp, 0, 16);
 	strncpy(temp, KartColor_Names[color], 16);
-	memcpy(demobuf.p, temp, 16);
+	memcpy(demobuf.p,temp,16);
 	demobuf.p += 16;
 
 	// Score/time/whatever
@@ -2211,7 +2207,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 +2217,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 +2242,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 +2262,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 +2283,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 +2330,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);
 
@@ -2343,8 +2339,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 		extrainfo_p += 16;
 
 		// Skin
-		memcpy(temp, extrainfo_p, 16);
-		temp[16] = '\0';
+		memcpy(temp,extrainfo_p,16);
 		extrainfo_p += 16;
 		pdemo->standings[count].skin = UINT8_MAX;
 
@@ -2358,13 +2353,12 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 		}
 
 		// Color
-		memcpy(temp, extrainfo_p, 16);
-		temp[16] = '\0';
+		memcpy(temp,extrainfo_p,16);
 		extrainfo_p += 16;
 
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (fasticmp(KartColor_Names[i], temp)) // SRB2kart
+			if (fasticmp(KartColor_Names[i],temp)) // SRB2kart
 			{
 				pdemo->standings[count].color = i;
 				break;
@@ -2386,9 +2380,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 +2391,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 +2451,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 +2529,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 +2539,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 +2548,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 +2628,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 +2640,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 +2661,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 +2687,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 +2698,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 +2715,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 +2742,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 +2816,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();
@@ -2803,15 +2827,15 @@ void G_DoPlayDemo(char *defdemoname)
 	if (demo.version == 0x0001)
 	{
 		// Player name
-		memcpy(player_names[0], demobuf.p, 16);
+		memcpy(player_names[0],demobuf.p,16);
 		demobuf.p += 16;
 
 		// Skin
-		memcpy(skin, demobuf.p, 16);
+		memcpy(skin,demobuf.p,16);
 		demobuf.p += 16;
 
 		// Color
-		memcpy(color, demobuf.p, 16);
+		memcpy(color,demobuf.p,16);
 		demobuf.p += 16;
 
 		demobuf.p += 5; // Backwards compat - some stats
@@ -2824,7 +2848,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 +2858,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();
@@ -2844,7 +2868,7 @@ void G_DoPlayDemo(char *defdemoname)
 		// Set color
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (fasticmp(KartColor_Names[i], color)) // SRB2kart
+			if (fasticmp(KartColor_Names[i],color)) // SRB2kart
 			{
 				players[0].skincolor = i;
 				break;
@@ -2857,16 +2881,16 @@ 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();
 			return;
 		}
 
-		memset(&oldcmd, 0, sizeof(oldcmd));
-		memset(&oldghost, 0, sizeof(oldghost));
-		memset(&ghostext, 0, sizeof(ghostext));
+		memset(&oldcmd,0,sizeof(oldcmd));
+		memset(&oldghost,0,sizeof(oldghost));
+		memset(&ghostext,0,sizeof(ghostext));
 
 		CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
 
@@ -2895,7 +2919,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 +2968,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 +2980,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();
@@ -2970,16 +2994,16 @@ void G_DoPlayDemo(char *defdemoname)
 		players[p].spectator = spectator;
 
 		// Name
-		memcpy(player_names[p], demobuf.p, 16);
+		memcpy(player_names[p],demobuf.p,16);
 		demobuf.p += 16;
 
 		// Skin
-		memcpy(skin, demobuf.p, 16);
+		memcpy(skin,demobuf.p,16);
 		demobuf.p += 16;
 		SetPlayerSkin(p, skin);
 
 		// Color
-		memcpy(color, demobuf.p, 16);
+		memcpy(color,demobuf.p,16);
 		demobuf.p += 16;
 
 		for (i = 0; i < MAXSKINCOLORS; i++)
@@ -3197,15 +3221,15 @@ void G_AddGhost(char *defdemoname)
 	if (ghostversion == 0x0001)
 	{
 		// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
-		memcpy(name, p, 16);
+		memcpy(name, p,16);
 		p += 16;
 
 		// Skin
-		memcpy(skin, p, 16);
+		memcpy(skin, p,16);
 		p += 16;
 
 		// Color
-		memcpy(color, p, 16);
+		memcpy(color, p,16);
 		p += 16;
 
 		// Ghosts do not have a player structure to put this in.
@@ -3357,7 +3381,7 @@ void G_AddGhost(char *defdemoname)
 
 	for (i = 0; i < MAXSKINCOLORS; i++)
 	{
-		if (fasticmp(KartColor_Names[i], color)) // SRB2kart
+		if (fasticmp(KartColor_Names[i],color)) // SRB2kart
 		{
 			gh->mo->color = (UINT8)i;
 			break;
@@ -3449,7 +3473,7 @@ void G_UpdateStaffGhostName(lumpnum_t l)
 	if (ghostversion == 0x0001)
 	{
 		// Player name
-		memcpy(dummystaffname, p, 16);
+		memcpy(dummystaffname, p,16);
 		dummystaffname[16] = '\0';
 		return; // Not really a failure but whatever
 	}

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,9 +63,11 @@ gameaction_t gameaction = 0;
 gamestate_t gamestate = GS_NULL;
 
 boolean botingame = false;
-skinnum_t botskin = 0;
+UINT8 botskin = 0;
 UINT8 botcolor = 0;
 
+JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
+
 // SRB2kart
 char gamedatafilename[64] = "kartdata.dat";
 char timeattackfolder[64] = "kart";
@@ -453,13 +455,34 @@ consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, dr
 static CV_PossibleValue_t cechotoggle_t[] = {{0, "Off"}, {1, "On"}, {2, "Console"}, {0, NULL}};
 consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+#if MAXPLAYERS > 16
+#error "please update player_name table using the new value for MAXPLAYERS"
+#endif
+
 #ifdef SEENAMES
 player_t *seenplayer = NULL; // player we're aiming at right now
 #endif
 
-// now automatically allocated in D_RegisterServerCommands
-// so that it doesn't have to be updated depending on the value of MAXPLAYERS
-char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
+char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
+{
+	"Player 1",
+	"Player 2",
+	"Player 3",
+	"Player 4",
+	"Player 5",
+	"Player 6",
+	"Player 7",
+	"Player 8",
+	"Player 9",
+	"Player 10",
+	"Player 11",
+	"Player 12",
+	"Player 13",
+	"Player 14",
+	"Player 15",
+	"Player 16"
+}; // SRB2kart - removed Players 17 through 32
+
 INT32 player_name_changes[MAXPLAYERS] = {};
 
 INT16 rw_maximums[NUM_WEAPONS] =
@@ -604,18 +627,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';
 	}
 
@@ -736,7 +755,7 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
 	if (retaxis > (+JOYAXISRANGE))
 		retaxis = +JOYAXISRANGE;
 
-	if (!DigitalGamepadStyle(pnum) && axissel < AXISDEAD)
+	if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
 	{
 		const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;
 
@@ -784,8 +803,8 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
 
 	const UINT8 forplayer = (ssplayer-1);
 
-	const boolean analogjoystickmove  = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer);
-	const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer);
+	const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
+	const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;
 
 	turnright = InputDown(gc_turnright, ssplayer);
 	turnleft = InputDown(gc_turnleft, ssplayer);
@@ -840,8 +859,7 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
 static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
 {
 	INT32 axis = 0;
-	const UINT8 forplayer = (ssplayer-1);
-	const boolean usejoystick = cv_usejoystick[forplayer].value;
+	const boolean usejoystick = cv_usejoystick[(ssplayer-1)].value;
 
 	// check for inputs and return button commands
 	// for stuff like joining with item button, saltyhop, honking, etc.
@@ -877,7 +895,7 @@ static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
 #undef CHECKINPUT
 
 	axis = JoyAxis(AXISLOOKBACK, ssplayer);
-	camspin[forplayer] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
+	camspin[ssplayer-1] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
 
 	// Reset to our spec player if we watch someone else.
 	if ((cmd->driftturn || cmd->buttons)
@@ -974,7 +992,10 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	player_t *player = P_GetLocalPlayerForNum(forplayer);
 
 	camera_t *thiscam = &camera[forplayer];
-	const boolean freecam = thiscam->freecam;
+	const boolean freecam = camera[forplayer].freecam;
+
+	const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
+	const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;
 
 	lang = localangle[forplayer];
 	laim = localaiming[forplayer];
@@ -1006,9 +1027,6 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 		return;
 	}
 
-	const boolean analogjoystickmove  = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer);
-	const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer);
-
 	usejoystick = (analogjoystickmove || gamepadjoystickmove);
 	turnright = InputDown(gc_turnright, ssplayer);
 	turnleft = InputDown(gc_turnleft, ssplayer);
@@ -1293,7 +1311,6 @@ static void G_DoLoadLevel(boolean resetplayer)
 	{
 		// fail so reset game stuff
 		Command_ExitGame_f();
-		P_FreeCorruptMapWarnings();
 		return;
 	}
 
@@ -1327,8 +1344,6 @@ static void G_DoLoadLevel(boolean resetplayer)
 
 	// clear hud messages remains (usually from game startup)
 	CON_ClearHUD();
-	// print any map errors now due to clearhud above :chaosleep:
-	P_PrintCorruptMapWarnings();
 
 	server_lagless = !cv_gentlemens.value;
 
@@ -2630,18 +2645,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 +3785,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 +3797,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 +3863,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 +3882,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);
@@ -4080,7 +4089,6 @@ char *G_BuildMapTitle(INT32 mapnum)
 		const char *actnum = NULL;
 
 		len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
-
 		if (strlen(mapheaderinfo[mapnum-1]->zonttl) > 0)
 		{
 			zonetext = M_GetText(mapheaderinfo[mapnum-1]->zonttl);
@@ -4091,7 +4099,6 @@ char *G_BuildMapTitle(INT32 mapnum)
 			zonetext = M_GetText("Zone");
 			len += strlen(zonetext) + 1;	// ' ' + zonetext
 		}
-
 		if (strlen(mapheaderinfo[mapnum-1]->actnum) > 0)
 		{
 			actnum = M_GetText(mapheaderinfo[mapnum-1]->actnum);
@@ -4103,12 +4110,10 @@ 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);
-		if (actnum)
-			snprintf(title + strlen(title), len - strlen(title), " %s", actnum);
+		if (zonetext) sprintf(title + strlen(title), " %s", zonetext);
+		if (actnum) sprintf(title + strlen(title), " %s", actnum);
 	}
 
 	return title;

src/g_game.h

@@ -118,11 +118,10 @@ extern consvar_t cv_driftsparkpulse;
 extern consvar_t cv_gravstretch;
 extern consvar_t cv_sloperoll;
 extern consvar_t cv_sliptideroll;
-extern consvar_t cv_stairjank;
-extern consvar_t cv_stairjanksfx;
 extern consvar_t cv_slamsound;
 extern consvar_t cv_sloperolldist;
 extern consvar_t cv_sparkroll;
+extern consvar_t cv_spinoutroll;
 
 extern consvar_t cv_squishdance, cv_squishdancespeed;
 
@@ -228,11 +227,10 @@ void G_SaveGameData(boolean force);
 
 void G_SaveGame(UINT32 slot);
 
-#define G_RaceGametype()   (G_IsGameType(GT_RACE))
+#define G_GametypeHasTeams() (G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF))
 #define G_BattleGametype() (G_IsGameType(GT_MATCH))
-
-#define G_GametypeHasTeams() (UNLIKELY(G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF)))
-#define G_TagGametype()      (UNLIKELY(G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK)))
+#define G_RaceGametype() (G_IsGameType(GT_RACE))
+#define G_TagGametype() (G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK))
 
 FUNCINLINE static ATTRINLINE boolean G_IsGameType(int type)
 {

src/g_input.c

@@ -66,30 +66,13 @@ consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = {
 
 static CV_PossibleValue_t rumblestrength_cons_t[] = {{FRACUNIT/4, "MIN"}, {FRACUNIT*4, "MAX"}, {0, NULL}};
 
-consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS] = {
+consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS] = {
 	{"rumblestrength",  "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"rumblestrength2", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"rumblestrength3", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"rumblestrength4", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
 };
 
-#define IMPL_RUMBLE_TYPE(type)\
-consvar_t cv_rumble_##type [MAXSPLITSCREENPLAYERS] = {\
-	{"rumble_"  #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
-	{"rumble2_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
-	{"rumble3_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
-	{"rumble4_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}\
-};
-
-IMPL_RUMBLE_TYPE(spinout);
-IMPL_RUMBLE_TYPE(sneakerboost);
-IMPL_RUMBLE_TYPE(offroad);
-IMPL_RUMBLE_TYPE(bananadrag);
-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},
@@ -1053,8 +1036,8 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
 	// doesent need to be super precise
 	// but ensure this is within range (0-65535)
 	// placed here so it applies to lua aswell
-	low_strength = (UINT16)min(FixedMul(low_strength, cv_rumble_strength[playernum].value), UINT16_MAX);
-	high_strength = (UINT16)min(FixedMul(high_strength, cv_rumble_strength[playernum].value), UINT16_MAX);
+	low_strength = (UINT16)min(FixedMul(low_strength, cv_rumblestrength[playernum].value), UINT16_MAX);
+	high_strength = (UINT16)min(FixedMul(high_strength, cv_rumblestrength[playernum].value), UINT16_MAX);
 
 	I_GamepadRumble(playernum, low_strength, high_strength, duration);
 }
@@ -1076,7 +1059,7 @@ void G_DeviceRumbleTick(void)
 {
 	UINT8 i;
 
-	if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL || demo.playback)
+	if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL)
 	{
 		return;
 	}
@@ -1107,11 +1090,6 @@ void G_DeviceRumbleTick(void)
 
 		const player_t *player = P_GetLocalPlayerForNum(i);
 
-		if (!player)
-		{
-			continue;
-		}
-
 		// allow lua to do some crap for spectators
 		if (player->spectator || !player->mo)
 		{
@@ -1127,20 +1105,17 @@ void G_DeviceRumbleTick(void)
 			continue;
 		}
 
-		if (cv_rumble_spinout[i].value
-			&& player->kartstuff[k_spinouttimer])
+		if (player->kartstuff[k_spinouttimer])
 		{
 			//low = high = FRACUNIT / 6;
 			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 (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)
+		else if ((player->kartstuff[k_offroad])
+			&& player->speed != 0
 			&& P_IsObjectOnGround(player->mo))
 		{
 			// weaken this depending on if you got hyu or invinc
@@ -1157,37 +1132,26 @@ void G_DeviceRumbleTick(void)
 				low = high = RUMBLE_MODERATE;
 			}
 		}
-		else if (cv_rumble_bananadrag[i].value
-			&& (player->kartstuff[k_bananadrag] > TICRATE)
-			&& (player->speed != 0)
+		else if ((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))
-		{
-			low = high = RUMBLE_VERYWEAK;
-		}
 
-		if (cv_rumble_brakedrift[i].value
-			&& player->kartstuff[k_brakedrift])
+		if (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]
+		if (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)
 				lenght = 114;
 			else if (player->driftlevel == 3)
@@ -1250,8 +1214,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

@@ -100,10 +100,9 @@ typedef enum
 	gc_custom2, // Lua scriptable
 	gc_custom3, // Lua scriptable
 	gc_director,
-	// freecam specific controls
-	gc_freecam,  // Toggle for freecam while ingame
-	gc_camfloat, // alternative button for raising camera
-	gc_camsink,  // alternative button for sinking camera
+	gc_freecam, // Toggle for freecam while ingame
+	gc_camfloat, // alternative button for raising cam
+	gc_camsink, // alternative button for sinking
 	gc_strafeleft,
 	gc_straferight,
 	num_gamecontrols
@@ -113,18 +112,9 @@ typedef enum
 extern consvar_t cv_mousexsens, cv_mouseysens;
 extern consvar_t cv_controlperkey;
 extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
-
-extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
-
 extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_spinout[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_sneakerboost[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_offroad[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_bananadrag[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_stairjank[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_brakedrift[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_driftcharge[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
 
 extern consvar_t cv_gamepadifunfocused;
 extern consvar_t cv_gamepadledifunfocused;

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)
@@ -183,7 +183,6 @@ static int comparePolygons(const void *p1, const void *p2)
 
 	UINT32 downloaded1 = poly1->texture ? poly1->texture->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
 	UINT32 downloaded2 = poly2->texture ? poly2->texture->downloaded : 0;
-
 	diff64 = downloaded1 - downloaded2;
 	if (diff64 != 0) return diff64;
 
@@ -214,8 +213,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_cache.c

@@ -446,7 +446,7 @@ typedef struct
 } GLMapTextureSet_t; // idk i suck at naming things
 
 static size_t gl_numtextures = 0; // Texture count
-static GLMapTextureSet_t *gl_textures = NULL; // For all textures
+static GLMapTextureSet_t *gl_textures; // For all textures
 
 static void HWR_FreeTextureData(patch_t *patch)
 {
@@ -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);
 }
 
@@ -571,8 +570,7 @@ void HWR_ClearAllTextures(void)
 /*static void HWR_FreeColormapCache(void)
 {
 	HWR_FreePatchCache(false);
-}
-*/
+}*/
 
 void HWR_InitMapTextures(void)
 {
@@ -614,28 +612,27 @@ 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;
+	flatcheck_init(&flatpresent);
+	size_t i, j;
 	INT32 k;
 
-	// FIXME: this needs to account for FOFs to properly work
-#ifdef GLENCORE
-	if (encoremap)
-	{
-		return;
-	}
-#endif
-
 	// 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 +666,6 @@ static void HWR_PrecacheLevelFlats(void)
 		}
 	}
 	else
-#endif
 #endif
 	{
 		// on non encore we have it simple
@@ -678,7 +674,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 +686,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,13 +720,13 @@ 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++)
 		{
 			// check if single-sided linedef
-			if (line->sidenum[j] == NO_INDEX)
+			if (line->sidenum[j] == 0xffff)
 				continue;
 
 			const side_t *side = &sides[line->sidenum[j]];
@@ -731,27 +737,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 +774,6 @@ static void HWR_PrecacheLevelTextures(void)
 			{
 				HWR_GetTexture(animtexnum, false);
 			}
-
 #ifdef GLENCORE
 			if (texpresent & 2)
 			{
@@ -892,7 +895,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);
@@ -986,18 +989,18 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
 
 		flat[steppy] = glMipmap->colormap->source[flat[steppy]];
 	}
+#endif
 
 	if (haschromakey)
 	{
 		const char *flatname = W_CheckNameForNum(flatlumpnum);
 
 		// hack for gba rainbow roads cyan floors
-		if (UNLIKELY(flatname && memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
+		if (UNLIKELY(memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
 		{
 			glMipmap->flags &= ~TF_CHROMAKEYED;
 		}
 	}
-#endif
 }
 
 // Download a Doom 'flat' to the hardware cache and make it ready for use
@@ -1124,9 +1127,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 				HWR_UpdatePatchMipmap(patch, glMipmap);
 			}
 			else
-			{
 				HWR_LoadPatchMipmap(patch, glMipmap);
-			}
 
 			return;
 		}
@@ -1308,7 +1309,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 +1386,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 +1394,6 @@ void HWR_SetMapPalette(void)
 			RGBA_converted[i].s.blue = *(RGB_data++);
 			RGBA_converted[i].s.alpha = 255;
 		}
-
 		palette = RGBA_converted;
 	}
 
@@ -1403,7 +1401,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_defs.h

@@ -96,6 +96,7 @@ typedef struct
 typedef struct
 {
 	float x, y, z;
+	fixed_t x2, y2, z2;
 } polyvertex_t;
 
 // a convex 'plane' polygon, clockwise order

src/hardware/hw_glob.h

@@ -54,7 +54,7 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32
 // --------
 extern extrasubsector_t *extrasubsectors;
 #ifdef PARANOIA
-extern size_t num_extra_subsector;
+extern size_t addsubsector;
 #endif
 
 void HWR_FreeExtraSubsectors(void);

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;
@@ -101,7 +102,7 @@ void HWR_SetViewSize(void);
 void HWR_AddCommands(void);
 
 void HWR_RenderPlayerView(void);
-void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level);
+void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level, boolean allow_portals);
 
 void HWR_ClearSkyDome(void);
 void HWR_BuildSkyDome(void);

src/hardware/hw_md2.c

@@ -1146,18 +1146,15 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 
 	// Look at HWR_ProjectSprite for more
 	{
-		md2_t *md2s = NULL;
-		int skinnum = 0;
+		md2_t *md2s;
+		int skinnum;
 		patch_t *gpatch, *blendgpatch;
 		GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
 		INT32 durs = spr->mobj->state->tics;
 		INT32 tics = spr->mobj->tics;
 		//mdlframe_t *next = NULL;
-
-		//const UINT8 flip = (UINT8)(!(spr->mobj->eflags & MFE_VERTICALFLIP) != !R_ThingVerticallyFlipped(spr->mobj)); // :chaosleep:
 		const UINT8 flip = (UINT8)((spr->mobj->eflags & MFE_VERTICALFLIP) == MFE_VERTICALFLIP);
-		const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !R_ThingHorizontallyFlipped(spr->mobj));
-
+		const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !(spr->mobj->frame & FF_HORIZONTALFLIP));
 		spritedef_t *sprdef;
 		spriteframe_t *sprframe;
 		spriteinfo_t *sprinfo;
@@ -1221,7 +1218,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 				skinnum = (skin_t *)spr->mobj->localskin - skins;
 			}
 		}
-		else if (spr->mobj->skin)
+		else
 		{
 			md2s = md2_playermodels;
 			skinnum = (skin_t *)spr->mobj->skin - skins;
@@ -1247,7 +1244,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)
@@ -1403,11 +1400,12 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 
 		const angle_t sliptideroll = ((cv_sliptideroll.value && spr->mobj->player) ? spr->mobj->player->sliproll : 0);
 		const SINT8 flipfactor = flip ? -1 : 1;
-		const angle_t thingrollangle = (spr->mobj->rollangle - spr->mobj->temprollangle);
 
-		if (thingrollangle || sliptideroll)
+		if (spr->mobj->rollangle || sliptideroll)
 		{
-			angle_t rollang = sliptideroll ? (thingrollangle + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])) : thingrollangle;
+			angle_t rollang = sliptideroll
+			? (spr->mobj->rollangle) + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])
+			: (spr->mobj->rollangle);
 
 			rollang *= flipfactor;
 
@@ -1483,7 +1481,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_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_portal.c

@@ -80,8 +80,8 @@ void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg)
 	gl_portal_t *portal = HWR_Portal_Add(seg);
 
 	// Offset the portal view by the linedef centers
-	line_t* start = &lines[line1];
-	line_t* dest  = &lines[line2];
+	line_t* start	= &lines[line1];
+	line_t* dest	= &lines[line2];
 
 	angle_t dangle = R_PointToAngle2(0, 0, dest->dx, dest->dy) - R_PointToAngle2(start->dx, start->dy, 0, 0);
 
@@ -99,7 +99,7 @@ void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg)
 	dest_c.y = dest->v1->y/2 + dest->v2->y/2;
 
 	disttopoint = R_PointToDist2(start_c.x, start_c.y, viewx, viewy);
-	angtopoint  = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy);
+	angtopoint = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy);
 	angtopoint += dangle;
 
 	portal->viewx = dest_c.x + FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
@@ -170,7 +170,7 @@ void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float
 	HWR_PortalFrame(portal);
 
 	// call HWR_RenderViewpoint
-	HWR_RenderPortalViewpoint(portal, stencil_level + 1);
+	HWR_RenderPortalViewpoint(portal, stencil_level + 1, true);
 
 	// return to current frame
 	if (rootportal)
@@ -220,9 +220,9 @@ boolean HWR_PortalCheckBBox(const fixed_t *bspcoord)
 	if (!portalclipline)
 		return true;
 
-	if (HWR_PortalCheckPointSide(bspcoord[BOXLEFT],  bspcoord[BOXTOP])    ||
-		HWR_PortalCheckPointSide(bspcoord[BOXLEFT],  bspcoord[BOXBOTTOM]) ||
-		HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXTOP])    ||
+	if (HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXTOP]) ||
+		HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]) ||
+		HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXTOP]) ||
 		HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]))
 	{
 		return true;

src/hardware/hw_shaders.h

@@ -76,11 +76,6 @@
 //
 
 // Include GLSL_FLOOR_FUDGES or GLSL_WALL_FUDGES or define the fudges in shaders that use this macro.
-
-// dither shader based on
-// https://github.com/hughsk/glsl-dither/blob/master/8x8.glsl
-// https://github.com/libretro/glsl-shaders/blob/master/dithering/shaders/bayer_4x4.glsl
-// adapted and messed about to work with srb2 and scale per resolution
 #define GLSL_DOOM_COLORMAP_DITHER \
 	"float baseValue = max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
 	"float patscale = min(scr_resolution.x / 1280.0, scr_resolution.y / 720.0);\n" \
@@ -193,6 +188,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/ogl_win.c

@@ -0,0 +1,549 @@
+// Emacs style mode select   -*- C++ -*-
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+//-----------------------------------------------------------------------------
+/// \file
+/// \brief Windows specific part of the OpenGL API for Doom Legacy
+///
+///	TODO:
+///	- check if windowed mode works
+///	- support different pixel formats
+
+
+#if defined (_WIN32)
+
+//#define WIN32_LEAN_AND_MEAN
+#define RPC_NO_WINDOWS_H
+#include <windows.h>
+#include <time.h>
+#include "r_opengl.h"
+
+
+// **************************************************************************
+//                                                                    GLOBALS
+// **************************************************************************
+
+#ifdef DEBUG_TO_FILE
+static unsigned long nb_frames = 0;
+static clock_t my_clock;
+FILE *gllogstream;
+#endif
+
+static  HDC     hDC           = NULL;       // the window's device context
+static  HGLRC   hGLRC         = NULL;       // the OpenGL rendering context
+static  HWND    hWnd          = NULL;
+static  BOOL    WasFullScreen = FALSE;
+static void UnSetRes(void);
+
+#ifdef USE_WGL_SWAP
+PFNWGLEXTSWAPCONTROLPROC wglSwapIntervalEXT = NULL;
+#endif
+
+PFNglClear pglClear;
+PFNglGetIntegerv pglGetIntegerv;
+PFNglGetString pglGetString;
+
+#define MAX_VIDEO_MODES   32
+static  vmode_t     video_modes[MAX_VIDEO_MODES];
+INT32     oglflags = 0;
+
+// **************************************************************************
+//                                                                  FUNCTIONS
+// **************************************************************************
+
+// -----------------+
+// APIENTRY DllMain : DLL Entry Point,
+//                  : open/close debug log
+// Returns          :
+// -----------------+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, // handle to DLL module
+                    DWORD fdwReason,    // reason for calling function
+                    LPVOID lpvReserved) // reserved
+{
+	// Perform actions based on the reason for calling.
+	UNREFERENCED_PARAMETER(lpvReserved);
+	switch (fdwReason)
+	{
+		case DLL_PROCESS_ATTACH:
+			// Initialize once for each new process.
+			// Return FALSE to fail DLL load.
+#ifdef DEBUG_TO_FILE
+			gllogstream = fopen("ogllog.txt", "wt");
+			if (gllogstream == NULL)
+				return FALSE;
+#endif
+			DisableThreadLibraryCalls(hinstDLL);
+			break;
+
+		case DLL_THREAD_ATTACH:
+			// Do thread-specific initialization.
+			break;
+
+		case DLL_THREAD_DETACH:
+			// Do thread-specific cleanup.
+			break;
+
+		case DLL_PROCESS_DETACH:
+			// Perform any necessary cleanup.
+#ifdef DEBUG_TO_FILE
+			if (gllogstream)
+			{
+				fclose(gllogstream);
+				gllogstream  = NULL;
+			}
+#endif
+			break;
+	}
+
+	return TRUE;  // Successful DLL_PROCESS_ATTACH.
+}
+
+#ifdef STATIC_OPENGL
+#define pwglGetProcAddress wglGetProcAddress;
+#define pwglCreateContext wglCreateContext;
+#define pwglDeleteContext wglDeleteContext;
+#define pwglMakeCurrent wglMakeCurrent;
+#else
+static HMODULE OGL32;
+typedef void *(WINAPI *PFNwglGetProcAddress) (const char *);
+static PFNwglGetProcAddress pwglGetProcAddress;
+typedef HGLRC (WINAPI *PFNwglCreateContext) (HDC hdc);
+static PFNwglCreateContext pwglCreateContext;
+typedef BOOL (WINAPI *PFNwglDeleteContext) (HGLRC hglrc);
+static PFNwglDeleteContext pwglDeleteContext;
+typedef BOOL (WINAPI *PFNwglMakeCurrent) (HDC hdc, HGLRC hglrc);
+static PFNwglMakeCurrent pwglMakeCurrent;
+#endif
+
+#ifndef STATIC_OPENGL
+void *GetGLFunc(const char *proc)
+{
+	void *func = NULL;
+	if (pwglGetProcAddress)
+		func = pwglGetProcAddress(proc);
+	if (!func)
+		func = GetProcAddress(OGL32, proc);
+	return func;
+}
+#endif
+
+boolean LoadGL(void)
+{
+#ifndef STATIC_OPENGL
+	OGL32 = LoadLibrary("OPENGL32.DLL");
+
+	if (!OGL32)
+		return 0;
+
+	pwglGetProcAddress = GetGLFunc("wglGetProcAddress");
+	pwglCreateContext = GetGLFunc("wglCreateContext");
+	pwglDeleteContext = GetGLFunc("wglDeleteContext");
+	pwglMakeCurrent = GetGLFunc("wglMakeCurrent");
+#endif
+	return SetupGLfunc();
+}
+
+// -----------------+
+// SetupPixelFormat : Set the device context's pixel format
+// Note             : Because we currently use only the desktop's BPP format, all the
+//                  : video modes in Doom Legacy OpenGL are of the same BPP, thus the
+//                  : PixelFormat is set only once.
+//                  : Setting the pixel format more than once on the same window
+//                  : doesn't work. (ultimately for different pixel formats, we
+//                  : should close the window, and re-create it)
+// -----------------+
+int SetupPixelFormat(INT32 WantColorBits, INT32 WantStencilBits, INT32 WantDepthBits)
+{
+	static DWORD iLastPFD = 0;
+	INT32 nPixelFormat;
+	PIXELFORMATDESCRIPTOR pfd =
+	{
+		sizeof (PIXELFORMATDESCRIPTOR),  // size
+		1,                              // version
+		PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER,
+		PFD_TYPE_RGBA,                  // color type
+		32 /*WantColorBits*/,           // cColorBits : prefered color depth
+		0, 0,                           // cRedBits, cRedShift
+		0, 0,                           // cGreenBits, cGreenShift
+		0, 0,                           // cBlueBits, cBlueShift
+		0, 0,                           // cAlphaBits, cAlphaShift
+		0,                              // cAccumBits
+		0, 0, 0, 0,                     // cAccum Red/Green/Blue/Alpha Bits
+		0,                              // cDepthBits (0,16,24,32)
+		0,                              // cStencilBits
+		0,                              // cAuxBuffers
+		PFD_MAIN_PLANE,                 // iLayerType
+		0,                              // reserved, must be zero
+		0, 0, 0,                        // dwLayerMask, dwVisibleMask, dwDamageMask
+	};
+
+	DWORD iPFD = (WantColorBits<<16) | (WantStencilBits<<8) | WantDepthBits;
+
+	pfd.cDepthBits = (BYTE)WantDepthBits;
+	pfd.cStencilBits = (BYTE)WantStencilBits;
+
+	if (iLastPFD)
+	{
+		DBG_Printf("WARNING : SetPixelFormat() called twise not supported by all drivers !\n");
+	}
+
+	// set the pixel format only if different than the current
+	if (iPFD == iLastPFD)
+		return 2;
+	else
+		iLastPFD = iPFD;
+
+	DBG_Printf("SetupPixelFormat() - %d ColorBits - %d StencilBits - %d DepthBits\n",
+	           WantColorBits, WantStencilBits, WantDepthBits);
+
+	nPixelFormat = ChoosePixelFormat(hDC, &pfd);
+
+	if (nPixelFormat == 0)
+		DBG_Printf("ChoosePixelFormat() FAILED\n");
+
+	if (SetPixelFormat(hDC, nPixelFormat, &pfd) == 0)
+	{
+		DBG_Printf("SetPixelFormat() FAILED\n");
+		return 0;
+	}
+
+	return 1;
+}
+
+
+// -----------------+
+// SetRes           : Set a display mode
+// Notes            : pcurrentmode is actually not used
+// -----------------+
+static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode)
+{
+	LPCSTR renderer;
+	BOOL WantFullScreen = !(lvid->u.windowed);  //(lvid->u.windowed ? 0 : CDS_FULLSCREEN);
+
+	UNREFERENCED_PARAMETER(pcurrentmode);
+	DBG_Printf ("SetMode(): %dx%d %d bits (%s)\n",
+	            lvid->width, lvid->height, lvid->bpp*8,
+	            WantFullScreen ? "fullscreen" : "windowed");
+
+	hWnd = lvid->WndParent;
+
+	// BP : why flush texture ?
+	//      if important flush also the first one (white texture) and restore it !
+	Flush();    // Flush textures.
+
+// TODO: if not fullscreen, skip display stuff and just resize viewport stuff ...
+
+	// Exit previous mode
+	//if (hGLRC) //Hurdler: TODO: check if this is valid
+	//    UnSetRes();
+	if (WasFullScreen)
+		ChangeDisplaySettings(NULL, CDS_FULLSCREEN); //switch in and out of fullscreen
+
+		// Change display settings.
+	if (WantFullScreen)
+	{
+		DEVMODE dm;
+		ZeroMemory(&dm, sizeof (dm));
+		dm.dmSize       = sizeof (dm);
+		dm.dmPelsWidth  = lvid->width;
+		dm.dmPelsHeight = lvid->height;
+		dm.dmBitsPerPel = lvid->bpp*8;
+		dm.dmFields     = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL;
+		if (ChangeDisplaySettings(&dm, CDS_TEST) != DISP_CHANGE_SUCCESSFUL)
+			return -2;
+		if (ChangeDisplaySettings(&dm, CDS_FULLSCREEN) !=DISP_CHANGE_SUCCESSFUL)
+			return -3;
+
+		SetWindowLong(hWnd, GWL_STYLE, WS_POPUP|WS_VISIBLE);
+		// faB : book says to put these, surely for windowed mode
+		//WS_CLIPCHILDREN|WS_CLIPSIBLINGS);
+		SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, lvid->width, lvid->height, SWP_NOACTIVATE|SWP_NOZORDER);
+	}
+	else
+	{
+		RECT bounds;
+		INT32 x, y;
+		INT32 w = lvid->width, h = lvid->height;
+		GetWindowRect(hWnd, &bounds);
+		bounds.right = bounds.left+w;
+		bounds.bottom = bounds.top+h;
+		AdjustWindowRectEx(&bounds, GetWindowLong(hWnd, GWL_STYLE), (GetMenu(hWnd) != NULL), 0);
+		w = bounds.right-bounds.left;
+		h = bounds.bottom-bounds.top;
+		x = (GetSystemMetrics(SM_CXSCREEN)-w)/2;
+		y = (GetSystemMetrics(SM_CYSCREEN)-h)/2;
+		SetWindowPos(hWnd, NULL, x, y, w, h, SWP_NOACTIVATE|SWP_NOZORDER);
+	}
+
+	if (!hDC)
+		hDC = GetDC(hWnd);
+	if (!hDC)
+	{
+		DBG_Printf("GetDC() FAILED\n");
+		return 0;
+	}
+
+	{
+		INT32 res;
+
+		// Set res.
+		res = SetupPixelFormat(lvid->bpp*8, 0, 16);
+
+		if (res == 0)
+			return 0;
+		else if (res == 1)
+		{
+			// Exit previous mode
+			if (hGLRC)
+				UnSetRes();
+			hGLRC = pwglCreateContext(hDC);
+			if (!hGLRC)
+			{
+				DBG_Printf("pwglCreateContext() FAILED\n");
+				return 0;
+			}
+			if (!pwglMakeCurrent(hDC, hGLRC))
+			{
+				DBG_Printf("wglMakeCurrent() FAILED\n");
+				return 0;
+			}
+		}
+	}
+
+	gl_extensions = pglGetString(GL_EXTENSIONS);
+	// Get info and extensions.
+	//BP: why don't we make it earlier ?
+	//Hurdler: we cannot do that before intialising gl context
+	renderer = (LPCSTR)pglGetString(GL_RENDERER);
+	DBG_Printf("Vendor     : %s\n", pglGetString(GL_VENDOR));
+	DBG_Printf("Renderer   : %s\n", renderer);
+	DBG_Printf("Version    : %s\n", pglGetString(GL_VERSION));
+	DBG_Printf("Extensions : %s\n", gl_extensions);
+
+	// BP: disable advenced feature that don't work on somes hardware
+	// Hurdler: Now works on G400 with bios 1.6 and certified drivers 6.04
+	if (strstr(renderer, "810"))   oglflags |= GLF_NOZBUFREAD;
+	DBG_Printf("oglflags   : 0x%X\n", oglflags);
+
+#ifdef USE_WGL_SWAP
+	if (isExtAvailable("WGL_EXT_swap_control",gl_extensions))
+		wglSwapIntervalEXT = GetGLFunc("wglSwapIntervalEXT");
+	else
+		wglSwapIntervalEXT = NULL;
+#endif
+
+	if (isExtAvailable("GL_EXT_texture_filter_anisotropic",gl_extensions))
+		pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy);
+	else
+		maximumAnisotropy = 0;
+
+	SetupGLFunc13();
+
+	screen_depth = (GLbyte)(lvid->bpp*8);
+	if (screen_depth > 16)
+		textureformatGL = GL_RGBA;
+	else
+		textureformatGL = GL_RGB5_A1;
+
+	GL_SetModelView(lvid->width, lvid->height);
+	GL_SetStates();
+	// we need to clear the depth buffer. Very important!!!
+	pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+
+	lvid->buffer = NULL;    // unless we use the software view
+	lvid->direct = NULL;    // direct access to video memory, old DOS crap
+
+	WasFullScreen = WantFullScreen;
+
+	return 1;               // on renvoie une valeur pour dire que cela s'est bien pass�
+}
+
+
+// -----------------+
+// UnSetRes         : Restore the original display mode
+// -----------------+
+static void UnSetRes(void)
+{
+	DBG_Printf("UnSetRes()\n");
+
+	pwglMakeCurrent(hDC, NULL);
+	pwglDeleteContext(hGLRC);
+	hGLRC = NULL;
+	if (WasFullScreen)
+		ChangeDisplaySettings(NULL, CDS_FULLSCREEN);
+}
+
+
+// -----------------+
+// GetModeList      : Return the list of available display modes.
+// Returns          : pvidmodes   - points to list of detected OpenGL video modes
+//                  : numvidmodes - number of detected OpenGL video modes
+// -----------------+
+EXPORT void HWRAPI(GetModeList) (vmode_t** pvidmodes, INT32 *numvidmodes)
+{
+	INT32  i;
+
+#if 1
+	INT32 iMode;
+/*
+	faB test code
+
+	Commented out because there might be a problem with combo (Voodoo2 + other card),
+	we need to get the 3D card's display modes only.
+*/
+	(*pvidmodes) = &video_modes[0];
+
+	// Get list of device modes
+	for (i = 0,iMode = 0; iMode < MAX_VIDEO_MODES; i++)
+	{
+		DEVMODE Tmp;
+		ZeroMemory(&Tmp, sizeof (Tmp));
+		Tmp.dmSize = sizeof (Tmp);
+		if (!EnumDisplaySettings(NULL, i, &Tmp))
+			break;
+
+		// add video mode
+		if (Tmp.dmBitsPerPel == 16 &&
+			 (iMode == 0 || !
+			  (Tmp.dmPelsWidth == video_modes[iMode-1].width &&
+			   Tmp.dmPelsHeight == video_modes[iMode-1].height)
+			 )
+			)
+		{
+			video_modes[iMode].pnext = &video_modes[iMode+1];
+			video_modes[iMode].windowed = 0;                    // fullscreen is the default
+			video_modes[iMode].misc = 0;
+			video_modes[iMode].name = malloc(12 * sizeof (CHAR));
+			sprintf(video_modes[iMode].name, "%dx%d", (INT32)Tmp.dmPelsWidth, (INT32)Tmp.dmPelsHeight);
+			DBG_Printf ("Mode: %s\n", video_modes[iMode].name);
+			video_modes[iMode].width = Tmp.dmPelsWidth;
+			video_modes[iMode].height = Tmp.dmPelsHeight;
+			video_modes[iMode].bytesperpixel = Tmp.dmBitsPerPel/8;
+			video_modes[iMode].rowbytes = Tmp.dmPelsWidth * video_modes[iMode].bytesperpixel;
+			video_modes[iMode].pextradata = NULL;
+			video_modes[iMode].setmode = SetRes;
+			iMode++;
+		}
+	}
+	(*numvidmodes) = iMode;
+#else
+
+	// classic video modes (fullscreen/windowed)
+	// Added some. Tails
+	INT32 res[][2] = {
+					{ 320, 200},
+					{ 320, 240},
+					{ 400, 300},
+					{ 512, 384},
+					{ 640, 400},
+					{ 640, 480},
+					{ 800, 600},
+					{ 960, 600},
+					{1024, 768},
+					{1152, 864},
+					{1280, 800},
+					{1280, 960},
+					{1280,1024},
+					{1600,1000},
+					{1680,1050},
+					{1920,1200},
+};
+
+	HDC bpphdc;
+	INT32 iBitsPerPel;
+
+	DBG_Printf ("HWRAPI GetModeList()\n");
+
+	bpphdc = GetDC(NULL); // on obtient le bpp actuel
+	iBitsPerPel = GetDeviceCaps(bpphdc, BITSPIXEL);
+
+	ReleaseDC(NULL, bpphdc);
+
+	(*pvidmodes) = &video_modes[0];
+	(*numvidmodes) = sizeof (res) / sizeof (res[0]);
+	for (i = 0; i < (*numvidmodes); i++)
+	{
+		video_modes[i].pnext = &video_modes[i+1];
+		video_modes[i].windowed = 0; // fullscreen is the default
+		video_modes[i].misc = 0;
+		video_modes[i].name = malloc(12 * sizeof (CHAR));
+		sprintf(video_modes[i].name, "%dx%d", res[i][0], res[i][1]);
+		DBG_Printf ("Mode: %s\n", video_modes[i].name);
+		video_modes[i].width = res[i][0];
+		video_modes[i].height = res[i][1];
+		video_modes[i].bytesperpixel = iBitsPerPel/8;
+		video_modes[i].rowbytes = res[i][0] * video_modes[i].bytesperpixel;
+		video_modes[i].pextradata = NULL;
+		video_modes[i].setmode = SetRes;
+	}
+#endif
+	video_modes[(*numvidmodes)-1].pnext = NULL;
+}
+
+
+// -----------------+
+// Shutdown         : Shutdown OpenGL, restore the display mode
+// -----------------+
+EXPORT void HWRAPI(Shutdown) (void)
+{
+#ifdef DEBUG_TO_FILE
+	long nb_centiemes;
+
+	DBG_Printf ("HWRAPI Shutdown()\n");
+	nb_centiemes = ((clock()-my_clock)*100)/CLOCKS_PER_SEC;
+	DBG_Printf("Nb frames: %li;  Nb sec: %2.2f  ->  %2.1f fps\n",
+					nb_frames, nb_centiemes/100.0f, (100*nb_frames)/(double)nb_centiemes);
+#endif
+
+	Flush();
+
+	// Exit previous mode
+	if (hGLRC)
+		UnSetRes();
+
+	if (hDC)
+	{
+		ReleaseDC(hWnd, hDC);
+		hDC = NULL;
+	}
+	FreeLibrary(OGL32);
+	DBG_Printf ("HWRAPI Shutdown(DONE)\n");
+}
+
+// -----------------+
+// FinishUpdate     : Swap front and back buffers
+// -----------------+
+void GL_FinishUpdate (INT32 waitvbl)
+{
+#ifdef USE_WGL_SWAP
+	static INT32 oldwaitvbl = 0;
+#else
+	UNREFERENCED_PARAMETER(waitvbl);
+#endif
+	// DBG_Printf ("FinishUpdate()\n");
+#ifdef DEBUG_TO_FILE
+	if ((++nb_frames)==2)  // on ne commence pas � la premi�re frame
+		my_clock = clock();
+#endif
+
+#ifdef USE_WGL_SWAP
+	if (oldwaitvbl != waitvbl && wglSwapIntervalEXT)
+		wglSwapIntervalEXT(waitvbl);
+	oldwaitvbl = waitvbl;
+#endif
+
+	SwapBuffers(hDC);
+}
+#endif

src/hardware/r_opengl/r_opengl.c

@@ -136,7 +136,8 @@ enum
 {
 	FBO_NONE,
 	FBO_ARB,
-	FBO_EXT
+	FBO_EXT,
+	FBO_EXT_STENCIL // supports stencil attachment
 };
 
 typedef struct
@@ -160,7 +161,7 @@ GL_DEPTH24_STENCIL8 GL_DEPTH_COMPONENT_EXT
 GL_DEPTH_STENCIL_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
 #endif
 
-static void GL_FBO_DeleteAttachments(void);
+static void GL_Framebuffer_DeleteAttachments(void);
 #endif
 
 // needed for glportals
@@ -768,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
-	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))
-	{
+	// in opengl 3.0 and up fbos are standart and always supported
+	if (majorGL >= 3)
 		return FBO_ARB;
-	}
 
-	// gl versions from 2.1 and older may still support framebuffer objects
-	// depending on vendor and driver support
-	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 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;
+
+	// 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))
 	{
+		// 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;
 	}
 
@@ -878,7 +885,7 @@ void SetupGLFunc4(void)
 	{ \
 		GL_MSG_Warning("failed to get OpenGL FBO function: %s\n", #func); \
 		GL_DBG_Printf("\nFBO: No framebuffer object support\n"); \
-		supportFBO = FBO_NONE; \
+		supportFBO = false; \
 		return; \
 	} \
 
@@ -901,41 +908,36 @@ void SetupGLFunc4(void)
 
 			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;
 
-			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;
@@ -1120,7 +1122,7 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect)
 
 	const GLfloat deltaZ = FAR_CLIPPING_PLANE - NEAR_CLIPPING_PLANE;
 
-	if ((fabsf(deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
+	if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
 	{
 		return;
 	}
@@ -1149,7 +1151,7 @@ void GL_SetModelView(GLint w, GLint h)
 		GL_FlushScreenTextures();
 
 #ifdef USE_FBO_OGL
-		GL_FBO_DeleteAttachments();
+		GL_Framebuffer_DeleteAttachments();
 #endif
 	}
 
@@ -1463,19 +1465,6 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
 	if (tex != HWD_SCREENTEXTURE_GENERIC2)
 		GL_DrawScreenTexture(tex, NULL, 0);
 
-#ifdef USE_FBO_OGL
-	// FIXME: this is incredibly stupid
-	// but the final screen texture will NOT be drawn in the downsample fbo
-	if (tex == HWD_SCREENTEXTURE_GENERIC2 &&
-		UseScreenFBO() && HWR_ShouldUsePaletteRendering())
-	{
-		GL_SetShader(HWR_GetShaderFromTarget(SHADER_PALETTE_POSTPROCESS));
-		GL_EnableShader();
-		GL_DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0);
-		GL_UnSetShader();
-	}
-#endif
-
 	image = malloc(screen_width*screen_height*3);
 	pglPixelStorei(GL_PACK_ALIGNMENT, 1);
 	pglReadPixels(0, 0, screen_width, screen_height, GL_RGB, GL_UNSIGNED_BYTE, image);
@@ -1594,7 +1583,6 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color)
 		angle = atanf((v2->y-v1->y)/(v2->x-v1->x));
 	else
 		angle = (float)N_PI_DEMI;
-
 	dx = sinf(angle) / (float)screen_width;
 	dy = cosf(angle) / (float)screen_height;
 
@@ -1709,7 +1697,7 @@ static void GL_SetBlendMode(FBITFIELD flags)
 
 void GL_SetBlend(FBITFIELD PolyFlags)
 {
-	const FBITFIELD Xor = CurrentPolyFlags^PolyFlags;
+	const FBITFIELD Xor = CurrentPolyFlags^PolyFlags;;
 
 	if (Xor & (PF_Blending|PF_RemoveYWrap|PF_ForceWrapX|PF_ForceWrapY|PF_Occlude|PF_NoTexture|PF_Modulated|PF_NoDepthTest|PF_Decal|PF_Skydecal|PF_Invisible))
 	{
@@ -1929,7 +1917,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;
@@ -2502,7 +2489,7 @@ void GL_RenderSkyDome(gl_sky_t *sky)
 	GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
 
 	// Build the sky dome! Yes!
-	if (sky->rebuild || !sky->vbo)
+	if (sky->rebuild)
 	{
 		// delete VBO when already exists
 		if (sky->vbo)
@@ -2639,7 +2626,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:
@@ -2923,7 +2914,7 @@ void GL_CreateModelVBOs(model_t *model)
 	}
 }
 
-#define BUFFER_OFFSET(i) ((void*)(i))
+#define BUFFER_OFFSET(i) ((char*)(i))
 
 void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
 {
@@ -3216,8 +3207,8 @@ void GL_SetTransform(FTransform *stransform)
 	{
 		float dy = stransform->viewaiming * 2;
 
-		if (stransform->fliptype == TRANSFORM_FLIP ||
-			stransform->fliptype == TRANSFORM_MIRRORFLIP)
+		if (stransform->fliptype == TRANSFORM_FLIP
+			|| stransform->fliptype == TRANSFORM_MIRRORFLIP)
 			dy *= -1.0f;
 
 		pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f);
@@ -3240,9 +3231,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 || !framebufferobject.init)
+	if (!supportFBO || !framebufferobject.init)
 		return;
 
 	// Unbind the framebuffer
@@ -3260,9 +3251,9 @@ static void GL_FBO_DeleteAttachments(void)
 	framebufferobject.init = false;
 }
 
-static void GL_FBO_Generate(void)
+static void GL_Framebuffer_Generate(void)
 {
-	if (supportFBO == FBO_NONE || framebufferobject.init)
+	if (!supportFBO || framebufferobject.init || !UseScreenFBO())
 		return;
 
 	// Generate the framebuffer
@@ -3277,15 +3268,15 @@ 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);
 		Clamp2D(GL_TEXTURE_WRAP_T);
+		pglBindTexture(GL_TEXTURE_2D, 0);
 
 		// Attach the framebuffer texture to the framebuffer
 		pglFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, framebufferobject.tex, 0);
-		pglBindTexture(GL_TEXTURE_2D, 0);
 	}
 
 	// Generate the renderbuffer
@@ -3300,13 +3291,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
@@ -3318,11 +3314,11 @@ 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 wouldnt recover
-		supportFBO = FBO_NONE;
+		supportFBO = false;
 		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 		return;
 	}
@@ -3333,33 +3329,33 @@ static void GL_FBO_Generate(void)
 	framebufferobject.init = true;
 }
 
-void GL_FBO_BindMainFrameBuffer(void)
+void GL_Framebuffer_Unbind(void)
 {
-	if (supportFBO == FBO_NONE || !framebufferobject.init)
+	if (!supportFBO || !framebufferobject.init)
 		return;
 
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 	pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
 }
 
-void GL_FBO_Enable(void)
+void GL_Framebuffer_Enable(void)
 {
-	if (supportFBO == FBO_NONE)
+	if (!supportFBO || !UseScreenFBO())
 		return;
 
-	GL_FBO_Generate();
+	GL_Framebuffer_Generate();
 
 	// failed
-	if (!framebufferobject.init)
+	if (!supportFBO || !framebufferobject.init)
 		return;
 
 	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 || !framebufferobject.init)
+	if (!supportFBO || !framebufferobject.init)
 		return;
 
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
@@ -3370,7 +3366,7 @@ void GL_FBO_Disable(void)
 		pglDeleteFramebuffers(1, &framebufferobject.fboobj);
 	framebufferobject.fboobj = 0;
 
-	GL_FBO_DeleteAttachments();
+	GL_Framebuffer_DeleteAttachments();
 }
 #endif
 
@@ -3721,7 +3717,6 @@ 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};
 
 	if (!gl_enable_screen_textures)
 		return;
@@ -3734,29 +3729,16 @@ 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];
 }

src/hardware/r_opengl/r_opengl.dev

@@ -0,0 +1,79 @@
+[Project]
+FileName=r_opengl.dev
+Name=r_opengl
+Ver=1
+IsCpp=1
+Type=3
+Compiler=-D_M_IX86=500_@@_-Wall_@@_-D_WINDOWS_@@_-DUSE_WGL_SWAP_@@_-Os_@@_-fomit-frame-pointer_@@_
+CppCompiler=
+Includes=
+Linker=--def ../r_mingw.def_@@_-lgdi32_@@_
+Libs=
+UnitCount=3
+Folders=
+ObjFiles=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=C:\srb2demo2
+ObjectOutput=..\..\..\objs\Mingw\r_opengl
+OverrideOutput=1
+OverrideOutputName=r_opengl.dll
+HostApplication=
+CommandLine=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=00000000000000000111d0
+UseCustomMakefile=0
+CustomMakefile=
+
+[Unit1]
+FileName=ogl_win.c
+Folder=
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=r_opengl.c
+Folder=
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=r_opengl.h
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=r_opengl.exe
+ProductName=r_opengl
+ProductVersion=0.1
+AutoIncBuildNr=0
+

src/hardware/r_opengl/r_opengl.dsp

@@ -0,0 +1,105 @@
+# Microsoft Developer Studio Project File - Name="r_opengl" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=r_opengl - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "r_opengl.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "r_opengl.mak" CFG="r_opengl - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "r_opengl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "r_opengl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "r_opengl - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "r_opengl___Win32_Release"
+# PROP BASE Intermediate_Dir "r_opengl___Win32_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\bin\VC\Release\r_opengl"
+# PROP Intermediate_Dir "..\..\..\objs\VC\Release\r_opengl"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /G5 /W3 /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x80c /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Release\r_opengl.pdb" /machine:I386 /out:"C:\srb2demo2\r_opengl.dll"
+# SUBTRACT LINK32 /pdb:none /debug
+
+!ELSEIF  "$(CFG)" == "r_opengl - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\..\objs\Debug"
+# PROP BASE Intermediate_Dir "..\..\..\objs\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\bin\VC\Debug\r_opengl"
+# PROP Intermediate_Dir "..\..\..\objs\VC\Debug\r_opengl"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x80c /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Debug\r_opengl.pdb" /debug /machine:I386 /out:"C:\srb2demo2\r_opengld.dll" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "r_opengl - Win32 Release"
+# Name "r_opengl - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\ogl_win.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_opengl.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_opengl.h
+# End Source File
+# End Target
+# End Project

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

@@ -117,11 +117,6 @@ static void HU_DrawRankings(void);
 
 consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-// stuff from SRB2-Banpyura thx alot! :3
-consvar_t cv_chat_xoffset = {"chat_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chat_yoffset = {"chat_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chat_showlimit = {"chat_showlimit", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 static char cechotext[1024];
 static tic_t cechotimer = 0;
 static tic_t cechoduration = 5*TICRATE;
@@ -138,7 +133,6 @@ static void Command_Say_f(void);
 static void Command_Sayto_f(void);
 static void Command_Sayteam_f(void);
 static void Command_CSay_f(void);
-static void Command_Mute_f(void);
 static void Got_Saycmd(const UINT8 **p, INT32 playernum);
 
 void HU_LoadGraphics(void)
@@ -154,14 +148,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 +182,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 +193,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 +206,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 +218,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 +234,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);
 	}
 
@@ -266,8 +260,6 @@ void HU_Init(void)
 	COM_AddCommand("csay", Command_CSay_f);
 	RegisterNetXCmd(XD_SAY, Got_Saycmd);
 
-	COM_AddCommand("muteplayer", Command_Mute_f);
-
 	if (dedicated || rendermode == render_none)
 		return;
 
@@ -472,7 +464,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 +520,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 +771,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 +823,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;
@@ -968,7 +963,7 @@ void HU_Ticker(void)
 		size_t i = 0;
 
 		// handle spam while we're at it:
-		for (; (i < MAXPLAYERS); i++)
+		for(; (i < MAXPLAYERS); i++)
 		{
 			if (stop_spamming[i] > 0)
 				stop_spamming[i]--;
@@ -1027,42 +1022,21 @@ static boolean HU_clearChatSpaces(void)
 	return nothingbutspaces;
 }
 
-static void DoMute(const char *name, boolean chat)
+static void DoMute(const char *name)
 {
 	INT32 pnum = D_LookupPlayer(name);
 
-	// Shortcut to reuse this function for console and chat command
-#define PRINT(msg, sound) do { \
-	if (chat) \
-		HU_AddChatText((msg), (sound)); \
-	else \
-		CONS_Printf("%s\n", msg); \
-} while (0)
-
-	if (pnum < 0 || !playeringame[pnum])
+	if (pnum < 0)
 	{
-		PRINT("\x85""ERROR: \x80Player not found.", false);
+		HU_AddChatText("\x85""ERROR: \x80Player not found.", false);
 		return;
 	}
 
 	player_muted[pnum] = !player_muted[pnum];
 
-	PRINT(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false);
+	HU_AddChatText(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false);
 	if (player_muted[pnum])
-		PRINT("Use same command to unmute them.", false);
-
-#undef PRINT
-}
-
-static void Command_Mute_f(void)
-{
-	if (COM_Argc() < 2)
-	{
-		CONS_Printf(M_GetText("mute <playername|playernum>: mute/unmute a player\n"));
-		return;
-	}
-
-	DoMute(COM_Argv(1), false);
+		HU_AddChatText("Use same command to unmute them.", false);
 }
 
 static void HU_SendChatMessage(void)
@@ -1096,7 +1070,7 @@ static void HU_SendChatMessage(void)
 	if (msglength >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute
 	{
 		if (msglength > 6)
-			DoMute(msg+6, true);
+			DoMute(msg+6);
 		else
 			HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false);
 
@@ -1137,7 +1111,6 @@ static void HU_SendChatMessage(void)
 				return;
 			}
 		}
-
 		// I'm very bad at C, I swear I am, additional checks eww!
 		if (spc != 0)
 		{
@@ -1284,15 +1257,13 @@ boolean HU_Responder(event_t *ev)
 			chat_on = false;
 			I_SetTextInput(false);
 		}
-		else if ((c == KEY_UPARROW || c == KEY_PGUP || c == KEY_MOUSEWHEELUP) &&
-			     ((chat_scroll > 0) && !OLDCHAT)) // CHAT SCROLLING YAYS!
+		else if ((c == KEY_UPARROW || c == KEY_MOUSEWHEELUP) && chat_scroll > 0 && !OLDCHAT) // CHAT SCROLLING YAYS!
 		{
 			chat_scroll--;
 			justscrolledup = true;
 			chat_scrolltime = 4;
 		}
-		else if ((c == KEY_DOWNARROW || c == KEY_PGDN || c == KEY_MOUSEWHEELDOWN) &&
-			    ((chat_scroll < chat_maxscroll) && (chat_maxscroll > 0) && !OLDCHAT))
+		else if ((c == KEY_DOWNARROW || c == KEY_MOUSEWHEELDOWN) && chat_scroll < chat_maxscroll && chat_maxscroll > 0 && !OLDCHAT)
 		{
 			chat_scroll++;
 			justscrolleddown = true;
@@ -1372,12 +1343,7 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 
 // 30/7/18: chaty is now the distance at which the lowest point of the chat will be drawn if that makes any sense.
 
-// let's use this as our coordinates, shh
-// :chao: guess this just works lol
-#define chatx ((INT16)(13 + (cv_chat_xoffset.value)))
-#define chaty ((INT16)(169 + (cv_chat_yoffset.value)))
-
-#define CHATSNAP (V_SNAPTOBOTTOM|V_SNAPTOLEFT)
+INT16 chatx = 13, chaty = 169; // let's use this as our coordinates, shh
 
 // chat stuff by VincyTM LOL XD!
 
@@ -1404,7 +1370,7 @@ static void HU_drawMiniChat(void)
 
 	for (; i > 0; i--)
 	{
-		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i-1]);
+		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i-1]);
 		size_t j = 0;
 		INT32 linescount = 0;
 		emote_t *emote = NULL;
@@ -1464,7 +1430,6 @@ static void HU_drawMiniChat(void)
 	if (splitscreen)
 	{
 		y -= BASEVIDHEIGHT/2;
-
 		if (splitscreen > 1)
 			y += 16;
 	}
@@ -1482,7 +1447,7 @@ static void HU_drawMiniChat(void)
 		INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below...
 		INT32 transflag = (timer >= 0 && timer <= 9) ? (timer*V_10TRANS) : 0; // you can make bad jokes out of this one.
 		size_t j = 0;
-		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it.
+		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it.
 		UINT8 *colormap = NULL;
 		emote_t *emote = NULL;
 		int emotelen = 0;
@@ -1515,9 +1480,9 @@ static void HU_drawMiniChat(void)
 			else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
 			{
 				if (cv_chatbacktint.value) // on request of wolfy
-					V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|CHATSNAP);
+					V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 
-				M_DrawEmote(x+dx+2, y+dy, emote, CHATSNAP|transflag);
+				M_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
 				dx += EMOTEWIDTH - charwidth;
 
 				j += emotelen;
@@ -1525,9 +1490,9 @@ static void HU_drawMiniChat(void)
 			else
 			{
 				if (cv_chatbacktint.value) // on request of wolfy
-					V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|CHATSNAP);
+					V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 
-				V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |CHATSNAP|transflag, !cv_allcaps.value, colormap);
+				V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag, !cv_allcaps.value, colormap);
 			}
 
 			dx += charwidth;
@@ -1588,13 +1553,13 @@ static void HU_drawChatLog(INT32 offset)
 	chat_topy = y + chat_scroll*charheight;
 	chat_bottomy = chat_topy + boxh*charheight;
 
-	V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|CHATSNAP); // log box
+	V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); // log box
 
 	for (i = 0; i < chat_nummsg_log; i++) // iterate through our chatlog
 	{
 		INT32 clrflag = 0;
 		INT32 j = 0;
-		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it.
+		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it.
 		UINT8 *colormap = NULL;
 		emote_t *emote = NULL;
 		int emotelen = 0;
@@ -1624,7 +1589,7 @@ static void HU_drawChatLog(INT32 offset)
 			{
 				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
 				{
-					M_DrawEmote(x+dx+2, y+dy+1, emote, CHATSNAP);
+					M_DrawEmote(x+dx+2, y+dy+1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 					dx += EMOTEWIDTH - charwidth;
 				}
 				j += emotelen;
@@ -1632,7 +1597,7 @@ static void HU_drawChatLog(INT32 offset)
 			else
 			{
 				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
-					V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |CHATSNAP, !cv_allcaps.value, colormap);
+					V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT, !cv_allcaps.value, colormap);
 				else
 					j++; // don't forget to increment this or we'll get stuck in the limbo.
 			}
@@ -1669,9 +1634,9 @@ static void HU_drawChatLog(INT32 offset)
 
 	// draw arrows to indicate that we can (or not) scroll.
 	if (chat_scroll > 0)
-		V_DrawCharacter(chatx-9, ((justscrolledup) ? (chat_topy-1) : (chat_topy)), CHATSNAP | highlight | '\x1A', false); // up arrow
+		V_DrawCharacter(chatx-9, ((justscrolledup) ? (chat_topy-1) : (chat_topy)), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1A', false); // up arrow
 	if (chat_scroll < chat_maxscroll)
-		V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), CHATSNAP | highlight | '\x1B', false); // down arrow
+		V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1B', false); // down arrow
 
 	justscrolleddown = false;
 	justscrolledup = false;
@@ -1689,7 +1654,6 @@ static void HU_DrawChat(void)
 	INT32 boxw = cv_chatwidth.value;
 	INT32 t = 0, c = 0, y = chaty - (typelines*charheight);
 	UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday!
-	UINT32 charcount = 0;
 	INT32 cflag = 0;
 	INT32 pm_offset = 0; // for cases when you type emote while also doing /pm
 	size_t select_start = 0, select_end = 0;
@@ -1721,7 +1685,7 @@ static void HU_DrawChat(void)
 		cflag = V_GRAYMAP; // set text in gray if chat is muted.
 	}
 
-	V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | CHATSNAP);
+	V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);
 
 	while (talk[i])
 	{
@@ -1729,7 +1693,7 @@ static void HU_DrawChat(void)
 			++i;
 		else
 		{
-			V_DrawChatCharacter(chatx + c + 2, y, talk[i] |CHATSNAP|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag));
+			V_DrawChatCharacter(chatx + c + 2, y, talk[i] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag));
 			i++;
 		}
 
@@ -1747,7 +1711,7 @@ static void HU_DrawChat(void)
 	typelines = 1;
 
 	if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4)
-		V_DrawChatCharacter(chatx+2+c, y+1, '_'|CHATSNAP|t, !cv_allcaps.value, NULL);
+		V_DrawChatCharacter(chatx+2+c, y+1, '_'|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
 
 	if (w_chat.select != w_chat.cursor)
 	{
@@ -1764,23 +1728,17 @@ static void HU_DrawChat(void)
 
 		if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
 		{
-			M_DrawEmote(chatx + c + 2, y-1, emote, CHATSNAP|t);
+			M_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
 			c += EMOTEWIDTH - charwidth;
 			i += emotelen-1;
 			drawwidth = EMOTEWIDTH;
-			if (cv_chat_showlimit.value)
-				charcount += emotelen;
 		}
 		else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
-		{
-			V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | CHATSNAP | t, !cv_allcaps.value, NULL);
-			if (cv_chat_showlimit.value)
-				charcount++;
-		}
+			V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL);
 
 		// Draw selection
 		if (i >= select_start && i < select_end)
-			V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|CHATSNAP|t);
+			V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
 
 		++i;
 
@@ -1789,7 +1747,7 @@ static void HU_DrawChat(void)
 			INT32 cursorx = (c+charwidth < boxw-charwidth) ? (chatx + 2 + c+charwidth) : (chatx+1); // we may have to go down.
 			INT32 cursory = (cursorx != chatx+1) ? (y) : (y+charheight);
 			if (hu_tick < 4)
-				V_DrawChatCharacter(cursorx, cursory+1, '_' |CHATSNAP|t, !cv_allcaps.value, NULL);
+				V_DrawChatCharacter(cursorx, cursory+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
 
 			if (cursorx == chatx+1 && saylen == i-1) // a weirdo hack
 			{
@@ -1807,13 +1765,6 @@ static void HU_DrawChat(void)
 		}
 	}
 
-	if (cv_chat_showlimit.value)
-	{
-		// Limit
-		const INT32 clr = ((HU_MAXMSGLEN - charcount) > 64 ? V_TRANSLUCENT : (charcount == HU_MAXMSGLEN ? V_REDMAP : V_YELLOWMAP));
-		V_DrawSmallString(chatx, y+7, CHATSNAP|clr, va("%d/%d", charcount, HU_MAXMSGLEN));
-	}
-
 	// handle /pm list. It's messy, horrible and I don't care.
 	if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
 	{
@@ -1849,7 +1800,6 @@ static void HU_DrawChat(void)
 			{
 				char nodenum[3];
 				UINT32 n;
-
 				// right, that's half important: (w_chat_buf[4] may be a space since /pm0 msg is perfectly acceptable!)
 				if (!isdigit(w_chat_buf[3]) || !(isdigit(w_chat_buf[4]) || (w_chat_buf[4] == ' ') || (w_chat_buf[4] == 0)))
 					break;
@@ -1887,17 +1837,17 @@ static void HU_DrawChat(void)
 			}
 
 			// fill it like the chat so the text doesn't become hard to read because of the hud.
-			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | CHATSNAP);
+			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);
 
-			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), CHATSNAP|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i]));
+			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i]));
 			count++;
 		}
 
 		if (count == 0) // no results.
 		{
 			pm_offset = 48 + 2;
-			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | CHATSNAP); // fill it like the chat so the text doesn't become hard to read because of the hud.
-			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), CHATSNAP|V_ALLOWLOWERCASE, "NO RESULT.");
+			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
+			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
 		}
 		else
 		{
@@ -1949,15 +1899,15 @@ static void HU_DrawChat(void)
 
 		while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
 		{
-			V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, CHATSNAP);
+			V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 
 			// Highlight currently suggested emote
 			int hlflag = 0;
 			if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
 				hlflag = V_YELLOWMAP;
 
-			V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|CHATSNAP|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
-			M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, CHATSNAP);
+			V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
+			M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 
 			++skip;
 		}
@@ -1971,7 +1921,6 @@ static void HU_DrawChat(void)
 static void HU_DrawChat_Old(void)
 {
 	INT32 t = 0, c = 0, y = HU_INPUTY;
-	UINT32 charcount = 0;
 	size_t i = 0;
 	const char *ntalk = "Say: ", *ttalk = "Say-Team: ";
 	const char *talk = ntalk;
@@ -2017,17 +1966,11 @@ static void HU_DrawChat_Old(void)
 		{
 			M_DrawScaledEmote((HU_INPUTX + c)<<FRACBITS, (y+con_scalefactor*2)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART | V_NOSCALEPATCH | t);
 			i += emotelen-1;
-
-			if (cv_chat_showlimit.value)
-				charcount += emotelen;
 		}
 		else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
 		{
 			//charwidth = hu_font[w_chat[i]-HU_FONTSTART]->width * con_scalefactor;
 			V_DrawCharacter(HU_INPUTX + c, y, w_chat_buf[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
-
-			if (cv_chat_showlimit.value)
-				charcount++;
 		}
 
 		// Draw selection
@@ -2040,7 +1983,7 @@ static void HU_DrawChat_Old(void)
 		{
 			INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down.
 			INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight);
-			V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' | cv_constextsize.value | V_NOSCALESTART |t, !cv_allcaps.value);
+			V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
 		}
 
 		c += charwidth;
@@ -2050,24 +1993,6 @@ static void HU_DrawChat_Old(void)
 			y += charheight;
 		}
 	}
-
-	// console chat users are FINALLY being fed!
-	if (cv_chat_showlimit.value)
-	{
-		const char *lim = va(" (%i/%i)", charcount, HU_MAXMSGLEN);
-		for (i = 0; lim[i]; i++)
-		{
-			V_DrawCharacter(HU_INPUTX + c, y, lim[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
-
-			c += charwidth;
-			if (c >= vid.width) // text wrapping
-			{
-				c = 0;
-				y += charheight;
-			}
-		}
-	}
-
 }
 
 static void HU_DrawCEcho(void)
@@ -2256,13 +2181,12 @@ static void HU_DrawSongCreditsBox(void)
 		y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup - interpoffset)/FRACUNIT;
 	}
 
-	bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2) - 2; // arbitrary value, looks a bit better
+	bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2);
 
 	if (bgt < NUMTRANSMAPS)
 	{
-		const UINT8 accent = colortranslations[K_GetHudColor()][7];
-		V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, accent|flags|(bgt<<V_ALPHASHIFT));
-		V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, accent|flags|(bgt<<V_ALPHASHIFT));
+		V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, 28|flags|(bgt<<V_ALPHASHIFT));
+		V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, 30|flags|(bgt<<V_ALPHASHIFT));
 	}
 
 	if (cursongcredit.trans < NUMTRANSMAPS)
@@ -2289,22 +2213,7 @@ void HU_DrawSongCredits(void)
 	}
 }
 
-static void HU_ForceShowChat(void)
-{
-	// only matters for non console chat
-	// see m_menu for how forceshowchat is set
-	if (!chat_on && forceshowchat)
-	{
-		// only print this if theres nothing in chat already
-		if (chat_nummsg_log == 0)
-		{
-			HU_AddChatText("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", false);
-		}
 
-		HU_DrawChat();
-	}
-}
-	
 // Heads up displays drawer, call each frame
 //
 void HU_Drawer(void)
@@ -2312,8 +2221,6 @@ void HU_Drawer(void)
 	if (cv_vhseffect.value && ((paused && !camera[R_GetViewNumber()].freecam) || (demo.playback && cv_playbackspeed.value > 1)))
 		V_DrawVhsEffect(demo.rewinding);
 
-	HU_ForceShowChat();
-
 	// draw chat string plus cursor
 	if (chat_on)
 	{
@@ -2393,7 +2300,8 @@ void HU_Drawer(void)
 //                   IN-LEVEL MULTIPLAYER RANKINGS
 //======================================================================
 
-static int Ping_gfx_num(int lag)
+static int
+Ping_gfx_num (int lag)
 {
 	if (lag < 2)
 		return 0;
@@ -2407,7 +2315,8 @@ static int Ping_gfx_num(int lag)
 		return 4;
 }
 
-static int Ping_gfx_color(UINT32 lag)
+static int
+Ping_gfx_color (UINT32 lag)
 {
 	if (lag < 2)
 		return SKINCOLOR_JAWZ;
@@ -2430,7 +2339,8 @@ static int Ping_gfx_color(UINT32 lag)
 		return SKINCOLOR_WHITE; // to make the flashing work
 }
 
-static const UINT8 *Ping_gfx_colormap(UINT32 lag, boolean gentleman)
+static const UINT8 *
+Ping_gfx_colormap (UINT32 lag, boolean gentleman)
 {
 	const UINT8 *colormap = NULL;
 
@@ -2450,7 +2360,8 @@ static const UINT8 *Ping_gfx_colormap(UINT32 lag, boolean gentleman)
 	return colormap;
 }
 
-static UINT32 Ping_conversion(UINT32 lag)
+static UINT32
+Ping_conversion (UINT32 lag)
 {
 	if (cv_pingmeasurement.value)
 	{
@@ -2567,26 +2478,6 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
 	}
 }
 
-void HU_drawLocalPlayerPing(INT32 x, INT32 y, INT32 flags)
-{
-	UINT32 lag = localplayerping;
-	const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag));
-
-	if (gentleman)
-	{
-		lag = simulated_lag;
-	}
-
-	if (cv_pingstyle.value == 0) // kart
-	{
-		HU_drawKartPing(x, y, lag, flags, gentleman);
-	}
-	else if (cv_pingstyle.value == 1) // old style ping
-	{
-		HU_drawOldPing(x, y, lag, flags, gentleman);
-	}
-}
-
 //
 // HU_DrawSpectatorTicker
 //
@@ -2827,9 +2718,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/hu_stuff.h

@@ -88,10 +88,6 @@ extern patch_t *tallminus;
 // set true whenever the tab rankings are being shown for any reason
 extern boolean hu_showscores;
 
-extern consvar_t cv_chat_xoffset;
-extern consvar_t cv_chat_yoffset;
-extern consvar_t cv_chat_showlimit;
-
 // init heads up data at game startup.
 void HU_Init(void);
 
@@ -108,7 +104,6 @@ void HU_Drawer(void);
 char HU_dequeueChatChar(void);
 void HU_clearChatChars(void);
 void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags);	// Lat': Ping drawer for scoreboard.
-void HU_drawLocalPlayerPing(INT32 x, INT32 y, INT32 flags);
 void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol);
 void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds);
 const char *HU_SkinColorToConsoleColor(skincolors_t color);

src/i_joy.h

@@ -36,7 +36,25 @@ extern "C" {
 "JOYBUTTONS is greater than INT64 bits can hold"
 #endif
 
-#define DigitalGamepadStyle(i) (cv_joyscale[i].value == 0)
+/**	\brief	The struct JoyType_s
+
+ share some joystick information (maybe 2 for splitscreen), to the game input code,
+ actually, we need to know if it is a gamepad or analog controls
+*/
+
+struct JoyType_s
+{
+	/*! this joystick is a gamepad, read: digital axes
+	if FALSE, interpret the joystick event data as JOYAXISRANGE (see above) */
+	INT32 bGamepadStyle;
+
+};
+typedef struct JoyType_s JoyType_t;
+/**	\brief Joystick info
+	for palyer[sic] 1-4's joystick/gamepad
+*/
+
+extern JoyType_t Joystick[MAXSPLITSCREENPLAYERS];
 
 #ifdef __cplusplus
 } // extern "C"

src/i_system.h

@@ -14,9 +14,6 @@
 #ifndef __I_SYSTEM__
 #define __I_SYSTEM__
 
-// page for Saturn issue reports
-#define SATURNISSUEPAGE "https://github.com/Indev450/SRB2Kart-Saturn/issues"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -206,15 +203,6 @@ void I_ShutdownSystem(void);
 /**	\brief To check if a Interrupt or Terminate Signal was fired
  */
 boolean I_Interrupted(void);
-static inline void I_HandleInterrupt(void)
-{
-	if (I_Interrupted())
-		I_Quit();
-}
-
-/** \brief Open A URL
- */
-int I_OpenURL(const char *url);
 
 /**	\brief	The I_GetDiskFreeSpace function
 
@@ -237,21 +225,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
 
@@ -1693,7 +1694,6 @@ boolean I_InitTcpNetwork(void)
 			hardware_MAXPACKETLENGTH = MAXPACKETLENGTH;
 		}
 	}
-
 	if (M_CheckProtoParam("ip"))
 	{
 		COM_ImmedExecute(va("exec \"%s"PATHSEP"kartexec.cfg\" -noerror\n", srb2home));

src/i_video.h

@@ -126,9 +126,11 @@ 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,11 +452,7 @@ 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
 #define NUMMOBJFREESLOTS 1024
-#endif
 #define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
 #define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)
 

src/k_hud.c

@@ -98,8 +98,6 @@ consvar_t cv_showminimapfinished = {"showminimapfinished", "On", CV_SAVE, CV_OnO
 CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
 consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_spinoutroll = {"spinoutroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 static CV_PossibleValue_t posanim_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Smooth"}, {0, NULL}};
 consvar_t cv_posanim        = {"postitionanimation", "On", CV_SAVE, posanim_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_smallposnum    = {"smallpositionnumber", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -112,11 +110,6 @@ consvar_t cv_fancyroulette = {"animatedroulette", "Off", CV_SAVE, CV_OnOff, NULL
 consvar_t cv_darkitembox   = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // itembox gets a dark border with specific items
 consvar_t cv_multiitemicon = {"multiitemicon", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-enum { ROULETTECOLOR_NONE = -1, ROULETTECOLOR_HUD, ROULETTECOLOR_PLAYER, ROULETTECOLOR_ITEM };
-static CV_PossibleValue_t roulettecolor_cons_t[] = {
-	{ROULETTECOLOR_NONE, "None"}, {ROULETTECOLOR_HUD, "Hud"}, {ROULETTECOLOR_PLAYER, "Player"}, {ROULETTECOLOR_ITEM, "Item"}, {0, NULL}};
-consvar_t cv_roulettecolor = {"roulettecolor", "Hud", CV_SAVE, roulettecolor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_showlaptimes = {"showlaptimes", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_biglaps = {"biglaphud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // here for ppl who dont want to make 2 more patches for their custom hud
@@ -233,7 +226,6 @@ void K_RegisterKartHudStuff(void)
 	CV_RegisterVar(&cv_showminimapnames);
 	CV_RegisterVar(&cv_showminimapfinished);
 	CV_RegisterVar(&cv_showminimapangle);
-	CV_RegisterVar(&cv_spinoutroll);
 
 	CV_RegisterVar(&cv_showlapemblem);
 
@@ -251,8 +243,6 @@ void K_RegisterKartHudStuff(void)
 	CV_RegisterVar(&cv_multiitemicon);
 	CV_RegisterVar(&cv_huditemamount);
 
-	CV_RegisterVar(&cv_roulettecolor);
-
 	CV_RegisterVar(&cv_highresportrait);
 
 	CV_RegisterVar(&cv_nametag);
@@ -388,7 +378,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 +497,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 +667,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 +678,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 +693,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 +762,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 +784,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 +792,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 +805,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 +813,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 +822,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 +837,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 +848,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);
@@ -1149,7 +1136,7 @@ enum
 	SPEEDO_PMETERSMOL,
 };
 
-static UINT8 K_GetSpeedometerStyle(void)
+static SINT8 K_GetSpeedometerStyle(void)
 {
 	if (cv_newspeedometer.value == 2 && xtra_speedo)
 		return SPEEDO_EXTRA;
@@ -1520,77 +1507,74 @@ static void K_drawKartItem(void)
 
 	if (stplyr->kartstuff[k_itemroulette])
 	{
-		if (cv_roulettecolor.value == ROULETTECOLOR_PLAYER)
-			localcolor = stplyr->skincolor;
-		else if (cv_roulettecolor.value != ROULETTECOLOR_NONE)
-			localcolor = K_GetHudColor();
+		localcolor = K_GetHudColor();
 
 		switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3)
 		{
 			// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
 			case 0: // Sneaker
 				localpatch = kp_sneaker[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_RASPBERRY;
+				//localcolor = SKINCOLOR_RASPBERRY;
 				break;
 			case 1: // Banana
 				localpatch = kp_banana[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_YELLOW;
+				//localcolor = SKINCOLOR_YELLOW;
 				break;
 			case 2: // Orbinaut
 				localpatch = kp_orbinaut[3+offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL;
+				//localcolor = SKINCOLOR_STEEL;
 				break;
 			case 3: // Mine
 				localpatch = kp_mine[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET;
+				//localcolor = SKINCOLOR_JET;
 				break;
 			case 4: // Grow
 				localpatch = kp_grow[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TEAL;
+				//localcolor = SKINCOLOR_TEAL;
 				break;
 			case 5: // Hyudoro
 				localpatch = kp_hyudoro[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL;
+				//localcolor = SKINCOLOR_STEEL;
 				break;
 			case 6: // Rocket Sneaker
 				localpatch = kp_rocketsneaker[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE;
+				//localcolor = SKINCOLOR_TANGERINE;
 				break;
 			case 7: // Jawz
 				localpatch = kp_jawz[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JAWZ;
+				//localcolor = SKINCOLOR_JAWZ;
 				break;
 			case 8: // Self-Propelled Bomb
 				localpatch = kp_selfpropelledbomb[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET;
+				//localcolor = SKINCOLOR_JET;
 				break;
 			case 9: // Shrink
 				localpatch = kp_shrink[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ORANGE;
+				//localcolor = SKINCOLOR_ORANGE;
 				break;
 			case 10: // Invincibility
 				localpatch = localinv;
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_GREY;
+				//localcolor = SKINCOLOR_GREY;
 				break;
 			case 11: // Eggman Monitor
 				localpatch = kp_eggman[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ROSE;
+				//localcolor = SKINCOLOR_ROSE;
 				break;
 			case 12: // Ballhog
 				localpatch = kp_ballhog[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_LILAC;
+				//localcolor = SKINCOLOR_LILAC;
 				break;
 			case 13: // Thunder Shield
 				localpatch = kp_thundershield[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_CYAN;
+				//localcolor = SKINCOLOR_CYAN;
 				break;
 			/*case 14: // Pogo Spring
 				localpatch = kp_pogospring[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE;
+				localcolor = SKINCOLOR_TANGERINE;
 				break;
 			case 15: // Kitchen Sink
 				localpatch = kp_kitchensink[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL;
+				localcolor = SKINCOLOR_STEEL;
 				break;*/
 			default:
 				break;
@@ -1977,7 +1961,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));
@@ -2297,11 +2281,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]);
 		}
@@ -2393,12 +2372,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]);
 		}
@@ -3595,10 +3568,6 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
 #endif
 
 	skin = K_GetMobjSkin(mo);
-
-	if (!skin)
-		return;
-
 	minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)];
 
 	if (minimaphead == NULL)
@@ -3802,9 +3771,6 @@ static void K_drawKartMinimap(void)
 
 		mobj_t *mobj = players[localplayers[i]].mo;
 
-		if (!mobj)
-			continue;
-
 		// dont draw for no contestants
 		boolean playertimedout = (mobj->health <= 0 && players[localplayers[i]].pflags & PF_TIMEOVER);
 
@@ -3829,8 +3795,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 (K_GetMobjSkin(mobj)->starttranscolor != skins[0].starttranscolor)
+					if (skinnum && skins[skinnum].starttranscolor != skins[0].starttranscolor)
 					{
 						colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE);
 					}
@@ -3960,23 +3928,10 @@ static void K_drawBattleFullscreen(void)
 
 	INT32 x = BASEVIDWIDTH/2;
 	INT32 y = (-64*FRACUNIT) + cardanim; // card animation goes from 0 to 164, 164 is the middle of the screen
-	INT32 splitflags = splitscreen ? V_SNAPTOTOP : 0; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead
+	INT32 splitflags = V_SNAPTOTOP; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead
 	fixed_t scale = FRACUNIT;
 	boolean drawcomebacktimer = true;	// lazy hack because it's cleaner in the long run.
 
-	// Small hack, if we're not in splitscreen we will not use V_SNAPTOTOP, instead we will just slightly offset
-	// y position so "attack or protect" doesn't slightly show before popping in
-	// We will also reduce this when is closer to finishing so when its at the bottom, the "hack offset" is 0
-	if (!splitscreen)
-	{
-		fixed_t offset = ((vid.height - vid.dup*BASEVIDHEIGHT)/vid.dup) * FRACUNIT/2;
-
-		// cardanim goes from 0 to 164, so when it is 164 offset will be multiplied by (1 - 164/164) = 0 :3
-		offset = FixedMul(offset, FRACUNIT - FixedDiv(cardanim, 164*FRACUNIT));
-
-		y -= offset;
-	}
-
 	if (!LUA_HudEnabled(hud_battlecomebacktimer))
 		drawcomebacktimer = false;
 
@@ -4064,12 +4019,12 @@ static void K_drawBattleFullscreen(void)
 			if (K_UseColorHud()) // Colourized hud
 			{
 				UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, splitflags, kp_timeoutstickerclr, colormap);
+				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutstickerclr, colormap);
 			}
 			else
-				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, splitflags, kp_timeoutsticker, NULL);
+				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutsticker, NULL);
 
-			V_DrawKartString(x-txoff, ty, splitflags, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
+			V_DrawKartString(x-txoff, ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
 		}
 	}
 
@@ -4299,7 +4254,6 @@ static void K_drawInput(void)
 
 	y -= FRACUNIT;
 
-	// stick displays
 	if (cv_showinput.value == 2 || cv_showinput.value == 3)
 	{
 		INT32 axis;
@@ -4309,7 +4263,7 @@ static void K_drawInput(void)
 		const INT32 joyy = y>>FRACBITS;
 		static const INT32 joyxoffs = -8;
 		static const INT32 joyyoffs = -24;
-		const boolean usejoysprite = (cv_showinput.value == 3 && joystickicon);
+		const boolean usejoysprite  = (cv_showinput.value == 3 && joystickicon);
 
 		// O backing
 		if (usejoysprite)
@@ -4327,19 +4281,39 @@ static void K_drawInput(void)
 		// kart does not have anything we can get analogue joystick y axis values from
 		// during normal gameplay, so replicate shit here
 
-		const boolean analogjoystickmove = (!demo.playback && P_IsLocalPlayer(stplyr) && cv_usejoystick[stplyrnum].value && !DigitalGamepadStyle(stplyrnum));
-		axis = analogjoystickmove ? JoyAxis(AXISAIM, stplyrnum+1) : 0;
-
-		if (axis != 0)
-		{
-			hudforward -= ((axis * KART_FULLTURN) / JOYAXISRANGE);
-		}
-		else
+		// this is horrid but we cant get actual input in replays so uhh
+		if (demo.playback || !P_IsLocalPlayer(stplyr)) // yeah...........
 		{
 			hudforward = stplyr->kartstuff[k_throwdir] * KART_FULLTURN;
 		}
+		else
+		{
+			const boolean analogjoystickmove  = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
+			const boolean gamepadjoystickmove = cv_usejoystick[stplyrnum].value && Joystick[stplyrnum].bGamepadStyle;
+			const UINT8 ssplayer = stplyrnum+1;
 
-		hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN);
+			axis = JoyAxis(AXISAIM, ssplayer);
+
+			if (analogjoystickmove && axis != 0)
+			{
+				// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
+				hudforward -= ((axis * KART_FULLTURN) / (JOYAXISRANGE-1));
+			}
+			else
+			{
+				if (InputDown(gc_aimforward, ssplayer) || (gamepadjoystickmove && axis < 0))
+				{
+					hudforward += KART_FULLTURN;
+				}
+
+				if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
+				{
+					hudforward -= KART_FULLTURN;
+				}
+			}
+
+			hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN);
+		}
 
 		if (cmd->driftturn || hudforward)
 		{
@@ -4373,7 +4347,7 @@ static void K_drawInput(void)
 			}
 		}
 	}
-	else // wheel
+	else
 	{
 		if (!cmd->driftturn) // no turn
 			target = 0;
@@ -4429,9 +4403,6 @@ static void K_drawChallengerScreen(void)
 
 static void K_drawLapStartAnim(void)
 {
-	if (!cv_showlapemblem.value)
-		return;
-
 	// This is an EVEN MORE insanely complicated animation.
 	const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation];
 	UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
@@ -4475,10 +4446,9 @@ static void K_drawLapStartAnim(void)
 		V_DrawFixedPatch(leftx, y, FRACUNIT, vflags, kp_lapanim_lap[min(progress/2, 6)], NULL);
 
 		char *lapnum = va("%02d", stplyr->laps + 1);
+		const size_t laplength = strlen(lapnum);
 
-		const int laplength = (int)strlen(lapnum);
-
-		for (int i = 0; i < laplength; i++)
+		for (size_t i = 0; i < laplength; i++)
 		{
 			int digit = lapnum[i] - '0';
 			int frame = min(2, progress/2 - 8 - (i*2));
@@ -4608,11 +4578,7 @@ static void K_drawCheckpointDebugger(void)
 	else
 		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((numstarposts/2) + stplyr->starpostnum)));
 
-	// really gnarly hack
-	const INT32 prevcheck = (stprevnextchecks[0] != INT32_MAX) ? stprevnextchecks[0]: stplyr->kartstuff[k_prevcheck];
-	const INT32 nextcheck = (stprevnextchecks[1] != INT32_MAX) ? stprevnextchecks[1]: stplyr->kartstuff[k_nextcheck];
-
-	V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", prevcheck, nextcheck));
+	V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck]));
 }
 
 // determines if gametype info (laps/bumpers) should be hidden
@@ -4864,7 +4830,7 @@ void K_drawKartHUD(void)
 	{
 		if (stplyr->exiting)
 			K_drawKartFinish();
-		else if (stplyr->kartstuff[k_lapanimation] && !splitscreen)
+		else if (stplyr->kartstuff[k_lapanimation] && !splitscreen && cv_showlapemblem.value)
 			K_drawLapStartAnim();
 	}
 

src/k_hud.h

@@ -41,7 +41,6 @@ extern consvar_t cv_showlaptimes;
 extern consvar_t cv_battlespeedo;
 extern consvar_t cv_multiitemicon;
 extern consvar_t cv_huditemamount;
-extern consvar_t cv_roulettecolor;
 
 // for use in timeattack menu
 extern patch_t *kp_facenum[MAXPLAYERS+1];

src/k_kart.h

@@ -32,8 +32,6 @@ extern consvar_t cv_bananajitter;
 extern consvar_t cv_bananthrowroll;
 extern consvar_t cv_airsparks;
 
-extern INT32 stprevnextchecks[2];
-
 boolean K_IsPlayerLosing(player_t *player);
 boolean K_IsPlayerWanted(player_t *player);
 INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush);

src/lua_baselib.c

@@ -3055,46 +3055,58 @@ static int lib_kSetHyuCountdown(lua_State *L)
 
 static int lib_gSetPlayerGamepadIndicatorColor(lua_State *L)
 {
-	INT32 pnum = -1;
-	player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
+	INT32 player = -1;
+	player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
 	UINT8 color = (UINT8)luaL_checkinteger(L, 2); // skincolor
 
-	if (!player)
+	if (!plr)
 		return LUA_ErrInvalid(L, "player_t");
 
 	if (color >= MAXTRANSLATIONS)
 		return luaL_error(L, "color %d out of range (0 - %d).", color, MAXTRANSLATIONS-1);
 
-	pnum = P_GetLocalPlayerNumForPlayer(player);
+	for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
+	{
+		if (plr - players == displayplayers[i])
+		{
+			player = i;
+			break;
+		}
+	}
 
 	// Not a local player
-	if (pnum == -1) return 0;
+	if (player == -1) return 0;
 
 	// pls update with color 0 when youre done with changing led stuff so it can get player color again
-	G_SetPlayerGamepadIndicatorColor(pnum, color);
+	G_SetPlayerGamepadIndicatorColor(player, color);
 
 	return 0;
 }
 
 static int lib_gPlayerDeviceRumble(lua_State *L)
 {
-	INT32 pnum = -1;
-	player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
+	INT32 player = -1;
+	player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
 	UINT16 low_strength = (UINT16)luaL_checkinteger(L, 2); // low frequency rumble motor strenght
 	UINT16 high_strength = (UINT16)luaL_checkinteger(L, 3); // high frequency rumble motor strenght
 	UINT32 duration = (UINT32)luaL_optinteger(L, 4, 84); // duration of rumble in ms
 
-	if (!player)
+	if (!plr)
 		return LUA_ErrInvalid(L, "player_t");
 
-	if (demo.playback) return 0;
-
-	pnum = P_GetLocalPlayerNumForPlayer(player);
+	for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
+	{
+		if (plr - players == displayplayers[i])
+		{
+			player = i;
+			break;
+		}
+	}
 
 	// Not a local player
-	if (pnum == -1) return 0;
+	if (player == -1) return 0;
 
-	G_PlayerDeviceRumble(pnum, low_strength, high_strength, duration);
+	G_PlayerDeviceRumble(player, low_strength, high_strength, duration);
 
 	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

@@ -25,7 +25,6 @@
 #include "lua_libs.h"
 #include "lua_hook.h"
 #include "lua_hud.h" // hud_running errors
-#include "lua_profile.h"
 
 /* =========================================================================
                                   ABSTRACTION
@@ -66,8 +65,6 @@ static stringhook_t stringHooks[STRING_HOOK(MAX)];
 
 bool hook_important = true;
 
-#define NONMOHOOK ((mobjtype_t)-1)
-
 // This will be indexed by hook id, the value of which fetches the registry.
 static int * hookRefs;
 static int   nextid;
@@ -299,7 +296,7 @@ struct Hook_State {
 	INT32         status;          /* return status to calling function */
 	void        * userdata;
 	int           hook_type;
-	mobjtype_t    mobj_type;       /* != NONMOHOOK if mobj hook */
+	mobjtype_t    mobj_type;       /* < NUMMOBJTYPES if mobj hook */
 	const char  * string;          /* used to fetch table, ran first if set */
 	int           top;             /* index of last argument passed to hook */
 	int           id;              /* id to fetch ref */
@@ -367,7 +364,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_hook
 		int hook_type
 ){
 	return init_hook_type(hook, default_status,
-			hook_type, NONMOHOOK, NULL,
+			hook_type, NUMMOBJTYPES, NULL,
 			hookIds[hook_type].numHooks);
 }
 
@@ -394,7 +391,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_string_hook
 		const char * string
 ){
 	if (init_hook_type(hook, default_status,
-				hook_type, NONMOHOOK, string,
+				hook_type, NUMMOBJTYPES, string,
 				stringHooks[hook_type].ref))
 	{
 		lua_pushstring(gL, string);
@@ -410,7 +407,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_hud_hook
 		int hook_type
 ){
 	return init_hook_type(hook, 0,
-			hook_type, NONMOHOOK, NULL,
+			hook_type, NUMMOBJTYPES, NULL,
 			hudHookIds[hook_type].numHooks);
 }
 
@@ -446,54 +443,11 @@ FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n)
 	lua_getref(gL, hookRefs[hook->id]);
 }
 
-static int pcall(Hook_State *hook)
-{
-	return lua_pcall(gL, hook->values, hook->results, EINDEX);
-}
-
-static const char *hook_name(Hook_State *hook)
-{
-	if (hud_running)
-	{
-		return hudHookNames[hook->hook_type];
-	}
-	else if (hook->string)
-	{
-		return stringHookNames[hook->hook_type];
-	}
-	//else if (hook->mobj_type > 0)
-	else if (hook->mobj_type != NONMOHOOK)
-	{
-		return mobjHookNames[hook->hook_type];
-	}
-	else
-	{
-		return hookNames[hook->hook_type];
-	}
-}
-
-static int pcall_timed_or_untimed(Hook_State *hook)
-{
-	if (!hud_running && cv_lua_profile.value > 0)
-	{
-		lua_timer_t *timer = LUA_BeginFunctionTimer(gL, -1 - hook->values, hook_name(hook));
-		int k = pcall(hook);
-		LUA_EndFunctionTimer(timer);
-
-		return k;
-	}
-	else
-	{
-		return pcall(hook);
-	}
-}
-
 static int call_single_hook_no_copy(Hook_State *hook)
 {
 	hook_important = hook->important;
 
-	//if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
-	if (pcall_timed_or_untimed(hook) == 0)
+	if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
 	{
 		if (hook->results > 0)
 		{
@@ -575,45 +529,9 @@ static int call_string_hooks(Hook_State *hook)
 }
 
 FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
-{
-	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    )
-		|| hook->hook_type == MOBJ_HOOK(MobjCollide    )
-		|| hook->hook_type == MOBJ_HOOK(MobjMoveCollide)
-		|| hook->hook_type == MOBJ_HOOK(MobjFuse       )
-		|| hook->hook_type == MOBJ_HOOK(BossThinker    )
-	))
-	{
-		seen = 1;
-
-		CONS_Alert(
-			CONS_WARNING, "%s\n", va(
-			"%s hooks not attached to a specific mobj type may cause performance issues!",
-			mobjHookNames[hook->hook_type])
-		);
-
-		// print which script triggered it, ty indev <3
-		for (int k = 0; k < mobjHookIds[mobj_type][hook->hook_type].numHooks; ++k)
-		{
-			lua_getref(gL, hookRefs[mobjHookIds[mobj_type][hook->hook_type].ids[k].id]);
-
-			lua_Debug ar;
-			lua_getinfo(gL, ">S", &ar);
-
-			CONS_Printf("%s:%d\n", ar.short_src, ar.linedefined);
-		}
-	}
-
-	return numCalls;
-}
-
-/*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
 (
@@ -629,13 +547,11 @@ static int call_hooks
 	{
 		calls += call_string_hooks(hook);
 	}
-	//else if (hook->mobj_type > 0)
-	else if (hook->mobj_type != NONMOHOOK)
+	else if (hook->mobj_type < NUMMOBJTYPES)
 	{
 		/* call generic mobj hooks first */
 		calls += call_mobj_type_hooks(hook, MT_NULL);
-		if (hook->mobj_type < NUMMOBJTYPES)
-			calls += call_mobj_type_hooks(hook, hook->mobj_type);
+		calls += call_mobj_type_hooks(hook, hook->mobj_type);
 		ps_lua_mobjhooks.value.i += calls;
 	}
 	else
@@ -802,7 +718,7 @@ static void hook_think_frame(int type)
 	const hook_t * map = &hookIds[type];
 	int k;
 
-	const boolean perfstats = (cv_perfstats.value >= PS_THINKFRAME);
+	const boolean perfstats = (cv_perfstats.value >= 3);
 
 	if (prepare_hook(&hook, 0, type))
 	{
@@ -898,7 +814,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)
@@ -987,7 +903,7 @@ void LUA_HookLinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
 {
 	Hook_State hook = {};
 	if (prepare_string_hook
-		(&hook, 0, STRING_HOOK(LinedefExecute), line->text))
+			(&hook, 0, STRING_HOOK(LinedefExecute), line->text))
 	{
 		LUA_PushUserdata(gL, line, META_LINE);
 		LUA_PushUserdata(gL, mo, META_MOBJ);
@@ -1060,9 +976,6 @@ void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save)
 		lua_pushcclosure(gL, archFunc, 2);
 		// stack: tables, savebuffer_t, archFunc
 
-		// Manually set the hook's variables here since we don't call prepare_hook
-		hook.hook_type = HOOK(NetVars);
-		hook.mobj_type = NONMOHOOK; // Force mobj_type to be NONMOHOOK so the mobj_type check get skipped
 		init_hook_call(&hook, 0, res_none);
 		call_mapped(&hook, map);
 

src/lua_hudlib.c

@@ -644,22 +644,20 @@ static int libd_drawScaled(lua_State *L)
 // KART: draw patch on minimap from x, y coordinates on the map
 static int libd_drawOnMinimap(lua_State *L)
 {
-	fixed_t x, y, scale;    // coordinates of the object
-	patch_t *patch;         // patch we want to draw
-	UINT8 *colormap = NULL; // do we want to colormap this patch?
-	boolean centered;       // the patch is centered and doesn't need readjusting on x/y coordinates.
+	fixed_t x, y, scale;	// coordinates of the object
+	patch_t *patch;	// patch we want to draw
+	UINT8 *colormap = NULL;	// do we want to colormap this patch?
+	boolean centered;	// the patch is centered and doesn't need readjusting on x/y coordinates.
 	huddrawlist_h list;
+	patch_t *AutomapPic = NULL;
 	drawinfo_t info;
 
-	// variables used to replicate k_kart's mmap drawer:
-	patch_t *AutomapPic;
-
 	// variables used for actually drawing the icon:
 	INT32 splitflags, minimaptrans;
 	fixed_t amnumxpos, amnumypos;
 	fixed_t amxpos, amypos;
 	INT32 mm_x, mm_y;
-	fixed_t patchw, patchh;
+	fixed_t patchw = 0, patchh = 0;
 
 	HUDONLY // only run this function in hud hooks
 
@@ -724,11 +722,8 @@ static int libd_drawOnMinimap(lua_State *L)
 
 	mm_y -= AutomapPic->topoffset;
 
-	if (centered)
-	{
-		patchw = patchh = 0; // patch is supposedly already centered, don't butt in.
-	}
-	else
+	// patch is supposedly already centered, don't butt in.
+	if (!centered)
 	{
 		// scale patch coords
 		patchw = (patch->width * scale / 2);

src/lua_infolib.c

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

src/lua_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)
 {
@@ -642,7 +652,7 @@ static int line_get(lua_State *L)
 		LUA_PushUserdata(L, &sides[line->sidenum[0]], META_SIDE);
 		return 1;
 	case line_backside: // backside
-		if (line->sidenum[1] == NO_INDEX)
+		if (line->sidenum[1] == 0xffff)
 			return 0;
 		LUA_PushUserdata(L, &sides[line->sidenum[1]], META_SIDE);
 		return 1;

src/lua_profile.cpp

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

src/lua_profile.h

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

src/lua_script.c

@@ -62,6 +62,14 @@ static lua_CFunction liblist[] = {
 	NULL
 };
 
+// Lua asks for memory using this.
+static void *LUA_Alloc(void *ud, void *ptr, size_t osize, size_t nsize)
+{
+	(void)ud;
+	(void)osize;
+	return Z_Realloc(ptr, nsize, PU_LUA, NULL);
+}
+
 // Panic function Lua calls when there's an unprotected error.
 // This function cannot return. Lua would kill the application anyway if it did.
 FUNCNORETURN static int LUA_Panic(lua_State *L)
@@ -189,7 +197,7 @@ void LUA_ClearState(void)
 	CONS_Printf(M_GetText("Pardon me while I initialize the Lua scripting interface...\n"));
 
 	// allocate state
-	L = luaL_newstate();
+	L = lua_newstate(LUA_Alloc, NULL);
 	lua_atpanic(L, LUA_Panic);
 
 	// open base libraries
@@ -269,19 +277,20 @@ void LUA_LoadLump(UINT16 wad, UINT16 lump)
 
 	if (wadfiles[wad]->type == RET_LUA)
 	{
-		name = malloc(len + 1);
-		snprintf(name, len + 1, "%s", wadfiles[wad]->filename);
+		name = malloc(len+1);
+		strcpy(name, wadfiles[wad]->filename);
 	}
 	else // If it's not a .lua file, copy the lump name in too.
 	{
 		lumpinfo_t *lump_p = &wadfiles[wad]->lumpinfo[lump];
 		len += 1 + strlen(lump_p->fullname); // length of file name, '|', and lump name
-		name = malloc(len + 1);
+		name = malloc(len+1);
 
 		if (!name)
 			I_Error("LUA_LoadLump: Out of memory!\n");
 
-		snprintf(name, len + 1, "%s|%s", wadfiles[wad]->filename, lump_p->fullname);
+		sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->fullname);
+		name[len] = '\0';
 	}
 
 	LUA_LoadFile(&f, name); // actually load file!
@@ -365,7 +374,7 @@ void LUA_DumpFile(const char *filename)
 
 static void createMathLibState(void)
 {
-	mL = luaL_newstate();
+	mL = lua_newstate(LUA_Alloc, NULL);
 	lua_atpanic(mL, LUA_Panic);
 
 	// open only enum lib
@@ -583,7 +592,6 @@ void LUA_InvalidateLevel(void)
 
 	for (i = 0; i < numsubsectors; i++)
 		LUA_InvalidateUserdata(&subsectors[i]);
-
 	for (i = 0; i < numsectors; i++)
 	{
 		LUA_InvalidateUserdata(&sectors[i]);
@@ -604,7 +612,6 @@ void LUA_InvalidateLevel(void)
 
 	for (i = 0; i < numsides; i++)
 		LUA_InvalidateUserdata(&sides[i]);
-
 	for (i = 0; i < numvertexes; i++)
 		LUA_InvalidateUserdata(&vertexes[i]);
 
@@ -615,10 +622,6 @@ void LUA_InvalidateLevel(void)
 		LUA_InvalidateUserdata(&slope->o);
 		LUA_InvalidateUserdata(&slope->d);
 	}
-
-	// We invalidated a lot of userdata objects, a lot of them probably ended up unreachable so they can be
-	// GC'd right away
-	lua_gc(gL, LUA_GCCOLLECT, 0);
 }
 
 void LUA_InvalidateMapthings(void)
@@ -710,12 +713,9 @@ static UINT8 GetUserdataArchType(int index)
 
 static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 {
-	int type = lua_type(gL, myindex);
-
 	if (myindex < 0)
 		myindex = lua_gettop(gL)+1+myindex;
-
-	switch (type)
+	switch (lua_type(gL, myindex))
 	{
 	case LUA_TNONE:
 	case LUA_TNIL:
@@ -725,12 +725,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 	case LUA_TLIGHTUSERDATA:
 	case LUA_TTHREAD:
 	case LUA_TFUNCTION:
-	{
-		const char *typestr = (type == LUA_TLIGHTUSERDATA ? "light userdata" : (type == LUA_TTHREAD ? "thread" : (type == LUA_TFUNCTION ? "function" : "??")));
-		CONS_Alert(CONS_ERROR, M_GetText("Archived an invalid value! (%s)\n"), typestr);
 		WRITEUINT8(*p, ARCH_NULL);
 		return 2;
-	}
 	case LUA_TBOOLEAN:
 		WRITEUINT8(*p, ARCH_BOOLEAN);
 		WRITEUINT8(*p, lua_toboolean(gL, myindex));
@@ -1457,16 +1453,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_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_cheat.c

@@ -766,7 +766,7 @@ boolean OP_FreezeObjectplace(void)
 	if (!objectplacing)
 		return false;
 
-	if (nightsmode && nightsplayer(&players[consoleplayer]))
+	if ((maptol & TOL_NIGHTS) && (players[consoleplayer].pflags & PF_NIGHTSMODE))
 		return false;
 
 	return true;
@@ -1049,7 +1049,7 @@ void Command_ObjectPlace_f(void)
 	{
 		objectplacing = true;
 
-		if (nightsplayer(&players[0]))
+		if ((players[0].pflags & PF_NIGHTSMODE))
 			return;
 
 		if (!COM_CheckParm("-silent"))
@@ -1120,7 +1120,7 @@ void Command_ObjectPlace_f(void)
 
 		// Don't touch the NiGHTS Objectplace stuff.
 		// ... or if the mo mysteriously vanished.
-		if (!players[0].mo || nightsplayer(&players[0]))
+		if (!players[0].mo || (players[0].pflags & PF_NIGHTSMODE))
 			return;
 
 		// If still in dummy state, get out of it.

src/m_curl.c

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