point2uint for blua interning string cache

will optimize away or inline the extra loops)

src/Makefile

@@ -93,7 +93,8 @@
 # NOLDWARNING=1 - ?
 # NOSDLMAIN=1 - ?
 # SDLMAIN=1 - ?
-# USELTO=1 - Enable building with LTO.
+# NOLTO=1 - Disable link time optimizations
+# USEJEMALLOC=1 Enable building with jemalloc Allocator to replace GLibc malloc, might improve performance
 #
 # Library configuration flags:
 # Everything here is an override.
@@ -260,7 +261,7 @@ debug_opts=-D_DEBUG
 else # build a normal optimized version
 debug_opts=-DNDEBUG
 opts+=-O3
-ifdef USELTO
+ifndef NOLTO
 # compile with LTO
 opts+=-flto=auto
 libs+=-flto=auto
@@ -279,6 +280,10 @@ opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
 libs+=-fsanitize=undefined
 endif
 
+ifdef USEJEMALLOC
+libs+=-ljemalloc
+endif
+
 ifneq (,$(filter $(CC) $(CXX),clang clang++))
  libs+=-fuse-ld=lld
 endif

src/Makefile.d/detect.mk

@@ -64,6 +64,7 @@ endif
 
 # This must have high to low order.
 gcc_versions:=\
+	161 160 16\
 	152 151 150 15\
 	142 141 140 14\
 	133 132 131 130 13\
@@ -77,7 +78,7 @@ gcc_versions:=\
 	55 54 53 52 51 50\
 	49 48 47 46 45 44 43 42 41 40
 
-latest_gcc_version:=15.2
+latest_gcc_version:=16.1
 
 # Automatically set version flag, but not if one was
 # manually set. And don't bother if this is a clean only

src/Makefile.d/features.mk

@@ -8,6 +8,7 @@ passthru_opts+=\
 	HAVE_MINIUPNPC\
 	HAVE_DISCORDRPC DEVELOP\
 	NOHOLEPUNCH\
+	HAVE_IPV6\
 
 # build with debugging information
 ifdef DEBUGMODE

src/blua/lapi.c

@@ -526,13 +526,12 @@ static void auxgetstr (lua_State *L, TValue *t, const char *k) {
   api_checkvalidindex(L, t);
   if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
     setobj2s(L, L->top, slot);
-    api_incr_top(L);
   }
   else {
     setsvalue(L, &key, str);
-    luaV_finishget(L, t, L->top, L->top, slot);
-    api_incr_top(L);
+    luaV_finishget(L, t, &key, L->top, slot);
   }
+  api_incr_top(L);
   lua_unlock(L);
 }
 
@@ -641,25 +640,6 @@ LUA_API void lua_getfenv (lua_State *L, int idx) {
 */
 
 
-static void auxsetstr (lua_State *L, TValue *t, const char *k) {
-  TValue key;
-  TValue *slot;
-  TString *str = luaS_new(L, k);
-  api_checknelems(L, 1);
-  api_checkvalidindex(L, t);
-  if (luaV_fastset(L, t, str, slot, luaH_setstr, L->top)) {
-    setobj2t(L, cast(TValue *, slot), L->top - 1);
-    L->top--;  /* pop value */
-  }
-  else {
-    setsvalue2s(L, &key, str);
-    luaV_finishset(L, t, &key, L->top - 1, slot);
-    L->top--;  /* pop value */
-  }
-  lua_unlock(L);
-}
-
-
 LUA_API void lua_settable (lua_State *L, int idx) {
   StkId t;
   lua_lock(L);
@@ -673,8 +653,16 @@ LUA_API void lua_settable (lua_State *L, int idx) {
 
 
 LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
+  StkId t;
+  TValue key;
   lua_lock(L);
-  auxsetstr(L, index2adr(L, idx), k);
+  api_checknelems(L, 1);
+  t = index2adr(L, idx);
+  api_checkvalidindex(L, t);
+  setsvalue(L, &key, luaS_new(L, k));
+  luaV_settable(L, t, &key, L->top - 1);
+  L->top--;  /* pop value */
+  lua_unlock(L);
 }
 
 

src/blua/lcode.c

@@ -626,20 +626,8 @@ static void codenot (FuncState *fs, expdesc *e) {
   removevalues(fs, e->t);
 }
 
-/*
-** Check whether expression 'e' is a literal string
-*/
-static int isKstr (FuncState *fs, expdesc *e) {
-  return (e->k == VK && ttisstring(&fs->f->k[e->u.s.info]));
-}
 
-/*
-** Create expression 't[k]'. 't' must have its final result already in a
-** register or upvalue. Upvalues can only be indexed by literal strings.
-*/
 void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
-  if (t->k == VUPVAL && !isKstr(fs, k))  /* upvalue indexed by non string? */
-    luaK_exp2anyreg(fs, t);  /* put it in a register */
   t->u.s.aux = luaK_exp2RK(fs, k);
   t->k = VINDEXED;
 }

src/blua/ldo.c

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

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

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

src/blua/lopcodes.h

@@ -232,8 +232,6 @@ OP_VARARG/*	A B	R(A), R(A+1), ..., R(A+B-1) = vararg		*/
   (*) In OP_SETLIST, if (B == 0) then B = `top';
       if (C == 0) then next `instruction' is real C
 
-  (*) In OP_SELF, the index must be a string.
-
   (*) For comparisons, A specifies what condition the test should accept
       (true or false).
 

src/blua/lstate.c

@@ -73,10 +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);
-  luaS_fix(luaS_newliteral(L, MEMERRMSG));
   g->GCthreshold = 4*g->totalbytes;
 }
 

src/blua/lstate.h

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

@@ -81,6 +81,7 @@ static /*const*/ Node dummynode_ = {
 /*
 ** hash for lua_Numbers
 */
+#if 0
 static Node *hashnum (const Table *t, lua_Number n) {
   unsigned int a[numints];
   int i;
@@ -90,6 +91,12 @@ static Node *hashnum (const Table *t, lua_Number n) {
   for (i = 1; i < numints; i++) a[0] += a[i];
   return hashmod(t, a[0]);
 }
+#else
+// our lua_Number is just typedef´d int32 so no need to do any of the above
+static inline Node *hashnum (const Table *t, lua_Number n) {
+  return hashmod(t, cast(unsigned int, n));
+}
+#endif
 
 
 

src/blua/lvm.c

@@ -136,57 +136,45 @@ void luaV_finishget (lua_State *L, TValue *t, TValue *key, StkId val,
       return;
     }
     t = tm;  /* else try to access 'tm[key]' */
-    if (luaV_fastget(L,t,key,slot,luaH_get)) {  /* fast track? */
+    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, "'__index' chain too long; possible loop");
+  luaG_runerror(L, "loop in gettable");
 }
 
 
-/*
-** Finish a table assignment 't[key] = val'.
-** If 'slot' is NULL, 't' is not a table.  Otherwise, 'slot' points
-** to the entry 't[key]', or to 'luaO_nilobject' if there is no such
-** entry.  (The value at 'slot' must be nil, otherwise 'luaV_fastset'
-** would have done the job.)
-*/
-void luaV_finishset (lua_State *L, TValue *t, TValue *key,
-                     StkId val, TValue *slot) {
-  int loop;  /* counter to avoid infinite loops */
+void luaV_settable (lua_State *L, TValue *t, TValue *key, StkId val) {
+  int loop;
   for (loop = 0; loop < MAXTAGLOOP; loop++) {
-    TValue *tm;
-    if (slot != NULL) {
-      lua_assert(ttistable(t) && ttisnil(slot));
+    TValue *tm = NULL;
+    if (ttistable(t)) {  /* `t' is a table? */
       Table *h = hvalue(t);
-      /* must check the metamethod */
-      /* slot is nil=> look for newindex, slot is not nil => look for usedindex */
-      if (!((ttisnil(slot) && ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) != NULL)) ||
-         ((!ttisnil(slot)) && ((tm = fasttm(L, h->metatable, TM_USEDINDEX)) != NULL)))) {
-        /* no metamethod and (now) there is an entry with given key */
-        setobj2t(L, cast(TValue *, slot), val);
+      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); /* 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;
       }
-      /* else will try the metamethod */
+      /* else will try the tag method */
     }
-    else {  /* not a table; check metamethod */
-      if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))))
-        luaG_typeerror(L, t, "index");
-    }
-    /* try the metamethod */
+    else if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))))
+      luaG_typeerror(L, t, "index");
     if (ttisfunction(tm)) {
       callTM(L, tm, t, key, val);
       return;
     }
-    t = tm;  /* else repeat assignment over 'tm' */
-    if (luaV_fastset(L, t, key, slot, luaH_set, val))
-      return;  /* done */
-    /* else loop */
+    t = tm;  /* else repeat with `tm' */
   }
-  luaG_runerror(L, "settable chain too long; possible loop");
+  luaG_runerror(L, "loop in settable");
 }
 
 
@@ -418,13 +406,6 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
   else Protect(luaV_finishget(L,t,k,v,slot)); }
 
 
-/* same for 'luaV_settable' */
-#define settableProtected(L,t,k,v) { TValue *slot; \
-  if (!luaV_fastset(L,t,k,slot,luaH_set,v)) \
-    Protect(luaV_finishset(L,t,k,v,slot)); }
-
-
-
 void luaV_execute (lua_State *L, int nexeccalls) {
   LClosure *cl;
   StkId base;
@@ -517,7 +498,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
         StkId ra = RA(i);
         TValue *rb = RKB(i);
         TValue *rc = RKC(i);
-        settableProtected(L, ra, rb, rc);
+        Protect(luaV_settable(L, ra, rb, rc));
         continue;
       }
       case OP_NEWTABLE: {
@@ -529,16 +510,11 @@ void luaV_execute (lua_State *L, int nexeccalls) {
         continue;
       }
       case OP_SELF: {
-        TValue *slot;
         StkId ra = RA(i);
         StkId rb = RB(i);
         TValue *rc = RKC(i);
-        TString *key = rawtsvalue(rc);  /* key must be a string */
         setobjs2s(L, ra + 1, rb);
-        if (luaV_fastget(L, rb, key, slot, luaH_getstr)) {
-          setobj2s(L, ra, slot);
-        }
-        else Protect(luaV_finishget(L, rb, rc, ra, slot));
+        gettableProtected(L, rb, rc, ra);
         continue;
       }
       case OP_ADD: {

src/blua/lvm.h

@@ -43,32 +43,6 @@
   else luaV_finishget(L,t,k,v,slot); }
 
 
-/*
-** Fast track for set table. If 't' is a table and 't[k]' is not nil,
-** call GC barrier, do a raw 't[k]=v', and return true; otherwise,
-** return false with 'slot' equal to NULL (if 't' is not a table) or
-** 'nil'. (This is needed by 'luaV_finishget'.) Note that, if the macro
-** returns true, there is no need to 'invalidateTMcache', because the
-** call is not creating a new entry.
-*/
-#define luaV_fastset(L,t,k,slot,f,v) \
-  (!ttistable(t) \
-   ? (slot = NULL, 0) \
-   : (slot = f(L, hvalue(t), k), \
-     ttisnil(slot) ? 0 \
-     : (__extension__ ({ \
-          if (valiswhite(v) && isblack(obj2gco(hvalue(t)))) \
-            luaC_barrierback(L, hvalue(t)); \
-          setobj2t(L, cast(TValue *,slot), v); \
-          1; \
-        }))))
-
-
-#define luaV_settable(L,t,k,v) { TValue *slot; \
-  if (!luaV_fastset(L,t,k,slot,luaH_set,v)) \
-    luaV_finishset(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);
@@ -76,8 +50,8 @@ 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_finishget (lua_State *L, TValue *t, TValue *key,
                                StkId val, TValue *tm);
-LUAI_FUNC void luaV_finishset (lua_State *L, TValue *t, TValue *key,
-                               StkId val, TValue *oldval);
+LUAI_FUNC void luaV_settable (lua_State *L, TValue *t, TValue *key,
+                                            StkId val);
 LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls);
 LUAI_FUNC void luaV_concat (lua_State *L, int total, int last);
 

src/command.c

@@ -1168,8 +1168,8 @@ void VS_Print(vsbuf_t *buf, const char *data)
 #define NAME      cvar_map_t
 #define KEY_TY    const char *
 #define VAL_TY    consvar_t *
-#define HASH_FN   vt_hash_string
-#define CMPR_FN   vt_cmpr_string
+#define HASH_FN   FNV1a_HashLowercaseString
+#define CMPR_FN   vt_cmpr_casestring
 #include "verstable.h"
 
 #define NAME      netvar_map_t

src/console.c

@@ -208,14 +208,6 @@ static void CONS_Clear_f(void)
 	Unlock_state();
 }
 
-// Choose english keymap
-//
-/*static void CONS_English_f(void)
-{
-	shiftxform = english_shiftxform;
-	CONS_Printf(M_GetText("%s keymap.\n"), M_GetText("English"));
-}*/
-
 static char *bindtable[NUMINPUTS];
 
 static void CONS_Bind_f(void)
@@ -633,27 +625,186 @@ void CON_MoveConsole(void)
 	Unlock_state();
 }
 
+//======================================================================
+//                 KEYBOARD LAYOUTS FOR ENTERING TEXT
+//======================================================================
+
+static char english_shiftxform[] =
+{
+	0,
+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+	11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+	21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+	31,
+	' ', '!', '"', '#', '$', '%', '&',
+	'"', // shift-'
+	'(', ')', '*', '+',
+	'<', // shift-,
+	'_', // shift--
+	'>', // shift-.
+	'?', // shift-/
+	')', // shift-0
+	'!', // shift-1
+	'@', // shift-2
+	'#', // shift-3
+	'$', // shift-4
+	'%', // shift-5
+	'^', // shift-6
+	'&', // shift-7
+	'*', // shift-8
+	'(', // shift-9
+	':',
+	':', // shift-;
+	'<',
+	'+', // shift-=
+	'>', '?', '@',
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+	'{', // shift-[
+	'|', // shift-backslash - OH MY GOD DOES WATCOM SUCK
+	'}', // shift-]
+	'"', '_',
+	'~', // shift-`
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+	'{', '|', '}', '~', 127
+};
+
+static char french_shiftxform[] =
+{
+	0,
+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+	11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+	21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+	31,
+	' ','$', //shift-!
+	'3', //shift-"
+	'#', '$', '%',
+	'1', //shift-&
+	'4', // shift-'
+	'5', // shift-(
+	')', // shift-)
+	'*', '+',
+	'?', // shift-,
+	'6', // shift--
+	'.', '/',
+	'0', '1', '2', '3', '4', '5',
+	'6', '7', '8', '9',
+	'/', // shitf-:
+	'.', // shift-;
+	'>', // shift-<
+	'+', // shift-=
+	'>', '?', '@',
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+	'[', '\\', ']', '^',
+	'8', //shift-_
+	'`',
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+	'{', '|', '}', '~', 127,
+	128, 129,
+	'2',
+	131, 132,
+	'0',
+	134,
+	'9',
+	136, 137,
+	'7',
+	139, 140,
+	'%'
+};
+
+static char french_altgrxform[] =
+{
+	0,
+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+	11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+	21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+	31,
+	' ', '!',
+	'#', //altgr-"
+	'#', '$', '%', '&',
+	'{', //altgr-'
+	'[', //altgr-(
+	']', //altgr-)
+	'*', '+', ',',
+	'|', //altg--
+	'.', '/',
+	'0', '1', '2', '3', '4', '5',
+	'6', '7', '8', '9',
+	':', ';', '<',
+	'}', //altgr-=
+	'>', '?', '@',
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+	'[', '\\', ']', '^',
+	'\\', //altgr-backslash
+	'`',
+	'a', 'b', 'c', 'd', 'E', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+	'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+	'{', '|', '}', '~', 127,
+	128, 129,
+	'~',
+	131, 132,
+	'@',
+	134,
+	'^',
+	136, 137,
+	'`',
+	139, 140,
+	KEY_FR_U_GRAVE
+};
+
+// fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
+static INT32 CON_FallBackFrSpecialLetter(INT32 key)
+{
+	switch (key)
+	{
+		case KEY_FR_E_AIGUE:     return 'e';
+		case KEY_FR_E_GRAVE:     return 'e';
+		case KEY_FR_C_CEDILLE:   return 'c';
+		case KEY_FR_A_GRAVE:     return 'a';
+		case KEY_FR_U_GRAVE:     return 'u';
+		default:       return key;
+	}
+}
+
+// goddang AZERTY
+static size_t CON_GetShiftSize(void)
+{
+	return ((cv_keyboardlayout.value == 3) ? sizeof(french_shiftxform) : sizeof(english_shiftxform));
+}
+
+static char *CON_Shiftform(void)
+{
+	return (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
+}
+
 INT32 CON_ShiftChar(INT32 ch)
 {
-	if (I_UseNativeKeyboard())
+	if (I_UseNativeKeyboard() || ch >= (INT32)CON_GetShiftSize())
 		return ch;
 
+	// warning: shiftdown is NOT a boolean, it's 1 or 2 for lshift/rshift
 	if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
 	{
-		if (shiftdown ^ capslock)
-			ch = shiftxform[ch];
+		return !!shiftdown != capslock ? CON_Shiftform()[ch] : ch;
 	}
-	else // if we're holding shift we should still shift non letter symbols
+
+	// if we're holding shift we should still shift non letter symbols
+	if (shiftdown)
 	{
-		if (shiftdown)
-			ch = shiftxform[ch];
-		else if (cv_keyboardlayout.value == 3)
-		{
-			if (altdown & 0x2)
-				ch = french_altgrxform[ch];
-			else
-				ch = HU_FallBackFrSpecialLetter(ch);
-		}
+		return CON_Shiftform()[ch];
+	}
+
+	// AZERTY
+	if (cv_keyboardlayout.value == 3)
+	{
+		if (altdown & 0x2)
+			return french_altgrxform[ch];
+
+		return CON_FallBackFrSpecialLetter(ch);
 	}
 
 	return ch;

src/d_clisrv.c

@@ -1255,20 +1255,18 @@ static void CL_DrawConnectionStatus(void)
 			case CL_DOWNLOADSAVEGAME:
 				if (filedownload.current != -1)
 				{
-					INT32 dldlength = 0;
+					UINT32 dldlength = 0;
 					fileneeded_t *file = &fileneeded[filedownload.current];
-					UINT32 currentsize = file->currentsize;
 					UINT32 totalsize   = file->totalsize;
+					UINT32 currentsize = min(file->currentsize, totalsize);
 
 					cltext = M_GetText("Downloading game state...");
 					Net_GetNetStat();
 
 					if (totalsize != 0)
-						dldlength = (INT32)((currentsize/(double)totalsize) * 256);
-					if (dldlength > 256)
-						dldlength = 256;
+						dldlength = (UINT32)((currentsize/(double)totalsize) * 256);
 					V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 111);
-					V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 96);
+					V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, (INT32)dldlength, 8, 96);
 
 					V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
 						va(" %4uK/%4uK", currentsize>>10, totalsize>>10));
@@ -1485,14 +1483,15 @@ static void CL_DrawConnectionStatus(void)
 		}
 		else if (filedownload.current != -1)
 		{
-			INT32 dldlength = 0;
-			INT32 totalfileslength = 0;
+			UINT32 dldlength = 0;
 			UINT32 totaldldsize = 0;
+			UINT32 totalfileslength = 0;
 			static char tempname[28];
 			fileneeded_t *file = &fileneeded[filedownload.current];
 			char *filename = file->filename;
-			UINT32 currentsize = file->currentsize;
 			UINT32 totalsize   = file->totalsize;
+			UINT32 currentsize = min(file->currentsize, totalsize);
+			UINT32 fdtotalsize = filedownload.totalsize;
 
 			// Draw the bottom box.
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-58-8, 32, 1);
@@ -1500,11 +1499,9 @@ static void CL_DrawConnectionStatus(void)
 
 			Net_GetNetStat();
 			if (totalsize != 0)
-				dldlength = (INT32)((currentsize/(double)totalsize) * 256);
-			if (dldlength > 256)
-				dldlength = 256;
+				dldlength = (UINT32)((currentsize/(double)totalsize) * 256);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, 256, 8, 175);
-			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, dldlength, 8, 160);
+			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, (INT32)dldlength, 8, 160);
 
 			memset(tempname, 0, sizeof(tempname));
 
@@ -1545,18 +1542,18 @@ static void CL_DrawConnectionStatus(void)
 				totaldldsize = filedownload.completedsize;
 
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-14, V_YELLOWMAP|MENUCAPS, "Overall Download Progress");
-			if (filedownload.totalsize != 0)
-				totalfileslength = (INT32)((totaldldsize/(double)filedownload.totalsize) * 256);
+			if (fdtotalsize != 0)
+				totalfileslength = (UINT32)((totaldldsize/(double)fdtotalsize) * 256);
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175);
-			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
+			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, (INT32)totalfileslength, 8, 160);
 
-			if (filedownload.totalsize>>20 >= 10) // display in MB if over 10MB
+			if ((fdtotalsize>>20) >= 10) // display in MB if over 10MB
 				V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
-					va(" %4uM/%4uM", totaldldsize>>20, filedownload.totalsize>>20));
+					va(" %4uM/%4uM", (INT32)(totaldldsize>>20), (INT32)(fdtotalsize>>20)));
 			else
 				V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
-					va(" %4uK/%4uK", totaldldsize>>10, filedownload.totalsize>>10));
+					va(" %4uK/%4uK", (INT32)(totaldldsize>>10), (INT32)(fdtotalsize>>10)));
 
 			V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
 					va("%2u/%2u Files ", filedownload.completednum, filedownload.totalnum));
@@ -2231,7 +2228,12 @@ static void CL_ReloadReceivedSavegame(void)
 static void SendAskInfo(INT32 node)
 {
 	tic_t asktime;
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+	doomdata_t *netbuffer;
+
+	if (node == -1)
+		return;
+
+	netbuffer = DOOMCOM_DATA(doomcom);
 
 #ifdef HOLEPUNCH
 	if (node != 0 && node != BROADCASTADDR &&
@@ -3390,9 +3392,21 @@ static void Command_connect(void)
 		}
 		else
 			CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
+
+		// invalid address
+		if (servernode == -1)
+		{
+			D_QuitNetGame(); // this will also call D_CloseConnection for us
+			CL_Reset();
+			servernode = 0; // not sure if this is cool, but if this is -1 then bad things happen in alot of networking code
+			D_StartTitle();
+			M_StartMessage(M_GetText("Failed to connect to server\nMake sure you put in a valid Address!\n"), NULL, MM_NOTHING);
+			return;
+		}
 	}
 
-	CV_Set(&cv_lastserver, I_GetNodeAddress(servernode));
+	if (I_GetNodeAddress)
+		CV_Set(&cv_lastserver, I_GetNodeAddress(servernode));
 
 	if (splitscreen != cv_splitplayers.value-1)
 	{
@@ -4361,7 +4375,7 @@ void D_ClientServerInit(void)
 		playerinfo[i].node = 255;
 
 	gametic = 0;
-	localgametic = 0;
+	leveltime = 0;
 
 	// do not send anything before the real begin
 	SV_StopServer();
@@ -5617,7 +5631,7 @@ static void PT_ClientCmd(INT32 netconsole, SINT8 node)
 	realstart = ExpandTics(netbuffer->u.clientpak.client_tic, nettics[node]);
 	realend = ExpandTics(netbuffer->u.clientpak.resendfrom, nettics[node]);
 
-	if (netbuffer->packettype == PT_CLIENTMIS || netbuffer->packettype == PT_CLIENT2MIS
+	if (   netbuffer->packettype == PT_CLIENTMIS  || netbuffer->packettype == PT_CLIENT2MIS
 		|| netbuffer->packettype == PT_CLIENT3MIS || netbuffer->packettype == PT_CLIENT4MIS
 		|| netbuffer->packettype == PT_NODEKEEPALIVEMIS
 		|| supposedtics[node] < realend)
@@ -5660,10 +5674,10 @@ static void PT_ClientCmd(INT32 netconsole, SINT8 node)
 		return;
 
 	// Splitscreen cmd
-	if (((netbuffer->packettype == PT_CLIENT2CMD || netbuffer->packettype == PT_CLIENT2MIS)
+	if ((nodetoplayer2[node] >= 0) &&
+		  ((netbuffer->packettype == PT_CLIENT2CMD || netbuffer->packettype == PT_CLIENT2MIS)
 		|| (netbuffer->packettype == PT_CLIENT3CMD || netbuffer->packettype == PT_CLIENT3MIS)
-		|| (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS))
-		&& (nodetoplayer2[node] >= 0))
+		|| (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS)))
 	{
 		G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer2[node]], &netbuffer->u.client2pak.cmd2, 1);
 
@@ -5671,9 +5685,9 @@ static void PT_ClientCmd(INT32 netconsole, SINT8 node)
 			return;
 	}
 
-	if (((netbuffer->packettype == PT_CLIENT3CMD || netbuffer->packettype == PT_CLIENT3MIS)
-		|| (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS))
-		&& (nodetoplayer3[node] >= 0))
+	if ((nodetoplayer3[node] >= 0) &&
+		  ((netbuffer->packettype == PT_CLIENT3CMD || netbuffer->packettype == PT_CLIENT3MIS)
+		|| (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS)))
 	{
 		G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer3[node]], &netbuffer->u.client3pak.cmd3, 1);
 
@@ -5681,8 +5695,8 @@ static void PT_ClientCmd(INT32 netconsole, SINT8 node)
 			return;
 	}
 
-	if ((netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS)
-		&& (nodetoplayer4[node] >= 0))
+	if ((nodetoplayer4[node] >= 0) &&
+		(netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS))
 	{
 		G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer4[node]], &netbuffer->u.client4pak.cmd4, 1);
 
@@ -6819,7 +6833,7 @@ boolean TryRunTics(tic_t realtics)
 		{
 			boolean update_stats = !(paused || P_AutoPause());
 
-			DEBFILE(va("============ Running tic %d (local %d)\n", gametic, localgametic));
+			DEBFILE(va("============ Running tic %d (local %d)\n", gametic, leveltime));
 
 			if (update_stats)
 				PS_START_TIMING(ps_tictime);

src/d_main.c

@@ -138,6 +138,7 @@ boolean devparm = false; // started game with -devparm
 
 boolean singletics = false; // timedemo
 boolean lastdraw = false;
+boolean intermissionbginit = false;
 
 #ifdef MOTIONBLUR
 INT32 postimgparam[MAXSPLITSCREENPLAYERS];
@@ -362,6 +363,33 @@ static void D_Renderview(void)
 // added comment : there is a wipe eatch change of the gamestate
 gamestate_t wipegamestate = GS_LEVEL;
 
+static void D_MakeIntermissionBG(void)
+{
+	if (!lastdraw)
+		return;
+
+	if (rendermode == render_none)
+	{
+		lastdraw = false;
+		intermissionbginit = false;
+		return;
+	}
+
+#ifdef HWRENDER
+	if (rendermode == render_opengl)
+	{
+		HWR_MakeScreenTexture();
+	}
+	else
+#endif
+	{
+		VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
+	}
+
+	lastdraw = false;
+	intermissionbginit = true;
+}
+
 static boolean D_Display(void)
 {
 	boolean ranwipe = false;
@@ -527,16 +555,8 @@ static boolean D_Display(void)
 			PS_START_TIMING(ps_rendercalltime);
 			D_Renderview();
 			PS_STOP_TIMING(ps_rendercalltime);
-		}
 
-		if (lastdraw)
-		{
-			if (rendermode == render_soft)
-			{
-				VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
-			}
-
-			lastdraw = false;
+			D_MakeIntermissionBG();
 		}
 
 		PS_START_TIMING(ps_uitime);
@@ -697,18 +717,20 @@ void D_SRB2Loop(void)
 
 	for (;;)
 	{
-		if (I_Interrupted())
-		{
-			I_Quit();
-		}
-
 		// capbudget is the minimum precise_t duration of a single loop iteration
 		precise_t capbudget;
 		precise_t elapsed;
 		precise_t enterprecise, finishprecise;
 
+		boolean ranwipe = false;
+
 		enterprecise = I_GetPreciseTime();
 
+		if (I_Interrupted())
+		{
+			I_Quit();
+		}
+
 		memset(&g_dc, 0, sizeof(g_dc));
 		Z_Frame_Reset();
 
@@ -716,8 +738,6 @@ void D_SRB2Loop(void)
 		const UINT32 framecap = R_GetFramerateCap();
 		capbudget = (framecap == 0) ? 0 : (precise_t)((double)precision / (double)framecap + 0.5); // + 0.5 instead of round
 
-		boolean ranwipe = false;
-
 		I_UpdateTime(cv_timescale.value);
 
 		if (lastwipetic)
@@ -1385,8 +1405,6 @@ static inline void D_MakeTitleString(char *s)
 // extra graphic patches for saturn specific thingies
 boolean xtra_speedo       = false; // extra speedometer check
 boolean xtra_speedo_clr   = false; // extra speedometer colour check
-boolean xtra_speedo3      = false; // 80x 11 extra speedometer check
-boolean xtra_speedo_clr3  = false; // 80x 11 extra speedometer colour check
 boolean achi_speedo       = false; // achiiro speedometer check
 boolean achi_speedo_clr   = false; // extra speedometer colour check
 boolean dial_speedo       = false; // dial speedometer check
@@ -1416,7 +1434,6 @@ static void D_CheckSaturnExtraFiles(void)
 	CV_PossibleValue_t minimapdot_cons_temp[NUMMINIMAPDOTSTUFF] = {{0, "Off"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}};
 
 	unsigned last_speedo_i = 0;
-	unsigned last_driftgauge_i = 3;
 	unsigned last_inputdisplay_i = 2;
 	unsigned last_minimapdot_i = 0;
 #define PUSHCONS(cons, i, id, name) { ++i; cons[i].value = id; cons[i].strvalue = name; }
@@ -1575,20 +1592,6 @@ static void D_CheckSaturnExtraFiles(void)
 	if (found_extra3_kart)
 	{
 		mainwads++;
-
-		// 80x11 speedometer crap
-		if (W_LumpExists("SP_SM3TC"))
-		{
-			xtra_speedo3 = true;
-			PUSHCONS(speedo_cons_temp, last_speedo_i, 7, "Extra");
-			PUSHCONS(driftgaugestyle_cons_temp, last_driftgauge_i, 5, "Extra");
-		}
-
-		// 80x11 speedometer crap but colour
-		if (W_LumpExists("SC_SM3TC"))
-		{
-			xtra_speedo_clr3 = true;
-		}
 	}
 
 #undef PUSHCONS
@@ -1786,10 +1789,6 @@ void D_SRB2Main(void)
 	// Setup default unlockable conditions
 	M_SetupDefaultConditionSets();
 
-	// Setup character tables
-	// Have to be done here before files are loaded
-	M_InitCharacterTables();
-
 	// load wad, including the main wad file
 	CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
 
@@ -2163,8 +2162,8 @@ void D_SRB2Main(void)
 
 	if (dedicated && server)
 	{
-		levelstarttic = gametic;
 		G_SetGamestate(GS_LEVEL);
+
 		if (!P_SetupLevel(false, false))
 			I_Quit(); // fail so reset game stuff
 	}

src/d_main.h

@@ -38,8 +38,6 @@ extern boolean found_extra3_kart; // for use in k_kart.c
 
 extern boolean xtra_speedo;       // extra speedometer check
 extern boolean xtra_speedo_clr;   // extra speedometer colour check
-extern boolean xtra_speedo3;      // 80x11 extra speedometer check
-extern boolean xtra_speedo_clr3;  // 80x11 extra speedometer colour check
 extern boolean achi_speedo;       // achiiro speedometer check
 extern boolean achi_speedo_clr;   // extra speedometer colour check
 extern boolean dial_speedo;       // dial speedometer check

src/d_net.h

@@ -27,7 +27,6 @@ extern "C" {
 // SINT8 is used for nodes sometimes >:(
 #define MAXNETNODES 127
 #define BROADCASTADDR MAXNETNODES
-#define NETSPLITSCREEN // Kart's splitscreen netgame feature
 
 #define STATLENGTH (TICRATE*2)
 

src/d_netcmd.c

@@ -1010,6 +1010,7 @@ void D_RegisterClientCommands(void)
 		CV_RegisterVar(&cv_gamepadled[i]);
 	}
 
+	CV_RegisterVar(&cv_gamepadifunfocused);
 	CV_RegisterVar(&cv_gamepadledifunfocused);
 	CV_RegisterVar(&cv_rumbleifunfocused);
 
@@ -1213,13 +1214,22 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
 
 	if (len == 0 || len > MAXPLAYERNAME)
 		return false; // Empty or too long.
-	if (name[0] == ' ' || name[len-1] == ' ')
-		return false; // Starts or ends with a space.
+	if (name[0] == ' ')
+		return false; // Starts with a space.
 	if (isdigit(name[0]))
 		return false; // Starts with a digit.
 	if (name[0] == '@' || name[0] == '~')
 		return false; // Starts with an admin symbol.
 
+	// Clean up trailing whitespace.
+	while (len && name[len-1] == ' ')
+	{
+		name[len-1] = '\0';
+		len--;
+	}
+	if (len == 0)
+		return false;
+
 	// Check if it contains a non-printing character.
 	// Note: ANSI C isprint() considers space a printing character.
 	// Also don't allow semicolons, since they are used as
@@ -1272,7 +1282,8 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
   * is restored to what it was before.
   *
   * We assume that if playernum is ::consoleplayer or ::secondarydisplayplayer
-  * the console variable ::cv_playername or ::cv_playername2 respectively is
+  * (unless clientjoin is true, a necessary evil)
+  * the console variable ::cv_playername to ::cv_playername4 respectively is
   * already set to newname. However, the player name table is assumed to
   * contain the old name.
   *
@@ -1292,6 +1303,10 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
 	char *tmpname = NULL;
 	INT32 i;
 	boolean namefailed = true;
+	boolean clientjoin = !!(playernum >= MAXPLAYERS);
+
+	if (clientjoin)
+		playernum -= MAXPLAYERS;
 
 	buf = Z_StrDup(newname);
 
@@ -1348,17 +1363,20 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
 		}
 
 		// no stealing another player's name
-		for (i = 0; i < MAXPLAYERS; i++)
+		if (!clientjoin)
 		{
-			if (i != playernum && playeringame[i]
-				&& fasticmp(tmpname, player_names[i]))
+			for (i = 0; i < MAXPLAYERS; i++)
 			{
-				break;
+				if (i != playernum && playeringame[i]
+				 && fasticmp(tmpname, player_names[i]))
+				{
+					break;
+				}
 			}
-		}
 
-		if (i < MAXPLAYERS)
-			break;
+			if (i < MAXPLAYERS)
+				break;
+		}
 
 		// name is okay then
 		namefailed = false;
@@ -1369,15 +1387,23 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
 
 	// set consvars whether namefailed or not, because even if it succeeded,
 	// spaces may have been removed
-	if (playernum == consoleplayer)
-		CV_StealthSet(&cv_playername, tmpname);
-	else if (playernum == displayplayers[1] || (!netgame && playernum == 1))
-		CV_StealthSet(&cv_playername2, tmpname);
-	else if (playernum == displayplayers[2] || (!netgame && playernum == 2))
-		CV_StealthSet(&cv_playername3, tmpname);
-	else if (playernum == displayplayers[3] || (!netgame && playernum == 3))
-		CV_StealthSet(&cv_playername4, tmpname);
-	else I_Assert(((void)"CleanupPlayerName used on non-local player", 0));
+	if (clientjoin)
+	{
+		consvar_t *namevars[]  = {&cv_playername, &cv_playername2, &cv_playername3, &cv_playername4};
+		CV_StealthSet(namevars[playernum], tmpname);
+	}
+	else
+	{
+		if (playernum == consoleplayer)
+			CV_StealthSet(&cv_playername, tmpname);
+		else if (playernum == displayplayers[1] || (!netgame && playernum == 1))
+			CV_StealthSet(&cv_playername2, tmpname);
+		else if (playernum == displayplayers[2] || (!netgame && playernum == 2))
+			CV_StealthSet(&cv_playername3, tmpname);
+		else if (playernum == displayplayers[3] || (!netgame && playernum == 3))
+			CV_StealthSet(&cv_playername4, tmpname);
+		else I_Assert(((void)"CleanupPlayerName used on non-local player", 0));
+	}
 
 	Z_Free(buf);
 }
@@ -1495,7 +1521,9 @@ static void ForceAllSkins(INT32 forcedskin)
 }
 
 static INT32 chmappending;
+#ifdef PARANOIA
 static INT32 snacpending[MAXSPLITSCREENPLAYERS];
+#endif
 
 // wonky compat, idk if anything uses this....
 #define playerisbot (splitplayer == 1 && botingame)
@@ -1595,7 +1623,9 @@ static void SendNameAndColor(UINT8 splitplayer)
 		return;
 	}
 
+#ifdef PARANOIA
 	snacpending[splitplayer]++;
+#endif
 
 	// Don't change name if muted
 	if (player_name_changes[pnum] >= MAXNAMECHANGES)
@@ -1631,7 +1661,7 @@ static void SendNameAndColor(UINT8 splitplayer)
 
 static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
 {
-	player_t *player = &players[playernum];
+	player_t *player;
 	char name[MAXPLAYERNAME+1] = {};
 	UINT8 color, skin;
 
@@ -1640,14 +1670,18 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
 		I_Error("There is no player %d!", playernum);
 #endif
 
+	player = &players[playernum];
+
+#ifdef PARANOIA
 	if (P_IsLocalPlayer(player))
 	{
-		snacpending[playernum]--;
-#ifdef PARANOIA
-		if (snacpending[playernum] < 0)
-			I_Error("snacpending negative!");
-#endif
+		const INT32 localpnum = P_GetLocalPlayerNumForPlayer(player);
+		snacpending[localpnum]--;
+
+		if (snacpending[localpnum] < 0)
+			I_Error("snacpending negative for player %d!", localpnum);
 	}
+#endif
 
 	READSTRINGN(*cp, name, MAXPLAYERNAME);
 	color = READUINT8(*cp);
@@ -2188,7 +2222,6 @@ void D_SetupVote(void)
 	WRITEUINT8(p, secondgt);
 	secondgt &= ~0x80;
 
-
 	for (i = 0; i < 4; i++)
 	{
 		UINT16 m;
@@ -5815,7 +5848,6 @@ static void BaseNumLaps_OnChange(void)
 	}
 }
 
-
 static void KartFrantic_OnChange(void)
 {
 	if ((boolean)cv_kartfrantic.value != franticitems && gamestate == GS_LEVEL && leveltime > starttime)

src/d_netcmd.h

@@ -93,11 +93,6 @@ extern consvar_t cv_pause;
 extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_ingamecap, cv_respawntime;
 extern consvar_t cv_spectatorreentry, cv_antigrief;
 
-/*extern consvar_t cv_teleporters, cv_superring, cv_supersneakers, cv_invincibility;
-extern consvar_t cv_jumpshield, cv_watershield, cv_ringshield, cv_forceshield, cv_bombshield;
-extern consvar_t cv_1up, cv_eggmanbox;
-extern consvar_t cv_recycler;*/
-
 // SRB2kart items
 extern consvar_t cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana;
 extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine;

src/dedicated/i_system.c

@@ -735,6 +735,10 @@ const char *I_GetJoyName(INT32 joyindex)
 	return NULL;
 }
 
+void I_SetJoystickFocus(void)
+{
+}
+
 boolean I_GamepadHasLED(INT32 playernum)
 {
 	(void)playernum;
@@ -1019,8 +1023,13 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
 			sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close.");
 			break;
 #ifdef SIGTERM
-		case SIGTERM: // Software termination signal from kill
-			sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a kill signal.");
+		case SIGTERM: // Software termination signal from terminate
+			sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a terminate signal.");
+			break;
+#endif
+#ifdef SIGKILL
+		case SIGKILL: // Software termination signal from kill
+			sigmsg = ("SIGKILL - SRB2Kart-Saturn was terminated by a kill signal.");
 			break;
 #endif
 #ifdef SIGBREAK
@@ -1353,18 +1362,28 @@ static void I_Fork(void)
 			I_RegisterChildSignals();
 			break;
 		default:
+			// ignore those, those are handled by child process
+			// otherwise parent might exit before it
+			// and the below stuff wont run and your terminal will be left in an awkward state
+#ifdef SIGINT
+			signal(SIGINT,   SIG_IGN);
+#endif
+#ifdef SIGBREAK
+			signal(SIGBREAK, SIG_IGN);
+#endif
+#ifdef SIGTERM
+			signal(SIGTERM,  SIG_IGN);
+#endif
 			if (logstream)
 				fclose(logstream);/* the child has this */
 
 			c = wait(&status);
-
 #ifdef LOGMESSAGES
 			/* By the way, exit closes files. */
 			logstream = fopen(logfilename, "at");
 #else
 			logstream = 0;
 #endif
-
 			if (c == -1)
 			{
 				kill(child, SIGKILL);
@@ -1424,8 +1443,8 @@ void I_Quit(void)
 	/* prevent recursive I_Quit() */
 	if (quiting)
 		goto death;
+
 	quiting = false;
-	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
 	D_SaveBan(); // save the ban list
 	G_SaveGameData(false); // Tails 12-08-2002
@@ -1441,16 +1460,18 @@ void I_Quit(void)
 	// use this for 1.28 19990220 by Kin
 	I_ShutdownGraphics();
 	I_ShutdownSystem();
+
 	/* if option -noendtxt is set, don't print the text */
 	if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM") != LUMPERROR)
 	{
 		printf("\r");
 		ShowEndTxt();
 	}
+
 	if (myargmalloc)
 		free(myargv); // Deallocate allocated memory
+
 death:
-	W_Shutdown();
 	exit(0);
 }
 
@@ -1496,7 +1517,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 
 			I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
 
-			W_Shutdown();
 			exit(-1); // recursive errors detected
 		}
 	}
@@ -1514,8 +1534,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 #endif
 	// ---
 
-	I_ShutdownConsole();
-
 	M_SaveConfig(NULL); // save game config, cvars..
 	D_SaveBan(); // save the ban list
 	G_SaveGameData(false); // Tails 12-08-2002
@@ -1531,8 +1549,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 	I_ShutdownGraphics();
 	I_ShutdownSystem();
 
-	W_Shutdown();
-
 #if defined (PARANOIA) && defined (__CYGWIN__)
 	*(INT32 *)2 = 4; //Alam: Debug!
 #endif
@@ -1638,9 +1654,10 @@ void I_ShutdownSystem(void)
 {
 	INT32 c;
 
-#ifndef NEWSIGNALHANDLER
-	I_ShutdownConsole();
+#ifdef NEWSIGNALHANDLER
+	if (M_CheckParm("-nofork"))
 #endif
+		I_ShutdownConsole();
 
 	for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
 		if (quit_funcs[c])

src/dedicated/i_video.c

@@ -115,10 +115,6 @@ INT32 VID_GetModeForSize(INT32 w, INT32 h)
 	return -1;
 }
 
-void VID_RefreshModeList(void)
-{
-}
-
 void VID_PrepareModeList(void)
 {
 }
@@ -129,13 +125,6 @@ INT32 VID_SetMode(INT32 modeNum)
 	return true;
 }
 
-boolean I_CheckAboveDesktopRes(INT32 width, INT32 height)
-{
-	(void)width;
-	(void)height;
-	return false;
-}
-
 void I_StartupGraphics(void)
 {
 }

src/dehacked.c

@@ -43,6 +43,9 @@
 
 #include "m_cond.h"
 
+// idk how PUSHGETTER works, but this is unused
+static UINT8 ultimatemode = false;
+
 #define REQUIRE_MATHLIB_GUID "{748fcbc8-6480-4013-ac4e-7afce6cab766}"
 
 // Free slot names
@@ -280,149 +283,6 @@ static void clear_levels(void)
 	P_AllocMapHeader(gamemap-1);
 }
 
-static boolean findFreeSlot(INT32 *num)
-{
-	// Send the character select entry to a free slot.
-	while (*num < MAXSKINS && PlayerMenu[*num].status != IT_DISABLED)
-		*num = *num+1;
-
-	// No more free slots. :(
-	if (*num >= MAXSKINS)
-		return false;
-
-	// Found one! ^_^
-	return true;
-}
-
-// Reads a player.
-// For modifying the character select screen
-static void readPlayer(MYFILE *f, INT32 num)
-{
-	char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
-	char *word;
-	char *word2;
-	INT32 i;
-	boolean slotfound = false;
-
-	do
-	{
-		if (myfgets(s, MAXLINELEN, f))
-		{
-			if (s[0] == '\n')
-				break;
-
-			word = strtok(s, " ");
-			if (word)
-				strupr(word);
-			else
-				break;
-
-			if (fastcmp(word, "PLAYERTEXT"))
-			{
-				char *playertext = NULL;
-
-				if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
-					goto done;
-				PlayerMenu[num].status = IT_CALL;
-
-				// A friendly neighborhood alias for brevity's sake
-				const size_t note_size = sizeof(description[num].notes);
-
-				for (i = 0; i < (INT32)(MAXLINELEN-note_size-3); i++)
-				{
-					if (s[i] == '=')
-					{
-						playertext = &s[i+2];
-						break;
-					}
-				}
-
-				if (playertext)
-				{
-					strlcpy(description[num].notes, playertext, note_size);
-					strlcat(description[num].notes,
-							myhashfgets(playertext, note_size, f), note_size);
-				}
-				else
-					strcpy(description[num].notes, "");
-
-				// For some reason, cutting the string did not work above. Most likely due to strcpy or strcat...
-				// It works down here, though.
-				{
-					INT32 numline = 0;
-					for (i = 0; (size_t)i < note_size-1; i++)
-					{
-						if (numline < 20 && description[num].notes[i] == '\n')
-							numline++;
-
-						if (numline >= 20 || description[num].notes[i] == '\0' || description[num].notes[i] == '#')
-							break;
-					}
-				}
-
-				description[num].notes[strlen(description[num].notes)-1] = '\0';
-				description[num].notes[i] = '\0';
-				continue;
-			}
-
-			word2 = strtok(NULL, " = ");
-			if (word2)
-				strupr(word2);
-			else
-				break;
-
-			if (word2[strlen(word2)-1] == '\n')
-				word2[strlen(word2)-1] = '\0';
-			i = atoi(word2);
-
-			if (fastcmp(word, "PICNAME"))
-			{
-				if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
-					goto done;
-				PlayerMenu[num].status = IT_CALL;
-				strncpy(description[num].picname, word2, 8);
-			}
-			else if (fastcmp(word, "STATUS"))
-			{
-				// Limit the status to only IT_DISABLED and IT_CALL
-				if (i)
-					i = IT_CALL;
-				else
-					i = IT_DISABLED;
-
-				/*
-					You MAY disable previous entries if you so desire...
-					But try to enable something that's already enabled and you will be sent to a free slot.
-
-					Because of this, you are allowed to edit any previous entrys you like, but only if you
-					signal that you are purposely doing so by disabling and then reenabling the slot.
-
-					... Or use MENUPOSITION first, that works too. Hell, you could edit multiple character
-					slots in a single section that way, due to how SOC editing works.
-				*/
-				if (i != IT_DISABLED && !slotfound && (slotfound = findFreeSlot(&num)) == false)
-					goto done;
-				PlayerMenu[num].status = (INT16)i;
-			}
-			else if (fastcmp(word, "SKINNAME"))
-			{
-				// Send to free slot.
-				if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
-					goto done;
-				PlayerMenu[num].status = IT_CALL;
-
-				strlcpy(description[num].skinname, word2, sizeof description[num].skinname);
-				strlwr(description[num].skinname);
-			}
-			else
-				deh_warning("readPlayer %d: unknown word '%s'", num, word);
-		}
-	} while (!myfeof(f)); // finish when the line is empty
-
-done:
-	Z_Free(s);
-}
-
 static int freeslotusage[2][2] = {{0, 0}, {0, 0}}; // [S_, MT_][max, previous .wad's max]
 
 void DEH_UpdateMaxFreeslots(void)
@@ -2503,26 +2363,12 @@ static void readmaincfg(MYFILE *f)
 			{
 				flashingtics = (UINT16)get_number(word2);
 			}
-			else if (fastcmp(word, "TAILSFLYTICS"))
-			{
-				tailsflytics = (UINT16)get_number(word2);
-			}
-			else if (fastcmp(word, "UNDERWATERTICS"))
-			{
-				underwatertics = (UINT16)get_number(word2);
-			}
-			else if (fastcmp(word, "SPACETIMETICS"))
-			{
-				spacetimetics = (UINT16)get_number(word2);
-			}
 			else if (fastcmp(word, "EXTRALIFETICS"))
 			{
+				// this modifies player->powers[pw_extralife]
+				// which still has some game behaviour attached to it...
 				extralifetics = (UINT16)get_number(word2);
 			}
-			else if (fastcmp(word, "GAMEOVERTICS"))
-			{
-				gameovertics = get_number(word2);
-			}
 
 			else if (fastcmp(word, "INTROTOPLAY"))
 			{
@@ -2546,10 +2392,7 @@ static void readmaincfg(MYFILE *f)
 				if (creditscutscene > 128)
 					creditscutscene = 128;
 			}
-			else if (fastcmp(word, "NUMDEMOS"))
-			{
-				numDemos = (UINT8)get_number(word2);
-			}
+
 			else if (fastcmp(word, "DEMODELAYTIME"))
 			{
 				demoDelayTime = get_number(word2);
@@ -2562,10 +2405,6 @@ static void readmaincfg(MYFILE *f)
 			{
 				use1upSound = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
 			}
-			else if (fastcmp(word, "MAXXTRALIFE"))
-			{
-				continue; // unused
-			}
 			else if (fastcmp(word, "GAMEDATA"))
 			{
 				// just ignore it but dont throw a warning
@@ -2604,6 +2443,30 @@ static void readmaincfg(MYFILE *f)
 			{
 				strlcpy(customversionstring, word2, sizeof (customversionstring));
 			}
+			else if (fastcmp(word, "NUMDEMOS"))
+			{
+				continue; // unused
+			}
+			else if (fastcmp(word, "TAILSFLYTICS"))
+			{
+				continue; // unused
+			}
+			else if (fastcmp(word, "UNDERWATERTICS"))
+			{
+				continue; // unused
+			}
+			else if (fastcmp(word, "SPACETIMETICS"))
+			{
+				continue; // unused
+			}
+			else if (fastcmp(word, "GAMEOVERTICS"))
+			{
+				continue; // unused
+			}
+			else if (fastcmp(word, "MAXXTRALIFE"))
+			{
+				continue; // unused
+			}
 			else
 				deh_warning("Maincfg: unknown word '%s'", word);
 		}
@@ -2817,6 +2680,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 
 	// it doesn't test the version of SRB2 and version of dehacked file
 	dbg_line = -1; // start at -1 so the first line is 0.
+
 	while (!myfeof(f))
 	{
 		char origpos[256];
@@ -2844,11 +2708,15 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 		strncpy(origpos, s, size);
 		origpos[size] = '\0';
 
-		if (NULL != (word = strtok(s, " "))) {
+		if (NULL != (word = strtok(s, " ")))
+		{
 			strupr(word);
-			if (word[strlen(word)-1] == '\n')
-				word[strlen(word)-1] = '\0';
+			const size_t wordlen = strlen(word);
+
+			if (word[wordlen-1] == '\n')
+				word[wordlen-1] = '\0';
 		}
+
 		if (word)
 		{
 			if (fastcmp(word, "FREESLOT"))
@@ -2869,32 +2737,46 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 				// This is not a major mod.
 				continue;
 			}
+
 			word2 = strtok(NULL, " ");
+
 			if (fastcmp(word, "CHARACTER"))
 			{
-				if (word2) {
+				if (word2)
+				{
 					strupr(word2);
-					if (word2[strlen(word2)-1] == '\n')
-						word2[strlen(word2)-1] = '\0';
+					const size_t wordlen = strlen(word2);
+
+					if (word2[wordlen-1] == '\n')
+						word2[wordlen-1] = '\0';
+
 					i = atoi(word2);
-				} else
+				}
+				else
 					i = 0;
+
 				if (i >= 0 && i < 32)
-					readPlayer(f, i);
+					ignorelines(f); // unused
 				else
 				{
 					deh_warning("Character %d out of range (0 - 31)", i);
 					ignorelines(f);
 				}
+
 				// This is not a major mod.
 				continue;
 			}
+
 			if (word2)
 			{
 				strupr(word2);
-				if (word2[strlen(word2)-1] == '\n')
-					word2[strlen(word2)-1] = '\0';
+				const size_t wordlen = strlen(word2);
+
+				if (word2[wordlen-1] == '\n')
+					word2[wordlen-1] = '\0';
+
 				i = atoi(word2);
+
 				if (fastcmp(word, "PATCH"))
 				{
 					// Read patch from spec file.
@@ -2905,6 +2787,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 				{
 					if (i == 0 && word2[0] != '0') // If word2 isn't a number
 						i = get_mobjtype(word2); // find a thing by name
+
 					if (i < NUMMOBJTYPES && i >= 0)
 					{
 						if (i < (MT_FIRSTFREESLOT+freeslotusage[1][1]))
@@ -2952,6 +2835,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 				{
 					if (i == 0 && word2[0] != '0') // If word2 isn't a number
 						i = get_state(word2); // find a state by name
+
 					if (i < NUMSTATES && i >= 0)
 					{
 						if (i < (S_FIRSTFREESLOT+freeslotusage[0][1]))
@@ -2968,6 +2852,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 				{
 					if (i == 0 && word2[0] != '0') // If word2 isn't a number
 						i = get_sfx(word2); // find a sound by name
+
 					if (i < NUMSFX && i >= 0)
 						readsound(f, i, savesfxnames);
 					else
@@ -2981,6 +2866,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 				{
 					if (i == 0 && word2[0] != '0') // If word2 isn't a number
 						i = get_huditem(word2); // find a huditem by name
+
 					if (i >= 0 && i < NUMHUDITEMS)
 						readhuditem(f, i);
 					else
@@ -8572,13 +8458,13 @@ FUNCINLINE static ATTRINLINE int lib_getenum(lua_State *L)
 	const char *word;
 	boolean mathlib = lua_toboolean(L, UV_MATHLIB);
 
-	if (lua_type(L,2) != LUA_TSTRING)
+	if (lua_type(L, 2) != LUA_TSTRING)
 		return 0;
 
-	word = lua_tostring(L,2);
+	word = lua_tostring(L, 2);
 
 	/* First check actions, as they can be overridden. */
-	if (!mathlib && fastncmp("A_",word,2))
+	if (!mathlib && fastncmp("A_", word, 2))
 	{
 		char *caps;
 		// Try to get a Lua action first.

src/doomdata.h

@@ -61,7 +61,7 @@ enum
 typedef struct
 {
 	INT16 x, y;
-}ATTRPACK  mapvertex_t;
+} ATTRPACK  mapvertex_t;
 
 // A SideDef, defining the visual appearance of a wall,
 // by setting textures and offsets.

src/doomdef.h

@@ -130,8 +130,8 @@ extern char  logfilename[1024];
 #else
 #define VERSION    1 // Game version
 #define SUBVERSION 6 // more precise version number
-#define VERSIONSTRING "Saturn v9.3 - Testing"
-#define VERSIONSTRINGW L"Saturn v9.3 - Testing"
+#define VERSIONSTRING "Saturn v9.3"
+#define VERSIONSTRINGW L"Saturn v9.3"
 
 #define SATURN_TESTING // comment out for saturn release builds!
 

src/doomstat.h

@@ -54,7 +54,6 @@ extern INT16 maptol;
 extern UINT8 globalweather;
 extern INT32 curWeather;
 extern INT32 cursaveslot;
-extern INT16 lastmapsaved;
 extern boolean gamecomplete;
 
 #define PRECIP_NONE  0
@@ -78,7 +77,6 @@ extern boolean imcontinuing; // Temporary flag while continuing
 extern UINT8 modeattacking;
 
 // menu demo things
-extern UINT8  numDemos;
 extern UINT32 demoDelayTime;
 extern UINT32 demoIdleTime;
 
@@ -114,8 +112,8 @@ extern UINT8 paused; // Game paused?
 extern UINT8 window_notinfocus; // are we in focus? (backend independant -- handles auto pausing and display of "focus lost" message)
 
 extern boolean nodrawers;
-extern boolean noblit;
 extern boolean lastdraw;
+extern boolean intermissionbginit;
 
 #ifdef MOTIONBLUR
 extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
@@ -402,9 +400,6 @@ extern boolean CheckForReverseGravity;
 extern UINT16 invulntics;
 extern UINT16 sneakertics;
 extern UINT16 flashingtics;
-extern UINT16 tailsflytics;
-extern UINT16 underwatertics;
-extern UINT16 spacetimetics;
 extern UINT16 extralifetics;
 
 // SRB2kart
@@ -490,7 +485,6 @@ extern UINT32 timesBeatenWithEmeralds;
 //  WAD, partly set at startup time.
 
 extern tic_t gametic;
-#define localgametic leveltime
 
 // Player spawn spots.
 extern mapthing_t *playerstarts[MAXPLAYERS]; // Cooperative

src/f_finale.c

@@ -1110,14 +1110,6 @@ void F_TitleScreenTicker(boolean run)
 			return;
 		}
 
-		// Replay intro when done cycling through demos
-		/*if (curDemo == numDemos) -- uuuh... we have a LOT of maps AND a big devteam... probably not gonna see a repeat unless you're super unlucky :V
-		{
-			curDemo = 0;
-			F_StartIntro();
-			return;
-		}*/
-
 		mapname = G_BuildMapName(G_RandMap(TOL_RACE, -2, false, 0, false, NULL)+1);
 
 		numstaff = 1;

src/g_demo.c

@@ -66,12 +66,10 @@
 #include <locale.h>
 
 // menu demo things
-UINT8  numDemos      = 0; //3; -- i'm FED UP of losing my skincolour to a broken demo. change this back when we make new ones
 UINT32 demoDelayTime = 15*TICRATE;
 UINT32 demoIdleTime  = 3*TICRATE;
 
 boolean nodrawers = false; // for comparative timing purposes
-boolean noblit = false; // for comparative timing purposes
 static tic_t demostarttime; // for comparative timing purposes
 
 //@TODO put these all in a struct for namespacing purposes?
@@ -3512,10 +3510,11 @@ static INT32 restorecv_vidwait;
 void G_TimeDemo(const char *name)
 {
 	nodrawers = M_CheckParm("-nodraw");
-	noblit = M_CheckParm("-noblit");
+
 	restorecv_vidwait = cv_vidwait.value;
 	if (cv_vidwait.value)
 		CV_Set(&cv_vidwait, "0");
+
 	demo.timing = true;
 	singletics = true;
 	framecount = 0;

src/g_game.c

@@ -61,7 +61,6 @@
 
 gameaction_t gameaction = 0;
 gamestate_t gamestate = GS_NULL;
-UINT8 ultimatemode = false;
 
 boolean botingame = false;
 UINT8 botskin = 0;
@@ -87,7 +86,6 @@ INT16 maptol = 0;
 UINT8 globalweather = 0;
 INT32 curWeather = PRECIP_NONE;
 INT32 cursaveslot = -1; // Auto-save 1p savegame slot
-INT16 lastmapsaved = 0; // Last map we auto-saved at
 boolean gamecomplete = false;
 
 UINT16 mainwads = 0;
@@ -108,7 +106,6 @@ INT32 consoleplayer = 0; // player taking events and displaying
 INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {}; // view being displayed
 
 tic_t gametic = 0;
-tic_t levelstarttic = 0; // gametic at level start
 UINT32 totalrings = 0; // for intermission
 INT16 lastmap = 0; // last level you were at (returning from special stages)
 tic_t timeinmap = 0; // Ticker for time spent in level (used for levelcard display)
@@ -186,9 +183,6 @@ boolean CheckForReverseGravity = false;
 UINT16 invulntics = 20*TICRATE;
 UINT16 sneakertics = 20*TICRATE;
 UINT16 flashingtics = 3*TICRATE/2; // SRB2kart
-UINT16 tailsflytics = 8*TICRATE;
-UINT16 underwatertics = 30*TICRATE;
-UINT16 spacetimetics = 11*TICRATE + (TICRATE/2);
 UINT16 extralifetics = 4*TICRATE;
 
 // SRB2kart
@@ -206,8 +200,6 @@ const INT32 wipeoutslowtime = 20;
 const INT32 wantedreduce = 5*TICRATE;
 const INT32 wantedfrequency = 10*TICRATE;
 
-INT32 gameovertics = 15*TICRATE;
-
 UINT8 use1upSound = 0;
 
 UINT8 introtoplay = 0;
@@ -1298,8 +1290,6 @@ static void G_DoLoadLevel(boolean resetplayer)
 	// Make sure objectplace is OFF when you first start the level!
 	OP_ResetObjectplace();
 
-	levelstarttic = gametic; // for time calculation
-
 	if (wipegamestate == GS_LEVEL)
 		wipegamestate = -1; // force a wipe
 
@@ -3353,18 +3343,6 @@ static void G_DoStartVote(void)
 	gameaction = ga_nothing;
 }
 
-//
-// G_UseContinue
-//
-void G_UseContinue(void)
-{
-	if (gamestate == GS_LEVEL && !netgame && !multiplayer)
-	{
-		gameaction = ga_startcont;
-		lastdraw = true;
-	}
-}
-
 static void G_DoStartContinue(void)
 {
 	I_Assert(!netgame && !multiplayer);
@@ -3403,7 +3381,7 @@ static void G_DoContinued(void)
 	token = 0;
 
 	// Reset # of lives
-	pl->lives = (ultimatemode) ? 1 : 3;
+	pl->lives = 3;
 
 	D_MapChange(gamemap, gametype, false, false, 0, false, false);
 

src/g_game.h

@@ -39,12 +39,8 @@ extern INT32 player_name_changes[MAXPLAYERS];
 extern player_t players[MAXPLAYERS];
 extern boolean playeringame[MAXPLAYERS];
 
-// gametic at level start
-extern tic_t levelstarttic;
-
 // for modding?
 extern INT16 prevmap, nextmap;
-extern INT32 gameovertics;
 extern tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
 extern INT16 rw_maximums[NUM_WEAPONS];
 
@@ -252,7 +248,6 @@ UINT8 G_GetGametypeColor(INT16 gt);
 void G_ExitLevel(void);
 void G_NextLevel(void);
 void G_Continue(void);
-void G_UseContinue(void);
 void G_AfterIntermission(void);
 void G_EndGame(void); // moved from y_inter.c/h and renamed
 

src/g_input.c

@@ -81,6 +81,7 @@ consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
 	{"gamepadled4", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle4, 0, NULL, NULL, 0, 0, NULL}
 };
 
+consvar_t cv_gamepadifunfocused = {"gamepadunfocused",  "Off", CV_SAVE|CV_CALL, CV_OnOff, I_SetJoystickFocus, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_gamepadledifunfocused = {"gamepadledunfocused",  "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_rumbleifunfocused = {"rumbleifunfocused",  "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 

src/g_input.h

@@ -116,6 +116,7 @@ extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
 
+extern consvar_t cv_gamepadifunfocused;
 extern consvar_t cv_gamepadledifunfocused;
 extern consvar_t cv_rumbleifunfocused;
 

src/g_state.h

@@ -52,7 +52,6 @@ typedef enum
 } gameaction_t;
 
 extern gamestate_t gamestate;
-extern UINT8 ultimatemode; // was sk_insane
 extern gameaction_t gameaction;
 
 extern boolean botingame;

src/hardware/hw_clip.c

@@ -319,16 +319,17 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
 	double clipfov;
 	double floatangle;
 	angle_t a1;
-
-	float tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
-
-	if (tilt > 90.0f)
-		tilt = 90.0f;
+	float tilt;
 
 	// If the pitch is larger than this you can look all around at a FOV of 90
 	if (abs((signed)tiltangle) > 46 * ANG1)
 		return 0xffffffff;
 
+	tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
+
+	if (tilt > 90.0f)
+		tilt = 90.0f;
+
 	// ok, this is a gross hack that barely works...
 	// but at least it doesn't overestimate too much...
 	clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI;

src/hardware/hw_draw.c

@@ -32,20 +32,6 @@
 
 #include <fcntl.h>
 
-typedef struct
-{
-	UINT8 id_field_length ; // 1
-	UINT8 color_map_type  ; // 2
-	UINT8 image_type      ; // 3
-	UINT8 dummy[5]        ; // 4,  8
-	INT16 x_origin        ; // 9, 10
-	INT16 y_origin        ; //11, 12
-	INT16 width           ; //13, 14
-	INT16 height          ; //15, 16
-	UINT8 image_pix_size  ; //17
-	UINT8 image_descriptor; //18
-} ATTRPACK TGAHeader; // sizeof is 18
-
 static const UINT8 softwaretranstogl[11]    = {  0, 25, 51, 76,102,127,153,178,204,229,255};
 static const UINT8 softwaretranstogl_hi[11] = {  0, 51,102,153,204,255,255,255,255,255,255};
 static const UINT8 softwaretranstogl_lo[11] = {  0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
@@ -57,8 +43,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
 {
 	FOutVector v[4];
 	FBITFIELD flags;
-	float cx = FIXED_TO_FLOAT(x);
-	float cy = FIXED_TO_FLOAT(y);
+	float cx, cy;
 	UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
 	UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT);
 	GLPatch_t *hwrPatch;
@@ -72,6 +57,9 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
 	if (alphalevel >= 10 && alphalevel < 13)
 		return;
 
+	cx = FIXED_TO_FLOAT(x);
+	cy = FIXED_TO_FLOAT(y);
+
 	const float fvw = (float)vid.width;
 	const float fvh = (float)vid.height;
 
@@ -244,8 +232,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
 {
 	FOutVector v[4];
 	FBITFIELD flags;
-	float cx = FIXED_TO_FLOAT(x);
-	float cy = FIXED_TO_FLOAT(y);
+	float cx, cy;
 	UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
 	GLPatch_t *hwrPatch;
 
@@ -258,6 +245,9 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
 	if (alphalevel >= 10 && alphalevel < 13)
 		return;
 
+	cx = FIXED_TO_FLOAT(x);
+	cy = FIXED_TO_FLOAT(y);
+
 	const float fvw = (float)vid.width;
 	const float fvh = (float)vid.height;
 
@@ -964,6 +954,20 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 #endif
 
 #ifndef USE_PNG
+typedef struct
+{
+	UINT8 id_field_length ; // 1
+	UINT8 color_map_type  ; // 2
+	UINT8 image_type      ; // 3
+	UINT8 dummy[5]        ; // 4,  8
+	INT16 x_origin        ; // 9, 10
+	INT16 y_origin        ; //11, 12
+	INT16 width           ; //13, 14
+	INT16 height          ; //15, 16
+	UINT8 image_pix_size  ; //17
+	UINT8 image_descriptor; //18
+} ATTRPACK TGAHeader; // sizeof is 18
+
 // --------------------------------------------------------------------------
 // save screenshots with TGA format
 // --------------------------------------------------------------------------

src/hardware/hw_gl.h

@@ -32,8 +32,12 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value);
 void GL_SetTransform(FTransform *stransform);
 void GL_SetBlend(FBITFIELD PolyFlags);
 void GL_SetPalette(RGBA_t *palette);
+
 void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat * ClearColor);
 
+void GL_EnableStencilTest(void);
+void GL_DisableStencilTest(void);
+
 void GL_DrawPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags);
 void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray);
 void GL_Draw2DLine(F2DCoord *v1, F2DCoord *v2, RGBA_t Color);
@@ -63,7 +67,7 @@ void GL_FlushScreenTextures(void);
 void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags);
 void GL_DoScreenWipe(int wipeStart, int wipeEnd);
 void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
-void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader);
+void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height);
 
 void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]);
 
@@ -72,6 +76,7 @@ void GL_LoadShader(int slot, char *code, hwdshaderstage_t stage);
 boolean GL_CompileShader(int slot);
 void GL_SetShader(int slot);
 void GL_UnSetShader(void);
+void GL_EnableShader(void);
 
 void GL_SetShaderInfo(hwdshaderinfo_t info, INT32 value);
 

src/hardware/hw_glob.h

@@ -34,8 +34,8 @@ typedef struct gl_vissprite_s
 	float gz, gzt;
 	float tz;
 	float scale;
-	float spritexscale, spriteyscale;
-	float spritexoffset, spriteyoffset;
+	//float spritexscale, spriteyscale;
+	//float spritexoffset, spriteyoffset;
 	patch_t *gpatch;
 	boolean flip;
 	UINT8 translucency;       //alpha level 0-255

src/hardware/hw_main.cpp

@@ -254,11 +254,11 @@ static void CV_screentextures_OnChange(void)
 	{
 		if (cv_glpaletterendering.value != 0)
 			CV_SetValue(&cv_glpaletterendering, 0);
-
 #ifdef USE_FBO_OGL
 		if (cv_glframebuffer.value != 0)
 			CV_SetValue(&cv_glframebuffer, 0);
 #endif
+		intermissionbginit = false;
 	}
 	GL_SetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_glscreentextures.value);
 	M_UpdateOGLMenu();
@@ -275,6 +275,7 @@ static void CV_glframebuffer_OnChange(void)
 	I_DownSample();
 	RefreshOGLSDLSurface();
 	M_UpdateOGLMenu();
+	intermissionbginit = false;
 }
 #endif
 
@@ -510,7 +511,7 @@ static FUINT HWR_CalcWallLight(FUINT lightnum, seg_t *seg, extracolormap_t *colo
 {
 	INT16 finallight = lightnum;
 
-	if (cv_glfakecontrast.value == 0 || (HWR_ShouldUsePaletteRendering() && colormap))
+	if (cv_glfakecontrast.value == 0 || (colormap && HWR_ShouldUsePaletteRendering()))
 		return (FUINT)finallight;
 
 	if (seg != NULL && P_ApplyLightOffsetFine(lightnum, seg->frontsector))
@@ -695,7 +696,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 		vert->z = (vy);\
 \
 }
-	for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++,v3d++, pv++)
+	for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++, v3d++, pv++)
 		SETUP3DVERT(v3d, pv->x, pv->y);
 
 	if (slope)
@@ -2672,7 +2673,7 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
 	float           anglef  = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
 	angle_t         angle = 0;
 	FSurfaceInfo    Surf = {};
-	fixed_t         tempxsow, tempytow;
+	float           tempxsow, tempytow;
 	size_t          nrPlaneVerts;
 
 	static FOutVector *planeVerts = NULL;
@@ -3800,7 +3801,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
 	{
 		const fixed_t h = P_GetLightZAt(&sector->lightlist[i], sprmo->x, sprmo->y);
 
-		if (!(h <= temp))
+		if (h > temp)
 			continue;
 
 		if (!lightset)
@@ -3862,7 +3863,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
 		wallVerts[1].y = endbot;
 
 		// The x and y only need to be adjusted in the case that it's not a papersprite
-		if (cv_glspritebillboarding.value && sprmo && !papersprite)
+		if (cv_glspritebillboarding.value && !cv_glshearing.value && !papersprite)
 		{
 			// Get the x and z of the vertices so billboarding draws correctly
 			realheight = realbot - realtop;
@@ -3935,7 +3936,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
 
 	mobj_t *sprmo = spr->mobj;
 
-	if (UNLIKELY(!sprmo->subsector))
+	if (!sprmo->subsector)
 		return;
 
 	const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE);
@@ -4099,7 +4100,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
 
 	const precipmobj_t *sprmo = spr->precip;
 
-	if (UNLIKELY(!sprmo->subsector))
+	if (!sprmo->subsector)
 		return;
 
 	// cache sprite graphics
@@ -4299,22 +4300,23 @@ static std::vector<gl_drawnode_t> drawnodes;
 
 static void *HWR_CreateDrawNode(gl_drawnode_type_t type)
 {
-	// if we didnt alloc anything yet, reserve atleast 64 nodes
-	// dont declare with it as we want our size to be 0!
+	gl_drawnode_t *drawnode;
 	drawnodes.reserve(DRAWNODES_INIT_SIZE);
 
 	drawnodes.emplace_back();
-	drawnodes.back().type = type;
+
+	drawnode = &drawnodes.back();
+	drawnode->type = type;
 
 	// not sure if returning different pointers to a union is necessary
 	switch (type)
 	{
 		case DRAWNODE_PLANE:
-			return &drawnodes.back().u.plane;
+			return &drawnode->u.plane;
 		case DRAWNODE_POLYOBJECT_PLANE:
-			return &drawnodes.back().u.polyplane;
+			return &drawnode->u.polyplane;
 		case DRAWNODE_WALL:
-			return &drawnodes.back().u.wall;
+			return &drawnode->u.wall;
 	}
 
 	return NULL;
@@ -4381,9 +4383,7 @@ static int CompareDrawNodePlanes(const void *p1, const void *p2)
 static void HWR_RenderDrawNodes(void)
 {
 	size_t i = 0, run_start = 0;
-	static std::vector<INT32> sortindex;
-
-	sortindex.reserve(DRAWNODES_INIT_SIZE);
+	static std::vector<INT32> sortindex(DRAWNODES_INIT_SIZE);
 
 	// Array for storing the rendering order.
 	// A list of indices into the drawnodes array.
@@ -4818,11 +4818,9 @@ static void HWR_ProjectSprite(mobj_t *thing)
 	)
 	{
 		ang = R_PointToAngle(interp.x, interp.y);
-
 #ifdef ROTSPRITE
 		camang = ang;
 #endif
-
 		ang -= interp.angle;
 
 		if (mirrored)
@@ -4857,9 +4855,9 @@ static void HWR_ProjectSprite(mobj_t *thing)
 			flip ^= (1<<rot);
 	}
 
-	spr_width = spritecachedinfo[lumpoff].width;
-	spr_height = spritecachedinfo[lumpoff].height;
-	spr_offset = spritecachedinfo[lumpoff].offset;
+	spr_width     = spritecachedinfo[lumpoff].width;
+	spr_height    = spritecachedinfo[lumpoff].height;
+	spr_offset    = spritecachedinfo[lumpoff].offset;
 	spr_topoffset = spritecachedinfo[lumpoff].topoffset;
 
 #ifdef ROTSPRITE
@@ -4945,11 +4943,11 @@ static void HWR_ProjectSprite(mobj_t *thing)
 	// if the sprite is out of our view, dont need to draw it X)
 	if (!gld_SphereInFrustum(
 							(FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f,
-							FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
-							FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
-							//1.5 == sqrt(2) + small delta for MF_FOREGROUND
-							std::max<float>(FixedToFloat(spr_width)  * spritexscale,
-											FixedToFloat(spr_height) * spriteyscale) / 2.0f * 1.5f))
+							 FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
+							 FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
+							 //1.5 == sqrt(2) + small delta for MF_FOREGROUND
+							 std::max<float>(FixedToFloat(spr_width)  * spritexscale,
+											 FixedToFloat(spr_height) * spriteyscale) / 2.0f * 1.5f))
 	{
 		return;
 	}
@@ -5008,10 +5006,10 @@ static void HWR_ProjectSprite(mobj_t *thing)
 	vis->flip = flip;
 
 	vis->scale = thing_scale;
-	vis->spritexscale = spritexscale;
+	/*vis->spritexscale = spritexscale;
 	vis->spriteyscale = spriteyscale;
 	vis->spritexoffset = FixedToFloat(spr_offset);
-	vis->spriteyoffset = FixedToFloat(spr_topoffset);
+	vis->spriteyoffset = FixedToFloat(spr_topoffset);*/
 
 #ifdef ROTSPRITE
 	if (rotsprite != NULL)
@@ -5140,9 +5138,9 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
 	lumpoff = sprframe->lumpid[0];
 	flip = sprframe->flip; // Will only be 0x00 or 0xFF
 
-	spr_width = spritecachedinfo[lumpoff].width;
-	spr_height = spritecachedinfo[lumpoff].height;
-	spr_offset = spritecachedinfo[lumpoff].offset;
+	spr_width     = spritecachedinfo[lumpoff].width;
+	spr_height    = spritecachedinfo[lumpoff].height;
+	spr_offset    = spritecachedinfo[lumpoff].offset;
 	spr_topoffset = spritecachedinfo[lumpoff].topoffset;
 
 	if (flip)
@@ -5165,11 +5163,11 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
 
 	if (!gld_SphereInFrustum(
 							(FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f,
-							FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
-							FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
-							//1.5 == sqrt(2) + small delta for MF_FOREGROUND
-							std::max<float>(FixedToFloat(spr_width)  * thing_scale,
-											FixedToFloat(spr_height) * thing_scale) / 2.0f * 1.5f))
+							 FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
+							 FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
+							 //1.5 == sqrt(2) + small delta for MF_FOREGROUND
+							 std::max<float>(FixedToFloat(spr_width)  * thing_scale,
+											 FixedToFloat(spr_height) * thing_scale) / 2.0f * 1.5f))
 	{
 		return;
 	}
@@ -5282,7 +5280,6 @@ void HWR_ClearSkyDome(void)
 	sky->loops = NULL;
 	sky->data = NULL;
 
-	sky->vbo = 0;
 	sky->rows = sky->columns = 0;
 	sky->loopcount = 0;
 
@@ -5694,6 +5691,12 @@ extern "C" {
 // ==========================================================================
 static void HWR_RenderFrame(boolean skybox, boolean drawsky)
 {
+	// NetUpdate below may cause this to be false midrender if toggled
+	const boolean useportals = HWR_UsePortals();
+
+	if (useportals)
+		GL_EnableStencilTest();
+
 	// Clear view, set viewport (glViewport), set perspective...
 	HWR_ClearView();
 
@@ -5711,7 +5714,7 @@ static void HWR_RenderFrame(boolean skybox, boolean drawsky)
 					 viewwindowy,
 					(viewwindowx + viewwidth),
 					(viewwindowy + viewheight),
-					ZCLIP_PLANE, clipping_distances[renderdist - 1]);
+					 ZCLIP_PLANE, clipping_distances[renderdist - 1]);
 		current_bsp_culling_distance = bsp_culling_distances[renderdist- 1];
 	}
 
@@ -5719,11 +5722,14 @@ static void HWR_RenderFrame(boolean skybox, boolean drawsky)
 	NetUpdate();
 
 	portalclipline = NULL;
-	if (UNLIKELY(HWR_UsePortals()))
+	if (useportals)
 		HWR_RenderViewpoint<RenderViewpointType::kPortal>(NULL, 0, !skybox);
 	else
 		HWR_RenderViewpoint<RenderViewpointType::kNormal>(NULL, 0, !skybox);
 
+	if (useportals)
+		GL_DisableStencilTest();
+
 	// Check for new console commands.
 	NetUpdate();
 }
@@ -5979,7 +5985,7 @@ static void COM_HWR_glinfo(void)
 		// if the GPU is super new and supports a bajillion extensions - xyzzy
 
 		char *copy = strdup((const char*)gl_extensions);
-		char *ext = strtok(copy, " ");
+		char *ext;
 
 		if (copy == NULL)
 		{
@@ -5987,6 +5993,8 @@ static void COM_HWR_glinfo(void)
 			return;
 		}
 
+		ext = strtok(copy, " ");
+
 		do
 		{
 			CONS_Printf(" - %s\n", ext);
@@ -6088,64 +6096,66 @@ static void HWR_DoPostProcessor(void)
 		}
 	}
 
-	if (cv_glscreentextures.value != 2) // screen textures are needed for the rest of the effects
+	// screen textures are needed for the rest of the effects
+	if (cv_glscreentextures.value != 2)
 		return;
 
-	//UINT8 viewnum = R_GetViewNumber(); // see below
+	// Not supported in splitscreen - someone want to add support?
+	if (splitscreen || cv_reducevfx.value)
+		return;
+
+	//UINT8 viewnum = R_GetViewNumber();
 	//camera_t *thiscam = &camera[viewnum];
 	const camera_t *thiscam = &camera[0];
 
-	// Not supported in splitscreen - someone want to add support?
-	const boolean screenwave = (!splitscreen && !cv_reducevfx.value && (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT));
+	if (!(thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT))
+		return;
 
 	// Capture the screen for intermission and screen waving
-	if ((lastdraw || screenwave) && gamestate != GS_INTERMISSION)
+	if (gamestate != GS_INTERMISSION)
 		GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
 
 	// Drunken vision! WooOOooo~
-	if (screenwave)
+	// 10 by 10 grid. 2 coordinates (xy)
+	float v[SCREENVERTS][SCREENVERTS][2];
+	float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL));
+
+	UINT8 x, y;
+	float WAVELENGTH;
+	float AMPLITUDE;
+	float FREQUENCY;
+
+	// Modifies the wave.
+	if (thiscam->postimg & POSTIMG_WATER)
 	{
-		// 10 by 10 grid. 2 coordinates (xy)
-		float v[SCREENVERTS][SCREENVERTS][2];
-		float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL));
-
-		UINT8 x, y;
-		float WAVELENGTH;
-		float AMPLITUDE;
-		float FREQUENCY;
-
-		// Modifies the wave.
-		if (thiscam->postimg & POSTIMG_WATER)
-		{
-			WAVELENGTH = 5.0f;
-			AMPLITUDE = 40.0f;
-			FREQUENCY = 8.0f;
-		}
-		else
-		{
-			WAVELENGTH = 10.0f;
-			AMPLITUDE = 60.0f;
-			FREQUENCY = 4.0f;
-		}
-
-		//static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek
-
-		for (x = 0; x < SCREENVERTS; x++)
-		{
-			for (y = 0; y < SCREENVERTS; y++)
-			{
-				// Change X position based on its Y position.
-				v[x][y][0] = x-4.5f + sinf(((disStart+(static_cast<float>(y) * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale)
-				v[x][y][1] = y-4.5f; // (y / scale)
-			}
-		}
-
-		GL_PostImgRedraw(v);
-
-		// Capture the screen again for screen waving on the intermission
-		if (gamestate != GS_INTERMISSION)
-			GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
+		WAVELENGTH = 5.0f;
+		AMPLITUDE = 40.0f;
+		FREQUENCY = 8.0f;
 	}
+	else
+	{
+		WAVELENGTH = 10.0f;
+		AMPLITUDE = 60.0f;
+		FREQUENCY = 4.0f;
+	}
+
+	//static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek
+
+	for (x = 0; x < SCREENVERTS; x++)
+	{
+		for (y = 0; y < SCREENVERTS; y++)
+		{
+			// Change X position based on its Y position.
+			v[x][y][0] = x-4.5f + sinf(((disStart+(static_cast<float>(y) * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale)
+			v[x][y][1] = y-4.5f; // (y / scale)
+		}
+	}
+
+	GL_PostImgRedraw(v);
+
+	// Capture the screen again for screen waving on the intermission
+	if (gamestate != GS_INTERMISSION)
+		GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
 	// Flipping of the screen isn't done here anymore
 }
 

src/hardware/hw_main.h

@@ -151,14 +151,19 @@ FUNCINLINE static ATTRINLINE void HWR_RenderVhsEffect(fixed_t upbary, fixed_t do
 	GL_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
 }
 
+FUNCINLINE static ATTRINLINE void HWR_MakeScreenTexture(void)
+{
+	GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
+}
+
 FUNCINLINE static ATTRINLINE void HWR_MakeScreenFinalTexture(void)
 {
 	GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC2);
 }
 
-FUNCINLINE static ATTRINLINE void HWR_DrawScreenFinalTexture(INT32 width, INT32 height, boolean useshader)
+FUNCINLINE static ATTRINLINE void HWR_DrawScreenFinalTexture(INT32 width, INT32 height)
 {
-	GL_DrawScreenFinalTexture(HWD_SCREENTEXTURE_GENERIC2, width, height, useshader);
+	GL_DrawScreenFinalTexture(HWD_SCREENTEXTURE_GENERIC2, width, height);
 }
 
 // hw_main.c: Segs

src/hardware/hw_md3load.c

@@ -154,7 +154,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 	char *buffer;
 	int surfEnd;
 	int i, t;
-	int matCount;
+	//int matCount;
 	FILE *f;
 
 	if (!latlnginit)
@@ -227,7 +227,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 
 	retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t)*retModel->numMeshes, ztag, NULL);
 
-	matCount = 0;
+	//matCount = 0;
 	for (i = 0, surfEnd = 0; i < mdh->numSurfaces; i++)
 	{
 		int j;
@@ -237,7 +237,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 
 		mdShader = (md3Shader*)((char*)mdS + mdS->offsetShaders);
 
-		for (j = 0; j < mdS->numShaders; j++, matCount++)
+		for (j = 0; j < mdS->numShaders; j++ /*, matCount++*/)
 		{
 			size_t len = strlen(mdShader[j].name);
 			mdShader[j].name[len-1] = 'z';
@@ -503,7 +503,6 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 		}
 	}*/
 
-
 	free(buffer);
 
 	return retModel;

src/hardware/hw_shaders.h

@@ -78,33 +78,23 @@
 // Include GLSL_FLOOR_FUDGES or GLSL_WALL_FUDGES or define the fudges in shaders that use this macro.
 #define GLSL_DOOM_COLORMAP_DITHER \
 	"float baseValue = max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
-	"float endResolutionx = scr_resolution.x;\n" \
-	"float endResolutiony = scr_resolution.y;\n" \
-	"if (scr_resolution.x > 1280.0) {\n" \
-		"endResolutionx = scr_resolution.x * 0.5;\n" \
-	"}\n" \
-	"if (scr_resolution.y > 720.0) {\n" \
-		"endResolutiony = scr_resolution.y * 0.5;\n" \
-	"}\n" \
-	"float zFactor = clamp((z - 192.0) / (6144.0 - 192.0), 0.0, 1.0);\n" \
-	"int scaleFactor = int(mix(1.0, 8.0, zFactor));\n" \
-	"endResolutionx = endResolutionx * scaleFactor;\n" \
-	"endResolutiony = endResolutiony * scaleFactor;\n" \
-	"vec2 normalizedPosition = position * vec2(endResolutionx / scr_resolution.x, endResolutiony / scr_resolution.y);\n" \
-	"int x = int(mod(normalizedPosition.x, 4.0));\n" \
-	"int y = int(mod(normalizedPosition.y, 4.0));\n" \
+	"float patscale = min(scr_resolution.x / 1280.0, scr_resolution.y / 720.0);\n" \
+	"patscale = max(floor(patscale + 0.5), 1.0);\n" \
+	"patscale = 1.0 / patscale;\n" \
+	"ivec2 p = ivec2(mod(floor(position * patscale), 4.0));\n" \
+	"float depthfactor = clamp((z - 192.0) / (6144.0 - 192.0), 0.0, 1.0);\n" \
 	"float bayerMatrix[4*4] = float[4*4](\n" \
 		"0.0, 8.0, 2.0, 10.0,\n" \
 		"12.0, 4.0, 14.0, 6.0,\n" \
 		"3.0, 11.0, 1.0, 9.0,\n" \
 		"15.0, 7.0, 13.0, 5.0\n" \
 	");\n" \
+	"float threshold = 16.0;\n" \
 	"#ifdef SRB2_PALETTE_RENDERING\n" \
-	"float threshold = (1.0 - pow(zFactor, 2.0)) * (bayerMatrix[y*4 + x] / 11.0);\n" \
-	"#else\n" \
-	"float threshold = (1.0 - pow(zFactor, 2.0)) * (bayerMatrix[y*4 + x] / 16.0);\n" \
+	"threshold = 11.0;\n" \
 	"#endif\n" \
-	"return mix(baseValue + threshold - 0.5 / 16.0, baseValue, zFactor);\n"
+	"threshold = (1.0 - pow(depthfactor, 2.0)) * (bayerMatrix[p.y*4 + p.x] / threshold);\n" \
+	"return mix(baseValue + threshold - 0.5 / 16.0, baseValue, depthfactor);\n"
 
 #define GLSL_DOOM_COLORMAP_NODITHER \
 	"return max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \

src/hardware/r_opengl/r_opengl.c

@@ -1068,6 +1068,13 @@ void GL_SetShader(int slot)
 	gl_shadersenabled = false;
 }
 
+void GL_EnableShader(void)
+{
+	// we can just use GL_Shader_SetUniforms as itll enable the shader for us
+	// and handle any failures
+	GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
+}
+
 void GL_UnSetShader(void)
 {
 	if (gl_shadersenabled) // don't repeatedly call glUseProgram if not needed
@@ -1277,7 +1284,7 @@ void GL_SetStates(void)
 
 	pglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
-	pglEnable(GL_STENCIL_TEST);
+	pglDisable(GL_STENCIL_TEST);
 	pglEnable(GL_DEPTH_TEST);    // check the depth buffer
 	pglDepthMask(GL_TRUE);       // enable writing to depth buffer
 	pglClearDepth(1.0f);
@@ -1307,6 +1314,16 @@ void GL_SetStates(void)
 #endif
 }
 
+void GL_EnableStencilTest(void)
+{
+	pglEnable(GL_STENCIL_TEST);
+}
+
+void GL_DisableStencilTest(void)
+{
+	pglDisable(GL_STENCIL_TEST);
+}
+
 // -----------------+
 // DeleteTexture    : Deletes a texture from the GPU and frees its data
 // -----------------+
@@ -3243,14 +3260,6 @@ static void GL_Framebuffer_Generate(void)
 	if (!framebufferobject.fboobj)
 		pglGenFramebuffers(1, &framebufferobject.fboobj);
 
-	if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT)
-	{
-		// if this fails, dont retry it a gazillion times
-		// this wouldnt recover
-		supportFBO = false;
-		return;
-	}
-
 	// Bind the framebuffer
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
 
@@ -3302,6 +3311,18 @@ static void GL_Framebuffer_Generate(void)
 		pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
 	}
 
+	if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT)
+	{
+		//pglGetError(); TODO:implement this or smth
+		GL_MSG_Error("GL_Framebuffer_Generate: Failed to create Framebuffer Object");
+
+		// if this fails, dont retry it a gazillion times
+		// this wouldnt recover
+		supportFBO = false;
+		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
+		return;
+	}
+
 	// Unbind the framebuffer
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 
@@ -3324,6 +3345,10 @@ void GL_Framebuffer_Enable(void)
 
 	GL_Framebuffer_Generate();
 
+	// failed
+	if (!supportFBO || !framebufferobject.init)
+		return;
+
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
 	pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
 }
@@ -3718,7 +3743,7 @@ void GL_MakeScreenTexture(int tex)
 	tex_downloaded = screenTextures[tex];
 }
 
-void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader)
+void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)
 {
 	float xfix, yfix;
 	float origaspect, newaspect;
@@ -3771,9 +3796,6 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 
 	pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
 
-	if (useshader)
-		pglUseProgram(gl_shaders[SHADER_PALETTE_POSTPROCESS].program); // Final postprocess step of palette rendering, after everything else has been drawn.
-
 	pglColor4ubv(white);
 
 	pglTexCoordPointer(2, GL_FLOAT, 0, fix);
@@ -3781,9 +3803,6 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 
 	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
-	if (useshader)
-		pglUseProgram(0);
-
 	tex_downloaded = screenTextures[tex];
 }
 

src/hu_stuff.c

@@ -115,155 +115,8 @@ static patch_t *songcreditbg = NULL;
 // -------
 static void HU_DrawRankings(void);
 
-
 consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-//======================================================================
-//                 KEYBOARD LAYOUTS FOR ENTERING TEXT
-//======================================================================
-
-char *shiftxform = NULL;
-
-char english_shiftxform[] =
-{
-	0,
-	1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-	11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-	21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-	31,
-	' ', '!', '"', '#', '$', '%', '&',
-	'"', // shift-'
-	'(', ')', '*', '+',
-	'<', // shift-,
-	'_', // shift--
-	'>', // shift-.
-	'?', // shift-/
-	')', // shift-0
-	'!', // shift-1
-	'@', // shift-2
-	'#', // shift-3
-	'$', // shift-4
-	'%', // shift-5
-	'^', // shift-6
-	'&', // shift-7
-	'*', // shift-8
-	'(', // shift-9
-	':',
-	':', // shift-;
-	'<',
-	'+', // shift-=
-	'>', '?', '@',
-	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-	'{', // shift-[
-	'|', // shift-backslash - OH MY GOD DOES WATCOM SUCK
-	'}', // shift-]
-	'"', '_',
-	'~', // shift-`
-	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-	'{', '|', '}', '~', 127
-};
-
-char french_shiftxform[] =
-{
-	0,
-	1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-	11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-	21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-	31,
-	' ','$', //shift-!
-	'3', //shift-"
-	'#', '$', '%',
-	'1', //shift-&
-	'4', // shift-'
-	'5', // shift-(
-	')', // shift-)
-	'*', '+',
-	'?', // shift-,
-	'6', // shift--
-	'.', '/',
-	'0', '1', '2', '3', '4', '5',
-	'6', '7', '8', '9',
-	'/', // shitf-:
-	'.', // shift-;
-	'>', // shift-<
-	'+', // shift-=
-	'>', '?', '@',
-	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-	'[', '\\', ']', '^',
-	'8', //shift-_
-	'`',
-	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-	'{', '|', '}', '~', 127,
-	128, 129,
-	'2',
-	131, 132,
-	'0',
-	134,
-	'9',
-	136, 137,
-	'7',
-	139, 140,
-	'%'
-};
-
-char french_altgrxform[] =
-{
-	0,
-	1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-	11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-	21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-	31,
-	' ', '!',
-	'#', //altgr-"
-	'#', '$', '%', '&',
-	'{', //altgr-'
-	'[', //altgr-(
-	']', //altgr-)
-	'*', '+', ',',
-	'|', //altg--
-	'.', '/',
-	'0', '1', '2', '3', '4', '5',
-	'6', '7', '8', '9',
-	':', ';', '<',
-	'}', //altgr-=
-	'>', '?', '@',
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-	'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-	'[', '\\', ']', '^',
-	'\\', //altgr-backslash
-	'`',
-	'a', 'b', 'c', 'd', 'E', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-	'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-	'{', '|', '}', '~', 127,
-	128, 129,
-	'~',
-	131, 132,
-	'@',
-	134,
-	'^',
-	136, 137,
-	'`',
-	139, 140,
-	KEY_FR_U_GRAVE
-};
-
-//fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
-INT32 HU_FallBackFrSpecialLetter(INT32 key)
-{
-	switch(key){
-		case KEY_FR_E_AIGUE:     return 'e';
-		case KEY_FR_E_GRAVE:     return 'e';
-		case KEY_FR_C_CEDILLE:   return 'c';
-		case KEY_FR_A_GRAVE:     return 'a';
-		case KEY_FR_U_GRAVE:     return 'u';
-		default:       return key;
-	}
-}
-
 static char cechotext[1024];
 static tic_t cechotimer = 0;
 static tic_t cechoduration = 5*TICRATE;
@@ -407,9 +260,6 @@ void HU_Init(void)
 	COM_AddCommand("csay", Command_CSay_f);
 	RegisterNetXCmd(XD_SAY, Got_Saycmd);
 
-	// set shift translation table
-	shiftxform = english_shiftxform;
-
 	if (dedicated || rendermode == render_none)
 		return;
 
@@ -435,11 +285,6 @@ void HU_Start(void)
 	headsupactive = true;
 }
 
-void HU_Shiftform(void)
-{
-	shiftxform = (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
-}
-
 //======================================================================
 //                            EXECUTION
 //======================================================================
@@ -1134,7 +979,8 @@ void HU_Ticker(void)
 		}
 	}
 
-	if (cechotimer > 0) --cechotimer;
+	if (cechotimer > 0)
+		--cechotimer;
 
 	// Animate the desynch dots
 	if (hu_resynching
@@ -1581,7 +1427,6 @@ static void HU_drawMiniChat(void)
 
 	y = chaty - charheight*(msglines+1);
 
-#ifdef NETSPLITSCREEN
 	if (splitscreen)
 	{
 		y -= BASEVIDHEIGHT/2;
@@ -1589,7 +1434,6 @@ static void HU_drawMiniChat(void)
 			y += 16;
 	}
 	else
-#endif
 		y -= (cv_kartspeedometer.value ? 16 : 0);
 
 	dx = 0;
@@ -1687,18 +1531,15 @@ static void HU_drawChatLog(INT32 offset)
 	if (chat_scroll > chat_maxscroll)
 		chat_scroll = chat_maxscroll;
 
-#ifdef NETSPLITSCREEN
 	if (splitscreen)
 	{
 		boxh = max(6, boxh/2);
 		if (splitscreen > 1)
 			boxw = max(64, boxw/2);
 	}
-#endif
 
 	y = chaty - offset*charheight - (chat_scroll*charheight) - boxh*charheight - 12;
 
-#ifdef NETSPLITSCREEN
 	if (splitscreen)
 	{
 		y -= BASEVIDHEIGHT/2;
@@ -1706,7 +1547,6 @@ static void HU_drawChatLog(INT32 offset)
 			y += 16;
 	}
 	else
-#endif
 		y -= (cv_kartspeedometer.value ? 16 : 0);
 
 
@@ -1821,7 +1661,6 @@ static void HU_DrawChat(void)
 	const char *talk = ntalk;
 	const char *mute = "Chat has been muted.";
 
-#ifdef NETSPLITSCREEN
 	if (splitscreen)
 	{
 		y -= BASEVIDHEIGHT/2;
@@ -1832,7 +1671,6 @@ static void HU_DrawChat(void)
 		}
 	}
 	else
-#endif
 		y -= (cv_kartspeedometer.value ? 16 : 0);
 
 	if (teamtalk)
@@ -1933,7 +1771,7 @@ static void HU_DrawChat(void)
 		INT32 count = 0;
 		INT32 p_dispy = chaty - charheight - 1;
 		size_t longest_name_length = 0;
-#ifdef NETSPLITSCREEN
+
 		if (splitscreen)
 		{
 			p_dispy -= BASEVIDHEIGHT/2;
@@ -1941,13 +1779,13 @@ static void HU_DrawChat(void)
 				p_dispy += 16;
 		}
 		else
-#endif
 			p_dispy -= (cv_kartspeedometer.value ? 16 : 0);
 
 		// Find longest player name, for drawing background for /pm list later
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
-			if (!playeringame[i]) continue;
+			if (!playeringame[i])
+				continue;
 
 			longest_name_length = max(longest_name_length, strlen(player_names[i]));
 		}
@@ -2050,7 +1888,6 @@ static void HU_DrawChat(void)
 
 		skip = 0;
 
-#ifdef NETSPLITSCREEN
 		if (splitscreen)
 		{
 			suggesty -= BASEVIDHEIGHT/2;
@@ -2058,7 +1895,6 @@ static void HU_DrawChat(void)
 				suggesty += 16;
 		}
 		else
-#endif
 			suggesty -= (cv_kartspeedometer.value ? 16 : 0);
 
 		while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)

src/hu_stuff.h

@@ -42,15 +42,6 @@
 #define CRED_FONTEND 'Z' // the last font character
 #define CRED_FONTSIZE (CRED_FONTEND - CRED_FONTSTART + 1)
 
-extern char *shiftxform; // english translation shift table
-extern char english_shiftxform[];
-
-extern char french_shiftxform[];
-extern char french_altgrxform[];
-
-//fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
-INT32 HU_FallBackFrSpecialLetter(INT32 key);
-
 //------------------------------------
 //        sorted player lines
 //------------------------------------
@@ -68,12 +59,7 @@ typedef struct
 #define HU_MAXMSGLEN 223
 #define HU_MSGBUFSIZE 255
 #define MAX_CHAT_BUFSIZE 256		// that's enough messages, right? We'll delete the older ones when that gets out of hand.
-#define NETSPLITSCREEN // why the hell WOULDN'T we want this?
-#ifdef NETSPLITSCREEN
 #define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
-#else
-#define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
-#endif
 #define CHAT_MUTE (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer)))	// this still allows to open the chat but not to type. That's used for scrolling and whatnot.
 #define OLD_MUTE (OLDCHAT && cv_mute.value && !(server || IsPlayerAdmin(consoleplayer)))	// this is used to prevent oldchat from opening when muted.
 
@@ -110,8 +96,6 @@ void HU_LoadGraphics(void);
 // reset heads up when consoleplayer respawns.
 void HU_Start(void);
 
-void HU_Shiftform(void);
-
 boolean HU_Responder(event_t *ev);
 void HU_Ticker(void);
 void HU_TickSongCredits(void);
@@ -120,8 +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_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer);
-//void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer);
 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

@@ -44,9 +44,6 @@ extern "C" {
 
 struct JoyType_s
 {
-	/*! if true, we MUST Poll() to get new joystick data,
-	that is: we NEED the DIRECTINPUTDEVICE2 ! (watchout NT compatibility) */
-	INT32 bJoyNeedPoll;
 	/*! this joystick is a gamepad, read: digital axes
 	if FALSE, interpret the joystick event data as JOYAXISRANGE (see above) */
 	INT32 bGamepadStyle;

src/i_system.h

@@ -148,6 +148,8 @@ extern INT32 numcontrollers;
 */
 const char *I_GetJoyName(INT32 joyindex);
 
+void I_SetJoystickFocus(void);
+
 boolean I_GamepadHasLED(INT32 playernum);
 boolean I_GamepadHasRumble(INT32 playernum);
 

src/i_tcp.c

@@ -392,6 +392,9 @@ static const char *SOCK_GetNodeAddress(INT32 node)
 	if (node == 0)
 		return "self";
 
+	if (node < 0 || node > MAXNETNODES)
+		return NULL;
+
 	if (!nodeconnected[node])
 		return NULL;
 

src/i_video.h

@@ -95,7 +95,6 @@ INT32 VID_SetMode(INT32 modenum);
 */
 const char *VID_GetModeName(INT32 modenum);
 
-void VID_RefreshModeList(void);
 void VID_PrepareModeList(void);
 
 /**	\brief can video system do fullscreen
@@ -122,7 +121,6 @@ void I_ReadScreen(UINT8 * restrict scr, INT32 scale);
 
 UINT32 I_GetRefreshRate(void);
 
-boolean I_CheckAboveDesktopRes(INT32 width, INT32 height);
 boolean I_CheckNativeRes(void);
 
 void I_SetBorderlessWindow(void);

src/k_hud.c

@@ -274,7 +274,6 @@ void K_RegisterKartHudStuff(void)
 
 // Smol speedo
 static patch_t *skp_smallsticker    = NULL;
-static patch_t *skp_smallsticker3   = NULL;
 
 static patch_t *skp_speedpatches[5] = {NULL};
 
@@ -312,7 +311,6 @@ static patch_t *kp_bumperstickerwideclr  =  NULL;
 static patch_t *kp_karmastickerclr       =  NULL;
 static patch_t *kp_timeoutstickerclr     =  NULL;
 static patch_t *skp_smallstickerclr      =  NULL;
-static patch_t *skp_smallstickerclr3     =  NULL;
 static patch_t *kp_itemmulstickerclr[2]  = {NULL};
 static patch_t *kp_itembgclr[4]          = {NULL};
 
@@ -478,11 +476,6 @@ static void K_LoadSaturnHUDGraphics(void)
 			skp_smallstickerclr = (patch_t *)W_CachePatchName("SC_SMSTC", PU_HUDGFX);
 		}
 
-		if (xtra_speedo_clr3)
-		{
-			skp_smallstickerclr3 = (patch_t *)W_CachePatchName("SC_SM3TC", PU_HUDGFX);
-		}
-
 		if (achi_speedo_clr)
 		{
 			skp_smallstickerachiclr    = (patch_t *)W_CachePatchName("SC_AMSTC", PU_HUDGFX);
@@ -537,14 +530,6 @@ static void K_LoadSaturnHUDGraphics(void)
 			kp_itemmulstickerclr[0] = (patch_t *)W_CachePatchName("K_ITMULC", PU_HUDGFX);
 		}
 	}
-
-	if (found_extra3_kart)
-	{
-		if (xtra_speedo3) // 80x11 patch scaled to size
-		{
-			skp_smallsticker3 = (patch_t *)W_CachePatchName("SP_SM3TC", PU_HUDGFX);
-		}
-	}
 }
 
 // -- Kart patches --
@@ -879,7 +864,7 @@ void K_LoadKartHUDGraphics(void)
 
 	kp_yougotem = (patch_t *)W_CachePatchName("YOUGOTEM", PU_HUDGFX);
 
-	if (found_extra_kart || found_extra2_kart || found_extra3_kart)
+	if (found_extra_kart || found_extra2_kart)
 		K_LoadSaturnHUDGraphics();
 }
 
@@ -1149,7 +1134,6 @@ enum
 	SPEEDO_DIAL,
 	SPEEDO_PMETER,
 	SPEEDO_PMETERSMOL,
-	SPEEDO_EXTRA3,
 };
 
 static SINT8 K_GetSpeedometerStyle(void)
@@ -1164,8 +1148,6 @@ static SINT8 K_GetSpeedometerStyle(void)
 		return SPEEDO_PMETER;
 	else if (cv_newspeedometer.value == 6 && kartz_speedo_smol)
 		return SPEEDO_PMETERSMOL;
-	else if (cv_newspeedometer.value == 7 && xtra_speedo3)
-		return SPEEDO_EXTRA3;
 	else
 		return SPEEDO_VANILLA;
 }
@@ -1183,8 +1165,6 @@ static boolean K_UseColorSpeedo(int speedostyle)
 			return achi_speedo_clr;
 		case SPEEDO_DIAL:
 			return dial_speedo_clr;
-		case SPEEDO_EXTRA3:
-			return xtra_speedo_clr3;
 		default:
 			return false;
 	}
@@ -1196,7 +1176,6 @@ enum
 	GAUGE_SMALL,
 	GAUGE_BIGNUM,
 	GAUGE_NUMONLY,
-	GAUGE_EXTRA,
 };
 
 static SINT8 K_GetDriftgaugeStyle(void)
@@ -1209,8 +1188,6 @@ static SINT8 K_GetDriftgaugeStyle(void)
 			return GAUGE_SMALL;
 		else if (cv_driftgaugestyle.value == 3)
 			return GAUGE_BIGNUM;
-		else if (cv_driftgaugestyle.value == 5 && xtra_speedo3)
-			return GAUGE_EXTRA;
 	}
 
 	// Fallback
@@ -1362,10 +1339,12 @@ INT32 K_getMinimapTrans(void)
 		return -1;
 
 	if (timeinmap <= 113)
+	{
 		minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105);
 
-	if (!minimaptrans)
-		return -1;
+		if (!minimaptrans)
+			return -1;
+	}
 
 	return (10-minimaptrans)<<FF_TRANSSHIFT;
 }
@@ -1407,7 +1386,6 @@ static void K_drawKartStats(void)
 		{
 			case SPEEDO_EXTRA:
 			case SPEEDO_ACHII:
-			case SPEEDO_EXTRA3:
 				spdoffset = -10;
 				break;
 			case SPEEDO_DIAL:
@@ -2183,8 +2161,9 @@ static boolean K_drawKartPositionFaces(void)
 	UINT8 *colormap;
 
 	ranklines = 0;
-	memset(completed, 0, sizeof (completed));
-	memset(rankplayer, 0, sizeof (rankplayer));
+
+	if (!LUA_HudEnabled(hud_minirankings))
+		return false; // Don't proceed but still return true for free play above if HUD is disabled.
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
@@ -2199,8 +2178,7 @@ static boolean K_drawKartPositionFaces(void)
 	if (numplayersingame <= 1)
 		return true;
 
-	if (!LUA_HudEnabled(hud_minirankings))
-		return false; // Don't proceed but still return true for free play above if HUD is disabled.
+	memset(completed, 0, sizeof (completed));
 
 	for (j = 0; j < numplayersingame; j++)
 	{
@@ -2257,6 +2235,7 @@ static boolean K_drawKartPositionFaces(void)
 
 		if (!playeringame[rankplayer[i]])
 			continue;
+
 		if (player->spectator || !player->mo)
 			continue;
 
@@ -2434,7 +2413,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
 
 static boolean K_BigLap(void)
 {
-	return (cv_biglaps.value && (cv_numlaps.value > 9) && (K_UseColorHud() ? big_lap_color : big_lap) && (!stplyr->exiting));
+	return (cv_biglaps.value && (cv_numlaps.value > 9) && !stplyr->exiting && (K_UseColorHud() ? big_lap_color : big_lap));
 }
 
 static void K_drawKartLaps(void)
@@ -2643,7 +2622,7 @@ static void K_drawKartSpeedometer(void)
 		return;
 
 	// index 0 is the raw value, index 1 is the converted value
-	fixed_t convSpeed[2] = {0,0};
+	fixed_t convSpeed[2] = {0, 0};
 #ifdef ROTSPRITE
 	fixed_t dial_divisor = DIALSPDDIV;
 #endif
@@ -2712,34 +2691,28 @@ static void K_drawKartSpeedometer(void)
 
 		V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, metric);
 	}
-	else if (speedostyle == SPEEDO_EXTRA) // why bother if we dont?
+	else if (speedostyle == SPEEDO_EXTRA || speedostyle == SPEEDO_ACHII) // why bother if we dont?
 	{
-		if (K_UseColorSpeedo(SPEEDO_EXTRA)) //Colourized hud
+		patch_t *speedopat;
+		UINT8 *colormap = NULL;
+
+		if (K_UseColorSpeedo(speedostyle)) //Colourized hud
 		{
-			UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-			V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerclr, colormap);
+			colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+
+			speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_smallstickerclr : skp_smallstickerachiclr);
+			V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, speedopat, colormap);
+			speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_speedpatches[cv_kartspeedometer.value] : skp_speedpatchesachiclr[cv_kartspeedometer.value]);
 		}
 		else
-			V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallsticker);
+		{
+			speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_smallsticker : skp_smallstickerachi);
+			V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, speedopat);
+			speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_speedpatches[cv_kartspeedometer.value] : skp_speedpatchesachi[cv_kartspeedometer.value]);
+		}
 
 		V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
-		V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]);
-	}
-	else if (speedostyle == SPEEDO_ACHII) // why bother if we dont?
-	{
-		if (K_UseColorSpeedo(SPEEDO_ACHII)) //Colourized hud
-		{
-			UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-			V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerachiclr, colormap);
-			V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
-			V_DrawMappedPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachiclr[cv_kartspeedometer.value], colormap);
-		}
-		else
-		{
-			V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerachi);
-			V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
-			V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachi[cv_kartspeedometer.value]);
-		}
+		V_DrawMappedPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, speedopat, colormap);
 	}
 #ifdef ROTSPRITE
 	else if (speedostyle == SPEEDO_DIAL)  // why bother if we dont?
@@ -2752,46 +2725,36 @@ static void K_drawKartSpeedometer(void)
 							(K_UseColorSpeedo(SPEEDO_DIAL)));
 	}
 #endif
-	else if (speedostyle == SPEEDO_EXTRA3) // why bother if we dont?
-	{
-		if (K_UseColorSpeedo(SPEEDO_EXTRA3)) //Colourized hud
-		{
-			UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-			V_DrawStretchyFixedPatch((SPDM_X-1)<<FRACBITS, (SPDM_Y + 5)<<FRACBITS, XTRA3PSCALE, XTRA3VSCALE, V_HUDTRANS|splitflags, skp_smallstickerclr3, colormap, 0);
-		}
-		else
-			V_DrawStretchyFixedPatch((SPDM_X-1)<<FRACBITS, (SPDM_Y + 5)<<FRACBITS, XTRA3PSCALE, XTRA3VSCALE, V_HUDTRANS|splitflags, skp_smallsticker3, NULL, 0);
-
-		V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
-		V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]);
-	}
 	// Kart Z speedo bullshit...
 	// Draw the Speed counter.
 	else if ((speedostyle == SPEEDO_PMETER) || (speedostyle == SPEEDO_PMETERSMOL))
 	{
-		fixed_t fuspeed = 0;
 		INT32 spdpatch = 0;
-		static const INT32 speedIntervals[22] = {2, 5, 7, 10, 12, 15, 17,
-												20, 22, 25, 27, 30, 32,
-												35, 37, 40, 42, 45, 47,
-												50, 52, 55};
+		static const INT32 spdinterval[22] = { 2,  5,  7, 10,
+											  12, 15, 17, 20,
+											  22, 25, 27, 30,
+											  32, 35, 37, 40,
+											  42, 45, 47, 50,
+											  52, 55};
 
-		fuspeed = FixedDiv(stplyr->speed, mapobjectscale)/FRACUNIT;
+		const fixed_t spd = FixedDiv(stplyr->speed, mapobjectscale) / FRACUNIT;
 
-		for (INT32 i = 0; i < 22; ++i)
+		if (spd > 54)
 		{
-			if (fuspeed < speedIntervals[i])
+			spdpatch = (leveltime & 4) ? 24 : 23;
+		}
+		else
+		{
+			for (INT32 i = 0; i < 22; ++i)
 			{
-				spdpatch = i;
-				break;
+				if (spd < spdinterval[i])
+				{
+					spdpatch = i;
+					break;
+				}
 			}
 		}
 
-		if (((fuspeed < 57 && fuspeed > 54) || (fuspeed < 60 && fuspeed > 56) || (fuspeed > 59)) && (leveltime & 4))
-			spdpatch = 24;
-		else if (((fuspeed < 57 && fuspeed > 54) || (fuspeed < 60 && fuspeed > 56) || (fuspeed > 59)) && !(leveltime & 4))
-			spdpatch = 23;
-
 		V_DrawScaledPatch(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, (speedostyle == SPEEDO_PMETER) ? kp_kartzspeedo[spdpatch] : kp_kartzspeedo_smol[spdpatch]);
 	}
 }
@@ -2819,7 +2782,7 @@ static void K_drawKartBumpersOrKarma(void)
 	{
 		const UINT8 speedostyle = K_GetSpeedometerStyle();
 
-		if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII) || (speedostyle == SPEEDO_EXTRA3))
+		if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII))
 			fy += 5;
 		else
 			fy += 7;
@@ -2911,10 +2874,12 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe
 	x = (fixed_t)(viewangle - R_PointToAngle(targx, targy));
 
 	distfact = FINECOSINE((x>>ANGLETOFINESHIFT) & FINEMASK);
-    if (!distfact) distfact = 1;
+    if (!distfact)
+		distfact = 1;
 
 	if (encoremode)
 		x = -x;
+
 	if (x < (fixed_t)ANGLE_270 || x > (fixed_t)ANGLE_90)
 		return false;
 
@@ -2996,7 +2961,7 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe
 		if (stplyrnum > 0)
 			y = y + yres;
 	}
-	if (splitscreen >= 2) // 3P or 4P
+	else if (splitscreen >= 2) // 3P or 4P
 	{
 		x = x>>1;
 		y = y>>1;
@@ -3056,9 +3021,11 @@ static void K_drawNameTags(void)
 		if (players[i].kartstuff[k_hyudorotimer]) // player is invisible
 			continue;
 		if (maxdistance)
+		{
 			distance = R_PointToDist(players[i].mo->x, players[i].mo->y);
-		if (distance > maxdistance)
-			continue;
+			if (distance > maxdistance)
+				continue;
+		}
 		if (!P_CheckSightFast(stplyr->mo, players[i].mo))
 			continue;
 
@@ -3267,13 +3234,12 @@ static void K_drawDriftGauge(void)
 	if (!splitscreen && !camera->chase)
 		return;
 
-	if (forceshowhud)
-		goto skipcrap; // i will skip the drift early return and you cant stop me!
-
-	if (!stplyr->kartstuff[k_drift])
-		return;
-
-skipcrap:
+	// i will skip the drift early return and you cant stop me!
+	if (!forceshowhud)
+	{
+		if (!stplyr->kartstuff[k_drift])
+			return;
+	}
 
 	if (P_MobjWasRemoved(stplyr->mo))
 		return;
@@ -3298,12 +3264,11 @@ skipcrap:
 	{
 		case GAUGE_DEFAULT:
 		case GAUGE_SMALL:
-		case GAUGE_EXTRA:
 		case GAUGE_BIGNUM:
 			{
 				patch_t *driftpatch = NULL;
 
-				if (gaugestyle == GAUGE_DEFAULT || gaugestyle == GAUGE_BIGNUM || gaugestyle == GAUGE_EXTRA)
+				if (gaugestyle == GAUGE_DEFAULT || gaugestyle == GAUGE_BIGNUM)
 				{
 					barx = basex - vid.dup*23;
 					BAR_WIDTH = vid.dup*47;
@@ -3316,30 +3281,15 @@ skipcrap:
 
 				bary = basey - vid.dup*2;
 
-				if (gaugestyle == GAUGE_EXTRA) // i hate hud code i hate hud code i hate hud code i hate hud code i hate hud code.....
+				if (K_UseColorHud()) // Colourized hud
 				{
-					if (K_UseColorSpeedo(SPEEDO_EXTRA3)) // We reuse the extra speedometer patch hence this check
-					{
-						colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-						driftpatch = skp_smallstickerclr3;
-					}
-					else
-						driftpatch = skp_smallsticker3;
-
-					V_DrawStretchyFixedPatch((basex - vid.dup*30)<<FRACBITS, ((basey<<FRACBITS) - FixedMul(vid.dup<<FRACBITS, 21*FRACUNIT/10)), XTRA3PSCALE, XTRA3VSCALE, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap, 0);
+					colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+					driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmallcolor : driftgaugecolor);
 				}
 				else
-				{
-					if (K_UseColorHud()) // Colourized hud
-					{
-						colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-						driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmallcolor : driftgaugecolor);
-					}
-					else
-						driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmall : driftgauge);
+					driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmall : driftgauge);
 
-					V_DrawMappedPatch(gaugestyle == GAUGE_SMALL ? basex + vid.dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap);
-				}
+				V_DrawMappedPatch(gaugestyle == GAUGE_SMALL ? basex + vid.dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap);
 
 				if (driftcharge >= driftval*4) // rainbow sparks
 				{
@@ -3637,7 +3587,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
 		V_DrawCenteredSmallStringAtFixed(amxpos + (4*FRACUNIT), amypos - (3*FRACUNIT), V_ALLOWLOWERCASE|flags|V_SkinColorToHighlightcolor(mo->color), player_names[player - players]);
 	}
 
-	const boolean minihead = K_useSmallMinimapHead(mo->player);
+	const boolean minihead = K_useSmallMinimapHead(player);
 
 	// thx wanted reticle for having weird offsets very cool
 	wntdamxpos = minihead ? amxpos + (1<<FRACBITS) : amxpos - (4<<FRACBITS);
@@ -4022,6 +3972,7 @@ static void K_drawBattleFullscreen(void)
 	{
 		if (stplyrnum == 0)
 			V_DrawFadeScreen(0xFF00, 16);
+
 		if (stplyr->exiting < 6*TICRATE && !stplyr->spectator)
 		{
 			if (stplyr->kartstuff[k_position] == 1)
@@ -4337,7 +4288,7 @@ static void K_drawInput(void)
 		}
 		else
 		{
-			const boolean analogjoystickmove = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
+			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;
 
@@ -4354,9 +4305,10 @@ static void K_drawInput(void)
 				{
 					hudforward += KART_FULLTURN;
 				}
+
 				if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
 				{
-					hudforward-= KART_FULLTURN;
+					hudforward -= KART_FULLTURN;
 				}
 			}
 
@@ -4442,6 +4394,7 @@ static void K_drawChallengerScreen(void)
 		19,20,19,20,19,20,19,20,19,20, // frame 20-21, 1 tic, 5 alternating: all text vibrates from impact
 		21,22,23,24 // frame 22-25, 1 tic: CHALLENGER turns gold
 	};
+
 	const UINT8 offset = min(52-1, (3*TICRATE)-mapreset);
 
 	V_DrawFadeScreen(0xFF00, 16); // Fade out
@@ -4495,7 +4448,7 @@ static void K_drawLapStartAnim(void)
 		char *lapnum = va("%02d", stplyr->laps + 1);
 		const size_t laplength = strlen(lapnum);
 
-		for (int i = 0; i < (int)laplength; i++)
+		for (size_t i = 0; i < laplength; i++)
 		{
 			int digit = lapnum[i] - '0';
 			int frame = min(2, progress/2 - 8 - (i*2));
@@ -4543,6 +4496,7 @@ static void K_drawDistributionDebugger(void)
 		kp_orbinaut[4],
 		kp_jawz[1]
 	};
+
 	INT32 useodds = 0;
 	INT32 pingame = 0, bestbumper = 0;
 	INT32 i;
@@ -4559,8 +4513,10 @@ static void K_drawDistributionDebugger(void)
 		if (!playeringame[i] || players[i].spectator)
 			continue;
 		pingame++;
+
 		if (players[i].exiting)
 			dontforcespb = true;
+
 		if (players[i].kartstuff[k_bumper] > bestbumper)
 			bestbumper = players[i].kartstuff[k_bumper];
 	}
@@ -4714,6 +4670,7 @@ void K_drawKartHUD(void)
 	{
 		if (LUA_HudEnabled(hud_battlefullscreen))
 			K_drawBattleFullscreen();
+
 		return;
 	}
 

src/k_kart.c

@@ -1600,57 +1600,78 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo)
 	sector_t *s2;		// FOF sector shortcut
 	ffloor_t *rover;	// FOF
 
-	fixed_t flr;
-	fixed_t cel;	// floor & ceiling for height checks to make sure we're touching the offroad sector.
+	fixed_t flr, cel; // floor & ceiling for height checks to make sure we're touching the offroad sector.
+	INT32 special;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
 	{
 		if (!node->m_sector)
-			break;	// shouldn't happen.
+			break; // shouldn't happen.
 
 		s = node->m_sector;
+
 		// 1: Check for the main sector, make sure we're on the floor of that sector and see if we can apply offroad.
 		// Make arbitrary Z checks because we want to check for 1 sector in particular, we don't want to affect the player if the offroad sector is way below them and they're lineriding a normal sector above.
 
-		flr = P_MobjFloorZ(mo, s, s, mo->x, mo->y, NULL, false, true);
-		cel = P_MobjCeilingZ(mo, s, s, mo->x, mo->y, NULL, true, true);	// get Z coords of both floors and ceilings for this sector (this accounts for slopes properly.)
-		// NOTE: we don't use P_GetZAt with our x/y directly because the mobj won't have the same height because of its hitbox on the slope. Complex garbage but tldr it doesn't work.
+		special = GETSECSPECIAL(s->special, 1);
+		for (i = 2; i < 5; i++) // check for sector special
+		{
+			if (special != i)
+				continue;
 
-		if ( ((s->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == flr)	// floor check
-			|| ((mo->eflags & MFE_VERTICALFLIP && (s->flags & SF_FLIPSPECIAL_CEILING) && (mo->z + mo->height) == cel)) )	// ceiling check.
+			if (s->flags & SF_FLIPSPECIAL_FLOOR)
+			{
+				flr = P_MobjFloorZ(mo, s, s, mo->x, mo->y, NULL, false, true);
+				if (mo->z == flr) // floor check
+					return i-1; // return offroad type
+			}
 
-			for (i = 2; i < 5; i++)	// check for sector special
-
-				if (GETSECSPECIAL(s->special, 1) == i)
-					return i-1;	// return offroad type
+			if (mo->eflags & MFE_VERTICALFLIP && (s->flags & SF_FLIPSPECIAL_CEILING))
+			{
+				cel = P_MobjCeilingZ(mo, s, s, mo->x, mo->y, NULL, true, true);
+				// NOTE: we don't use P_GetZAt with our x/y directly because the mobj won't have the same height because of its hitbox on the slope. Complex garbage but tldr it doesn't work.
+				if ((mo->z + mo->height) == cel) // ceiling check
+					return i-1; // return offroad type
+			}
+		}
 
 		// 2: If we're here, we haven't found anything. So let's try looking for FOFs in the sectors using the same logic.
 		for (rover = s->ffloors; rover; rover = rover->next)
 		{
-			if (!(rover->flags & FF_EXISTS))	// This FOF doesn't exist anymore.
+			if (!(rover->flags & FF_EXISTS)) // This FOF doesn't exist anymore.
 				continue;
 
-			s2 = &sectors[rover->secnum];	// makes things easier for us
+			s2 = &sectors[rover->secnum]; // makes things easier for us
 
-			flr = P_GetFOFBottomZ(mo, s, rover, mo->x, mo->y, NULL);
-			cel = P_GetFOFTopZ(mo, s, rover, mo->x, mo->y, NULL);	// Z coords for fof top/bottom.
+			special = GETSECSPECIAL(s2->special, 1);
+			for (i = 2; i < 5; i++) // check for sector special
+			{
+				if (special != i)
+					continue;
 
-			// we will do essentially the same checks as above instead of bothering with top/bottom height of the FOF.
-			// Reminder that an FOF's floor is its bottom, silly!
-			if (   ((s2->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == cel)	// "floor" check
-				|| ((s2->flags & SF_FLIPSPECIAL_CEILING) && (mo->z + mo->height) == flr) )	// "ceiling" check.
+				// we will do essentially the same checks as above instead of bothering with top/bottom height of the FOF.
+				// Reminder that an FOF's floor is its bottom, silly!
 
-				for (i = 2; i < 5; i++)	// check for sector special
-
-					if (GETSECSPECIAL(s2->special, 1) == i)
-						return i-1;	// return offroad type
+				if (s2->flags & SF_FLIPSPECIAL_FLOOR)
+				{
+					cel = P_GetFOFTopZ(mo, s, rover, mo->x, mo->y, NULL); // Z coords for fof top/bottom.
+					if (mo->z == cel) // "floor" check
+						return i-1; // return offroad type
+				}
 
+				if (s2->flags & SF_FLIPSPECIAL_CEILING)
+				{
+					flr = P_GetFOFBottomZ(mo, s, rover, mo->x, mo->y, NULL);
+					if ((mo->z + mo->height) == flr) // "ceiling" check
+						return i-1; // return offroad type
+				}
+			}
 		}
 	}
-	return 0;	// couldn't find any offroad
+
+	return 0; // couldn't find any offroad
 }
 
 /**	\brief	Updates the Player's offroad value once per frame
@@ -1721,7 +1742,6 @@ static void K_SpawnDashDustRelease(player_t *player)
 	INT32 i;
 
 	I_Assert(player != NULL);
-	I_Assert(player->mo != NULL);
 	I_Assert(!P_MobjWasRemoved(player->mo));
 
 	if (!player->speed && !player->kartstuff[k_startboost])
@@ -1759,7 +1779,6 @@ static void K_SpawnBrakeDriftSparks(player_t *player) // Be sure to update the m
 	mobj_t *sparks;
 
 	I_Assert(player != NULL);
-	I_Assert(player->mo != NULL);
 	I_Assert(!P_MobjWasRemoved(player->mo));
 
 	// Position & etc are handled in its thinker, and its spawned invisible.
@@ -2317,10 +2336,13 @@ fixed_t K_3dKartMovement(player_t *player, boolean onground, fixed_t forwardmove
 	finalspeed *= forwardmove/25;
 	finalspeed /= 2;
 
-	if (forwardmove < 0 && finalspeed > mapobjectscale*2)
-		return finalspeed/2;
-	else if (forwardmove < 0)
+	if (forwardmove < 0)
+	{
+		if (finalspeed > mapobjectscale*2)
+			return finalspeed/2;
+
 		return -mapobjectscale/2;
+	}
 
 	if (finalspeed < 0)
 		finalspeed = 0;
@@ -3156,7 +3178,6 @@ static void K_SpawnDriftSparks(player_t *player)
 	INT32 i;
 
 	I_Assert(player != NULL);
-	I_Assert(player->mo != NULL);
 	I_Assert(!P_MobjWasRemoved(player->mo));
 
 	if (leveltime % 2 == 1)
@@ -3420,7 +3441,7 @@ static void K_QuiteSaltyHop(player_t *player)
 			pmo->spritexscale -= (FRACUNIT/8);
 		}
 
-		pmo->spriteyoffset = FixedMul(psalt->zoffset, cv_saltyheight.value);
+		pmo->spriteyoffset += FixedMul(psalt->zoffset, cv_saltyheight.value);
 
 		if (cv_saltyhopsfx.value)
 		{
@@ -3528,7 +3549,6 @@ void K_SpawnBoostTrail(player_t *player)
 	INT32 i;
 
 	I_Assert(player != NULL);
-	I_Assert(player->mo != NULL);
 	I_Assert(!P_MobjWasRemoved(player->mo));
 
 	if (!P_IsObjectOnGround(player->mo)
@@ -3610,7 +3630,6 @@ void K_SpawnSparkleTrail(mobj_t *mo)
 	mobj_t *sparkle;
 	INT32 i;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	const boolean shouldblend = (mo->player && K_PlayerEffectsShouldBlend(mo->player));
@@ -3644,7 +3663,6 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
 	mobj_t *dust;
 	angle_t aoff;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	if (mo->player)
@@ -3693,7 +3711,7 @@ void K_DriftDustHandling(mobj_t *spawner)
 {
 	angle_t anglediff;
 
-	if (!P_IsObjectOnGround(spawner) || leveltime % 2 != 0)
+	if (leveltime % 2 != 0 || !P_IsObjectOnGround(spawner))
 		return;
 
 	if (spawner->player)
@@ -4076,7 +4094,7 @@ static void K_DoThunderShield(player_t *player)
 	mo->scale = player->mo->scale*3 + (player->mo->scale/2);
 
 	// spawn horizontal bolts;
-	for (i=0; i<7; i++)
+	for (i = 0; i < 7; i++)
 	{
 		mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THOK);
 		mo->angle = P_RandomRange(0, 359)*ANG1;
@@ -4087,7 +4105,7 @@ static void K_DoThunderShield(player_t *player)
 
 	// spawn the radius thing:
 	an = ANGLE_22h;
-	for (i=0; i<15; i++)
+	for (i = 0; i < 15; i++)
 	{
 		sx = player->mo->x + FixedMul((player->mo->scale*THUNDERRADIUS), FINECOSINE((an*i)>>ANGLETOFINESHIFT));
 		sy = player->mo->y + FixedMul((player->mo->scale*THUNDERRADIUS), FINESINE((an*i)>>ANGLETOFINESHIFT));
@@ -4179,12 +4197,12 @@ static void K_DoHyudoroSteal(player_t *player)
 
 void K_DoSneaker(player_t *player, INT32 type)
 {
-	const fixed_t intendedboost = K_GetSneakerBoostSpeed();
-
 	if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
 	{
 		S_StartSound(player->mo, sfx_cdfm01);
 		K_SpawnDashDustRelease(player);
+
+		const fixed_t intendedboost = K_GetSneakerBoostSpeed();
 		if (intendedboost > player->kartstuff[k_speedboost])
 			player->kartstuff[k_destboostcam] = FixedMul(FRACUNIT, FixedDiv((intendedboost - player->kartstuff[k_speedboost]), intendedboost));
 	}
@@ -6200,7 +6218,8 @@ void K_KartUpdatePosition(player_t *player)
 							players[i].kartstuff[k_prevcheck] += imo;
 							ipcd++;
 						}
-						if (isnextcheckpointi )
+
+						if (isnextcheckpointi)
 						{
 							players[i].kartstuff[k_nextcheck] += imo;
 							incd++;

src/lua_hooklib.c

@@ -293,17 +293,17 @@ typedef struct Hook_State Hook_State;
 typedef void (*Hook_Callback)(Hook_State *);
 
 struct Hook_State {
-	INT32        status;/* return status to calling function */
-	void       * userdata;
-	int          hook_type;
-	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 */
-	boolean      important;/* is this hook from local addon */
-	int          values;/* num arguments passed to hook */
-	int          results;/* num values returned by hook */
-	Hook_Callback results_handler;/* callback when hook successfully returns */
+	INT32         status;          /* return status to calling function */
+	void        * userdata;
+	int           hook_type;
+	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 */
+	bool          important;       /* is this hook from local addon */
+	int           values;          /* num arguments passed to hook */
+	int           results;         /* num values returned by hook */
+	Hook_Callback results_handler; /* callback when hook successfully returns */
 };
 
 enum {

src/lua_hudlib.c

@@ -1297,7 +1297,7 @@ static int lib_hudsetvotebackground(lua_State *L)
 
 		if (strlen(prefix) != 4)
 		{
-			return luaL_argerror(L, 1, "prefix should 4 characters wide");
+			return luaL_argerror(L, 1, "prefix should be 4 characters wide");
 		}
 
 		strncpy(VoteScreen.luaPrefix, prefix, 4);

src/lua_maplib.c

@@ -1658,17 +1658,22 @@ static int mapheaderinfo_get(lua_State *L)
 	{
 		// Read custom vars now
 		// (note: don't include the "LUA." in your lua scripts!)
-		UINT8 j = 0;
-		for (;j < header->numCustomOptions && !fastcmp(lua_tostring(L, 2), header->customopts[j].option); ++j);
+		if (!header->numCustomOptions) {
+			lua_pushnil(L);
+			break;
+		}
 
-		if(j < header->numCustomOptions)
+		UINT8 j = 0;
+		const char *cusoptstr = lua_tostring(L, 2);
+		for (;j < header->numCustomOptions && !fastcmp(cusoptstr, header->customopts[j].option); ++j);
+
+		if (j < header->numCustomOptions)
 			lua_pushstring(L, header->customopts[j].value);
 		else
 			lua_pushnil(L);
 	}
 	}
 	return 1;
-
 }
 
 int LUA_MapLib(lua_State *L)

src/lua_script.c

@@ -979,7 +979,7 @@ static void ArchiveExtVars(UINT8 **p, void *pointer, const char *ptype)
 
 	if (!gL)
 	{
-		if (fastcmp(ptype,"player")) // players must always be included, even if no vars
+		if (fastcmp(ptype, "player")) // players must always be included, even if no vars
 			WRITEUINT16(*p, 0);
 		return;
 	}
@@ -995,7 +995,7 @@ static void ArchiveExtVars(UINT8 **p, void *pointer, const char *ptype)
 	if (!lua_istable(gL, -1))
 	{ // no extra values table
 		lua_pop(gL, 1);
-		if (fastcmp(ptype,"player")) // players must always be included, even if no vars
+		if (fastcmp(ptype, "player")) // players must always be included, even if no vars
 			WRITEUINT16(*p, 0);
 		return;
 	}
@@ -1007,13 +1007,13 @@ static void ArchiveExtVars(UINT8 **p, void *pointer, const char *ptype)
 	// skip anything that has an empty table and isn't a player.
 	if (i == 0)
 	{
-		if (fastcmp(ptype,"player")) // always include players even if they have no extra variables
+		if (fastcmp(ptype, "player")) // always include players even if they have no extra variables
 			WRITEUINT16(*p, 0);
 		lua_pop(gL, 1);
 		return;
 	}
 
-	if (fastcmp(ptype,"mobj")) // mobjs must write their mobjnum as a header
+	if (fastcmp(ptype, "mobj")) // mobjs must write their mobjnum as a header
 		WRITEUINT32(*p, ((mobj_t *)pointer)->mobjnum);
 
 	WRITEUINT16(*p, i);
@@ -1065,8 +1065,9 @@ static void ArchiveTables(UINT8 **p)
 				n++; // the table contained a new table we'll have to archive. :(
 			else if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
 			{
-				CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -2), luaL_typename(gL, -2), i);
-				lua_pop(gL, 1);
+				lua_pushvalue(gL, -2); // copy key for error message (lua_tostring may mutate it which confuses lua_next)
+				CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -1), luaL_typename(gL, -1), i);
+				lua_pop(gL, 2); // pop key copy and value
 				continue;
 			}
 			else if (e == 3) // nil key due to invalid userdata. NOT an error.
@@ -1080,11 +1081,15 @@ static void ArchiveTables(UINT8 **p)
 			if (e == 1)
 				n++; // the table contained a new table we'll have to archive. :(
 			else if (e == 2) // invalid value type
-				CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -2), luaL_typename(gL, -1));
+			{
+				lua_pushvalue(gL, -2); // copy key for error message (same as above)
+				CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -1), luaL_typename(gL, -2));
+				lua_pop(gL, 1); // pop key copy
+			}
 
 			lua_pop(gL, 1);
-
 		}
+
 		lua_pop(gL, 1);
 		WRITEUINT8(*p, ARCH_TEND);
 	}

src/m_cheat.c

@@ -249,9 +249,6 @@ boolean cht_Responder(event_t *ev)
 #define REQUIRE_SINGLEPLAYER if (netgame || multiplayer)\
 { CONS_Printf(M_GetText("This only works in single player.\n")); return; }
 
-#define REQUIRE_NOULTIMATE if (ultimatemode)\
-{ CONS_Printf(M_GetText("You're too good to be cheating!\n")); return; }
-
 // command that can be typed at the console!
 void Command_CheatNoClip_f(void)
 {
@@ -259,7 +256,6 @@ void Command_CheatNoClip_f(void)
 
 	REQUIRE_INLEVEL;
 	REQUIRE_SINGLEPLAYER;
-	REQUIRE_NOULTIMATE;
 
 	plyr = &players[consoleplayer];
 	plyr->pflags ^= PF_NOCLIP;
@@ -274,7 +270,6 @@ void Command_CheatGod_f(void)
 
 	REQUIRE_INLEVEL;
 	REQUIRE_SINGLEPLAYER;
-	REQUIRE_NOULTIMATE;
 
 	plyr = &players[consoleplayer];
 	plyr->pflags ^= PF_GODMODE;
@@ -289,7 +284,6 @@ void Command_CheatNoTarget_f(void)
 
 	REQUIRE_INLEVEL;
 	REQUIRE_SINGLEPLAYER;
-	REQUIRE_NOULTIMATE;
 
 	plyr = &players[consoleplayer];
 	plyr->pflags ^= PF_INVIS;
@@ -593,7 +587,6 @@ void Command_Devmode_f(void)
 #ifndef _DEBUG
 	REQUIRE_SINGLEPLAYER;
 #endif
-	REQUIRE_NOULTIMATE;
 
 	if (COM_Argc() > 1)
 	{
@@ -1048,7 +1041,6 @@ void Command_ObjectPlace_f(void)
 {
 	REQUIRE_INLEVEL;
 	REQUIRE_SINGLEPLAYER;
-	REQUIRE_NOULTIMATE;
 
 	G_SetGameModified(multiplayer, true);
 

src/m_cheat.h

@@ -29,7 +29,6 @@ void Command_ObjectPlace_f(void);
 void Command_Writethings_f(void);
 
 extern consvar_t cv_opflags, cv_mapthingnum, cv_speed;
-//extern consvar_t cv_snapto, cv_grid;
 
 extern boolean objectplacing;
 extern mobjtype_t op_currentthing;
@@ -48,18 +47,10 @@ void Command_CheatNoClip_f(void);
 void Command_CheatGod_f(void);
 void Command_CheatNoTarget_f(void);
 void Command_Savecheckpoint_f(void);
-/*void Command_Getallemeralds_f(void);
-void Command_Resetemeralds_f(void);
-void Command_Setrings_f(void);
-void Command_Setlives_f(void);
-void Command_Setcontinues_f(void);*/
 void Command_Devmode_f(void);
 void Command_Scale_f(void);
 void Command_Gravflip_f(void);
 void Command_Hurtme_f(void);
-/*void Command_JumpToAxis_f(void);
-void Command_Charability_f(void);
-void Command_Charspeed_f(void);*/
 void Command_Teleport_f(void);
 void Command_RTeleport_f(void);
 void Command_Skynum_f(void);

src/m_fixed.c

@@ -62,6 +62,9 @@ FUNCMATH fixed_t FixedHypot(fixed_t x, fixed_t y)
 	angle_t angle;
 	fixed_t dist;
 
+	I_Assert(x != INT32_MIN);
+	I_Assert(y != INT32_MIN);
+
 	x = abs(x);
 	y = abs(y);
 
@@ -77,6 +80,10 @@ FUNCMATH fixed_t FixedHypot(fixed_t x, fixed_t y)
 	if (!y)
 		return x;
 
+	// prevent underflow
+	if (y == INT32_MIN)
+		return INT32_MAX;
+
 	angle = (tantoangle[FixedDiv(y, x)>>DBITS] + ANGLE_90) >> ANGLETOFINESHIFT;
 
 	// use as cosine

src/m_menu.c

@@ -149,9 +149,6 @@ M_waiting_mode_t m_waiting_mode = M_NOT_WAITING;
 
 const char *quitmsg[NUM_QUITMESSAGES] = {};
 
-// Stuff for customizing the player select screen Tails 09-22-2003
-description_t description[MAXSKINS] = {};
-
 INT32 mapwads[NUMMAPS] = {};
 
 boolean browselocalskins = false;
@@ -308,6 +305,7 @@ static void M_SetupMultiHandler(INT32 choice);
 
 // Options
 // Split into multiple parts due to size
+static void M_VideoModeMenu(INT32 choice);
 static void M_Setup1PControlsMenu(void);
 static void M_Setup2PControlsMenu(void);
 static void M_Setup3PControlsMenu(void);
@@ -498,32 +496,6 @@ static consvar_t cv_dummystaff = {"dummystaff", "0", CV_HIDEN|CV_CALL, dummystaf
 // all the menu definitions and onchanges reside in here now
 #include "m_menudefs.c"
 
-static INT32 M_ShiftChar(INT32 ch)
-{
-	if (I_UseNativeKeyboard())
-		return ch;
-
-	if (cv_keyboardlayout.value == 3)
-	{
-		if (ch >= 32 && ch <= 141)
-		{
-			if (shiftdown)
-				ch = shiftxform[ch];
-			else if (altdown & 0x2)
-				ch = french_altgrxform[ch];
-			else
-				ch = HU_FallBackFrSpecialLetter(ch);
-		}
-	}
-	else
-	{
-		if (shiftdown && ch >= 32 && ch <= 127)
-			ch = shiftxform[ch];
-	}
-
-	return ch;
-}
-
 //
 // M_GetGametypeColor
 //
@@ -1252,7 +1224,7 @@ boolean M_Responder(event_t *ev)
 	// Handle menuitems which need a specific key handling
 	if (routine && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_KEYHANDLER)
 	{
-		ch = M_ShiftChar(ch);
+		ch = CON_ShiftChar(ch);
 		routine(ch);
 		return true;
 	}
@@ -1282,6 +1254,7 @@ boolean M_Responder(event_t *ev)
 				void (*otherroutine)(event_t *sev) = currentMenu->menuitems[itemOn].itemaction;
 				otherroutine(ev); //Alam: what a hack
 			}
+
 			return true;
 		}
 	}
@@ -1995,8 +1968,6 @@ void M_Ticker(void)
 //
 void M_Init(void)
 {
-	UINT8 i;
-
 	COM_AddCommand("manual", Command_Manual_f);
 
 	CV_RegisterVar(&cv_nextmap);
@@ -2042,15 +2013,6 @@ void M_Init(void)
 	quitmsg[QUIT3MSG5] = M_GetText("You'll be back to play soon, though...\n...right?\n\n(Press 'Y' to quit)");
 	quitmsg[QUIT3MSG6] = M_GetText("Aww, is Eggman's Nightclub too\ndifficult for you?\n\n(Press 'Y' to quit)");
 
-	// Setup PlayerMenu table
-	for (i = 0; i < MAXSKINS; i++)
-	{
-		PlayerMenu[i].status = (i == 0 ? IT_CALL : IT_DISABLED);
-		PlayerMenu[i].patch = PlayerMenu[i].text = NULL;
-		PlayerMenu[i].itemaction = M_ChoosePlayer;
-		PlayerMenu[i].alphaKey = 0;
-	}
-
 #ifdef HWRENDER
 	// Permanently hide some options based on render mode
 	if (rendermode == render_soft)
@@ -2105,55 +2067,6 @@ void M_Init(void)
 	M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf);
 }
 
-void M_InitCharacterTables(void)
-{
-	UINT8 i;
-
-	// Setup PlayerMenu table
-	for (i = 0; i < MAXSKINS; i++)
-	{
-		PlayerMenu[i].status = (i < 4 ? IT_CALL : IT_DISABLED);
-		PlayerMenu[i].patch = PlayerMenu[i].text = NULL;
-		PlayerMenu[i].itemaction = M_ChoosePlayer;
-		PlayerMenu[i].alphaKey = 0;
-	}
-
-	// Setup description table
-	for (i = 0; i < MAXSKINS; i++)
-	{
-		if (i == 0)
-		{
-			strcpy(description[i].notes, "\x82Sonic\x80 is the fastest of the three, but also the hardest to control. Beginners beware, but experts will find Sonic very powerful.\n\n\x82""Ability:\x80 Speed Thok\nDouble jump to zoom forward with a huge burst of speed.\n\n\x82Tip:\x80 Simply letting go of forward does not slow down in SRB2. To slow down, hold the opposite direction.");
-			strcpy(description[i].picname, "");
-			strcpy(description[i].skinname, "sonic");
-		}
-		else if (i == 1)
-		{
-			strcpy(description[i].notes, "\x82Tails\x80 is the most mobile of the three, but has the slowest speed. Because of his mobility, he's well-\nsuited to beginners.\n\n\x82""Ability:\x80 Fly\nDouble jump to start flying for a limited time. Repetitively hit the jump button to ascend.\n\n\x82Tip:\x80 To quickly descend while flying, hit the spin button.");
-			strcpy(description[i].picname, "");
-			strcpy(description[i].skinname, "tails");
-		}
-		else if (i == 2)
-		{
-			strcpy(description[i].notes, "\x82Knuckles\x80 is well-\nrounded and can destroy breakable walls simply by touching them, but he can't jump as high as the other two.\n\n\x82""Ability:\x80 Glide & Climb\nDouble jump to glide in the air as long as jump is held. Glide into a wall to climb it.\n\n\x82Tip:\x80 Press spin while climbing to jump off the wall; press jump instead to jump off\nand face away from\nthe wall.");
-			strcpy(description[i].picname, "");
-			strcpy(description[i].skinname, "knuckles");
-		}
-		else if (i == 3)
-		{
-			strcpy(description[i].notes, "\x82Sonic & Tails\x80 team up to take on Dr. Eggman!\nControl Sonic while Tails desperately struggles to keep up.\n\nPlayer 2 can control Tails directly by setting the controls in the options menu.\nTails's directional controls are relative to Player 1's camera.\n\nTails can pick up Sonic while flying and carry him around.");
-			strcpy(description[i].picname, "CHRS&T");
-			strcpy(description[i].skinname, "sonic&tails");
-		}
-		else
-		{
-			strcpy(description[i].notes, "???");
-			strcpy(description[i].picname, "");
-			strcpy(description[i].skinname, "");
-		}
-	}
-}
-
 // ==========================================================================
 // SPECIAL MENU OPTION DRAW ROUTINES GO HERE
 // ==========================================================================
@@ -7952,25 +7865,24 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	INT32 tw = 0;
 	spritedef_t *sprdef;
 	spriteframe_t *sprframe;
-	patch_t *statbg  = (patch_t *)W_CachePatchName("K_STATBG", PU_PATCH);
-	patch_t *statlr  = (patch_t *)W_CachePatchName("K_STATLR", PU_PATCH);
-	patch_t *statud  = (patch_t *)W_CachePatchName("K_STATUD", PU_PATCH);
-	patch_t *statdot = (patch_t *)W_CachePatchName("K_SDOT0" , PU_PATCH);
 	patch_t *patch;
 	UINT8 frame;
 	UINT8 speed;
 	UINT8 weight;
 	UINT8 i;
 	UINT8 s, w;
-	const UINT8 *flashcol = V_GetStringColormap(highlightflags);
 	INT32 skinnum = 0;
 	INT32 statx, staty;
 	UINT32 speenframe;
 	INT32 sltw, actw, hetw;
 	UINT8 skintodisplay;
 	INT32 nameboxaddy = 0;
-	int statoffset = 0;
-	int gridyoffset = 0;
+
+	const UINT8 *flashcol = V_GetStringColormap(highlightflags);
+	patch_t *statbg  = (patch_t *)W_CachePatchName("K_STATBG", PU_PATCH);
+	patch_t *statlr  = (patch_t *)W_CachePatchName("K_STATLR", PU_PATCH);
+	patch_t *statud  = (patch_t *)W_CachePatchName("K_STATUD", PU_PATCH);
+	patch_t *statdot = (patch_t *)W_CachePatchName("K_SDOT0" , PU_PATCH);
 
 	mx = MP_PlayerSetupDef.x;
 	my = MP_PlayerSetupDef.y;
@@ -7985,8 +7897,6 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	switch (cv_skinselectmenu.value)
 	{
 		case SKINMENUTYPE_EXTENDED:
-			nameboxaddy = 6;
-			break;
 		case SKINMENUTYPE_GRID:
 			nameboxaddy = 6;
 			break;
@@ -8002,39 +7912,23 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	else
 		M_DrawTextInput(mx + 40, my + nameboxaddy, &setupm_input, 0);
 
+#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].realname : skins[setupm_fakeskin].realname)
+#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartspeed : skins[setupm_fakeskin].kartspeed)
+#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartweight : skins[setupm_fakeskin].kartweight)
+
 	// draw skin string
 	st = V_StringWidth(skins[setupm_fakeskin].realname, 0);
 	switch (cv_skinselectmenu.value)
 	{
 		case SKINMENUTYPE_EXTENDED:
-#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].realname : skins[setupm_fakeskin].realname)
-#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartspeed : skins[setupm_fakeskin].kartspeed)
-#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartweight : skins[setupm_fakeskin].kartweight)
-
-			tw = V_StringWidth("Character", 0);//V_StringWidth(GETSELECTEDSKINNAME, 0);
-			st = V_StringWidth(GETSELECTEDSKINNAME, 0);
-
-			V_DrawString((mx+(tw/2)) - (st/2), my + 37,
-				((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0) | highlightflags | V_ALLOWLOWERCASE,
-				GETSELECTEDSKINNAME);
-			if (statdp == true)
-				statoffset = 50;
-			else
-				statoffset = 113;
-
-			V_DrawString(statx - statoffset, staty - 10, V_6WIDTHSPACE, va("\x84%dS \x87%dW", GETSELECTEDSPEED, GETSELECTEDWEIGHT));
-#undef GETSELECTEDSKINNAME
-#undef GETSELECTEDSPEED
-#undef GETSELECTEDWEIGHT
-			break;
+			V_DrawString(statx - (statdp ? 50 : 113), staty - 10, V_6WIDTHSPACE, va("\x84%dS \x87%dW", GETSELECTEDSPEED, GETSELECTEDWEIGHT));
+			/* FALLTHRU */
 		case SKINMENUTYPE_GRID:
-#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].realname : skins[setupm_fakeskin].realname)
-			tw = V_StringWidth("Character", 0);//V_StringWidth(GETSELECTEDSKINNAME, 0);
+			tw = V_StringWidth("Character", 0);
 			st = V_StringWidth(GETSELECTEDSKINNAME, 0);
 			V_DrawString((mx+(tw/2)) - (st/2), my + 37,
 				((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0) | highlightflags | V_ALLOWLOWERCASE,
 				GETSELECTEDSKINNAME);
-#undef GETSELECTEDSKINNAME
 			break;
 		case SKINMENUTYPE_2D:
 
@@ -8112,8 +8006,6 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			break;
 	}
 
-#define GRIDSTATOFFSET 0
-
 	switch (cv_skinselectmenu.value)
 	{
 		case SKINMENUTYPE_EXTENDED:
@@ -8125,9 +8017,6 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			if (itemOn == 1)
 				V_DrawSmallString(statx+101, staty-37, V_6WIDTHSPACE|highlightflags, "BS: change");
 
-#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartspeed : skins[setupm_fakeskin].kartspeed)
-#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartweight : skins[setupm_fakeskin].kartweight)
-
 			if (statdp == true)
 			{
 				//Background
@@ -8157,22 +8046,19 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				}
 			}
 
-#undef GETSELECTEDSPEED
-#undef GETSELECTEDWEIGHT
-
 			break;
 		case SKINMENUTYPE_GRID:
 			// SRB2Kart: draw the stat backer
 			// labels
-			V_DrawSmallString(statx+12+GRIDSTATOFFSET, staty+67, V_6WIDTHSPACE|highlightflags, "Acceleration");
-			V_DrawSmallString(statx+76+GRIDSTATOFFSET, staty+67, V_6WIDTHSPACE|highlightflags, "Max Speed");
-			V_DrawSmallString(statx+14+GRIDSTATOFFSET, staty+75, V_6WIDTHSPACE|highlightflags, "Handling");
-			V_DrawSmallString(statx+21+GRIDSTATOFFSET, staty+108, V_6WIDTHSPACE|highlightflags, "Weight");
+			V_DrawSmallString(statx+12, staty+67, V_6WIDTHSPACE|highlightflags, "Acceleration");
+			V_DrawSmallString(statx+76, staty+67, V_6WIDTHSPACE|highlightflags, "Max Speed");
+			V_DrawSmallString(statx+14, staty+75, V_6WIDTHSPACE|highlightflags, "Handling");
+			V_DrawSmallString(statx+21, staty+108, V_6WIDTHSPACE|highlightflags, "Weight");
 			// label arrows
-			V_DrawFixedPatch(((statx+61+GRIDSTATOFFSET)<<FRACBITS) + (FRACUNIT>>1), (staty+67)<<FRACBITS, FRACUNIT>>1, 0, statlr, flashcol);
-			V_DrawFixedPatch((statx+40+GRIDSTATOFFSET)<<FRACBITS, (staty+80)<<FRACBITS, FRACUNIT>>1, 0, statud, flashcol);
+			V_DrawFixedPatch(((statx+61)<<FRACBITS) + (FRACUNIT>>1), (staty+67)<<FRACBITS, FRACUNIT>>1, 0, statlr, flashcol);
+			V_DrawFixedPatch((statx+40)<<FRACBITS, (staty+80)<<FRACBITS, FRACUNIT>>1, 0, statud, flashcol);
 			// bg
-			V_DrawFixedPatch(((statx+48+GRIDSTATOFFSET)<<FRACBITS)+(FRACUNIT>>1), (staty+73)<<FRACBITS, FRACUNIT>>1, 0, statbg, NULL);
+			V_DrawFixedPatch(((statx+48)<<FRACBITS)+(FRACUNIT>>1), (staty+73)<<FRACBITS, FRACUNIT>>1, 0, statbg, NULL);
 
 			for (i = 0; i < numskins; i++) // draw the stat dots
 			{
@@ -8180,7 +8066,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				{
 					speed = skins[i].kartspeed;
 					weight = skins[i].kartweight;
-					V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
+					V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
 				}
 			}
 
@@ -8206,9 +8092,9 @@ static void M_DrawSetupMultiPlayerMenu(void)
 #define TEXTVERTSHIFT 10
 
 			DRAWSLOW(statx - sltw - 2, staty);
-			DRAWSLOW(statx - sltw - 2, staty - TEXTVERTSHIFT+ (9 * 18) - 11);
+			DRAWSLOW(statx - sltw - 2, staty - TEXTVERTSHIFT + (9 * 18) - 11);
 			DRAWFAST(statx + (9 * 18), staty);
-			DRAWFAST(statx + (9 * 18), staty - TEXTVERTSHIFT+ (9 * 18) - 11);
+			DRAWFAST(statx + (9 * 18), staty - TEXTVERTSHIFT + (9 * 18) - 11);
 			DRAWACCEL(statx - actw - 2, staty + TEXTVERTSHIFT);
 			DRAWACCEL(statx + (9 * 18), staty + TEXTVERTSHIFT);
 			DRAWHEAVY(statx - hetw - 2, staty + (9 * 18) - 11);
@@ -8245,15 +8131,18 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			break;
 	}
 
+#undef GETSELECTEDSKINNAME
+#undef GETSELECTEDSPEED
+#undef GETSELECTEDWEIGHT
+
 	switch (cv_skinselectmenu.value)
 	{
-			//Skin grid stuff
-			case SKINMENUTYPE_EXTENDED:
-			gridyoffset = 10;
+		//Skin grid stuff
+		case SKINMENUTYPE_EXTENDED:
 			for (s = 0; s < SKINGRIDNEWWIDTH*SKINGRIDNEWHEIGHT; s++)
 			{
 				INT32 x = ((s % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
-				INT32 y = ((s / SKINGRIDNEWWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2)) + gridyoffset); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
+				INT32 y = ((s / SKINGRIDNEWWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2)) + 10); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
 				INT32 calcs = s + (setupm_skinypos * SKINGRIDNEWWIDTH);
 				INT32 skinn;
 				patch_t *face;
@@ -8279,7 +8168,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			{
 				patch_t *cursor;
 				INT32 curx = (((setupm_skinselect % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH/2)) + SKINXSHIFT) + 20;
-				INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ gridyoffset);
+				INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ 10);
 
 				UINT8 cursorframe = (I_GetTime() / 4) % 7;
 				cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
@@ -8339,13 +8228,13 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				weight = skins[selectedskin].kartweight;
 				statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
 				if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
-					V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, flashcol);
+					V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, flashcol);
 				else
-					V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
+					V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
 
 				statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
 				if (setupm_fakecolor)
-					V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
+					V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
 			}
 			break;
 		case SKINMENUTYPE_2D:
@@ -8396,7 +8285,6 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				}
 			}
 			break;
-#undef GRIDSTATOFFSET
 #undef SKINXSHIFT
 		default:
 			speed = skins[setupm_fakeskin].kartspeed;
@@ -9747,11 +9635,14 @@ static void M_ResetControls(INT32 choice)
 // ===============
 
 //added : 30-01-98:
+#define MAXCOLUMNMODES   12     //max modes displayed in one column
+#define MAXMODEDESCS     (MAXCOLUMNMODES*3)
+
 static modedesc_t modedescs[MAXMODEDESCS];
 
-void M_VideoModeMenu(INT32 choice)
+static void M_VideoModeMenu(INT32 choice)
 {
-	INT32 i, nummodes, width, height;
+	INT32 i, j, vdup, nummodes, width, height;
 	const char *desc;
 
 	(void)choice;
@@ -9765,30 +9656,54 @@ void M_VideoModeMenu(INT32 choice)
 	nummodes = VID_NumModes();
 
 	// DOS does not skip mode 0, because mode 0 is ALWAYS present
-	for (i = 0; i < nummodes && vidm_nummodes < MAXMODEDESCS; i++)
+	i = 0;
+	for (; i < nummodes && vidm_nummodes < MAXMODEDESCS; i++)
 	{
 		desc = VID_GetModeName(i);
+		if (desc)
+		{
+			vdup = 0;
 
-		if (!desc)
-			continue;
+			// when a resolution exists both under VGA and VESA, keep the
+			// VESA mode, which is always a higher modenum
+			for (j = 0; j < vidm_nummodes; j++)
+			{
+				if (fastcmp(modedescs[j].desc, desc))
+				{
+					// mode(0): 320x200 is always standard VGA, not vesa
+					if (modedescs[j].modenum)
+					{
+						modedescs[j].modenum = i;
+						vdup = 1;
 
-		modedescs[vidm_nummodes].modenum = i;
-		modedescs[vidm_nummodes].desc = desc;
+						if (i == vid.modenum)
+							vidm_selected = j;
+					}
+					else
+						vdup = 1;
 
-		if (i == vid.modenum)
-			vidm_selected = vidm_nummodes;
+					break;
+				}
+			}
 
-		// Pull out the width and height
-		sscanf(desc, "%u%*c%u", &width, &height);
+			if (!vdup)
+			{
+				modedescs[vidm_nummodes].modenum = i;
+				modedescs[vidm_nummodes].desc = desc;
 
-		// Show resolutions above desktop res as red.
-		if (I_CheckAboveDesktopRes(width, height))
-			modedescs[vidm_nummodes].goodratio = 2;
-		// Show multiples of 320x200 as green.
-		else if (SCR_IsAspectCorrect(width, height))
-			modedescs[vidm_nummodes].goodratio = 1;
+				if (i == vid.modenum)
+					vidm_selected = vidm_nummodes;
 
-		vidm_nummodes++;
+				// Pull out the width and height
+				sscanf(desc, "%u%*c%u", &width, &height);
+
+				// Show multiples of 320x200 as green.
+				if (SCR_IsAspectCorrect(width, height))
+					modedescs[vidm_nummodes].goodratio = 1;
+
+				vidm_nummodes++;
+			}
+		}
 	}
 
 	vidm_column_size = (vidm_nummodes+2) / 3;
@@ -10005,11 +9920,7 @@ static void M_DrawVideoMode(void)
 			V_DrawString(row, col, highlightflags|MENUCAPS, modedescs[i].desc);
 		// Show multiples of 320x200 as green.
 		else
-		{
-			const UINT8 goodratio = modedescs[i].goodratio;
-			const INT32 goodflag = ((goodratio == 2) ? warningflags : (goodratio == 1) ? recommendedflags : 0);
-			V_DrawString(row, col, goodflag|MENUCAPS, modedescs[i].desc);
-		}
+			V_DrawString(row, col, ((modedescs[i].goodratio) ? recommendedflags : 0)|MENUCAPS, modedescs[i].desc);
 
 		col += 8;
 		if ((i % vidm_column_size) == (vidm_column_size-1))
@@ -10048,26 +9959,9 @@ static void M_DrawVideoMode(void)
 		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 138,
 			recommendedflags|MENUCAPS, "Marked modes are recommended.");
 		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 146,
-							 warningflags|MENUCAPS, "Marked modes are above Desktop resolution");
-
-		if (rendermode == render_opengl)
-		{
-#ifdef USE_FBO_OGL
-			if (!cv_glframebuffer.value)
-#endif
-				V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 154,
-									warningflags|MENUCAPS, "and will have visual errors in OpenGL mode.");
-
-			V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 166,
-				highlightflags|MENUCAPS, "Other modes may have visual errors.");
-		}
-		else
-		{
-			V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 154,
-				highlightflags|MENUCAPS, "Other modes may have visual errors.");
-			V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 166,
-				highlightflags|MENUCAPS, "Larger modes may have performance issues.");
-		}
+			highlightflags|MENUCAPS, "Other modes may have visual errors.");
+		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 158,
+			highlightflags|MENUCAPS, "Larger modes may have performance issues.");
 	}
 
 	// Draw the cursor for the VidMode menu

src/m_menu.h

@@ -50,9 +50,6 @@ void M_Drawer(void);
 // Called by D_SRB2Main, loads the config file.
 void M_Init(void);
 
-// Called by D_SRB2Main also, sets up the playermenu and description tables.
-void M_InitCharacterTables(void);
-
 // Called by intro code to force menu up upon a keypress,
 // does nothing if menu is already up.
 void M_StartControlPanel(void);
@@ -84,11 +81,6 @@ typedef enum
 } menumessagetype_t;
 void M_StartMessage(const char *string, void *routine, menumessagetype_t itemtype);
 
-extern boolean DPADUPSCROLL;
-extern boolean DPADDOWNSCROLL;
-extern boolean DPADLEFTSCROLL;
-extern boolean DPADRIGHTSCROLL;
-
 typedef enum
 {
 	M_NOT_WAITING,
@@ -168,8 +160,6 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt);
 
 #define MAXMENUCCVARS 999
 
-#define MAXTOOLTIPS 255
-
 typedef union
 {
 	struct menu_s *submenu;      // IT_SUBMENU
@@ -195,8 +185,6 @@ typedef struct menuitem_s
 	UINT16 alphaKey;
 } menuitem_t;
 
-extern menuitem_t PlayerMenu[MAXSKINS];
-
 typedef struct menu_s
 {
 	const char    *menutitlepic;
@@ -223,23 +211,10 @@ extern menu_t *currentMenu;
 extern menu_t MainDef;
 extern menu_t SP_LoadDef;
 
-#define MAXCOLUMNMODES   12     //max modes displayed in one column
-#define MAXMODEDESCS     (MAXCOLUMNMODES*3)
-extern menu_t OP_VideoModeDef;
-void M_VideoModeMenu(INT32 choice);
-
 // Call upon joystick hotplug
 void M_SetupJoystickMenu(INT32 choice);
 extern menu_t OP_JoystickSetDef;
 
-// Stuff for customizing the player select screen
-typedef struct
-{
-	char notes[441];
-	char picname[8];
-	char skinname[SKINNAMESIZE*2+2]; // skin&skin\0
-} description_t;
-
 // mode descriptions for video mode menu
 typedef struct
 {
@@ -267,8 +242,6 @@ typedef struct
 
 extern INT32 mapwads[NUMMAPS];
 
-extern description_t description[MAXSKINS];
-
 extern consvar_t cv_replaysearchrate;
 extern consvar_t cv_showfocuslost;
 extern consvar_t cv_newgametype, cv_nextmap, cv_chooseskin, cv_serversort;

src/m_menudefs.c

@@ -495,12 +495,6 @@ static menuitem_t SP_LevelStatsMenu[] =
 	{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleLevelStats, '\0'},     // dummy menuitem for the control func
 };
 
-// A rare case.
-// External files modify this menu, so we can't call it static.
-// And I'm too lazy to go through and rename it everywhere. ARRGH!
-#define M_ChoosePlayer NULL
-menuitem_t PlayerMenu[MAXSKINS];
-
 // -----------------------------------
 // Multiplayer and all of its submenus
 // -----------------------------------
@@ -1191,20 +1185,20 @@ static menuitem_t OP_FocusOptionsMenu[] =
 {
 	{IT_HEADER, NULL, "Game Focus Options", NULL, 0},
 
-	{IT_STRING|IT_CVAR,	NULL, "Play Music While Unfocused",					&cv_playmusicifunfocused, 	30},
-	{IT_STRING|IT_CVAR,	NULL, "Play SFX While Unfocused",					&cv_playsoundifunfocused, 	40},
+	{IT_STRING|IT_CVAR,	NULL, "Play Music While Unfocused",					&cv_playmusicifunfocused, 	 10},
+	{IT_STRING|IT_CVAR,	NULL, "Play SFX While Unfocused",					&cv_playsoundifunfocused, 	 20},
 
-	{IT_STRING|IT_CVAR,	NULL, "Pause Game While Unfocused",					&cv_pauseifunfocused,		60},
+	{IT_STRING|IT_CVAR,	NULL, "Pause Game While Unfocused",					&cv_pauseifunfocused,		 40},
 
-	{IT_STRING|IT_CVAR,	NULL, "Background FPS Cap",         				&cv_fpscapbg,          		80},
+	{IT_STRING|IT_CVAR,	NULL, "Background FPS Cap",         				&cv_fpscapbg,          		 60},
 
-	{IT_STRING|IT_CVAR,	NULL, "Show \"FOCUS LOST\"",						&cv_showfocuslost,		   100},
+	{IT_STRING|IT_CVAR,	NULL, "Show \"FOCUS LOST\"",						&cv_showfocuslost,		     80},
 
-	{IT_STRING|IT_CVAR,	NULL, "Visible Mouse",								&cv_mousevisible,	       120},
-
-	{IT_STRING|IT_CVAR,	NULL, "Gamepad LED Color While Unfocused ",			&cv_gamepadledifunfocused, 	140},
-	{IT_STRING|IT_CVAR,	NULL, "Gamepad Rumble While Unfocused",				&cv_rumbleifunfocused, 	    150},
+	{IT_STRING|IT_CVAR,	NULL, "Visible Mouse",								&cv_mousevisible,	        100},
 
+	{IT_STRING|IT_CVAR,	NULL, "Gamepad Inputs While Unfocused",				&cv_gamepadifunfocused, 	120},
+	{IT_STRING|IT_CVAR,	NULL, "Gamepad LED Color While Unfocused ",			&cv_gamepadledifunfocused, 	130},
+	{IT_STRING|IT_CVAR,	NULL, "Gamepad Rumble While Unfocused",				&cv_rumbleifunfocused, 	    140},
 };
 
 static const char* OP_FocusOptionsTooltips[] =
@@ -1216,6 +1210,7 @@ static const char* OP_FocusOptionsTooltips[] =
 	"Set manual framerate cap while the game is unfocused.",
 	"Should the FOCUS LOST window appear\n while the game is unfocused?",
 	"Displays the mouse cursor while the game is in focus.",
+	"Should gamepad still control the game when unfocused?",
 	"Should gamepad LED indicator change color when unfocused?",
 	"Should gamepad rumble apply when unfocused?",
 };
@@ -1310,29 +1305,29 @@ static menuitem_t OP_DiscordOptionsMenu[] =
 
 static menuitem_t OP_HUDOptionsMenu[] =
 {
-	{IT_STRING | IT_CVAR, NULL,		"Show HUD (F3)",			&cv_showhud,			 10},
+	{IT_STRING | IT_CVAR, NULL,		"Show HUD (F3)",			&cv_showhud,			     10},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
-	                      NULL,		"HUD Visibility",			&cv_translucenthud,		 20},
+	                      NULL,		"HUD Visibility",			&cv_translucenthud,		     20},
 
-	{IT_STRING | IT_SUBMENU, NULL,	"Online HUD options...",	&OP_ChatOptionsDef,		 35},
-	{IT_STRING | IT_CVAR, NULL,		"Background Glass",			&cons_backcolor,		 45},
+	{IT_STRING | IT_SUBMENU, NULL,	"Online HUD options...",	&OP_ChatOptionsDef,		     35},
+	{IT_STRING | IT_CVAR, NULL,		"Background Glass",			&cons_backcolor,		     45},
 
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
-						  NULL,		"Minimap Visibility",		&cv_kartminimap,		 60},
-	{IT_STRING | IT_CVAR, NULL,		"Speedometer Display",		&cv_kartspeedometer,	 70},
-	{IT_STRING | IT_CVAR, NULL,		"Show \"CHECK\"",			&cv_kartcheck,			 80},
+						  NULL,		"Minimap Visibility",		&cv_kartminimap,		     60},
+	{IT_STRING | IT_CVAR, NULL,		"Speedometer Display",		&cv_kartspeedometer,	     70},
+	{IT_STRING | IT_CVAR, NULL,		"Show \"CHECK\"",			&cv_kartcheck,			     80},
 
-	{IT_STRING | IT_CVAR, NULL,		"Menu Highlights",			&cons_menuhighlight,	 95},
+	{IT_STRING | IT_CVAR, NULL,		"Menu Highlights",			&cons_menuhighlight,	     95},
 	// highlight info - (GOOD HIGHLIGHT, WARNING HIGHLIGHT) - 110 (see M_DrawHUDOptions)
 
-	{IT_STRING | IT_CVAR, NULL,		"Console Text Size",		  &cv_constextsize,		120},
-	{IT_STRING | IT_CVAR, NULL,		"Show Console Prints in Menu",&cons_consoleprintinmenu,		130},
+	{IT_STRING | IT_CVAR, NULL,		"Console Text Size",		  &cv_constextsize,		    120},
+	{IT_STRING | IT_CVAR, NULL,		"Show Console Prints in Menu",&cons_consoleprintinmenu, 130},
 
-	{IT_STRING | IT_CVAR, NULL,		"Show Track Addon Name",	&cv_showtrackaddon,   	145},
+	{IT_STRING | IT_CVAR, NULL,		"Show Track Addon Name",	&cv_showtrackaddon,   	    145},
 
-	{IT_STRING | IT_CVAR, NULL,		"Show All Maps",			&cv_showallmaps,		155},
+	{IT_STRING | IT_CVAR, NULL,		"Show All Maps",			&cv_showallmaps,		    155},
 
-	{IT_STRING | IT_CVAR, NULL,		"2D character select",		&cv_skinselectmenu,		165},
+	{IT_STRING | IT_CVAR, NULL,		"2D character select",		&cv_skinselectmenu,		    165},
 };
 
 static menuitem_t OP_CamOptionsMenu[] =

src/m_textinput.c

@@ -256,7 +256,7 @@ static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emot
 		return true;
 	}
 
-	if (ctrldown && (cv_keyboardlayout.value!=3 || !altdown))
+	if (ctrldown && (cv_keyboardlayout.value != 3 || !altdown))
 	{
 		if (key == 'x' || key == 'X')
 		{

src/p_enemy.c

@@ -306,7 +306,6 @@ void P_NewChaseDir(mobj_t *actor)
 	dirtype_t d[3];
 	dirtype_t tdir = DI_NODIR, olddir, turnaround;
 
-	I_Assert(actor->target != NULL);
 	I_Assert(!P_MobjWasRemoved(actor->target));
 
 	olddir = actor->movedir;
@@ -619,7 +618,6 @@ void A_Chase(void *thing)
 	if (LUA_CallAction(A_CHASE, actor))
 		return;
 
-	I_Assert(actor != NULL);
 	I_Assert(!P_MobjWasRemoved(actor));
 
 	if (actor->reactiontime)
@@ -1531,10 +1529,7 @@ void A_LobShot(void *thing)
 
 	if (!(actor->flags & MF_BOSS))
 	{
-		if (ultimatemode)
-			actor->reactiontime = actor->info->reactiontime*TICRATE;
-		else
-			actor->reactiontime = actor->info->reactiontime*TICRATE*2;
+		actor->reactiontime = actor->info->reactiontime*TICRATE*2;
 	}
 }
 
@@ -1570,10 +1565,7 @@ void A_FireShot(void *thing)
 
 	if (!(actor->flags & MF_BOSS))
 	{
-		if (ultimatemode)
-			actor->reactiontime = actor->info->reactiontime*TICRATE;
-		else
-			actor->reactiontime = actor->info->reactiontime*TICRATE*2;
+		actor->reactiontime = actor->info->reactiontime*TICRATE*2;
 	}
 }
 
@@ -1613,10 +1605,7 @@ void A_SuperFireShot(void *thing)
 
 	if (!(actor->flags & MF_BOSS))
 	{
-		if (ultimatemode)
-			actor->reactiontime = actor->info->reactiontime*TICRATE;
-		else
-			actor->reactiontime = actor->info->reactiontime*TICRATE*2;
+		actor->reactiontime = actor->info->reactiontime*TICRATE*2;
 	}
 }
 
@@ -2870,12 +2859,6 @@ void A_ExtraLife(void *thing)
 	if (actor->type == MT_1UPICO && !actor->tracer)
 		actor->frame -= 2; // No lives icon for this player, use the default.
 
-	if (ultimatemode) //I don't THINK so!
-	{
-		S_StartSound(player->mo, sfx_lose);
-		return;
-	}
-
 	// In shooter gametypes, give the player 100 rings instead of an extra life.
 	if (gametype != GT_COOP && gametype != GT_COMPETITION)
 		P_GivePlayerRings(player, 100);
@@ -4015,26 +3998,13 @@ void A_JetChase(void *thing)
 	}
 
 	// chase towards player
-	if (ultimatemode)
-		P_Thrust(actor, actor->angle, FixedMul(actor->info->speed/2, actor->scale));
-	else
-		P_Thrust(actor, actor->angle, FixedMul(actor->info->speed/4, actor->scale));
+	P_Thrust(actor, actor->angle, FixedMul(actor->info->speed/4, actor->scale));
 
 	// must adjust height
-	if (ultimatemode)
-	{
-		if (actor->z < (actor->target->z + actor->target->height + FixedMul((64<<FRACBITS), actor->scale)))
-			actor->momz += FixedMul(FRACUNIT/2, actor->scale);
-		else
-			actor->momz -= FixedMul(FRACUNIT/2, actor->scale);
-	}
+	if (actor->z < (actor->target->z + actor->target->height + FixedMul((32<<FRACBITS), actor->scale)))
+		actor->momz += FixedMul(FRACUNIT/2, actor->scale);
 	else
-	{
-		if (actor->z < (actor->target->z + actor->target->height + FixedMul((32<<FRACBITS), actor->scale)))
-			actor->momz += FixedMul(FRACUNIT/2, actor->scale);
-		else
-			actor->momz -= FixedMul(FRACUNIT/2, actor->scale);
-	}
+		actor->momz -= FixedMul(FRACUNIT/2, actor->scale);
 }
 
 // Function: A_JetbThink
@@ -4137,10 +4107,7 @@ void A_JetgShoot(void *thing)
 	A_FaceTarget(actor);
 	P_SpawnMissile(actor, actor->target, (mobjtype_t)actor->info->raisestate);
 
-	if (ultimatemode)
-		actor->reactiontime = actor->info->reactiontime*TICRATE;
-	else
-		actor->reactiontime = actor->info->reactiontime*TICRATE*2;
+	actor->reactiontime = actor->info->reactiontime*TICRATE*2;
 
 	if (actor->info->attacksound)
 		S_StartSound(actor, actor->info->attacksound);
@@ -6463,12 +6430,8 @@ void A_BuzzFly(void *thing)
 	// chase towards player
 	{
 		INT32 dist, realspeed;
-		const fixed_t mf = 5*(FRACUNIT/4);
 
-		if (ultimatemode)
-			realspeed = FixedMul(FixedMul(actor->info->speed,mf), actor->scale);
-		else
-			realspeed = FixedMul(actor->info->speed, actor->scale);
+		realspeed = FixedMul(actor->info->speed, actor->scale);
 
 		dist = P_AproxDistance(P_AproxDistance(actor->target->x - actor->x,
 			actor->target->y - actor->y), actor->target->z - actor->z);
@@ -9256,10 +9219,7 @@ void A_MultiShot(void *thing)
 
 	if (!(actor->flags & MF_BOSS))
 	{
-		if (ultimatemode)
-			actor->reactiontime = actor->info->reactiontime*TICRATE;
-		else
-			actor->reactiontime = actor->info->reactiontime*TICRATE*2;
+		actor->reactiontime = actor->info->reactiontime*TICRATE*2;
 	}
 }
 
@@ -10868,10 +10828,7 @@ void A_BrakFireShot(void *thing)
 
 	if (!(actor->flags & MF_BOSS))
 	{
-		if (ultimatemode)
-			actor->reactiontime = actor->info->reactiontime*TICRATE;
-		else
-			actor->reactiontime = actor->info->reactiontime*TICRATE*2;
+		actor->reactiontime = actor->info->reactiontime*TICRATE*2;
 	}
 }
 

src/p_floor.c

@@ -1894,7 +1894,6 @@ void T_NoEnemiesSector(levelspecthink_t *nobaddies)
 	{
 		if (nobaddies->sector->lines[i]->special == 223)
 		{
-
 			upperbound = nobaddies->sector->ceilingheight;
 			lowerbound = nobaddies->sector->floorheight;
 

src/p_local.h

@@ -99,9 +99,6 @@ typedef struct camera_s
 	// Hold up/down to pan the camera vertically
 	SINT8 dpad_y_held;
 
-	// Things used by FS cameras.
-	fixed_t viewheight;
-	angle_t startangle;
 
 	// Camera demobjerization
 	// Info for drawing: position.
@@ -121,8 +118,6 @@ typedef struct camera_s
 	fixed_t radius;
 	fixed_t height;
 
-	fixed_t relativex;
-
 	// Momentums, used to update position.
 	fixed_t momx, momy, momz;
 
@@ -219,7 +214,6 @@ void P_DoJumpShield(player_t *player);
 void P_BlackOw(player_t *player);
 void P_ElementalFireTrail(player_t *player);
 
-//void P_DoPityCheck(player_t *player);
 void P_PlayerThink(player_t *player);
 void P_PlayerAfterThink(player_t *player);
 void P_DoPlayerExit(player_t *player);
@@ -280,7 +274,6 @@ void P_RemoveMobj(mobj_t *th);
 void P_RemoveSavegameMobj(mobj_t *th);
 boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state);
 boolean P_SetMobjState(mobj_t *mobj, statenum_t state);
-//void P_RunShields(void);
 void P_RunOverlays(void);
 void P_RunShadows(void);
 void P_MobjThinker(mobj_t *mobj);

src/p_map.c

@@ -189,12 +189,12 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 	}
 
 	if (vertispeed)
-		object->momz = FixedMul(vertispeed,FixedSqrt(FixedMul(vscale, spring->scale)));
+		object->momz = FixedMul(vertispeed, FixedSqrt(FixedMul(vscale, spring->scale)));
 
 	if (horizspeed)
 	{
 		if (!object->player)
-			P_InstaThrustEvenIn2D(object, spring->angle, FixedMul(horizspeed,FixedSqrt(FixedMul(hscale, spring->scale))));
+			P_InstaThrustEvenIn2D(object, spring->angle, FixedMul(horizspeed, FixedSqrt(FixedMul(hscale, spring->scale))));
 		else
 		{
 			fixed_t finalSpeed = FixedDiv(horizspeed, hscale);
@@ -203,7 +203,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 			if (pSpeed > finalSpeed)
 				finalSpeed = pSpeed;
 
-			P_InstaThrustEvenIn2D(object, spring->angle, FixedMul(finalSpeed,FixedSqrt(FixedMul(hscale, spring->scale))));
+			P_InstaThrustEvenIn2D(object, spring->angle, FixedMul(finalSpeed, FixedSqrt(FixedMul(hscale, spring->scale))));
 		}
 	}
 
@@ -321,7 +321,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 
 	// Ignore spectators
 	if ((tmthing->player && tmthing->player->spectator)
-	|| (thing->player && thing->player->spectator))
+	 || (thing->player && thing->player->spectator))
 		return true;
 
 #ifdef SEENAMES
@@ -1509,14 +1509,14 @@ static boolean PIT_CheckThing(mobj_t *thing)
 // Adjusts tmfloorz and tmceilingz as lines are contacted - FOR CAMERA ONLY
 static boolean PIT_CheckCameraLine(line_t *ld)
 {
-	if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
+	if (tmbbox[BOXRIGHT]  <= ld->bbox[BOXLEFT]   ||
+		tmbbox[BOXLEFT]   >= ld->bbox[BOXRIGHT]  ||
+		tmbbox[BOXTOP]    <= ld->bbox[BOXBOTTOM] ||
+		tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
 		return true;
 
-	if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-		|| tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
-	{
+	if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
 		return true;
-	}
 
 	if (P_BoxOnLineSide(tmbbox, ld) != -1)
 		return true;
@@ -1571,11 +1571,13 @@ static boolean PIT_CheckCameraLine(line_t *ld)
 //
 static boolean PIT_CheckLine(line_t *ld)
 {
-	if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
+	if (tmbbox[BOXRIGHT]  <= ld->bbox[BOXLEFT]   ||
+		tmbbox[BOXLEFT]   >= ld->bbox[BOXRIGHT]  ||
+		tmbbox[BOXTOP]    <= ld->bbox[BOXBOTTOM] ||
+		tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
 		return true;
 
-	if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-	|| tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
+	if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
 		return true;
 
 	if (P_BoxOnLineSide(tmbbox, ld) != -1)
@@ -1584,10 +1586,12 @@ static boolean PIT_CheckLine(line_t *ld)
 	if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag.
 	{
 		fixed_t cosradius, sinradius;
+
 		cosradius = FixedMul(tmthing->radius, FINECOSINE(tmthing->angle>>ANGLETOFINESHIFT));
 		sinradius = FixedMul(tmthing->radius, FINESINE(tmthing->angle>>ANGLETOFINESHIFT));
+
 		if (P_PointOnLineSide(tmx - cosradius, tmy - sinradius, ld)
-		== P_PointOnLineSide(tmx + cosradius, tmy + sinradius, ld))
+		 == P_PointOnLineSide(tmx + cosradius, tmy + sinradius, ld))
 			return true; // the line doesn't cross between collider's start or end
 	}
 
@@ -2369,6 +2373,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 	fixed_t radius = thing->radius;
 	fixed_t thingtop ;//= thing->z + thing->height;
 	fixed_t startingonground = P_IsObjectOnGround(thing);
+	INT32 special = -1;
 	floatok = false;
 
 	if (radius < MAXRADIUS/2)
@@ -2402,21 +2407,31 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 
 		if (!(thing->flags & MF_NOCLIP))
 		{
-			//All things are affected by their scale.
-			fixed_t maxstep = FixedMul(MAXSTEPMOVE, mapobjectscale);
-			INT32 special = 0;
+			// All things are affected by their scale.
+			fixed_t maxstep;
+
+			if (tmceilingz - tmfloorz < thing->height)
+			{
+				if (tmfloorthing)
+					tmhitthing = tmfloorthing;
+
+				return false; // doesn't fit
+			}
+
+			maxstep = FixedMul(MAXSTEPMOVE, mapobjectscale);
 
 			if (thing->player)
 			{
-				special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1);
+				if (special == -1)
+					special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1);
 
 				// If using type Section1:13, double the maxstep.
-				if (P_PlayerTouchingSectorSpecial(thing->player, 1, 13) || special == 13)
+				if (special == 13 || P_PlayerTouchingSectorSpecial(thing->player, 1, 13))
 				{
 					maxstep <<= 1;
 				}
 				// If using type Section1:12, no maxstep. For ledges you don't want the player to climb! (see: Egg Zeppelin & SMK port walls)
-				else if (P_PlayerTouchingSectorSpecial(thing->player, 1, 12) || special == 12)
+				else if (special == 12 || P_PlayerTouchingSectorSpecial(thing->player, 1, 12))
 				{
 					maxstep = 0;
 				}
@@ -2427,14 +2442,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 				maxstep = 0;
 			}
 
-			if (tmceilingz - tmfloorz < thing->height)
-			{
-				if (tmfloorthing)
-					tmhitthing = tmfloorthing;
-
-				return false; // doesn't fit
-			}
-
 			floatok = true;
 
 			thingtop = thing->z + thing->height;
@@ -2465,7 +2472,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 				}
 			}
 			else if (maxstep > 0 && !(thing->player &&
-					(P_PlayerTouchingSectorSpecial(thing->player, 1, 14) || special == 14))) // Step down
+					(special == 14 || P_PlayerTouchingSectorSpecial(thing->player, 1, 14)))) // Step down
 			{
 				// If the floor difference is MAXSTEPMOVE or less, and the sector isn't Section1:14, ALWAYS
 				// step down! Formerly required a Section1:13 sector for the full MAXSTEPMOVE, but no more.
@@ -4001,10 +4008,10 @@ static inline boolean PIT_GetSectors(line_t *ld)
 		tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
 		return true;
 
-	if (P_BoxOnLineSide(tmbbox, ld) != -1)
+	if (ld->polyobj) // line belongs to a polyobject, don't add it
 		return true;
 
-	if (ld->polyobj) // line belongs to a polyobject, don't add it
+	if (P_BoxOnLineSide(tmbbox, ld) != -1)
 		return true;
 
 	// This line crosses through the object.

src/p_maputl.cpp

@@ -423,40 +423,40 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 	// Set open and high/low values here
 	fixed_t frontheight, backheight;
 
-	frontheight = P_GetCeilingZ(mobj, front, tmx, tmy, linedef);
-	backheight = P_GetCeilingZ(mobj, back, tmx, tmy, linedef);
-
-	if (frontheight < backheight)
-	{
-		opentop = frontheight;
-		highceiling = backheight;
-		opentopslope = front->c_slope;
-	}
-	else
-	{
-		opentop = backheight;
-		highceiling = frontheight;
-		opentopslope = back->c_slope;
-	}
-
-	frontheight = P_GetFloorZ(mobj, front, tmx, tmy, linedef);
-	backheight = P_GetFloorZ(mobj, back, tmx, tmy, linedef);
-
-	if (frontheight > backheight)
-	{
-		openbottom = frontheight;
-		lowfloor = backheight;
-		openbottomslope = front->f_slope;
-	}
-	else
-	{
-		openbottom = backheight;
-		lowfloor = frontheight;
-		openbottomslope = back->f_slope;
-	}
-
 	if (mobj)
 	{
+		frontheight = P_GetCeilingZ(mobj, front, tmx, tmy, linedef);
+		backheight  = P_GetCeilingZ(mobj, back, tmx, tmy, linedef);
+
+		if (frontheight < backheight)
+		{
+			opentop = frontheight;
+			highceiling = backheight;
+			opentopslope = front->c_slope;
+		}
+		else
+		{
+			opentop = backheight;
+			highceiling = frontheight;
+			opentopslope = back->c_slope;
+		}
+
+		frontheight = P_GetFloorZ(mobj, front, tmx, tmy, linedef);
+		backheight  = P_GetFloorZ(mobj, back, tmx, tmy, linedef);
+
+		if (frontheight > backheight)
+		{
+			openbottom = frontheight;
+			lowfloor = backheight;
+			openbottomslope = front->f_slope;
+		}
+		else
+		{
+			openbottom = backheight;
+			lowfloor = frontheight;
+			openbottomslope = back->f_slope;
+		}
+
 		fixed_t thingtop = mobj->z + mobj->height;
 
 		// Check for collision with front side's midtexture if Effect 4 is set
@@ -650,6 +650,43 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 				lowfloor = lowestfloor;
 		}
 	}
+	else
+	{
+		// this is what P_LineOpening did before the addition of slopes
+		// so i´ll just use it as the fallback case
+		// not that we will ever likely hit this
+		frontheight = front->ceilingheight;
+		backheight  = back->ceilingheight;
+
+		if (frontheight < backheight)
+		{
+			opentop = frontheight;
+			highceiling = backheight;
+			opentopslope = front->c_slope;
+		}
+		else
+		{
+			opentop = backheight;
+			highceiling = frontheight;
+			opentopslope = back->c_slope;
+		}
+
+		frontheight = front->floorheight;
+		backheight  = back->floorheight;
+
+		if (frontheight > backheight)
+		{
+			openbottom = frontheight;
+			lowfloor = backheight;
+			openbottomslope = front->f_slope;
+		}
+		else
+		{
+			openbottom = backheight;
+			lowfloor = frontheight;
+			openbottomslope = back->f_slope;
+		}
+	}
 
 	openrange = opentop - openbottom;
 }
@@ -668,7 +705,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 //
 void P_UnsetThingPosition(mobj_t *thing)
 {
-	I_Assert(thing != NULL);
 	I_Assert(!P_MobjWasRemoved(thing));
 
 	if (!(thing->flags & MF_NOSECTOR))
@@ -772,7 +808,6 @@ void P_SetThingPosition(mobj_t *thing)
 	sector_t *oldsec = NULL;
 	fixed_t tfloorz, tceilz;
 
-	I_Assert(thing != NULL);
 	I_Assert(!P_MobjWasRemoved(thing));
 
 	if (thing->player && thing->z <= thing->floorz && thing->subsector)
@@ -823,16 +858,20 @@ void P_SetThingPosition(mobj_t *thing)
 	// sector's floor is the same height.
 	if (thing->player && oldsec != NULL && thing->subsector && oldsec != thing->subsector->sector)
 	{
-		tfloorz = P_GetFloorZ(thing, ss->sector, thing->x, thing->y, NULL);
-		tceilz = P_GetCeilingZ(thing, ss->sector, thing->x, thing->y, NULL);
-
 		if (thing->eflags & MFE_VERTICALFLIP)
 		{
+			tceilz = P_GetCeilingZ(thing, ss->sector, thing->x, thing->y, NULL);
+
 			if (thing->z + thing->height >= tceilz)
 				thing->eflags |= MFE_JUSTSTEPPEDDOWN;
 		}
-		else if (thing->z <= tfloorz)
-			thing->eflags |= MFE_JUSTSTEPPEDDOWN;
+		else
+		{
+			tfloorz = P_GetFloorZ(thing, ss->sector, thing->x, thing->y, NULL);
+
+			if (thing->z <= tfloorz)
+				thing->eflags |= MFE_JUSTSTEPPEDDOWN;
+		}
 	}
 }
 

src/p_mobj.c

@@ -222,11 +222,6 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state)
 
 	INT32 recursion = 0;
 
-#ifdef PARANOIA
-	if (mobj->player != NULL)
-		I_Error("P_SetMobjState used for player mobj. Use P_SetPlayerMobjState instead!\n(State called: %d)", state);
-#endif
-
 	if (mobj->player != NULL)
 		return P_SetPlayerMobjState(mobj, state);
 
@@ -339,7 +334,6 @@ void P_ExplodeMissile(mobj_t *mo)
 {
 	mobj_t *explodemo;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	mo->momx = mo->momy = mo->momz = 0;
@@ -420,14 +414,18 @@ boolean P_InsideANonSolidFFloor(mobj_t *mobj, ffloor_t *rover)
 	if (!(rover->flags & FF_EXISTS))
 		return false;
 
-	if ((((rover->flags & FF_BLOCKPLAYER) && mobj->player)
-		|| ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
+	if ((((rover->flags & FF_BLOCKPLAYER) &&  mobj->player) ||
+		 ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
+		return false;
+
+	topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
+
+	if (mobj->z > topheight)
 		return false;
 
-	topheight    = P_GetFFloorTopZAt   (rover, mobj->x, mobj->y);
 	bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
 
-	if (mobj->z > topheight || (mobj->z + mobj->height < bottomheight))
+	if (mobj->z + mobj->height < bottomheight)
 		return false;
 
 	return true;
@@ -577,7 +575,7 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
 			return P_GetSlopeZAt(slope, testx, testy);
 
 		// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
-		if (perfect)
+		if (perfect && boundsec)
 		{
 			size_t i;
 			line_t *ld;
@@ -596,8 +594,10 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
 				fixed_t highline;
 				ld = boundsec->lines[i];
 
-				if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-				|| bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
+				if (bbox[BOXRIGHT]  <= ld->bbox[BOXLEFT]   ||
+					bbox[BOXLEFT]   >= ld->bbox[BOXRIGHT]  ||
+					bbox[BOXTOP]    <= ld->bbox[BOXBOTTOM] ||
+					bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
 					continue;
 
 				if (P_BoxOnLineSide(bbox, ld) != -1)
@@ -664,7 +664,7 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
 			return P_GetSlopeZAt(slope, testx, testy);
 
 		// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
-		if (perfect)
+		if (perfect && boundsec)
 		{
 			size_t i;
 			line_t *ld;
@@ -683,8 +683,10 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
 				fixed_t highline;
 				ld = boundsec->lines[i];
 
-				if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-				|| bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
+				if (bbox[BOXRIGHT]  <= ld->bbox[BOXLEFT]   ||
+					bbox[BOXLEFT]   >= ld->bbox[BOXRIGHT]  ||
+					bbox[BOXTOP]    <= ld->bbox[BOXBOTTOM] ||
+					bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
 					continue;
 
 				if (P_BoxOnLineSide(bbox, ld) != -1)
@@ -752,7 +754,7 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
 			return P_GetSlopeZAt(slope, testx, testy);
 
 		// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
-		if (perfect)
+		if (perfect && boundsec)
 		{
 			size_t i;
 			line_t *ld;
@@ -771,8 +773,10 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
 				fixed_t highline;
 				ld = boundsec->lines[i];
 
-				if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-				|| bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
+				if (bbox[BOXRIGHT]  <= ld->bbox[BOXLEFT]   ||
+					bbox[BOXLEFT]   >= ld->bbox[BOXRIGHT]  ||
+					bbox[BOXTOP]    <= ld->bbox[BOXBOTTOM] ||
+					bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
 					continue;
 
 				if (P_BoxOnLineSide(bbox, ld) != -1)
@@ -839,7 +843,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
 			return P_GetSlopeZAt(slope, testx, testy);
 
 		// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
-		if (perfect)
+		if (perfect && boundsec)
 		{
 			size_t i;
 			line_t *ld;
@@ -858,8 +862,10 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
 				fixed_t highline;
 				ld = boundsec->lines[i];
 
-				if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
-				|| bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
+				if (bbox[BOXRIGHT]  <= ld->bbox[BOXLEFT]   ||
+					bbox[BOXLEFT]   >= ld->bbox[BOXRIGHT]  ||
+					bbox[BOXTOP]    <= ld->bbox[BOXBOTTOM] ||
+					bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
 					continue;
 
 				if (P_BoxOnLineSide(bbox, ld) != -1)
@@ -890,6 +896,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
 	else // Well, that makes it easy. Just get the ceiling height
 		return sector->ceilingheight;
 }
+
 static void P_PlayerFlip(mobj_t *mo)
 {
 	if (!mo->player)
@@ -898,7 +905,12 @@ static void P_PlayerFlip(mobj_t *mo)
 	G_GhostAddFlip((INT32) (mo->player - players));
 	// Flip aiming to match!
 
-	if (mo->player->pflags & PF_FLIPCAM)
+	if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam
+	{
+		if (mo->tracer)
+			mo->tracer->eflags ^= MFE_VERTICALFLIP;
+	}
+	else if (mo->player->pflags & PF_FLIPCAM)
 	{
 		UINT8 i;
 
@@ -920,11 +932,6 @@ static void P_PlayerFlip(mobj_t *mo)
 				camera[i].z += FixedMul(20*FRACUNIT, mo->scale);
 		}
 	}
-	else if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam
-	{
-		if (mo->tracer)
-			mo->tracer->eflags ^= MFE_VERTICALFLIP;
-	}
 }
 
 //
@@ -940,7 +947,6 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
 	boolean goopgravity = false;
 	boolean wasflip;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	wasflip = (mo->eflags & MFE_VERTICALFLIP) != 0;
@@ -1113,7 +1119,6 @@ void P_CheckGravity(mobj_t *mo, boolean affect)
 //
 static void P_SceneryXYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy)
 {
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	const fixed_t fric_scale = FixedMul(FRACUNIT/32, mo->scale);
@@ -1157,7 +1162,6 @@ static void P_XYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy)
 {
 	player_t *player;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	player = mo->player;
@@ -1209,7 +1213,6 @@ static void P_PushableCheckBustables(mobj_t *mo)
 	fixed_t oldx;
 	fixed_t oldy;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	if (netgame && mo->player && mo->player->spectator)
@@ -1328,7 +1331,6 @@ void P_XYMovement(mobj_t *mo)
 	vector3_t slopemom = {0, 0, 0};
 	fixed_t predictedz = 0;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	// if it's stopped
@@ -1411,7 +1413,7 @@ void P_XYMovement(mobj_t *mo)
 		// blocked move
 		moved = false;
 
-		if (player && player->bot)
+		if (UNLIKELY(player && player->bot))
 		{
 			B_MoveBlocked(player);
 		}
@@ -1446,24 +1448,24 @@ void P_XYMovement(mobj_t *mo)
 				else
 					fx->eflags &= ~MFE_VERTICALFLIP;
 				fx->scale = mo->scale;
-			}
 
-			if (mo->type == MT_ORBINAUT) // Orbinaut speed decreasing
-			{
-				if (mo->health > 1)
+				if (mo->type == MT_ORBINAUT) // Orbinaut speed decreasing
 				{
-					S_StartSound(mo, mo->info->attacksound);
-					mo->health--;
-					mo->threshold = 0;
-				}
-				else if (mo->health == 1)
-				{
-					// This Item Damage
-					S_StartSound(mo, mo->info->deathsound);
-					P_KillMobj(mo, NULL, NULL);
+					if (mo->health > 1)
+					{
+						S_StartSound(mo, mo->info->attacksound);
+						mo->health--;
+						mo->threshold = 0;
+					}
+					else if (mo->health == 1)
+					{
+						// This Item Damage
+						S_StartSound(mo, mo->info->deathsound);
+						P_KillMobj(mo, NULL, NULL);
 
-					P_SetObjectMomZ(mo, 8*FRACUNIT, false);
-					P_InstaThrust(mo, R_PointToAngle2(mo->x, mo->y, mo->x, mo->y)+ANGLE_90, 16*FRACUNIT);
+						P_SetObjectMomZ(mo, 8*FRACUNIT, false);
+						P_InstaThrust(mo, R_PointToAngle2(mo->x, mo->y, mo->x, mo->y)+ANGLE_90, 16*FRACUNIT);
+					}
 				}
 			}
 			//}
@@ -1567,43 +1569,46 @@ void P_XYMovement(mobj_t *mo)
 	if (P_MobjWasRemoved(mo)) // MF_SPECIAL touched a player! O_o;;
 		return;
 
-	if (moved && oldslope) // Check to see if we ran off
+	if (moved)
 	{
-		if (oldslope != mo->standingslope) // First, compare different slopes
+		if (oldslope) // Check to see if we ran off
 		{
-			angle_t oldangle, newangle;
-			angle_t moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
+			if (oldslope != mo->standingslope) // First, compare different slopes
+			{
+				angle_t oldangle, newangle;
+				angle_t moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
 
-			oldangle = FixedMul((signed)oldslope->zangle, FINECOSINE((moveangle - oldslope->xydirection) >> ANGLETOFINESHIFT));
+				oldangle = FixedMul((signed)oldslope->zangle, FINECOSINE((moveangle - oldslope->xydirection) >> ANGLETOFINESHIFT));
 
-			if (mo->standingslope)
-				newangle = FixedMul((signed)mo->standingslope->zangle, FINECOSINE((moveangle - mo->standingslope->xydirection) >> ANGLETOFINESHIFT));
-			else
-				newangle = 0;
+				if (mo->standingslope)
+					newangle = FixedMul((signed)mo->standingslope->zangle, FINECOSINE((moveangle - mo->standingslope->xydirection) >> ANGLETOFINESHIFT));
+				else
+					newangle = 0;
 
-			// Now compare the Zs of the different quantizations
-			if (oldangle-newangle > ANG30 && oldangle-newangle < ANGLE_180) // Allow for a bit of sticking - this value can be adjusted later
+				// Now compare the Zs of the different quantizations
+				if (oldangle-newangle > ANG30 && oldangle-newangle < ANGLE_180) // Allow for a bit of sticking - this value can be adjusted later
+				{
+					mo->standingslope = oldslope;
+					P_SlopeLaunch(mo);
+				}
+			}
+			else if (predictedz-mo->z > abs(slopemom.z/2) // Sryder 2018-11-26: Don't launch here if it's a slope without physics, we stick to those like glue anyway
+				&& !(mo->standingslope->flags & SL_NOPHYSICS)) // Now check if we were supposed to stick to this slope
 			{
-				mo->standingslope = oldslope;
 				P_SlopeLaunch(mo);
 			}
 		}
-		else if (predictedz-mo->z > abs(slopemom.z/2) // Sryder 2018-11-26: Don't launch here if it's a slope without physics, we stick to those like glue anyway
-			&& !(mo->standingslope->flags & SL_NOPHYSICS)) // Now check if we were supposed to stick to this slope
+		else if (mo->standingslope && predictedz)
 		{
-			P_SlopeLaunch(mo);
-		}
-	}
-	else if (moved && mo->standingslope && predictedz)
-	{
-		angle_t moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
-		angle_t newangle = FixedMul((signed)mo->standingslope->zangle, FINECOSINE((moveangle - mo->standingslope->xydirection) >> ANGLETOFINESHIFT));
+			angle_t moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
+			angle_t newangle = FixedMul((signed)mo->standingslope->zangle, FINECOSINE((moveangle - mo->standingslope->xydirection) >> ANGLETOFINESHIFT));
 
-		if (ANGLE_MAX-newangle > ANG30 && newangle > ANGLE_180)
-		{
-			mo->momz = P_MobjFlip(mo)*FRACUNIT/2;
-			mo->z = predictedz + P_MobjFlip(mo);
-			mo->standingslope = NULL;
+			if (ANGLE_MAX-newangle > ANG30 && newangle > ANGLE_180)
+			{
+				mo->momz = P_MobjFlip(mo)*FRACUNIT/2;
+				mo->z = predictedz + P_MobjFlip(mo);
+				mo->standingslope = NULL;
+			}
 		}
 	}
 
@@ -1679,7 +1684,6 @@ void P_XYMovement(mobj_t *mo)
 
 static void P_RingXYMovement(mobj_t *mo)
 {
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	if (!P_SceneryTryMove(mo, mo->x + mo->momx, mo->y + mo->momy))
@@ -1690,7 +1694,6 @@ static void P_SceneryXYMovement(mobj_t *mo)
 {
 	fixed_t oldx, oldy; // reducing bobbing/momentum on ice when up against walls
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	oldx = mo->x;
@@ -1728,7 +1731,6 @@ static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motyp
 	fixed_t delta1, delta2, thingtop;
 	fixed_t topheight, bottomheight;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	thingtop = mo->z + mo->height;
@@ -1805,7 +1807,6 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec)
 	fixed_t delta1, delta2, thingtop;
 	fixed_t polytop, polybottom;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	thingtop = mo->z + mo->height;
@@ -1849,7 +1850,6 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec)
 
 static void P_RingZMovement(mobj_t *mo)
 {
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	// Intercept the stupid 'fall through 3dfloors' bug
@@ -1884,7 +1884,6 @@ static void P_RingZMovement(mobj_t *mo)
 
 boolean P_CheckDeathPitCollide(mobj_t *mo)
 {
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	const INT32 secspecial = GETSECSPECIAL(mo->subsector->sector->special, 1);
@@ -1901,7 +1900,6 @@ boolean P_CheckDeathPitCollide(mobj_t *mo)
 
 boolean P_CheckSolidLava(mobj_t *mo, ffloor_t *rover)
 {
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	if (rover->flags & FF_SWIMMABLE && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3
@@ -1920,7 +1918,6 @@ static boolean P_ZMovement(mobj_t *mo)
 {
 	fixed_t dist, delta;
 
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	// Intercept the stupid 'fall through 3dfloors' bug
@@ -2377,7 +2374,6 @@ static boolean P_ZMovement(mobj_t *mo)
 
 static void P_PlayerZMovement(mobj_t *mo)
 {
-	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	if (!mo->player)
@@ -2443,6 +2439,7 @@ static void P_PlayerZMovement(mobj_t *mo)
 			}
 			goto nightsdone;
 		}
+
 		// Get up if you fell.
 		if ((mo->state == &states[mo->info->painstate] || mo->state == &states[S_KART_SPIN])
 			&& mo->player->kartstuff[k_spinouttimer] == 0 && mo->player->kartstuff[k_squishedtimer] == 0) // SRB2kart
@@ -2495,7 +2492,7 @@ static void P_PlayerZMovement(mobj_t *mo)
 								polyobj_t *po = newsubsec->polyList;
 								sector_t *polysec;
 
-								while(po)
+								while (po)
 								{
 									if (!P_MobjInsidePolyobj(po, mo) || !(po->flags & POF_SOLID))
 									{
@@ -2723,6 +2720,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
 				P_RemoveMobj(mo);
 				return false;
 			}
+
 			if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z <= mo->floorz)
 			|| (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height >= mo->ceilingz)) // Hit the floor, so split!
 			{
@@ -2760,6 +2758,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
 				P_RemoveMobj(mo);
 				return false;
 			}
+
 			// Soniccd seed turns into a flower!
 			if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z <= mo->floorz)
 			|| (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height >= mo->ceilingz))
@@ -2870,22 +2869,29 @@ void P_MobjCheckWater(mobj_t *mobj)
 		 || ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
 			continue;
 
-		topheight    = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
-		bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
+		fixed_t topcheck, bottomcheck;
 
 		if (mobj->eflags & MFE_VERTICALFLIP)
 		{
-			if (topheight < (thingtop - FixedMul(mobj->info->height/2, mobj->scale))
-			 || bottomheight > thingtop)
-				continue;
+			topcheck = (thingtop - FixedMul(mobj->info->height/2, mobj->scale));
+			bottomcheck = thingtop;
 		}
 		else
 		{
-			if (topheight < mobj->z
-			 || bottomheight > (mobj->z + FixedMul(mobj->info->height/2, mobj->scale)))
-				continue;
+			topcheck = mobj->z;
+			bottomcheck = (mobj->z + FixedMul(mobj->info->height/2, mobj->scale));
 		}
 
+		topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
+
+		if (topheight < topcheck)
+			continue;
+
+		bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
+
+		if (bottomheight > bottomcheck)
+			continue;
+
 		// Set the watertop and waterbottom
 		mobj->watertop = topheight;
 		mobj->waterbottom = bottomheight;
@@ -3091,11 +3097,14 @@ static void P_SceneryCheckWater(mobj_t *mobj)
 			if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKOTHERS)
 				continue;
 
-			topheight    = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
+			topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
+
+			if (topheight <= mobj->z)
+				continue;
+
 			bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
 
-			if (topheight <= mobj->z
-				|| bottomheight > (mobj->z + FixedMul(mobj->info->height >> 1, mobj->scale)))
+			if (bottomheight > (mobj->z + FixedMul(mobj->info->height >> 1, mobj->scale)))
 				continue;
 
 			if (mobj->z + FixedMul(mobj->info->height, mobj->scale) > topheight)
@@ -3360,7 +3369,6 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 {
 	msecnode_t *node;
 
-	I_Assert(mobj != NULL);
 	I_Assert(mobj->player != NULL);
 	I_Assert(!P_MobjWasRemoved(mobj));
 
@@ -3375,20 +3383,23 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 	mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN;
 
 	// Zoom tube
-	if (UNLIKELY(mobj->tracer && mobj->tracer->type == MT_TUBEWAYPOINT))
+	if (mobj->tracer)
 	{
-		P_UnsetThingPosition(mobj);
-		mobj->x += mobj->momx;
-		mobj->y += mobj->momy;
-		mobj->z += mobj->momz;
-		P_SetThingPosition(mobj);
-		P_CheckPosition(mobj, mobj->x, mobj->y);
-		goto animonly;
-	}
-	else if (UNLIKELY(mobj->player->pflags & PF_MACESPIN && mobj->tracer))
-	{
-		P_CheckPosition(mobj, mobj->x, mobj->y);
-		goto animonly;
+		if (mobj->tracer->type == MT_TUBEWAYPOINT)
+		{
+			P_UnsetThingPosition(mobj);
+			mobj->x += mobj->momx;
+			mobj->y += mobj->momy;
+			mobj->z += mobj->momz;
+			P_SetThingPosition(mobj);
+			P_CheckPosition(mobj, mobj->x, mobj->y);
+			goto animonly;
+		}
+		else if (UNLIKELY(mobj->player->pflags & PF_MACESPIN))
+		{
+			P_CheckPosition(mobj, mobj->x, mobj->y);
+			goto animonly;
+		}
 	}
 
 	// Needed for gravity boots
@@ -3404,24 +3415,30 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 	else
 		P_TryMove(mobj, mobj->x, mobj->y, true);
 
-	if (LIKELY(!(netgame && mobj->player->spectator)))
+	if (!(netgame && mobj->player->spectator))
 	{
 		// Crumbling platforms
 		for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
 		{
-			fixed_t topheight, bottomheight;
 			ffloor_t *rover;
 
 			for (rover = node->m_sector->ffloors; rover; rover = rover->next)
 			{
+				boolean oncrumble;
+
 				if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_CRUMBLE))
 					continue;
 
-				topheight = P_GetSpecialTopZ(mobj, sectors + rover->secnum, node->m_sector);
-				bottomheight = P_GetSpecialBottomZ(mobj, sectors + rover->secnum, node->m_sector);
+				if (mobj->eflags & MFE_VERTICALFLIP)
+				{
+					oncrumble = P_GetSpecialBottomZ(mobj, sectors + rover->secnum, node->m_sector) == mobj->z + mobj->height; // You nut.
+				}
+				else
+				{
+					oncrumble = P_GetSpecialTopZ(mobj, sectors + rover->secnum, node->m_sector) == mobj->z;
+				}
 
-				if ((topheight == mobj->z && !(mobj->eflags & MFE_VERTICALFLIP))
-				|| (bottomheight == mobj->z + mobj->height && mobj->eflags & MFE_VERTICALFLIP)) // You nut.
+				if (oncrumble)
 					EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), mobj->player, rover->alpha, !(rover->flags & FF_NORETURN));
 			}
 		}
@@ -3524,11 +3541,9 @@ animonly:
 static void P_CalculatePrecipFloor(precipmobj_t *mobj)
 {
 	// recalculate floorz each time
-	const sector_t *sec;
+	const sector_t *sec = (mobj && mobj->subsector) ? mobj->subsector->sector : NULL;
 
-	if (mobj && mobj->subsector && mobj->subsector->sector)
-		sec = mobj->subsector->sector;
-	else
+	if (!sec)
 		return;
 
 	mobj->floorz = P_GetSectorFloorZAt(sec, mobj->x, mobj->y);
@@ -3622,8 +3637,10 @@ boolean P_PrecipThinker(precipmobj_t *mobj)
 		return true;
 
 	// only recalc this twice a second (doubt anyone will notice this lulul)
-	if ((leveltime % 17) == 0)
+	if ((leveltime % (TICRATE/2)) == 0)
+	{
 		P_CalculatePrecipFloor(mobj);
+	}
 
 	// adjust height
 	if ((mobj->z += mobj->momz) <= mobj->floorz)
@@ -4286,7 +4303,7 @@ static void P_Boss4PopSpikeballs(mobj_t *mobj)
 {
 	mobj_t *base = mobj->tracer, *seg, *next;
 	P_SetTarget(&mobj->tracer, NULL);
-	while(base)
+	while (base)
 	{
 		next = base->tracer;
 		P_SetTarget(&base->tracer, NULL);
@@ -9007,10 +9024,9 @@ static void P_FiringThink(mobj_t *mobj)
 //
 void P_MobjThinker(mobj_t *mobj)
 {
-	I_Assert(mobj != NULL);
 	I_Assert(!P_MobjWasRemoved(mobj));
 
-	if (UNLIKELY(mobj->flags & MF_NOTHINK))
+	if (mobj->flags & MF_NOTHINK)
 		return;
 
 	// Remove dead target/tracer.
@@ -9111,7 +9127,6 @@ void P_MobjThinker(mobj_t *mobj)
 	if (mobj->fuse && !P_FuseThink(mobj))
 		return;
 
-	I_Assert(mobj != NULL);
 	I_Assert(!P_MobjWasRemoved(mobj));
 
 	if (mobj->momx || mobj->momy || (mobj->flags2 & MF2_SKULLFLY))
@@ -9207,7 +9222,6 @@ boolean P_RailThinker(mobj_t *mobj)
 {
 	fixed_t x, y, z;
 
-	I_Assert(mobj != NULL);
 	I_Assert(!P_MobjWasRemoved(mobj));
 
 	x = mobj->x, y = mobj->y, z = mobj->z;
@@ -9233,7 +9247,6 @@ void P_PushableThinker(mobj_t *mobj)
 {
 	sector_t *sec;
 
-	I_Assert(mobj != NULL);
 	I_Assert(!P_MobjWasRemoved(mobj));
 
 	if (!mobj)
@@ -9271,12 +9284,13 @@ void P_PushableThinker(mobj_t *mobj)
 				x = mobj->spawnpoint->x << FRACBITS;
 				y = mobj->spawnpoint->y << FRACBITS;
 
-				ss = R_PointInSubsector(x, y);
-
 				if (mobj->spawnpoint->z != 0)
 					z = mobj->spawnpoint->z << FRACBITS;
 				else
+				{
+					ss = R_PointInSubsector(x, y);
 					z = ss->sector->floorheight;
+				}
 
 				spawnmo = P_SpawnMobj(x, y, z, mobj->type);
 				if (spawnmo)
@@ -10257,7 +10271,7 @@ void P_SpawnPrecipitation(void)
 			if (curWeather == PRECIP_BLANK)
 				rainmo->precipflags |= PCF_INVISIBLE;
 
-			floorz = rainmo->floorz >> FRACBITS;
+			floorz   = rainmo->floorz >> FRACBITS;
 			ceilingz = rainmo->ceilingz >> FRACBITS;
 
 			if (floorz < ceilingz)
@@ -10324,8 +10338,6 @@ void P_PrecipitationEffects(void)
 			return;
 	}
 
-	boolean sounds_rain = ((cv_drawdist_precip.value != 0) && rainsfx && (!leveltime || leveltime % 80 == 1));
-
 	// Currently thunderstorming with lightning, and we're sounding the thunder...
 	// and where there's thunder, there's gotta be lightning!
 	if (effects_lightning && lightningStrike)
@@ -10347,6 +10359,8 @@ void P_PrecipitationEffects(void)
 	if (sound_disabled)
 		return; // Sound off? D'aw, no fun.
 
+	const boolean sounds_rain = ((cv_drawdist_precip.value != 0) && rainsfx && (!leveltime || leveltime % 80 == 1));
+
 	if (!sounds_rain && !sounds_thunder)
 		return; // no need to calculate volume at ALL
 
@@ -11163,16 +11177,7 @@ void P_SpawnMapThing(mapthing_t *mthing)
 		}
 	}
 
-	if (ultimatemode)
-	{
-		if (i == MT_PITYTV || i == MT_GREENTV || i == MT_YELLOWTV || i == MT_BLUETV || i == MT_BLACKTV || i == MT_WHITETV)
-			return; // No shields in Ultimate mode
-
-		if (i == MT_SUPERRINGBOX)
-			return; // No rings in Ultimate mode (except special stages)
-	}
-
-	if (i == MT_EMMY && (gametype != GT_COOP || ultimatemode || tokenbits == 30 || tokenlist & (1 << tokenbits++)))
+	if (i == MT_EMMY && (gametype != GT_COOP || tokenbits == 30 || tokenlist & (1 << tokenbits++)))
 		return; // you already got this token, or there are too many, or the gametype's not right
 
 	// Objectplace landing point
@@ -11844,8 +11849,6 @@ void P_SpawnHoops(mapthing_t *mthing)
 	x = mthing->x << FRACBITS;
 	y = mthing->y << FRACBITS;
 
-	sec = R_PointInSubsector(x, y)->sector;
-
 	// Save our flags!
 	if (mthing->type == 1713)
 		z = (mthing->options >> ZSHIFT) << FRACBITS;
@@ -11857,6 +11860,8 @@ void P_SpawnHoops(mapthing_t *mthing)
 	if (P_MobjWasRemoved(hoopcenter))
 		return;
 
+	sec = R_PointInSubsector(x, y)->sector;
+
 	hoopcenter->spawnpoint = mthing;
 
 	z += P_GetSectorFloorZAt(sec, x, y);

src/p_mobj.h

@@ -421,10 +421,6 @@ typedef struct mobj_s
 //
 // For precipitation
 //
-// Sometimes this is casted to a mobj_t,
-// so please keep the start of the
-// structure the same.
-//
 typedef struct precipmobj_s
 {
 	// List: thinker links.

src/p_saveg.c

@@ -3308,8 +3308,6 @@ FUNCINLINE static ATTRINLINE void P_ArchiveMisc(savebuffer_t *save)
 	else
 		WRITEINT16(save->p, gamemap);
 
-	lastmapsaved = gamemap;
-
 	WRITEUINT16(save->p, (botskin ? (emeralds|(1<<10)) : emeralds)+357);
 	WRITESTRINGN(save->p, timeattackfolder, sizeof(timeattackfolder));
 }
@@ -3333,8 +3331,6 @@ FUNCINLINE static ATTRINLINE void P_UnArchiveSPGame(savebuffer_t *save, INT16 ma
 	if (!mapheaderinfo[gamemap-1])
 		P_AllocMapHeader(gamemap-1);
 
-	lastmapsaved = gamemap;
-
 	tokenlist = 0;
 	token = 0;
 

src/p_slopes.c

@@ -166,7 +166,8 @@ static void P_ReconfigureVertexSlope(pslope_t *slope)
 	slope->real_xydirection = R_PointToAngle2(0, 0, slope->d.x, slope->d.y)+ANGLE_180;
 	slope->real_zangle = InvAngle(R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta));
 
-	if (slope->normal.x == 0 && slope->normal.y == 0) // Set some defaults for a non-sloped "slope"
+	// Set some defaults for a non-sloped "slope"
+	if (slope->normal.x == 0 && slope->normal.y == 0)
 	{
 		slope->zangle = slope->xydirection = 0;
 		slope->zdelta = slope->d.x = slope->d.y = 0;

src/p_spec.c

@@ -4441,12 +4441,13 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
 	}
 
 	f_affectpoint = P_GetSpecialBottomZ(player->mo, sector, sector);
-	c_affectpoint = P_GetSpecialTopZ(player->mo, sector, sector);
 
 	// Only go further if on the ground
 	if ((sector->flags & SF_FLIPSPECIAL_FLOOR) && !(sector->flags & SF_FLIPSPECIAL_CEILING) && player->mo->z != f_affectpoint)
 		return;
 
+	c_affectpoint = P_GetSpecialTopZ(player->mo, sector, sector);
+
 	if ((sector->flags & SF_FLIPSPECIAL_CEILING) && !(sector->flags & SF_FLIPSPECIAL_FLOOR) && player->mo->z + player->mo->height != c_affectpoint)
 		return;
 

src/p_tick.c

@@ -706,6 +706,7 @@ void P_Ticker(boolean run)
 
 		if (indirectitemcooldown > 0)
 			indirectitemcooldown--;
+
 		if (hyubgone > 0)
 			hyubgone--;
 
@@ -713,8 +714,7 @@ void P_Ticker(boolean run)
 		{
 			K_UpdateSpectateGrief();
 		}
-
-		if (G_BattleGametype())
+		else if (G_BattleGametype())
 		{
 			if (wantedcalcdelay && --wantedcalcdelay <= 0)
 				K_CalculateBattleWanted();

src/p_user.c

@@ -157,6 +157,7 @@ void P_CalcHeight(player_t *player)
 			if (player->viewz > mo->ceilingz - FixedMul(FRACUNIT, mo->scale))
 				player->viewz = mo->ceilingz - FixedMul(FRACUNIT, mo->scale);
 		}
+
 		return;
 	}
 
@@ -774,7 +775,7 @@ boolean P_IsObjectInGoop(mobj_t *mo)
 //
 boolean P_IsObjectOnGround(mobj_t *mo)
 {
-	if (UNLIKELY(P_IsObjectInGoop(mo)))
+	if (P_IsObjectInGoop(mo))
 	{
 		// but I don't want you to ever 'stand' while submerged in goo.
 		// You're in constant vertical momentum, even if you get stuck on something.
@@ -1392,7 +1393,8 @@ static void P_CheckBustableBlocks(player_t *player)
 
 			for (rover = node->m_sector->ffloors; rover; rover = rover->next)
 			{
-				if (!(rover->flags & FF_EXISTS)) continue;
+				if (!(rover->flags & FF_EXISTS))
+					continue;
 
 				if ((rover->flags & FF_BUSTUP)/* && !rover->master->frontsector->crumblestate*/)
 				{
@@ -1512,11 +1514,12 @@ static void P_CheckBouncySectors(player_t *player)
 					continue; // this sector type is required for FOFs to be bouncy
 
 				topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
-				bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
 
 				if (player->mo->z > topheight)
 					continue;
 
+				bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
+
 				if (player->mo->z + player->mo->height < bottomheight)
 					continue;
 
@@ -2109,7 +2112,6 @@ void P_ElementalFireTrail(player_t *player)
 	INT32 i;
 
 	I_Assert(player != NULL);
-	I_Assert(player->mo != NULL);
 	I_Assert(!P_MobjWasRemoved(player->mo));
 
 	if (player->mo->eflags & MFE_VERTICALFLIP)
@@ -2271,7 +2273,8 @@ static void P_MovePlayer(player_t *player)
 			}
 			//CONS_Printf("applied turn: %d\n", angle_diff);
 
-			if (add_delta) {
+			if (add_delta)
+			{
 				player->mo->angle += angle_diff << TICCMD_REDUCE;
 				player->mo->angle &= ~0xFFFF; // Try to keep the turning somewhat similar to how it was before?
 				//CONS_Printf("leftover turn (%s): %5d or %4d%%\n",
@@ -2393,15 +2396,18 @@ static void P_MovePlayer(player_t *player)
 	{
 		mobj_t *water = P_SpawnMobj(player->mo->x, player->mo->y,
 			((player->mo->eflags & MFE_VERTICALFLIP) ? player->mo->waterbottom - FixedMul(mobjinfo[MT_SPLISH].height, player->mo->scale) : player->mo->watertop), MT_SPLISH);
+
 		if (player->mo->eflags & MFE_GOOWATER)
 			S_StartSound(water, sfx_ghit);
 		else
 			S_StartSound(water, sfx_wslap);
+
 		if (player->mo->eflags & MFE_VERTICALFLIP)
 		{
 			water->flags2 |= MF2_OBJECTFLIP;
 			water->eflags |= MFE_VERTICALFLIP;
 		}
+
 		water->destscale = player->mo->scale;
 		P_SetScale(water, player->mo->scale);
 	}
@@ -3478,8 +3484,6 @@ void P_ResetCamera(player_t *player, camera_t *thiscam)
 		}
 	}
 
-	thiscam->relativex = 0;
-
 	thiscam->subsector = R_PointInSubsectorFast(thiscam->x, thiscam->y);
 
 	thiscam->radius = 20*FRACUNIT;
@@ -3972,9 +3976,12 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 		{
 			fixed_t panmax = (dist/5);
 			const INT32 sparkval = K_GetKartDriftSparkValue(player);
+
 			pan = FixedDiv(FixedMul(min((fixed_t)player->kartstuff[k_driftcharge], sparkval), panmax), sparkval);
+
 			if (pan > panmax)
 				pan = panmax;
+
 			if (player->kartstuff[k_drift] < 0)
 				pan *= -1;
 		}
@@ -4751,6 +4758,7 @@ void P_PlayerThink(player_t *player)
 			player->mo->flags2 |= MF2_SHADOW;
 		else
 			player->mo->flags2 &= ~MF2_SHADOW;
+
 		P_DeathThink(player);
 		LUA_HookPlayer(player, HOOK(PlayerThink));
 		return;

src/r_bsp.cpp

@@ -221,8 +221,9 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
 		tempsec->floorheight = s->floorheight;
 		tempsec->ceilingheight = s->ceilingheight;
 
-		if ((underwater && (tempsec->  floorheight = sec->floorheight,
-			tempsec->ceilingheight = s->floorheight - 1, !back)) || viewz <= s->floorheight)
+		if ((underwater && (tempsec->floorheight = sec->floorheight,
+							tempsec->ceilingheight = s->floorheight - 1, !back)) ||
+							viewz <= s->floorheight)
 		{ // head-below-floor hack
 			tempsec->floorpic = s->floorpic;
 			tempsec->floor_xoffs = s->floor_xoffs;
@@ -258,8 +259,8 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
 				*ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel
 					: sectors[s->ceilinglightsec].lightlevel;
 		}
-		else if (heightsec != -1 && viewz >= sectors[heightsec].ceilingheight
-			&& sec->ceilingheight > s->ceilingheight)
+		else if (heightsec != -1 && viewz >= sectors[heightsec].ceilingheight &&
+				 sec->ceilingheight > s->ceilingheight)
 		{ // Above-ceiling hack
 			tempsec->ceilingheight = s->ceilingheight;
 			tempsec->floorheight = s->ceilingheight + 1;
@@ -296,7 +297,8 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
 				*ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel :
 			sectors[s->ceilinglightsec].lightlevel;
 		}
-		sec = tempsec;
+
+		sec = tempsec; // Use other sector
 	}
 
 	return sec;

src/r_defs.h

@@ -531,11 +531,10 @@ typedef struct seg_s
 	vertex_t *v1;
 	vertex_t *v2;
 
-	INT32 side;
-
-	fixed_t offset;
-
-	angle_t angle;
+#ifdef HWRENDER
+	floatvertex_t fv1; // v1 in floats - precalculated
+	floatvertex_t fv2; // v2 in floats - precalculated
+#endif
 
 	side_t *sidedef;
 	line_t *linedef;
@@ -545,11 +544,13 @@ typedef struct seg_s
 	sector_t *frontsector;
 	sector_t *backsector;
 
+	INT32 side;
+
 	fixed_t length; // precalculated seg length
-#ifdef HWRENDER
-	floatvertex_t fv1; // v1 in floats - precalculated
-	floatvertex_t fv2; // v2 in floats - precalculated
-#endif
+	fixed_t offset;
+
+	angle_t angle;
+
 	polyobj_t *polyseg;
 
 	// Fake contrast calculated on level load

src/r_draw.cpp

@@ -515,8 +515,6 @@ void R_FlushTranslationColormapCache(void)
 // in reality, the few routines that can work for either mode, are
 // put here
 
-enum columncontext_e columncontext = COLUMNCONTEXT_DIRECT;
-
 enum ColumnFlushType
 {
 	FLUSH_NONE				= 0x0000,
@@ -534,9 +532,12 @@ typedef struct drawcolumndata_temp_s
 	// e6y: resolution limitation is removed
 	UINT8 *buf;
 
-	INT32    startx;
-	ColumnFlushType    type;
-	INT32   commontop, commonbot;
+	INT32 startx;
+
+	ColumnFlushType type;
+
+	INT32 commontop, commonbot;
+
 	UINT8 *transmap;
 	// SoM 7-28-04: Fix the fuzz problem.
 	UINT8 *translation;
@@ -564,8 +565,8 @@ FUNCNORETURN static ATTRNORETURN void R_QuadFlushError(void)
 }
 
 static void (*R_FlushWholeColumns)(void) = R_FlushWholeError;
-static void (*R_FlushHTColumns)(void) = R_FlushHTError;
-static void (*R_FlushQuadColumn)(void) = R_QuadFlushError;
+static void (*R_FlushHTColumns)(void)    = R_FlushHTError;
+static void (*R_FlushQuadColumn)(void)   = R_QuadFlushError;
 
 static void R_FlushColumns(void)
 {
@@ -597,8 +598,8 @@ void R_ResetColumnBuffer(void)
 
 	temp_dc.type = FLUSH_NONE;
 	R_FlushWholeColumns = R_FlushWholeError;
-	R_FlushHTColumns = R_FlushHTError;
-	R_FlushQuadColumn = R_QuadFlushError;
+	R_FlushHTColumns    = R_FlushHTError;
+	R_FlushQuadColumn   = R_QuadFlushError;
 }
 
 /**	\brief	The R_InitViewBuffer function

src/r_draw.h

@@ -105,7 +105,6 @@ enum columncontext_e
 	COLUMNCONTEXT_FLUSH,
 };
 
-extern enum columncontext_e columncontext;
 void R_SetColumnContext(enum columncontext_e _columncontext);
 
 void R_ResetColumnBuffer(void);
@@ -124,6 +123,8 @@ enum
 	COLDRAWFUNC_TRANSTRANS,
 	COLDRAWFUNC_TWOSMULTIPATCH,
 	COLDRAWFUNC_TWOSMULTIPATCHTRANS,
+	COLDRAWFUNC_TWOSMULTIPATCH_DIRECT,
+	COLDRAWFUNC_TWOSMULTIPATCHTRANS_DIRECT,
 	COLDRAWFUNC_FOG,
 
 	COLDRAWFUNC_MAX

src/r_patch.cpp

@@ -161,7 +161,7 @@ static void R_ParseSpriteInfo(boolean spr2)
 			if (i == NUMSPRITES)
 				I_Error("Error parsing SPRTINFO lump: Unknown sprite name \"%s\"", newSpriteName);
 
-			if (!memcmp(newSpriteName,sprnames[i], 4))
+			if (!memcmp(newSpriteName, sprnames[i], 4))
 			{
 				sprnum = static_cast<spritenum_t>(i);
 				break;
@@ -443,6 +443,7 @@ void *Patch_AllocateHardwarePatch(patch_t *patch)
 		GLPatch_t *glPatch = static_cast<GLPatch_t*>(Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware));
 		glPatch->mipmap = static_cast<GLMipmap_t*>(Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &glPatch->mipmap));
 	}
+
 	return (void *)(patch->hardware);
 }
 

src/r_segs.cpp

@@ -16,6 +16,7 @@
 #include "r_sky.h"
 
 #include <algorithm>
+#include <vector>
 
 #include "r_portal.h"
 #include "r_splats.h"
@@ -1166,6 +1167,37 @@ static inline void R_ExpandPlaneY(visplane_t *pl, INT32 x, INT16 top, INT16 bott
 // CALLED: CORE LOOPING ROUTINE.
 //
 
+static std::vector<UINT8> holecol(256);
+
+// used for R_DrawWallColumn
+// convert "holey" columns into contigous columns
+// filled with cyan in place of holes
+static UINT8 *R_GetHoleColumn(drawcolumndata_t* dc)
+{
+	column_t *col = (column_t *)(dc->source - 3);
+
+	const INT32 texheight = dc->texheight;
+	holecol.resize(texheight);
+
+	// fill in everything with cyan so we can skip it
+	memset(holecol.data(), TRANSPARENTPIXEL, texheight);
+
+	// shamelessly copy pasted from R_GenerateTexture
+	INT32 topdelta, prevdelta = -1;
+	while (col->topdelta != 0xff)
+	{
+		topdelta = col->topdelta;
+		if (topdelta <= prevdelta)
+			topdelta += prevdelta;
+		prevdelta = topdelta;
+
+		memcpy(holecol.data() + topdelta, (UINT8*)col + 4, col->length);
+		col = (column_t *)((UINT8*)col + col->length + 4);
+	}
+
+	return holecol.data();
+}
+
 static void R_DrawWallColumn(drawcolumndata_t* dc, INT32 yl, INT32 yh, fixed_t mid, fixed_t texturecolumn, INT32 texture, boolean remap)
 {
 	const INT32 itexturecolumn = texturecolumn >> FRACBITS;
@@ -1175,13 +1207,35 @@ static void R_DrawWallColumn(drawcolumndata_t* dc, INT32 yl, INT32 yh, fixed_t m
 	dc->source = R_GetColumn(texture, itexturecolumn);
 	dc->texheight = textureheight[texture] >> FRACBITS;
 	dc->sourcelength = dc->texheight;
+
 	R_SetColumnFunc(colfunctype);
 	coldrawfunc_t* colfunccopy = colfunc;
+
+	if (textures[texture]->holes)
+	{
+		dc->source = R_GetHoleColumn(dc);
+
+		if (cv_softcyancut.value)
+		{
+			// need to use multipatch drawers to cut cyan pixels
+			if (R_CheckColumnFunc(COLDRAWFUNC_FUZZY) == true)
+			{
+				colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS_DIRECT];
+			}
+			else
+			{
+				colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCH_DIRECT];
+			}
+		}
+	}
+
 	drawcolumndata_t dc_copy = *dc;
+
 	if (remap)
 	{
 		dc_copy.colormap += COLORMAP_REMAPOFFSET;
 	}
+
 	colfunccopy(const_cast<drawcolumndata_t*>(&dc_copy));
 }
 
@@ -1390,7 +1444,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
 			// calculate lighting
 			pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
 
-			if (pindex >=  MAXLIGHTSCALE)
+			if (pindex >= MAXLIGHTSCALE)
 				pindex = MAXLIGHTSCALE-1;
 
 			dc->colormap = walllights[pindex];
@@ -1425,7 +1479,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
 
 				pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
 
-				if (pindex >=  MAXLIGHTSCALE)
+				if (pindex >= MAXLIGHTSCALE)
 					pindex = MAXLIGHTSCALE-1;
 
 				if (dc->lightlist[i].extra_colormap)

src/r_things.cpp

@@ -166,11 +166,13 @@ static void R_InstallSpriteLump(UINT16 wad,            // graphics patch
 			CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has rotations and a rot = 0 lump\n", spritename, cn);
 
 		sprtemp[frame].rotate = SRF_SINGLE;
+
 		for (r = 0; r < 8; r++)
 		{
 			sprtemp[frame].lumppat[r] = lumppat;
 			sprtemp[frame].lumpid[r] = lumpid;
 		}
+
 		sprtemp[frame].flip = flipped ? UINT8_MAX : 0; // 11111111 in binary
 		return;
 	}
@@ -267,8 +269,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
 	if (spritedef->numframes) // (then spriteframes is not null)
 	{
 		// copy the already defined sprite frames
-		memcpy(sprtemp, spritedef->spriteframes,
-		 spritedef->numframes * sizeof (spriteframe_t));
+		memcpy(sprtemp, spritedef->spriteframes, spritedef->numframes * sizeof (spriteframe_t));
 		maxframe = spritedef->numframes - 1;
 	}
 
@@ -1147,7 +1148,7 @@ fixed_t R_GetSpriteDirectionalLighting(angle_t angle)
 	fixed_t extralight = 0;
 
 	light = FixedMul(FINECOSINE(angle >> ANGLETOFINESHIFT), FINECOSINE(maplighting.angle >> ANGLETOFINESHIFT))
-		+ FixedMul(FINESINE(angle >> ANGLETOFINESHIFT), FINESINE(maplighting.angle >> ANGLETOFINESHIFT));
+		  + FixedMul(FINESINE(angle >> ANGLETOFINESHIFT), FINESINE(maplighting.angle >> ANGLETOFINESHIFT));
 	light = (light + FRACUNIT) / 2;
 
 	light = FixedMul(light, FRACUNIT - FSIN(abs(AngleDeltaSigned(angle, maplighting.angle)) / 2));
@@ -1356,9 +1357,9 @@ static void R_ProjectSprite(mobj_t *thing)
 
 	I_Assert(lump < max_spritelumps);
 
-	spr_width = spritecachedinfo[lump].width;
-	spr_height = spritecachedinfo[lump].height;
-	spr_offset = spritecachedinfo[lump].offset;
+	spr_width     = spritecachedinfo[lump].width;
+	spr_height    = spritecachedinfo[lump].height;
+	spr_offset    = spritecachedinfo[lump].offset;
 	spr_topoffset = spritecachedinfo[lump].topoffset;
 
 #ifdef ROTSPRITE
@@ -1399,10 +1400,10 @@ static void R_ProjectSprite(mobj_t *thing)
 
 			if (rotsprite != NULL)
 			{
-				spr_width = rotsprite->width << FRACBITS;
-				spr_height = rotsprite->height << FRACBITS;
-				spr_offset = rotsprite->leftoffset << FRACBITS;
-				spr_topoffset = rotsprite->topoffset << FRACBITS;
+				spr_width      = rotsprite->width << FRACBITS;
+				spr_height     = rotsprite->height << FRACBITS;
+				spr_offset     = rotsprite->leftoffset << FRACBITS;
+				spr_topoffset  = rotsprite->topoffset << FRACBITS;
 				spr_topoffset += FEETADJUST;
 
 				// flip -> rotate, not rotate -> flip

src/s_sound.c

@@ -722,12 +722,12 @@ void S_UpdateSounds(void)
 	if (dedicated || sound_disabled)
 		return;
 
+	memset(listenmobj, 0, sizeof(listenmobj));
+
 	for (i = 0; i <= splitscreen; i++)
 	{
 		player_t *player = &players[displayplayers[i]];
 
-		listenmobj[i] = NULL;
-
 		if (player->awayviewtics)
 		{
 			listenmobj[i] = player->awayviewmobj;
@@ -1398,8 +1398,8 @@ void S_LoadMusicDefs(UINT16 wadnum)
 
 	for (int k = 0; k < 2; k++)
 	{
-		const char *lumpname = (k == 1 ? "MUSCINFO" : "MUSICDEF");
-		lumpnum = W_CheckNumForNamePwad(lumpname, wadnum, 0); //check for MUSCINFO lump on 2nd iteration
+		const char *lumpname = (k == 1 ? "MUSCINFO" : "MUSICDEF"); //check for MUSCINFO lump on 2nd iteration
+		lumpnum = W_CheckNumForNamePwad(lumpname, wadnum, 0);
 
 		if (lumpnum == INT16_MAX)
 			continue;

src/screen.c

@@ -42,8 +42,8 @@ INT32 setmodeneeded = 0; // video mode change needed if > 0 (the mode number to
 static CV_PossibleValue_t shittyscreen_cons_t[] = {{0, "Okay"}, {1, "Shitty"}, {2, "Extra Shitty"}, {0, NULL}};
 
 //added : 03-02-98: default screen mode, as loaded/saved in config
-consvar_t cv_scr_width = {"scr_width", "1280", CV_SAVE|CV_CALL, CV_Unsigned, VID_RefreshModeList, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_scr_height = {"scr_height", "800", CV_SAVE|CV_CALL, CV_Unsigned, VID_RefreshModeList, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_scr_width = {"scr_width", "1280", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_scr_height = {"scr_height", "800", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_frameskip = {"frameskip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -120,6 +120,10 @@ static void SCR_SetDrawFuncs(enum columncontext_e _columncontext)
 		colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
 	}
 
+	// gotta keep a copy of those for R_DrawWallColumn.....
+	colfuncs[COLDRAWFUNC_TWOSMULTIPATCH_DIRECT] = R_Draw2sMultiPatchColumn;
+	colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS_DIRECT] = R_Draw2sMultiPatchTranslucentColumn;
+
 	colfuncs[COLDRAWFUNC_FOG] = R_DrawFogColumn;
 
 	R_SetColumnFunc(BASEDRAWFUNC);
@@ -154,7 +158,6 @@ void SCR_SetMode(void)
 // effectively adding massive overhead due to excessive flushing, so we draw our masked thing directly to screen instead
 void R_SetColumnContext(enum columncontext_e _columncontext)
 {
-	columncontext = _columncontext;
 	SCR_SetDrawFuncs(_columncontext); // set our column drawers
 }
 
@@ -274,6 +277,7 @@ void SCR_Recalc(void)
 	// vid.recalc lasts only for the next refresh...
 	con_recalc = true;
 	am_recalc = true;
+	intermissionbginit = false;
 }
 
 // Check for screen cmd-line parms: to force a resolution.
@@ -315,9 +319,8 @@ void SCR_CheckDefaultMode(void)
 void SCR_SetDefaultMode(void)
 {
 	// remember the default screen size
-	CV_StealthSetValue(&cv_scr_width, vid.width);
-	CV_StealthSetValue(&cv_scr_height, vid.height);
-	VID_RefreshModeList(); // probably not needed but justin käs
+	CV_SetValue(&cv_scr_width, vid.width);
+	CV_SetValue(&cv_scr_height, vid.height);
 }
 
 // Change fullscreen on/off according to cv_fullscreen

src/sdl/i_system.cpp

@@ -961,6 +961,11 @@ static int joy_open(int playerIndex, int joyIndex)
 	return SDL_CONTROLLER_AXIS_MAX;
 }
 
+void I_SetJoystickFocus(void)
+{
+	SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, cv_gamepadifunfocused.value ? "1" : "0");
+}
+
 //
 // I_InitJoystick
 //
@@ -975,6 +980,18 @@ void I_InitJoystick(UINT8 index)
 	if (M_CheckParm("-nojoy"))
 		return;
 
+	{
+		char dbpath[1024];
+		sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb.txt", srb2path);
+		SDL_GameControllerAddMappingsFromFile(dbpath);
+	}
+
+	{
+		char dbpath[1024];
+		sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb_user.txt", srb2home);
+		SDL_GameControllerAddMappingsFromFile(dbpath);
+	}
+
 	if (M_CheckParm("-noxinput"))
 		SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
 
@@ -1645,11 +1662,17 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
 			signame = "SIGSEGV";
 			break;
 #ifdef SIGTERM
-		case SIGTERM: // Software termination signal from kill
-			sigmsg = ("SRB2Kart-Saturn was terminated by a kill signal.");
+		case SIGTERM: // Software termination signal from terminate
+			sigmsg = ("SRB2Kart-Saturn was terminated by a terminate signal.");
 			signame = "SIGTERM";
 			break;
 #endif
+#ifdef SIGKILL
+		case SIGKILL: // Software termination signal from kill
+			sigmsg = ("SRB2Kart-Saturn was terminated by a kill signal.");
+			signame = "SIGKILL";
+			break;
+#endif
 #ifdef SIGBREAK
 		case SIGBREAK: // Ctrl-Break sequence
 			sigmsg =("SIGBREAK - SRB2Kart-Saturn was terminated by a Ctrl-Break sequence.");
@@ -1845,9 +1868,7 @@ static void I_RegisterChildSignals(void)
 	signal(SIGABRT, signal_handler_child);
 	signal(SIGFPE,  signal_handler_child);
 }
-#endif
 
-#ifdef NEWSIGNALHANDLER
 FUNCNORETURN static ATTRNORETURN void newsignalhandler_Warn(const char *pr)
 {
 	char text[128];
@@ -1883,6 +1904,18 @@ static void I_Fork(void)
 			I_RegisterChildSignals();
 			break;
 		default:
+			// ignore those, those are handled by child process
+			// otherwise parent might exit before it
+			// and the below stuff wont run and your terminal will be left in an awkward state
+#ifdef SIGINT
+			signal(SIGINT,   SIG_IGN);
+#endif
+#ifdef SIGBREAK
+			signal(SIGBREAK, SIG_IGN);
+#endif
+#ifdef SIGTERM
+			signal(SIGTERM,  SIG_IGN);
+#endif
 #ifdef LOGMESSAGES
 			if (logstream)
 				fclose(logstream);/* the child has this */
@@ -1891,6 +1924,8 @@ static void I_Fork(void)
 #ifdef LOGMESSAGES
 			/* By the way, exit closes files. */
 			logstream = fopen(logfilename, "at");
+#else
+			logstream = 0;
 #endif
 			if (c == -1)
 			{
@@ -1973,7 +2008,6 @@ FUNCNORETURN void ATTRNORETURN I_Quit(void)
 	is_quitting = true;
 	SDL_ShowCursor(SDL_TRUE);
 
-	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
 	D_SaveBan(); // save the ban list
 	G_SaveGameData(false); // Tails 12-08-2002
@@ -2002,7 +2036,6 @@ FUNCNORETURN void ATTRNORETURN I_Quit(void)
 	if (myargmalloc)
 		free(myargv); // Deallocate allocated memory
 
-	W_Shutdown();
 	exit(0);
 }
 
@@ -2062,7 +2095,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 			sigttl = "SRB2Kart " VERSIONSTRING " Recursive Error";
 			I_ShowSimpleErrorBox(sigttl, buffer);
 
-			W_Shutdown();
 			exit(-1); // recursive errors detected
 		}
 	}
@@ -2081,8 +2113,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 
 	// ---
 
-	I_ShutdownConsole();
-
 	M_SaveConfig(NULL); // save game config, cvars..
 	D_SaveBan(); // save the ban list
 	G_SaveGameData(false); // Tails 12-08-2002
@@ -2104,8 +2134,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 	//I_ShowSimpleErrorBox(sigttl, buffer);
 	I_ShowErrorBox(sigttl, buffer);
 
-	W_Shutdown();
-
 #if defined (PARANOIA) && defined (__CYGWIN__)
 	*(INT32 *)2 = 4; //Alam: Debug!
 #endif
@@ -2306,7 +2334,6 @@ char *I_GetUserName(void)
 		strncpy(username, p, MAXPLAYERNAME);
 	}
 
-
 	if (!fastcmp(username, ""))
 		return username;
 

src/sdl/i_video.c

@@ -84,20 +84,15 @@
 #endif
 
 // maximum number of windowed modes (see windowedModes[][])
-#define MAXWINMODES (128)
+#define MAXWINMODES (22)
 
-static void I_FillScreenResolutionsList(boolean force);
+/**	\brief
+*/
+static INT32 numVidModes = -1;
 
-typedef struct
-{
-	char name[10];
-	INT32 w;
-	INT32 h;
-} video_mode_t;
-
-static video_mode_t windowedModes[MAXWINMODES] = {{"320x200", 320, 200}}; // make sure the default mode exists
-static const char *fallback_resolution_name = "Fallback";
-static int vid_nummodes = 1;
+/**	\brief
+*/
+static char vidModeName[33][32]; // allow 33 different modes
 
 rendermode_t rendermode = render_none;
 
@@ -113,7 +108,6 @@ static void KeyboardLayout_OnChange(void)
 {
 	if (cv_keyboardlayout.value != 2)
 		SDL_StopTextInput();
-	HU_Shiftform();
 }
 
 static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {3, "AZERTY"}, {0, NULL}};
@@ -144,6 +138,9 @@ static SDL_bool disable_mouse = SDL_FALSE;
 #define MOUSE_MENU false //(!disable_mouse && cv_usemouse.value && menuactive && !USE_FULLSCREEN)
 #define MOUSEBUTTONS_MAX MOUSEBUTTONS
 
+// first entry in the modelist which is not bigger than MAXVIDWIDTHxMAXVIDHEIGHT
+static      INT32          firstEntry = 0;
+
 // Total mouse motion X/Y offsets
 static      INT32        mousemovex = 0, mousemovey = 0;
 
@@ -164,6 +161,38 @@ static SDL_Texture  *texture = NULL;
 static SDL_GLContext sdlglcontext = NULL;
 #endif
 static SDL_bool      havefocus = SDL_TRUE;
+static const char *fallback_resolution_name = "Fallback";
+
+// windowed video modes from which to choose from.
+static INT32 windowedModes[MAXWINMODES][2] =
+{
+	{2560,1440}, // 1.66
+	{1920,1200}, // 1.60,6.00
+	{1920,1080}, // 1.66
+	{1680,1050}, // 1.60,5.25
+	{1600,1200}, // 1.33
+	{1600, 900}, // 1.66
+	{1366, 768}, // 1.66
+	{1440, 900}, // 1.60,4.50
+	{1280,1024}, // 1.33?
+	{1280, 960}, // 1.33,4.00
+	{1280, 800}, // 1.60,4.00
+	{1280, 720}, // 1.66
+	{1152, 864}, // 1.33,3.60
+	{1024, 768}, // 1.33,3.20
+	{ 960, 600}, // 1.33,3.20
+	{ 800, 600}, // 1.33,2.50
+	{ 735, 415}, // 1.33,2.50
+	{ 640, 480}, // 1.33,2.00
+	{ 640, 400}, // 1.60,2.00
+	{ 500, 300}, // 1.33
+	{ 320, 240}, // 1.33,1.00
+	{ 320, 200}, // 1.60,1.00
+};
+
+#define CUSTOMMODENUM 9999
+static INT32 custom_width = 0;
+static INT32 custom_height = 0;
 
 static SDL_bool Impl_CreateWindow(SDL_bool fullscreen);
 static void Impl_SetWindowIcon(void);
@@ -489,20 +518,11 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 		return;
 	}
 
-	if (windowmoved)
+	if (windowmoved && rendermode == render_opengl)
 	{
 		I_CheckDesktopRes();
-
-		// if we say moved our game window to a different screen
-		// refetch our resolutions
-		I_FillScreenResolutionsList(false);
-#ifdef HWRENDER
 #ifdef USE_FBO_OGL
-		if (rendermode == render_opengl)
-		{
-			I_DownSample();
-		}
-#endif
+		I_DownSample();
 #endif
 		windowmoved = SDL_FALSE;
 	}
@@ -519,8 +539,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 
 		if (!firsttimeonmouse)
 		{
-			if (cv_usemouse.value)
-				I_StartupMouse();
+			if (cv_usemouse.value) I_StartupMouse();
 		}
 	}
 	else if (!mousefocus && !kbfocus)
@@ -1214,9 +1233,9 @@ static void VID_Command_ModeList_f(void)
 	"Under opengl, fullscreen only supports native desktop resolution.\n"
 	"Under software, the mode is stretched up to desktop resolution.\n");
 
-	for (i = 0; i < vid_nummodes; i++)
+	for (i = 0; i < MAXWINMODES; i++)
 	{
-		CONS_Printf("%2d: %dx%d\n", i, windowedModes[i].w, windowedModes[i].h);
+		CONS_Printf("%2d: %dx%d\n", i, windowedModes[i][0], windowedModes[i][1]);
 	}
 }
 
@@ -1255,7 +1274,7 @@ static void I_CheckDesktopRes(void)
 		return;
 	}
 
-	if (SDL_GetCurrentDisplayMode(currentDisplayIndex, &curmode) != 0)
+	if (SDL_GetDesktopDisplayMode(currentDisplayIndex, &curmode) != 0)
 	{
 		return;
 	}
@@ -1270,11 +1289,6 @@ boolean I_CheckNativeRes(void)
 	return (vid.width == desktopwidth && vid.height == desktopheight);
 }
 
-boolean I_CheckAboveDesktopRes(INT32 width, INT32 height)
-{
-	return (width > desktopwidth || height > desktopheight);
-}
-
 #ifdef USE_FBO_OGL
 
 void RefreshOGLSDLSurface(void)
@@ -1505,207 +1519,13 @@ void I_SetPalette(RGBA_t *palette)
 	}
 }
 
-// make sure the canonical resolutions are always available
-static const struct {
-	const int w, h;
-} canonicals[] = {
-	{1920, 1200}, // 16:10
-	{1280,  800}, // 16:10
-	{ 960,  600}, // 16:10
-	{ 640,  400}, // 16:10
-	{ 320,  200}, // Vanilla Doom
-};
-static const int num_canonicals = sizeof(canonicals)/sizeof(*canonicals);
-
-// [FG] sort resolutions by width first and height second
-static int cmp_resolutions(const void *a, const void *b)
-{
-	const video_mode_t *ma = (const video_mode_t *) a;
-	const video_mode_t *mb = (const video_mode_t *) b;
-
-	return (ma->w == mb->w) ? mb->h - ma->h : mb->w - ma->w;
-}
-
-static void I_AppendResolution(SDL_DisplayMode *mode, int *list_size)
-{
-	int i;
-
-	for (i = 0; i < *list_size; i++)
-		if (windowedModes[i].w == mode->w
-		 && windowedModes[i].h == mode->h)
-			return;
-
-	snprintf(windowedModes[*list_size].name,
-			 sizeof(windowedModes[*list_size].name),
-			 "%dx%d", mode->w, mode->h);
-	windowedModes[*list_size].w = mode->w;
-	windowedModes[*list_size].h = mode->h;
-
-	(*list_size)++;
-}
-
-// small helper to check if a video mode is canonical
-static boolean IsModeCanonical(int w, int h)
-{
-	for (int i = 0; i < num_canonicals; i++)
-	{
-		if (canonicals[i].w == w && canonicals[i].h == h)
-			return true;
-	}
-
-	return false;
-}
-
-// check if our desired resolution already is in the videomode list
-static int IsCustomResolutionInList(int list_size)
-{
-	INT32 custom_w = cv_scr_width.value;
-	INT32 custom_h = cv_scr_height.value;
-
-	// startup
-	if (!custom_w || !custom_h)
-		return -2;
-
-	// invalid resolution
-	// dont even attempt to add it
-	if (custom_w < BASEVIDWIDTH || custom_w > MAXVIDWIDTH
-	 || custom_h < BASEVIDHEIGHT || custom_h > MAXVIDHEIGHT)
-		return -1;
-
-	for (int i = 0; i < list_size; i++)
-	{
-		if (windowedModes[i].w == custom_w && windowedModes[i].h == custom_h)
-		{
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-//
-// I_FillScreenResolutionsList
-// Get all the supported screen resolutions
-// and fill the list with them
-//
-static void I_FillScreenResolutionsList(boolean force)
-{
-	int currentDisplayIndex = -1;
-	static int oldDisplayIndex = -1;
-	SDL_DisplayMode mode;
-	int i = 0, list_size = 0;
-	int count = 0;
-	char custom_resolution[10];
-
-	currentDisplayIndex = SDL_GetWindowDisplayIndex(window);
-
-	// No valid index
-	if (currentDisplayIndex < 0)
-	{
-		return;
-	}
-
-	// didnt change screen, no need to redo the list
-	if (!force && currentDisplayIndex == oldDisplayIndex)
-	{
-		return;
-	}
-
-	oldDisplayIndex = currentDisplayIndex;
-
-	// Don't call SDL_ListModes if SDL has not been initialized
-	count = SDL_GetNumDisplayModes(currentDisplayIndex);
-
-	list_size = 0;
-
-	// on success, SDL_GetNumDisplayModes() always returns at least 1
-	if (count > 0)
-	{
-		// -2 for the desired resolution and for NULL
-		count = min(count, MAXWINMODES - 2 - num_canonicals);
-
-		for (i = count - 1 + num_canonicals; i >= 0; i--)
-		{
-			// make sure the canonical resolutions are always available
-			if (i > count - 1)
-			{
-				mode.w = canonicals[i - count].w;
-				mode.h = canonicals[i - count].h;
-			}
-			else
-			{
-				SDL_GetDisplayMode(currentDisplayIndex, i, &mode);
-			}
-
-			I_AppendResolution(&mode, &list_size);
-		}
-
-		windowedModes[list_size].name[0] = '\0';
-	}
-
-	const int customresinlist = IsCustomResolutionInList(list_size);
-
-	if (customresinlist == 0)
-	{
-		// did not find mode from list, make custom resolution if the values somewhat make sense
-		if (list_size < MAXWINMODES)
-		{
-			snprintf(custom_resolution, sizeof(custom_resolution), "%dx%d", cv_scr_width.value, cv_scr_height.value);
-
-			// [FG] if the desired resolution not in the list, append it
-			snprintf(windowedModes[list_size].name,
-						sizeof(windowedModes[list_size].name),
-						"%dx%d", cv_scr_width.value, cv_scr_height.value);
-			windowedModes[list_size].w = cv_scr_width.value;
-			windowedModes[list_size].h = cv_scr_height.value;
-			list_size++;
-		}
-		else
-			CONS_Alert(CONS_ERROR, "Could not set custom resolution!\n");
-	}
-	else if (customresinlist == -1)
-		CONS_Alert(CONS_ERROR, "Could not set custom resolution!\n");
-
-	// [FG] sort the list
-	SDL_qsort(windowedModes, list_size, sizeof(*windowedModes), cmp_resolutions);
-
-	// if we have more video modes than we can list
-	// try to shrink the list, lowest resolutions first
-	// whilst keeping the canonicals
-	if (list_size > MAXMODEDESCS)
-	{
-		// list is sorted from largest to smallest, so start at the end
-		for (i = list_size - 1; i >= 0 && list_size > MAXMODEDESCS; i--)
-		{
-			if (IsModeCanonical(windowedModes[i].w, windowedModes[i].h))
-				continue;
-
-			// Should we like, instead prioritize checking for non aspect correct resolutions to remove?
-
-			// we gotta shift everything
-			// due to canonicals we cant just shrink the list
-			for (int k = i; k < list_size - 1; k++)
-			{
-				windowedModes[k] = windowedModes[k + 1];
-			}
-
-			list_size--;
-		}
-	}
-
-	windowedModes[list_size].name[0] = '\0';
-	vid_nummodes = list_size;
-
-	// be sure to update the video menu
-	if (menuactive &&
-		currentMenu == &OP_VideoModeDef)
-		M_VideoModeMenu(0);
-}
-
 // return number of fullscreen + X11 modes
 INT32 VID_NumModes(void)
 {
-	return vid_nummodes;
+	if (USE_FULLSCREEN && numVidModes != -1)
+		return numVidModes - firstEntry;
+	else
+		return MAXWINMODES;
 }
 
 const char *VID_GetModeName(INT32 modeNum)
@@ -1715,32 +1535,40 @@ const char *VID_GetModeName(INT32 modeNum)
 		return fallback_resolution_name;
 	}
 
-	if (modeNum > vid_nummodes)
+	if (modeNum > MAXWINMODES)
 		return NULL;
 
-	return windowedModes[modeNum].name;
+	sprintf(&vidModeName[modeNum][0], "%dx%d",
+		windowedModes[modeNum][0],
+		windowedModes[modeNum][1]);
+
+	return &vidModeName[modeNum][0];
 }
 
 INT32 VID_GetModeForSize(INT32 w, INT32 h)
 {
 	int i;
 
-	for (i = 0; i < vid_nummodes; i++)
+	for (i = 0; i < MAXWINMODES; i++)
 	{
-		if (windowedModes[i].w == w && windowedModes[i].h == h)
+		if (windowedModes[i][0] == w && windowedModes[i][1] == h)
 		{
 			return i;
 		}
 	}
 
-	return -1;
-}
+	// did not find mode from list, make custom resolution if the values somewhat make sense
+	// opengl mode does not mind about max resolution defined in screen.h
+	// if not using opengl, check against the maximum as well
+	if ((w >= BASEVIDWIDTH && h >= BASEVIDHEIGHT) &&
+		(rendermode == render_opengl || (w <= MAXVIDWIDTH && h <= MAXVIDHEIGHT)))
+	{
+		custom_width = w;
+		custom_height = h;
+		return CUSTOMMODENUM;
+	}
 
-void VID_RefreshModeList(void)
-{
-	// check if we even need to rebuild the list
-	if (IsCustomResolutionInList(vid_nummodes) == 0)
-		I_FillScreenResolutionsList(true);
+	return -1;
 }
 
 void VID_PrepareModeList(void)
@@ -1774,10 +1602,17 @@ INT32 VID_SetMode(INT32 modeNum)
 {
 	vid.recalc = true;
 
-	if (modeNum >= 0 && modeNum < vid_nummodes)
+	if (modeNum >= 0 && modeNum < MAXWINMODES)
 	{
-		vid.width = windowedModes[modeNum].w;
-		vid.height = windowedModes[modeNum].h;
+		vid.width = windowedModes[modeNum][0];
+		vid.height = windowedModes[modeNum][1];
+		vid.modenum = modeNum;
+	}
+	else if (modeNum == CUSTOMMODENUM && custom_width && custom_height)
+	{
+		// at this point these values are assumed to be okay
+		vid.width = custom_width;
+		vid.height = custom_height;
 		vid.modenum = modeNum;
 	}
 	else
@@ -1810,6 +1645,7 @@ INT32 VID_SetMode(INT32 modeNum)
 	return SDL_TRUE;
 }
 
+
 static SDL_bool Impl_CreateContext(void)
 {
 	// Renderer-specific stuff
@@ -1832,9 +1668,6 @@ static SDL_bool Impl_CreateContext(void)
 			I_Error("Failed to set up GL context: %s\n", SDL_GetError());
 		}
 
-		// be sure to fill the resolution list the moment we have a window
-		I_FillScreenResolutionsList(false);
-
 		return SDL_TRUE;
 	}
 #endif
@@ -1876,9 +1709,6 @@ static SDL_bool Impl_CreateContext(void)
 
 		SDL_RenderSetLogicalSize(renderer, BASEVIDWIDTH, BASEVIDHEIGHT);
 
-		// be sure to fill the resolution list the moment we have a window
-		I_FillScreenResolutionsList(false);
-
 		return SDL_TRUE;
 	}
 
@@ -2116,6 +1946,8 @@ void I_StartupGraphics(void)
 	usesdl2soft = M_CheckParm("-softblit");
 	borderlesswindow = M_CheckParm("-borderless");
 
+	VID_Command_ModeList_f();
+
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
 	{
@@ -2139,9 +1971,6 @@ void I_StartupGraphics(void)
 	vid.height = BASEVIDHEIGHT; // BitsPerPixel is the SDL interface's
 	vid.recalc = true; // Set up the console stufff
 
-	// be sure to print AFTER window creation
-	VID_Command_ModeList_f();
-
 #ifdef HAVE_TTF
 	I_ShutdownTTF();
 #endif

src/sdl/ogl_sdl.c

@@ -137,13 +137,13 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 
 		GL_DBG_Printf("OpenGL %s\n", gl_version);
 		GL_DBG_Printf("GPU: %s\n", gl_renderer);
-		GL_DBG_Printf("Extensions:");
+		GL_DBG_Printf("Extensions: \n");
 
 		{
 			// Need to do it with strtok for same reason its done like that in gr_glinfo command
 
 			char *copy = strdup((const char*)gl_extensions);
-			char *ext = strtok(copy, " ");
+			char *ext;
 
 			if (copy == NULL)
 			{
@@ -151,9 +151,11 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 			}
 			else
 			{
+				ext = strtok(copy, " ");
+
 				do
 				{
-					GL_DBG_Printf(" %s", ext);
+					GL_DBG_Printf(" - %s\n", ext);
 				} while ((ext = strtok(NULL, " ")) != NULL);
 
 				free(copy);
@@ -238,7 +240,18 @@ void OglSdlFinishUpdate(SDL_Window *window)
 	}
 #endif
 
-	HWR_DrawScreenFinalTexture(sdlw, sdlh, HWR_ShouldUsePaletteRendering());
+	if (HWR_ShouldUsePaletteRendering())
+	{
+		// Final postprocess step of palette rendering, after everything else has been drawn.
+		GL_SetShader(HWR_GetShaderFromTarget(SHADER_PALETTE_POSTPROCESS));
+		GL_EnableShader();
+		HWR_DrawScreenFinalTexture(sdlw, sdlh);
+		GL_UnSetShader();
+	}
+	else
+	{
+		HWR_DrawScreenFinalTexture(sdlw, sdlh);
+	}
 
 #ifdef USE_FBO_OGL
 	if (usefbo)
@@ -259,7 +272,7 @@ void OglSdlFinishUpdate(SDL_Window *window)
 #else
 	if (!I_CheckNativeRes() || WipeInAction)
 #endif
-		HWR_DrawScreenFinalTexture(realwidth, realheight, false);
+		HWR_DrawScreenFinalTexture(realwidth, realheight);
 }
 
 #endif //HWRENDER

src/verstable.h

@@ -462,6 +462,8 @@ License (MIT):
 #include <stdbool.h>
 #include <string.h>
 
+#include "fastcmp.h"
+
 // Two-way concatenation macro.
 #define VT_CAT_( a, b ) a##b
 #define VT_CAT( a, b ) VT_CAT_( a, b )
@@ -705,7 +707,12 @@ static inline FORCE_INLINE bool vt_cmpr_integer( uint64_t key_1, uint64_t key_2
 
 static inline FORCE_INLINE bool vt_cmpr_string( const char *key_1, const char *key_2 )
 {
-  return strcmp( key_1, key_2 ) == 0;
+  return fastcmp( key_1, key_2 );
+}
+
+static inline FORCE_INLINE bool vt_cmpr_casestring( const char *key_1, const char *key_2 )
+{
+  return fasticmp( key_1, key_2 );
 }
 
 // Default allocation and free functions.

src/w_wad.c

@@ -128,7 +128,7 @@ wadfile_t *wadfiles[MAX_WADFILES] = {}; // 0 to numwadfiles-1 are valid
 // If not done on a Mac then open wad files
 // can prevent removable media they are on from
 // being ejected
-void W_Shutdown(void)
+DESTRUCTOR static void W_Shutdown(void)
 {
 	lumpnum_map_cleanup(&lumpnumcache);
 

src/w_wad.h

@@ -154,8 +154,6 @@ extern wadfile_t *wadfiles[MAX_WADFILES];
 
 // =========================================================================
 
-void W_Shutdown(void);
-
 // Opens a WAD file. Returns the FILE * handle for the file, or NULL if not found or could not be opened
 FILE *W_OpenWadFile(const char **filename, boolean useerrors);
 // Load and add a wadfile to the active wad files, returns numbers of lumps, INT16_MAX on error

src/y_inter.c

@@ -330,7 +330,7 @@ static void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 x, INT32 hilicol)
 			V_DrawCenteredString(x+6, y, 0, va("%d", standings->pos[i]));
 
 			// localskins are amazing
-			if (standings->color[i] != SKINCOLOR_NONE)
+			if (*standings->color[i] != SKINCOLOR_NONE)
 			{
 				UINT8 *colormap = R_GetTranslationColormap(*standings->character[i], *standings->color[i], GTC_CACHE);
 				INT32 skinnum = (player->localskin ? (player->localskin - 1) : *standings->character[i]);
@@ -433,6 +433,7 @@ void Y_IntermissionDrawer(void)
 		return;
 
 	if (cv_betainterscreen.value == 1
+	|| !intermissionbginit
 #ifdef HWRENDER
 	|| (rendermode == render_opengl && cv_glscreentextures.value != 2) // use the neato kart bg for intermission on disabled screen textures
 #endif
@@ -794,6 +795,7 @@ void Y_EndIntermission(void)
 	endtic = -1;
 	sorttic = -1;
 	intertype = int_none;
+	intermissionbginit = false; // not sure if this is the right place to reset, but i guess it works for now....
 }
 
 //