z_zone: add asserts if zone memory functions are called from non main thread

also taken from srb2classic thanks!
refactor i_thread stuff
2026-02-02 18:14:38 +01:00 · 2026-02-02 18:14:35 +01:00
184 changed files with 10701 additions and 13365 deletions
@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.5)

-# needed for lto to work for some reason
-cmake_policy(SET CMP0069 NEW)
-
 if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
 	message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
 endif()
@@ -34,7 +31,7 @@ if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
 endif()

 set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart Saturn" CACHE STRING "Program name for display purposes")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart" CACHE STRING "Program name for display purposes")
 set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
 #set(CPACK_PACKAGE_DESCRIPTION_FILE )
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
@@ -191,6 +191,7 @@ set(SRB2_CORE_GAME_SOURCES
 	k_kart.c
 	k_stats.c
 	i_time.c
+	i_threads.c

 	p_local.h
 	p_maputl.h
@@ -518,7 +519,7 @@ if(${SRB2_CONFIG_HWRENDER})
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_bsp.c
-		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.cpp
@@ -93,8 +93,7 @@
 # NOLDWARNING=1 - ?
 # NOSDLMAIN=1 - ?
 # SDLMAIN=1 - ?
-# NOLTO=1 - Disable link time optimizations
-# USEJEMALLOC=1 Enable building with jemalloc Allocator to replace GLibc malloc, might improve performance
+# USELTO=1 - Enable building with LTO.
 #
 # Library configuration flags:
 # Everything here is an override.
@@ -261,7 +260,7 @@ debug_opts=-D_DEBUG
 else # build a normal optimized version
 debug_opts=-DNDEBUG
 opts+=-O3
-ifndef NOLTO
+ifdef USELTO
 # compile with LTO
 opts+=-flto=auto
 libs+=-flto=auto
@@ -270,20 +269,16 @@ endif

 ifdef USEASAN
 # compile with asan
-opts+=-O1 -fsanitize=address -fno-omit-frame-pointer -fno-common
+opts+=-fsanitize=address
 libs+=-fsanitize=address
 endif

 ifdef USEUBSAN
-# compile with ubsan
-opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
+# compile with asan
+opts+=-fsanitize=undefined
 libs+=-fsanitize=undefined
 endif

-ifdef USEJEMALLOC
-libs+=-ljemalloc
-endif
-
 ifneq (,$(filter $(CC) $(CXX),clang clang++))
 libs+=-fuse-ld=lld
 endif
@@ -300,7 +295,6 @@ opts+=$(debug_opts)

 opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))

-CWFLAGS+=-std=gnu17
 CXXFLAGS+=-std=c++17 # force c17 for c++ since most vpss run older ubuntu versions with old compilers

 opts+=$(WFLAGS) $(CFLAGS)
@@ -8,11 +8,6 @@ ifdef MINGW
 libs+=-mconsole
 endif

-ifndef NOTHREADS
-opts+=-DHAVE_THREADS
-sources+=dedicated/i_threads.c
-endif
-
 NOOPENMPT=1
 NOLIBGME=1
 NOHW=1
@@ -64,7 +64,6 @@ 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\
@@ -78,7 +77,7 @@ gcc_versions:=\
 	55 54 53 52 51 50\
 	49 48 47 46 45 44 43 42 41 40

-latest_gcc_version:=16.1
+latest_gcc_version:=15.2

 # Automatically set version flag, but not if one was
 # manually set. And don't bother if this is a clean only
@@ -8,7 +8,6 @@ passthru_opts+=\
 	HAVE_MINIUPNPC\
 	HAVE_DISCORDRPC DEVELOP\
 	NOHOLEPUNCH\
-	HAVE_IPV6\

 # build with debugging information
 ifdef DEBUGMODE
@@ -28,6 +27,11 @@ endif
 sources+=$(call List,hardware/Sourcefile)
 endif

+ifndef NOTHREADS
+opts+=-DHAVE_THREADS
+sources+=i_threads.c
+endif
+
 ifndef NOMD5
 sources+=md5.c
 endif
@@ -42,6 +42,8 @@ include Makefile.d/haiku.mk
 else ifdef SOLARIS # FIXME: UNTESTED
 UNIX=1
 platform=solaris
+else ifdef CYGWIN32 # FIXME: UNTESTED
+platform=cygwin
 else ifdef MINGW
 ifdef MINGW64
 NONX86=1
@@ -15,6 +15,16 @@ sources+=$(call List,sdl/Sourcefile)

 NOUPNP=1

+# FIXME: UNTESTED
+#ifdef PANDORA
+#include sdl/SRB2Pandora/Makefile.cfg
+#endif #ifdef PANDORA
+
+# FIXME: UNTESTED
+#ifdef CYGWIN32
+#include sdl/MakeCYG.cfg
+#endif #ifdef CYGWIN32
+
 ifndef NOHW
 sources+=sdl/ogl_sdl.c
 endif
@@ -30,11 +40,6 @@ sources+=sdl/mixer_sound.c
  endif
 endif

-ifndef NOTHREADS
-opts+=-DHAVE_THREADS
-sources+=sdl/i_threads.c
-endif
-
 ifdef SDL_PKGCONFIG
 $(eval $(call Use_pkg_config,SDL))
 else
@@ -20,8 +20,7 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\
 CXXFLAGS+= -Wno-aggregate-return

 # -W -Wno-unused
-WFLAGS:=-Wall -Wnull-dereference
-#WFLAGS+=-Wno-trigraphs
+WFLAGS:=-Wall -Wno-trigraphs -Wnull-dereference
 ifdef GCC152
 WFLAGS+=-Wzero-as-null-pointer-constant
 endif
@@ -32,7 +31,7 @@ ifndef RELAXWARNINGS
 WFLAGS+=-W
 #WFLAGS+=-Wno-sign-compare
 ifndef GCC295
-# WFLAGS+=-Wno-div-by-zero
+ WFLAGS+=-Wno-div-by-zero
 endif
 #WFLAGS+=-Wsystem-headers
 WFLAGS+=-Wfloat-equal
@@ -63,7 +62,7 @@ endif
 endif
 WFLAGS+=-Wsign-compare
 ifdef GCC91
-# WFLAGS+=-Wno-error=address-of-packed-member
+ WFLAGS+=-Wno-error=address-of-packed-member
 endif
 ifdef GCC45
 WFLAGS+=-Wlogical-op
@@ -106,14 +105,14 @@ endif
 endif
 WFLAGS+=-Wformat-y2k
 ifdef GCC71
-#WFLAGS+=-Wno-error=format-overflow=2
+WFLAGS+=-Wno-error=format-overflow=2
 endif
 WFLAGS+=-Wformat-security
 ifndef GCC29
 #WFLAGS+=-Winit-self
 endif
 ifdef GCC46
-#WFLAGS+=-Wno-suggest-attribute=noreturn
+WFLAGS+=-Wno-suggest-attribute=noreturn
 endif

 ifdef NOLDWARNING
@@ -131,21 +130,21 @@ ifdef GCC44
 #WFLAGS+=-Wno-error=array-bounds
 endif
 ifdef GCC46
-# WFLAGS+=-Wno-error=suggest-attribute=noreturn
+ WFLAGS+=-Wno-error=suggest-attribute=noreturn
 endif
 ifdef GCC54
-# WFLAGS+=-Wno-logical-op -Wno-error=logical-op
+ WFLAGS+=-Wno-logical-op -Wno-error=logical-op
 endif
 ifdef GCC61
-# WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
+ WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
 endif
 ifdef GCC71
 WFLAGS+=-Wimplicit-fallthrough=4
 endif
 ifdef GCC81
-# WFLAGS+=-Wno-error=format-overflow
-# WFLAGS+=-Wno-format-overflow
-# WFLAGS+=-Wno-error=multistatement-macros
+ WFLAGS+=-Wno-error=format-overflow
+ WFLAGS+=-Wno-format-overflow
+ WFLAGS+=-Wno-error=multistatement-macros
 endif

 ifneq (,$(filter $(CC) $(CXX),clang clang++))
@@ -184,6 +183,6 @@ endif
 # Lua
 ifdef GCC43
 ifndef GCC44
-#WFLAGS+=-Wno-logical-op
+WFLAGS+=-Wno-logical-op
 endif
 endif
@@ -34,8 +34,8 @@ size_t I_GetFreeMem(size_t *total)
  /* return si.freeram; */
  char buf[1024];
  char *memTag;
-  size_t freeKBytes;
-  size_t totalKBytes;
+  UINT32 freeKBytes;
+  UINT32 totalKBytes;
  INT32 n;
  INT32 meminfo_fd = -1;

@@ -46,7 +46,7 @@ size_t I_GetFreeMem(size_t *total)
  if (n < 0)
    {
      // Error
-      *total = 0;
+      *total = 0L;
      return 0;
    }

@@ -54,7 +54,7 @@ size_t I_GetFreeMem(size_t *total)
  if (NULL == (memTag = strstr(buf, MEMTOTAL)))
    {
      // Error
-      *total = 0;
+      *total = 0L;
      return 0;
    }

@@ -64,7 +64,7 @@ size_t I_GetFreeMem(size_t *total)
  if (NULL == (memTag = strstr(buf, MEMFREE)))
    {
      // Error
-      *total = 0;
+      *total = 0L;
      return 0;
    }

@@ -434,7 +434,7 @@ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
 LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
  lua_lock(L);
  luaC_checkGC(L);
-  setsvalue2s(L, L->top, (len == 0) ? luaS_newlstr(L, "", 0) : luaS_newlstr(L, s, len));
+  setsvalue2s(L, L->top, (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len));
  api_incr_top(L);
  lua_unlock(L);
 }
@@ -20,7 +20,6 @@
 #define lauxlib_c
 #define LUA_LIB

-#include "ldebug.h"
 #include "lua.h"

 #include "lauxlib.h"
@@ -469,19 +468,8 @@ LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B) {


 LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
- while (l) {
-    size_t space = bufffree(B);
-    if (space == 0) {
-      luaL_prepbuffer(B);
-      lua_assert(bufffree(B) == LUAL_BUFFERSIZE);
-      space = LUAL_BUFFERSIZE;
-    }
-    if (space > l) space = l;
-    memcpy(B->p, s, space);
-    B->p += space;
-    s += space;
-    l -= space;
-  }
+  while (l--)
+    luaL_addchar(B, *s++);
 }


@@ -698,6 +686,6 @@ static int panic (lua_State *L) {

 LUALIB_API lua_State *luaL_newstate (void) {
  lua_State *L = lua_newstate(l_alloc, NULL);
-  if (l_likely(L)) lua_atpanic(L, &panic);
+  if (L) lua_atpanic(L, &panic);
  return L;
 }
@@ -790,19 +790,18 @@ void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) {
    case OPR_BXOR: codearith(fs, OP_BXOR, e1, e2); break;
    case OPR_BSHL: codearith(fs, OP_BSHL, e1, e2); break;
    case OPR_BSHR: codearith(fs, OP_BSHR, e1, e2); break;
-    case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
-    case OPR_MOD: case OPR_POW: {
-      codearith(fs, op - OPR_ADD + OP_ADD, e1, e2);
-      break;
-    }
-    case OPR_EQ: case OPR_LT: case OPR_LE: {
-      codecomp(fs, op - OPR_EQ + OP_EQ, 1, e1, e2);
-      break;
-    }
-    case OPR_NE: case OPR_GT: case OPR_GE: {
-      codecomp(fs, op - OPR_NE + OP_EQ, 0, e1, e2);
-      break;
-    }
+    case OPR_ADD: codearith(fs, OP_ADD, e1, e2); break;
+    case OPR_SUB: codearith(fs, OP_SUB, e1, e2); break;
+    case OPR_MUL: codearith(fs, OP_MUL, e1, e2); break;
+    case OPR_DIV: codearith(fs, OP_DIV, e1, e2); break;
+    case OPR_MOD: codearith(fs, OP_MOD, e1, e2); break;
+    case OPR_POW: codearith(fs, OP_POW, e1, e2); break;
+    case OPR_EQ: codecomp(fs, OP_EQ, 1, e1, e2); break;
+    case OPR_NE: codecomp(fs, OP_EQ, 0, e1, e2); break;
+    case OPR_LT: codecomp(fs, OP_LT, 1, e1, e2); break;
+    case OPR_LE: codecomp(fs, OP_LE, 1, e1, e2); break;
+    case OPR_GT: codecomp(fs, OP_LT, 0, e1, e2); break;
+    case OPR_GE: codecomp(fs, OP_LE, 0, e1, e2); break;
    default: lua_assert(0);
  }
 }
@@ -21,13 +21,13 @@


 /*
-** grep "ORDER OPR" if you change these enums  (ORDER OP)
+** grep "ORDER OPR" if you change these enums
 */
 typedef enum BinOpr {
  OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
  OPR_CONCAT,
-  OPR_EQ, OPR_LT, OPR_LE,
-  OPR_NE, OPR_GT, OPR_GE,
+  OPR_NE, OPR_EQ,
+  OPR_LT, OPR_LE, OPR_GT, OPR_GE,
  OPR_AND, OPR_OR,
  OPR_BAND, OPR_BOR, OPR_BXOR,
  OPR_BSHL, OPR_BSHR,
@@ -542,39 +542,16 @@ static const char *getobjname (lua_State *L, CallInfo *ci, int stackpos,


 static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
-  TMS tm = 0;
  Instruction i;
  if ((isLua(ci) && ci->tailcalls > 0) || !isLua(ci - 1))
    return NULL;  /* calling function is not Lua (or is unknown) */
  ci--;  /* calling function */
  i = ci_func(ci)->l.p->code[currentpc(L, ci)];
-  switch (GET_OPCODE(i)) {
-    case OP_CALL:
-    case OP_TAILCALL:
-    case OP_TFORLOOP:
-      return getobjname(L, ci, GETARG_A(i), name);
-    case OP_GETGLOBAL:
-    case OP_SELF:
-    case OP_GETTABLE: tm = TM_INDEX; break;
-    case OP_SETGLOBAL:
-    case OP_SETTABLE: tm = TM_NEWINDEX; break;
-    case OP_EQ: tm = TM_EQ; break;
-    case OP_ADD: tm = TM_ADD; break;
-    case OP_SUB: tm = TM_SUB; break;
-    case OP_MUL: tm = TM_MUL; break;
-    case OP_DIV: tm = TM_DIV; break;
-    case OP_MOD: tm = TM_MOD; break;
-    case OP_POW: tm = TM_POW; break;
-    case OP_UNM: tm = TM_UNM; break;
-    case OP_LEN: tm = TM_LEN; break;
-    case OP_LT: tm = TM_LT; break;
-    case OP_LE: tm = TM_LE; break;
-    case OP_CONCAT: tm = TM_CONCAT; break;
-    default:
-      return NULL;  /* else no useful name can be found */
-  }
-  *name = getstr(G(L)->tmname[tm]);
-  return "metamethod";
+  if (GET_OPCODE(i) == OP_CALL || GET_OPCODE(i) == OP_TAILCALL ||
+      GET_OPCODE(i) == OP_TFORLOOP)
+    return getobjname(L, ci, GETARG_A(i), name);
+  else
+    return NULL;  /* no useful name can be found */
 }


@@ -164,7 +164,7 @@ void luaD_reallocCI (lua_State *L, int newsize) {


 void luaD_growstack (lua_State *L, int n) {
-  if (n <= L->stacksize)  /* double size is enough? */
+  if (l_likely(n <= L->stacksize))  /* double size is enough? */
    luaD_reallocstack(L, 2*L->stacksize);
  else
    luaD_reallocstack(L, L->stacksize + n);
@@ -318,7 +318,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
    ci->top = L->top + LUA_MINSTACK;
    lua_assert(ci->top <= L->stack_last);
    ci->nresults = nresults;
-    if (l_unlikely(L->hookmask & LUA_MASKCALL))
+    if (L->hookmask & LUA_MASKCALL)
      luaD_callhook(L, LUA_HOOKCALL, -1);
    lua_unlock(L);
    n = (*curr_func(L)->c.f)(L);  /* do the actual call */
@@ -356,21 +356,20 @@ static int read_line (lua_State *L, FILE *f) {


 static int read_chars (lua_State *L, FILE *f, size_t n) {
-  size_t tbr = n;  /* number of chars to be read */
-  size_t rlen;  /* how much to read in each cycle */
-  size_t nr;  /* number of chars actually read in each cycle */
+  size_t rlen;  /* how much to read */
+  size_t nr;  /* number of chars actually read */
  luaL_Buffer b;
  luaL_buffinit(L, &b);
  rlen = LUAL_BUFFERSIZE;  /* try to read that much each time */
  do {
    char *p = luaL_prepbuffer(&b);
-    if (rlen > tbr) rlen = tbr;  /* cannot read more than asked */
+    if (rlen > n) rlen = n;  /* cannot read more than asked */
    nr = fread(p, sizeof(char), rlen, f);
    luaL_addsize(&b, nr);
-    tbr -= nr;  /* still have to read 'tbr' chars */
-  } while (tbr > 0 && nr == rlen);  /* until end of count or eof */
+    n -= nr;  /* still have to read `n' chars */
+  } while (n > 0 && nr == rlen);  /* until end of count or eof */
  luaL_pushresult(&b);  /* close buffer */
-  return (tbr == 0 || tbr < n);  /* true iff read something */
+  return (n == 0 || lua_objlen(L, -1) > 0);
 }


@@ -433,13 +432,13 @@ static int f_read (lua_State *L) {

 static int io_readline (lua_State *L) {
  FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(1));
-  int success;
+  int sucess;
  if (f == NULL)  /* file is already closed? */
    luaL_error(L, "file is already closed");
-  success = read_line(L, f);
+  sucess = read_line(L, f);
  if (ferror(f))
    return luaL_error(L, "%s", strerror(errno));
-  if (success) return 1;
+  if (sucess) return 1;
  else {  /* EOF */
    if (lua_toboolean(L, lua_upvalueindex(2))) {  /* generator created file? */
      lua_settop(L, 0);
@@ -881,10 +881,10 @@ static const struct {
  lu_byte right; /* right priority */
 } priority[] = {  /* ORDER OPR */
   {6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7},  /* `+' `-' `/' `%' */
-   {10, 9}, {5, 4},                 /* ^, .. (right associative) */
-   {3, 3}, {3, 3}, {3, 3},          /* ==, <, <= */
-   {3, 3}, {3, 3}, {3, 3},          /* ~=, >, >= */
-   {2, 2}, {1, 1}                   /* and, or */
+   {10, 9}, {5, 4},                 /* power and concat (right associative) */
+   {3, 3}, {3, 3},                  /* equality and inequality */
+   {3, 3}, {3, 3}, {3, 3}, {3, 3},  /* order */
+   {2, 2}, {1, 1}                   /* logical (and/or) */
   ,{6, 6}, {6, 6}, {6, 6},           /* bit-wise (band/bor/bxor) */
   {7, 7}, {7, 7}		    /* shl/shr */
 };
@@ -51,7 +51,7 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
                                       unsigned int h) {
  TString *ts;
  stringtable *tb;
-  if (l_unlikely(l+1 > (MAX_SIZET - sizeof(TString))/sizeof(char)))
+  if (l+1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
    luaM_toobig(L);
  ts = cast(TString *, luaM_malloc(L, (l+1)*sizeof(char)+sizeof(TString)));
  ts->tsv.len = l;
@@ -72,72 +72,18 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
 }


-// string hash taken from luaJIT
-
-/* Unaligned load of uint32_t. */
-static inline __attribute__((always_inline)) uint32_t getu32(const void* ptr)
-{
-  uint32_t result;
-  memcpy(&result, ptr, 4);
-  return result;
-}
-
-// smol macro to look a little less messy lul
-#define getu8(p) *cast(const uint8_t *, p)
-
-/* Keyed sparse ARX string hash. Constant time. */
-static unsigned hash_sparse(const char *str, size_t len)
-{
-  /* Constants taken from lookup3 hash by Bob Jenkins. */
-  unsigned int a, b, h = cast(unsigned int, len);
-#define rol(x, n) (((x)<<(n)) | ((x)>>(-cast(int, n)&(8*sizeof(x)-1))))
-  if (len >= 4) {  /* Caveat: unaligned access! */
-    a  = getu32(str);
-    h ^= getu32(str+len-4);
-    b  = getu32(str+(len>>1)-2);
-    h ^= b; h -= rol(b, 14);
-    b += getu32(str+(len>>2)-1);
-  } else if (len > 0) {
-    a  = getu8(str);
-    h ^= getu8(str+len-1);
-    b  = getu8(str+(len>>1));
-    h ^= b; h -= rol(b, 14);
-  } else {
-    return 0;
-  }
-  a ^= h; a -= rol(h, 11);
-  b ^= a; b -= rol(a, 25);
-  h ^= b; h -= rol(b, 16);
-#undef rol
-  return h;
-}
-
-#undef getu8
-
-
-static inline __attribute__((always_inline)) unsigned luaS_hash (const char *str, size_t l) {
-#if 0
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
+  GCObject *o;
  unsigned int h = cast(unsigned int, l);  /* seed */
  size_t step = (l>>5)+1;  /* if string is too long, don't hash all its chars */
  size_t l1;
  for (l1=l; l1>=step; l1-=step)  /* compute hash */
    h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1]));
-  return h;
-#else
-  return hash_sparse(str, l);
-#endif
-}
-
-TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
-  GCObject *o;
-  unsigned int h = luaS_hash(str, l);
  for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
       o != NULL;
       o = o->gch.next) {
    TString *ts = rawgco2ts(o);
-    if (ts->tsv.hash == h &&
-        ts->tsv.len == l &&
-       (memcmp(str, getstr(ts), l) == 0)) {
+    if (l_unlikely(ts->tsv.len == l && (memcmp(str, getstr(ts), l) == 0))) {
      /* string may be dead */
      if (isdead(G(L), o)) changewhite(o);
      return ts;
@@ -81,7 +81,6 @@ 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;
@@ -91,12 +90,6 @@ 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



@@ -28,7 +28,7 @@



-/* limit for table tag-method chains (to avoid infinite loops) */
+/* limit for table tag-method chains (to avoid loops) */
 #define MAXTAGLOOP	100


@@ -366,7 +366,6 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,


 #define arith_op(op,tm) { \
-        StkId ra = RA(i); \
        TValue *rb = RKB(i); \
        TValue *rc = RKC(i); \
        if (ttisnumber(rb) && ttisnumber(rc)) { \
@@ -393,6 +392,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
  /* main loop of interpreter */
  for (;;) {
    const Instruction i = *pc++;
+    StkId ra;
    if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
        (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
      traceexec(L, pc);
@@ -402,28 +402,26 @@ void luaV_execute (lua_State *L, int nexeccalls) {
      }
      base = L->base;
    }
+    /* warning!! several calls may realloc the stack and invalidate `ra' */
+    ra = RA(i);
    lua_assert(base == L->base && L->base == L->ci->base);
    lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
    lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
    switch (GET_OPCODE(i)) {
      case OP_MOVE: {
-        StkId ra = RA(i);
        setobjs2s(L, ra, RB(i));
        continue;
      }
      case OP_LOADK: {
-        StkId ra = RA(i);
        setobj2s(L, ra, KBx(i));
        continue;
      }
      case OP_LOADBOOL: {
-        StkId ra = RA(i);
        setbvalue(ra, GETARG_B(i));
        if (GETARG_C(i)) pc++;  /* skip next instruction (if C) */
        continue;
      }
      case OP_LOADNIL: {
-        StkId ra = RA(i);
        TValue *rb = RB(i);
        do {
          setnilvalue(rb--);
@@ -431,13 +429,11 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_GETUPVAL: {
-        StkId ra = RA(i);
        int b = GETARG_B(i);
        setobj2s(L, ra, cl->upvals[b]->v);
        continue;
      }
      case OP_GETGLOBAL: {
-        StkId ra = RA(i);
        TValue g;
        TValue *rb = KBx(i);
        sethvalue(L, &g, cl->env);
@@ -446,14 +442,10 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_GETTABLE: {
-        StkId ra = RA(i);
-        StkId rb = RB(i);
-        TValue *rc = RKC(i);
-        Protect(luaV_gettable(L, rb, rc, ra));
+        Protect(luaV_gettable(L, RB(i), RKC(i), ra));
        continue;
      }
      case OP_SETGLOBAL: {
-        StkId ra = RA(i);
        TValue g;
        sethvalue(L, &g, cl->env);
        lua_assert(ttisstring(KBx(i)));
@@ -461,21 +453,16 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_SETUPVAL: {
-        StkId ra = RA(i);
        UpVal *uv = cl->upvals[GETARG_B(i)];
        setobj(L, uv->v, ra);
        luaC_barrier(L, uv, ra);
        continue;
      }
      case OP_SETTABLE: {
-        StkId ra = RA(i);
-        TValue *rb = RKB(i);
-        TValue *rc = RKC(i);
-        Protect(luaV_settable(L, ra, rb, rc));
+        Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
        continue;
      }
      case OP_NEWTABLE: {
-        StkId ra = RA(i);
        int b = GETARG_B(i);
        int c = GETARG_C(i);
        sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
@@ -483,7 +470,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_SELF: {
-        StkId ra = RA(i);
        StkId rb = RB(i);
        setobjs2s(L, ra+1, rb);
        Protect(luaV_gettable(L, rb, RKC(i), ra));
@@ -502,7 +488,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_DIV: {
-        StkId ra = RA(i);
        TValue *rb = RKB(i);
        TValue *rc = RKC(i);
        if (ttisnumber(rb) && ttisnumber(rc)) {
@@ -518,7 +503,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_MOD: {
-        StkId ra = RA(i);
        TValue *rb = RKB(i);
        TValue *rc = RKC(i);
        if (ttisnumber(rb) && ttisnumber(rc)) {
@@ -538,27 +522,26 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_BAND: {
-        arith_op(luai_numand, TM_AND);
-        continue;
+	arith_op(luai_numand, TM_AND);
+	continue;
      }
      case OP_BOR: {
-        arith_op(luai_numor, TM_OR);
-        continue;
+	arith_op(luai_numor, TM_OR);
+	continue;
      }
      case OP_BXOR: {
-        arith_op(luai_numxor, TM_XOR);
-        continue;
+	arith_op(luai_numxor, TM_XOR);
+	continue;
      }
      case OP_BSHL: {
-        arith_op(luai_numshl, TM_SHL);
-        continue;
+	arith_op(luai_numshl, TM_SHL);
+	continue;
      }
      case OP_BSHR: {
-        arith_op(luai_numshr, TM_SHR);
-        continue;
+	arith_op(luai_numshr, TM_SHR);
+	continue;
      }
      case OP_BNOT: {
-        StkId ra = RA(i);
        TValue *rb = RB(i);
        if (ttisnumber(rb)) {
          lua_Number nb = nvalue(rb);
@@ -570,7 +553,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_UNM: {
-        StkId ra = RA(i);
        TValue *rb = RB(i);
        if (ttisnumber(rb)) {
          lua_Number nb = nvalue(rb);
@@ -582,13 +564,11 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_NOT: {
-        StkId ra = RA(i);
        int res = l_isfalse(RB(i));  /* next assignment may change this value */
        setbvalue(ra, res);
        continue;
      }
      case OP_LEN: {
-        StkId ra = RA(i);
        TValue *rb = RB(i);
        switch (ttype(rb)) {
          case LUA_TTABLE: {
@@ -646,14 +626,12 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_TEST: {
-        StkId ra = RA(i);
        if (l_isfalse(ra) != GETARG_C(i))
          dojump(L, pc, GETARG_sBx(*pc));
        pc++;
        continue;
      }
      case OP_TESTSET: {
-        StkId ra = RA(i);
        TValue *rb = RB(i);
        if (l_isfalse(rb) != GETARG_C(i)) {
          setobjs2s(L, ra, rb);
@@ -663,7 +641,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_CALL: {
-        StkId ra = RA(i);
        int b = GETARG_B(i);
        int nresults = GETARG_C(i) - 1;
        if (b != 0) L->top = ra+b;  /* else previous instruction set top */
@@ -685,7 +662,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        }
      }
      case OP_TAILCALL: {
-        StkId ra = RA(i);
        int b = GETARG_B(i);
        if (b != 0) L->top = ra+b;  /* else previous instruction set top */
        L->savedpc = pc;
@@ -718,7 +694,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        }
      }
      case OP_RETURN: {
-        StkId ra = RA(i);
        int b = GETARG_B(i);
        if (b != 0) L->top = ra+b-1;
        if (L->openupval) luaF_close(L, base);
@@ -734,7 +709,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        }
      }
      case OP_FORLOOP: {
-        StkId ra = RA(i);
        lua_Number step = nvalue(ra+2);
        lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
        lua_Number limit = nvalue(ra+1);
@@ -747,7 +721,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_FORPREP: {
-        StkId ra = RA(i);
        const TValue *init = ra;
        const TValue *plimit = ra+1;
        const TValue *pstep = ra+2;
@@ -764,7 +737,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_TFORLOOP: {
-        StkId ra = RA(i);
        StkId cb = ra + 3;  /* call base */
        setobjs2s(L, cb+2, ra+2);
        setobjs2s(L, cb+1, ra+1);
@@ -781,7 +753,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_SETLIST: {
-        StkId ra = RA(i);
        int n = GETARG_B(i);
        int c = GETARG_C(i);
        int last;
@@ -804,12 +775,10 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_CLOSE: {
-        StkId ra = RA(i);
        luaF_close(L, ra);
        continue;
      }
      case OP_CLOSURE: {
-        StkId ra = RA(i);
        Proto *p;
        Closure *ncl;
        int nup, j;
@@ -830,7 +799,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
        continue;
      }
      case OP_VARARG: {
-        StkId ra = RA(i);
        int b = GETARG_B(i) - 1;
        int j;
        CallInfo *ci = L->ci;
@@ -1165,39 +1165,6 @@ 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   FNV1a_HashLowercaseString
-#define CMPR_FN   vt_cmpr_casestring
-#include "verstable.h"
-
-#define NAME      netvar_map_t
-#define KEY_TY    UINT16
-#define VAL_TY    consvar_t *
-#define HASH_FN   vt_hash_integer
-#define CMPR_FN   vt_cmpr_integer
-#include "verstable.h"
-
-static cvar_map_t cvar_map;
-static netvar_map_t netvar_map;
-
-CONSTRUCTOR static void CV_InitMap(void)
-{
-	// ensure the map is initialized
-	cvar_map_t_init(&cvar_map);
-	cvar_map_t_reserve(&cvar_map, 512);
-
-	netvar_map_t_init(&netvar_map);
-	netvar_map_t_reserve(&netvar_map, 256);
-}
-
-DESTRUCTOR static void CV_DestroyMap(void)
-{
-	cvar_map_t_cleanup(&cvar_map);
-	netvar_map_t_cleanup(&netvar_map);
-}
-
 static const char *cv_null_string = "";

 /** Searches if a variable has been registered.
@@ -1208,17 +1175,11 @@ static const char *cv_null_string = "";
  */
 consvar_t *CV_FindVar(const char *name)
 {
-	cvar_map_t_itr it = cvar_map_t_get(&cvar_map, name);
-	if (!cvar_map_t_is_end(it))
-		return it.data->val;
-
-	// fallback linear search
-	/*
 	consvar_t *cvar;
+
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if (fasticmp(name, cvar->name))
+		if (fasticmp(name,cvar->name))
 			return cvar;
-	*/

 	return NULL;
 }
@@ -1233,7 +1194,7 @@ consvar_t *CV_FindVar(const char *name)
 static inline UINT16 CV_ComputeNetid(const char *s)
 {
 	UINT16 ret = 0, i = 0;
-	static const UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53};
+	static UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53};

 	while (*s)
 	{
@@ -1252,17 +1213,11 @@ static inline UINT16 CV_ComputeNetid(const char *s)
  */
 static consvar_t *CV_FindNetVar(UINT16 netid)
 {
-	netvar_map_t_itr it = netvar_map_t_get(&netvar_map, netid);
-	if (!netvar_map_t_is_end(it))
-		return it.data->val;
-
-	/*
 	consvar_t *cvar;

 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
 		if (cvar->netid == netid)
 			return cvar;
-	*/

 	if (netid == 44542) // ouch this hack
 		return &cv_karteliminatelast;
@@ -1328,11 +1283,6 @@ void CV_RegisterVar(consvar_t *variable)

 	// the SetValue will set this bit
 	variable->flags &= ~CV_MODIFIED;
-
-	cvar_map_t_insert(&cvar_map, variable->name, variable);
-
-	if (variable->flags & CV_NETVAR)
-		netvar_map_t_insert(&netvar_map, variable->netid, variable);
 }

 /** Finds the string value of a console variable.
@@ -1638,21 +1588,9 @@ size_t CV_LoadNetVars(const UINT8 *bufstart)
 	// prevent "invalid command received"
 	serverloading = true;

-	// we can use our netvar map instead of going through all cvars each time
-	netvar_map_t_itr it;
-	for (it = netvar_map_t_first(&netvar_map);
-		 !netvar_map_t_is_end(it);
-		 it = netvar_map_t_next(it))
-	{
-		cvar = it.data->val;
-		Setvalue(cvar, cvar->defaultvalue, true);
-	}
-
-	/*
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
 		if (cvar->flags & CV_NETVAR)
 			Setvalue(cvar, cvar->defaultvalue, true);
-	*/

 	count = READUINT16(p);
 	while (count--)
@@ -1855,7 +1793,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 					if (newvalue == oldvalue)
 						break; // don't loop forever if there's none of a certain gametype

-					if (newvalue >= 0 && newvalue < NUMMAPS && !mapheaderinfo[newvalue])
+					if (newvalue >= 0 && !mapheaderinfo[newvalue])
 						continue; // Don't allocate the header.  That just makes memory usage skyrocket.

 				} while (!M_CanShowLevelInList(newvalue, gt));
@@ -44,25 +44,25 @@
 #define MAXHUDLINES 20

 #ifdef HAVE_THREADS
-I_mutex con_mutex;
+I_Mutex con_mutex;

-// I_In_Exiting_Signal_Handler is an evil hack
+// g_in_exiting_signal_handler is an evil hack
 // to avoid infinite SIGABRT recursion in the signal handler
 // due to poisoned locks or mach-o kernel not supporting locks in signals
 // or something like that. idk
-#  define Lock_state()    if (!I_In_Exiting_Signal_Handler()) { I_lock_mutex(&con_mutex); }
-#  define Unlock_state()  if (!I_In_Exiting_Signal_Handler()) { I_unlock_mutex(con_mutex); }
-#else /*HAVE_THREADS*/
+#  define Lock_state()    if (!g_in_exiting_signal_handler) { I_LockMutex(&con_mutex); }
+#  define Unlock_state()  if (!g_in_exiting_signal_handler) { I_UnlockMutex(con_mutex); }
+#else/*HAVE_THREADS*/
 #  define Lock_state()
 #  define Unlock_state()
-#endif /*HAVE_THREADS*/
+#endif/*HAVE_THREADS*/

 static boolean con_started = false; // console has been initialised
       boolean con_startup = false; // true at game startup, screen need refreshing
 static boolean con_forcepic = true; // at startup toggle console translucency when first off
       boolean con_recalc = false;  // set true when screen size has changed

-static tic_t con_tick; // console ticker for blinking prompt cursor
+static tic_t con_tick; // console ticker for anim or blinking prompt cursor
                        // con_scrollup should use time (currenttime - lasttime)..

 static boolean consoletoggle; // true when console key pushed, ticker will handle
@@ -103,7 +103,6 @@ static void CON_InputInit(void);
 static void CON_RecalcSize(void);
 static void CON_ChangeHeight(void);

-static void CONS_height_Change(void);
 static void CONS_hudlines_Change(void);
 static void CONS_backcolor_Change(void);

@@ -132,7 +131,7 @@ static CV_PossibleValue_t speed_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}};
 static consvar_t cons_speed = {"con_speed", "8", CV_SAVE, speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

 // percentage of screen height to use for console
-static consvar_t cons_height = {"con_height", "50", CV_CALL|CV_SAVE, CV_Unsigned, CONS_height_Change, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cons_height = {"con_height", "50", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};

 static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}};
 // whether to use console background picture, or translucent mode
@@ -174,18 +173,6 @@ consvar_t cons_consoleprintinmenu = {"consoleprintinmenu", "Off", CV_SAVE, CV_On

 static void CON_Print(char *msg);

-// Change the console height on demand
-//
-static void CONS_height_Change(void)
-{
-	Lock_state();
-
-	if (con_destlines > 0 && !con_startup) // If the console is open (as in, not using "bind")...
-		CON_ChangeHeight(); // ...update its height now, not only when it's closed and re-opened
-
-	Unlock_state();
-}
-
 //
 //
 static void CONS_hudlines_Change(void)
@@ -221,6 +208,14 @@ 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)
@@ -638,191 +633,72 @@ 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() || ch >= (INT32)CON_GetShiftSize())
+	if (I_UseNativeKeyboard())
 		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'))
 	{
-		return !!shiftdown != capslock ? CON_Shiftform()[ch] : ch;
+		if (cv_keyboardlayout.value == 3)
+		{
+			if (shiftdown ^ capslock)
+				ch = shiftxform[ch];
+			else if (altdown & 0x2)
+				ch = french_altgrxform[ch];
+			else
+				ch = HU_FallBackFrSpecialLetter(ch);
+		}
+		else
+		{
+			if (shiftdown ^ capslock)
+				ch = shiftxform[ch];
+		}
 	}
-
-	// if we're holding shift we should still shift non letter symbols
-	if (shiftdown)
+	else	// if we're holding shift we should still shift non letter symbols
 	{
-		return CON_Shiftform()[ch];
-	}
-
-	// AZERTY
-	if (cv_keyboardlayout.value == 3)
-	{
-		if (altdown & 0x2)
-			return french_altgrxform[ch];
-
-		return CON_FallBackFrSpecialLetter(ch);
+		if (cv_keyboardlayout.value == 3)
+		{
+			if (shiftdown)
+				ch = shiftxform[ch];
+			else if (altdown & 0x2)
+				ch = french_altgrxform[ch];
+			else
+				ch = HU_FallBackFrSpecialLetter(ch);
+		}
+		else
+		{
+			if (shiftdown)
+				ch = shiftxform[ch];
+		}
 	}

 	return ch;
 }

+INT32 CON_ShitAndAltGrChar(INT32 ch)
+{
+	if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
+	{
+		if (shiftdown ^ capslock)
+			ch = shiftxform[ch];
+	}
+	else	// if we're holding shift we should still shift non letter symbols
+	{
+		if (shiftdown)
+			ch = shiftxform[ch];
+		else if (altdown & 0x2)
+		{
+			ch = french_altgrxform[ch];
+		}
+		else
+		{
+			ch = HU_FallBackFrSpecialLetter(ch);
+		}
+	}
+
+	return ch;
+}

 // Clear time of console heads up messages
 //
@@ -1016,7 +892,7 @@ boolean CON_Responder(event_t *ev)
 		return true;

 	// ctrl modifier -- changes behavior, adds shortcuts
-	if (ctrldown && (cv_keyboardlayout.value != 3 || !altdown))
+	if ((cv_keyboardlayout.value != 3 && ctrldown) || (cv_keyboardlayout.value == 3 && ctrldown && !altdown))
 	{
 		// show all cvars/commands that match what we have inputted
 		if (key == KEY_TAB)
@@ -1346,10 +1222,19 @@ void CON_LogMessage(const char *msg)
 // Console print! Wahooo! Lots o fun!
 //

-static inline void CONS_PrintMsg(char *txt)
+void CONS_Printf(const char *fmt, ...)
 {
+	va_list argptr;
+	static char *txt = NULL;
 	boolean startup;

+	if (txt == NULL)
+		txt = malloc(8192);
+
+	va_start(argptr, fmt);
+	vsnprintf(txt, 8192, fmt, argptr);
+	va_end(argptr);
+
 	// echo console prints to log file
 	DEBFILE(txt);

@@ -1375,21 +1260,6 @@ static inline void CONS_PrintMsg(char *txt)
 	}
 }

-void CONS_Printf(const char *fmt, ...)
-{
-	va_list argptr;
-	static char *txt = NULL;
-
-	if (txt == NULL)
-		txt = malloc(8192);
-
-	va_start(argptr, fmt);
-	vsnprintf(txt, 8192, fmt, argptr);
-	va_end(argptr);
-
-	CONS_PrintMsg(txt);
-}
-
 void CONS_Alert(alerttype_t level, const char *fmt, ...)
 {
 	va_list argptr;
@@ -1418,7 +1288,9 @@ void CONS_Alert(alerttype_t level, const char *fmt, ...)
 			break;
 	}

-	CONS_PrintMsg(txt);
+	// I am lazy and I feel like just letting CONS_Printf take care of things.
+	// Is that okay?
+	CONS_Printf("%s", txt);
 }

 void CONS_Debug(INT32 debugflags, const char *fmt, ...)
@@ -1436,9 +1308,11 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...)
 	vsnprintf(txt, 8192, fmt, argptr);
 	va_end(argptr);

-	CONS_PrintMsg(txt);
+	// Again I am lazy, oh well
+	CONS_Printf("%s", txt);
 }

+
 // Print an error message, and wait for ENTER key to continue.
 // To make sure the user has seen the message
 //
@@ -1450,8 +1324,6 @@ void CONS_Error(const char *msg)
 	// dirty quick hack, but for the good cause
 	while (I_GetKey() != KEY_ENTER)
 	{
-		I_HandleInterrupt();
-
 		// Sleep so we don't take too much of cpu usage
 		I_Sleep(1.f/TICRATE*1000);

@@ -1650,54 +1522,53 @@ static void CON_DrawConsole(void)
 	}

 	// draw console text lines from top to bottom
-	if (con_curlines >= minheight)
+	if (con_curlines < minheight)
+		return;
+
+	i = con_cy - con_scrollup;
+
+	// skip the last empty line due to the cursor being at the start of a new line
+	i--;
+
+	i -= (con_curlines - minheight) / charheight;
+
+	if (rendermode == render_none) return;
+
+	for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
 	{
-		i = con_cy - con_scrollup;
+		INT32 x;
+		size_t c;

-		// skip the last empty line due to the cursor being at the start of a new line
-		i--;
+		p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width];

-		i -= (con_curlines - minheight) / charheight;
-
-		if (rendermode == render_none)
-			return;
-
-		for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
+		for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
 		{
-			INT32 x;
-			size_t c;
-
-			p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width];
-
-			for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
+			while (*p & 0x80)
 			{
-				while (*p & 0x80)
-				{
-					charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
-					p++;
-					c++;
-				}
-
-				if (c >= con_width)
-					break;
-
-				int emotelen;
-				emote_t *emote;
-
-				if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
-				{
-					M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
-					p += emotelen-1;
-					c += emotelen-1;
-					continue;
-				}
-				V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+				charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
+				p++;
+				c++;
 			}
+
+			if (c >= con_width)
+				break;
+
+			int emotelen;
+			emote_t *emote;
+
+			if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
+			{
+				M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
+				p += emotelen-1;
+				c += emotelen-1;
+				continue;
+			}
+			V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 		}
 	}

 	// draw prompt if enough place (not while game startup)
-	if ((con_curlines >= (minheight-charheight)) && !con_startup)
+	if ((con_curlines == con_destlines) && (con_curlines >= minheight) && !con_startup)
 		CON_DrawInput();
 }

@@ -13,10 +13,6 @@
 #ifndef __CONSOLE__
 #define __CONSOLE__

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "d_event.h"
 #include "command.h"
 #include "i_threads.h"
@@ -26,7 +22,7 @@ void CON_Init(void);
 boolean CON_Responder(event_t *ev);

 #ifdef HAVE_THREADS
-extern I_mutex con_mutex;
+extern I_Mutex con_mutex;
 #endif

 // set true when screen size has changed, to adapt console
@@ -49,6 +45,7 @@ extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *or
 extern UINT8 *consolebgmap;

 INT32 CON_ShiftChar(INT32 ch);
+INT32 CON_ShitAndAltGrChar(INT32 ch);

 void CON_SetupBackColormap(void);
 void CON_ClearHUD(void); // clear heads up messages
@@ -66,8 +63,4 @@ boolean CON_Ready(void);

 void CON_LogMessage(const char *msg);

-#ifdef __cplusplus
-} // extern "C"
-#endif
-
 #endif
@@ -114,7 +114,6 @@ void* PoolAllocator::allocate()

 	FreeBlock* ret = head_;
 	head_ = head_->next;
-	allocated_blocks_++;
 	return ret;
 }

@@ -126,7 +125,6 @@ void PoolAllocator::deallocate(void* p)
 	FreeBlock* block = reinterpret_cast<FreeBlock*>(p);
 	block->next = head_;
 	head_ = block;
-	allocated_blocks_--;
 }

 void PoolAllocator::release()
@@ -146,7 +144,6 @@ void PoolAllocator::release()

 	first_chunk_ = nullptr;
 	head_ = nullptr;
-	allocated_blocks_ = 0;
 }

 static LinearMemory g_frame_memory {4 * 1024 * 1024};
@@ -37,7 +37,6 @@ class PoolAllocator final
 	FreeBlock* head_;
 	size_t block_size_;
 	size_t blocks_;
-	size_t allocated_blocks_;
 	int32_t tag_;

 	ChunkFooter* allocate_chunk();
@@ -48,7 +47,6 @@ public:
 		, head_(nullptr)
 		, block_size_(block_size)
 		, blocks_(blocks)
-		, allocated_blocks_(0)
 		, tag_(tag)
 	{}
 	PoolAllocator(const PoolAllocator&) = delete;
@@ -61,8 +59,6 @@ public:
 	void* allocate();
 	void deallocate(void* p);
 	constexpr size_t block_size() const noexcept { return block_size_; };
-	constexpr size_t allocated_blocks() const noexcept { return allocated_blocks_; };
-	constexpr size_t allocated_bytes() const noexcept { return allocated_blocks_ * block_size_; };

 	void release();
 };
@@ -600,8 +600,6 @@ extern consvar_t cv_discordinvites;

 extern consvar_t cv_serverinfoscreen;

-extern consvar_t cv_serveraddoninfo;
-
 // Used in d_net, the only dependence
 //tic_t ExpandTics(INT32 low, tic_t basetic);
 void D_ClientServerInit(void);
@@ -650,25 +648,21 @@ extern UINT8 playernode[MAXPLAYERS];

 extern boolean player_muted[MAXPLAYERS];

-extern UINT32 localplayerping;
-
 INT32 D_NumPlayers(void);

 void D_ResetTiccmds(void);

 tic_t GetLag(INT32 node);

-extern boolean hu_resynching;
+extern UINT8 hu_resynching;
 #ifdef SATURNPAK
-extern boolean hu_redownloadinggamestate;
+extern UINT8 hu_redownloadinggamestate;
 #endif
 extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player

-#define SAVEGAMESIZE (768*1024)
-
 typedef struct rewind_s
 {
-	UINT8 savebuffer[SAVEGAMESIZE];
+	UINT8 savebuffer[(768*1024)];
 	tic_t leveltime;
 	size_t demopos;

@@ -130,15 +130,14 @@ static size_t startuppwadcount = 0;
 // autoloading
 static char *autoloadwadfiles[MAX_WADFILES];
 static char *autoloadwadfilespost[MAX_WADFILES];
-static size_t autoloadwadcount = 0;
-static size_t postloadwadcount = 0;
+static size_t autoloadcount = 0;
+static size_t postloadcount = 0;
 //

 boolean devparm = false; // started game with -devparm

 boolean singletics = false; // timedemo
 boolean lastdraw = false;
-boolean intermissionbginit = false;

 #ifdef MOTIONBLUR
 INT32 postimgparam[MAXSPLITSCREENPLAYERS];
@@ -154,7 +153,7 @@ boolean music_disabled = false;
 INT32 debugload = 0;
 #endif

-char savegamename[256] = {};
+char savegamename[256];

 char srb2home[256] = ".";
 char srb2path[256] = ".";
@@ -224,13 +223,13 @@ void D_ProcessEvents(void)

 		// Menu input
 #ifdef HAVE_THREADS
-		I_lock_mutex(&m_menu_mutex);
+		I_LockMutex(&m_menu_mutex);
 #endif
 		{
 			eaten = M_Responder(ev);
 		}
 #ifdef HAVE_THREADS
-		I_unlock_mutex(m_menu_mutex);
+		I_UnlockMutex(m_menu_mutex);
 #endif

 		if (eaten)
@@ -245,13 +244,13 @@ void D_ProcessEvents(void)

 		// console input
 #ifdef HAVE_THREADS
-		I_lock_mutex(&con_mutex);
+		I_LockMutex(&con_mutex);
 #endif
 		{
 			eaten = CON_Responder(ev);
 		}
 #ifdef HAVE_THREADS
-		I_unlock_mutex(con_mutex);
+		I_UnlockMutex(con_mutex);
 #endif

 		if (eaten)
@@ -275,6 +274,24 @@ static void D_Renderview(void)

 	R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL));

+	if (rendermode == render_soft)
+	{
+		// if this is display player 1
+		if (cv_homremoval.value)
+		{
+			if (cv_homremoval.value == 1)
+			{
+				// Clear the software screen buffer to remove HOM
+				memset(vid.screens[0], 31, vid.width * vid.height);
+			}
+			else if (cv_homremoval.value == 2)
+			{
+				//'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
+				memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height);
+			}
+		}
+	}
+
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
@@ -305,6 +322,7 @@ static void D_Renderview(void)
 					break;
 				default: // Initialize for P1
 					viewwindowy = viewwindowx = 0;
+					objectsdrawn = 0;
 					break;
 			}

@@ -315,17 +333,19 @@ static void D_Renderview(void)
 			}
 			else if (rendermode == render_soft)
 #endif
-			{
 				R_RenderPlayerView(&players[displayplayers[i]]);
+		}
+
+		if (rendermode == render_soft)
+		{
+			if (i == 0)
+				R_ApplyViewMorph();

-				if (i == 0)
-					R_ApplyViewMorph();
 #ifdef MOTIONBLUR
-				V_DoPostProcessor(i, postimgparam[i]);
+			V_DoPostProcessor(i, postimgparam[i]);
 #else
-				V_DoPostProcessor(i, 0);
+			V_DoPostProcessor(i, 0);
 #endif
-			}
 		}
 	}

@@ -349,33 +369,6 @@ 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;
@@ -541,8 +534,16 @@ static boolean D_Display(void)
 			PS_START_TIMING(ps_rendercalltime);
 			D_Renderview();
 			PS_STOP_TIMING(ps_rendercalltime);
+		}

-			D_MakeIntermissionBG();
+		if (lastdraw)
+		{
+			if (rendermode == render_soft)
+			{
+				VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
+			}
+
+			lastdraw = false;
 		}

 		PS_START_TIMING(ps_uitime);
@@ -576,11 +577,11 @@ static boolean D_Display(void)
 	vid.recalc = false;

 #ifdef HAVE_THREADS
-	I_lock_mutex(&m_menu_mutex);
+	I_LockMutex(&m_menu_mutex);
 #endif
 	M_Drawer(); // menu is drawn even on top of everything...
 #ifdef HAVE_THREADS
-	I_unlock_mutex(m_menu_mutex);
+	I_UnlockMutex(m_menu_mutex);
 #endif
 	// focus lost moved to M_Drawer

@@ -708,12 +709,8 @@ void D_SRB2Loop(void)
 		precise_t elapsed;
 		precise_t enterprecise, finishprecise;

-		boolean ranwipe = false;
-
 		enterprecise = I_GetPreciseTime();

-		I_HandleInterrupt();
-
 		memset(&g_dc, 0, sizeof(g_dc));
 		Z_Frame_Reset();

@@ -721,6 +718,8 @@ 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)
@@ -784,6 +783,11 @@ void D_SRB2Loop(void)

 				doDisplay = true;
 			}
+
+			if (!dedicated)
+			{
+				G_DeviceLEDTick();
+			}
 		}

 		if (interp)
@@ -825,13 +829,6 @@ void D_SRB2Loop(void)
 		if (takescreenshot)
 			M_DoScreenShot();

-#ifndef DEDICATED
-		if (!dedicated && renderisnewtic)
-		{
-			G_DeviceLEDTick();
-		}
-#endif
-
 		// consoleplayer -> displayplayers (hear sounds from viewpoint)
 		S_UpdateSounds(); // move positional sounds

@@ -1040,38 +1037,25 @@ static INT32 D_DetectFileType(const char* filename)
 }

 // autoload that shit
-static void D_AutoloadFile(const char *file, char **filearray, size_t *index)
+static void D_AutoloadFile(const char *file, char **filearray, size_t index)
 {
 	char *newfile;
 	INT32 fileType = D_DetectFileType(file);

-	if (*index >= MAX_WADFILES)
-	{
-		CONS_Printf("D_AutoloadFile: Failed to add file %s! Too many autoloaded files\n", file);
-		return;
-	}
-
 	if (!fileType)
 	{
 		CONS_Printf("D_AutoloadFile: File %s is unknown or invalid\n", file);
 		return;
 	}

-	if (fileType == 1)
-	{
-		CONS_Printf("D_AutoloadFile: File %s is a directory\n", file);
-		return;
-	}
-
 	if (fileType <= 6)
 	{
 		newfile = malloc(strlen(file) + 1);
 		if (!newfile)
-			I_Error("D_AutoloadFile: No more free memory to autoload file %s", file);
+			I_Error("No more free memory to AutoloadFile %s",file);

 		strcpy(newfile, file);
-		filearray[*index] = newfile;
-		(*index)++;
+		filearray[index] = newfile;
 	}
 	else
 	{
@@ -1114,7 +1098,7 @@ static void D_FindAddonsToAutoload(void)
 	// If the file is found, run our shit
 	if (!autoloadconfigfile) // nope outta here
 	{
-		autoloadwadcount = postloadwadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
+		autoloadcount = postloadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
 		return;
 	}

@@ -1140,34 +1124,27 @@ static void D_FindAddonsToAutoload(void)
 		if (newline)
 			*newline = '\0';

-		// ok so theres still issues with players adding stuff to autoload by accident
-		// sometimes this stuff contains maps
-		// you can probably imagine how that goes in a netgame....
-		if (W_CheckAutoLoadContainsMap(wadsToAutoload))
-		{
-			CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload);
-			continue;
-		}
-
 		if (!postload && W_CheckPostLoadList(wadsToAutoload))
 		{
-			CONS_Printf("Autoload: forcing postload for file %s\n", wadsToAutoload);
+			CONS_Printf("forcing postload for file %s\n", wadsToAutoload);
 			postload = true;
 		}

 		// LOAD IT
 		if (!postload)
 		{
-			D_AutoloadFile(wadsToAutoload, autoloadwadfiles, &autoloadwadcount);
+			D_AutoloadFile(wadsToAutoload, autoloadwadfiles, autoloadcount);
+			autoloadcount++;
 		}
 		else
 		{
-			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, &postloadwadcount);
+			D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, postloadcount);
+			postloadcount++;
 		}
 	}

-	autoloadwadfiles[autoloadwadcount] = NULL;
-	autoloadwadfilespost[postloadwadcount] = NULL;
+	autoloadwadfiles[autoloadcount] = NULL;
+	autoloadwadfilespost[postloadcount] = NULL;

 	// we dont want memory leaks around here do we?
 	fclose(autoloadconfigfile);
@@ -1176,7 +1153,7 @@ static void D_FindAddonsToAutoload(void)
 static void D_AddAutoloadFiles(void)
 {
 	// nothing to autoload
-	if (autoloadwadcount == 0)
+	if (autoloadcount == 0)
 		return;

 	CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
@@ -1184,15 +1161,15 @@ static void D_AddAutoloadFiles(void)
 	if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
 		CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");

-	D_CleanFile(autoloadwadfiles, autoloadwadcount);
+	D_CleanFile(autoloadwadfiles, autoloadcount);

-	autoloadwadcount = 0;
+	autoloadcount = 0;
 }

 void D_AddPostloadFiles(void)
 {
 	// nothing to postload
-	if (postloadwadcount == 0 || !netgame)
+	if (postloadcount == 0 || !netgame)
 		return;

 	CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
@@ -1200,9 +1177,9 @@ void D_AddPostloadFiles(void)
 	if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
 		CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");

-	D_CleanFile(autoloadwadfilespost, postloadwadcount);
+	D_CleanFile(autoloadwadfilespost, postloadcount);

-	postloadwadcount = 0;
+	postloadcount = 0;
 }

 // ==========================================================================
@@ -1211,7 +1188,7 @@ void D_AddPostloadFiles(void)

 static boolean AddIWAD(const char * file, const char *dir)
 {
-	char *path = va(pandf, dir, file);
+	char * path = va(pandf, dir, file);

 	if (FIL_ReadFileOK(path))
 	{
@@ -1339,24 +1316,20 @@ static void IdentifyVersion(void)
 //
 // search for maps
 //
-static void D_CheckMapReplacements(boolean pwad)
+static void D_CheckMaps(boolean checkreplaced)
 {
 	INT32 i;
 	char *name;
 	UINT16 wadnum;
 	lumpinfo_t *lumpinfo;
-	size_t numfiles;

-	wadnum = pwad ? (mainwads+1) : 0;
-	numfiles = pwad ? numwadfiles : mainwads;
-
-	for (; wadnum < numfiles; wadnum++)
+	for (wadnum = 0; wadnum < mainwads; wadnum++)
 	{
 		lumpinfo = wadfiles[wadnum]->lumpinfo;
 		for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)
 		{
 			name = lumpinfo->name;
-			P_CheckMapReplacements(name, pwad);
+			P_CheckMapReplacements(name, checkreplaced);
 		}
 	}
 }
@@ -1392,6 +1365,8 @@ 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
@@ -1421,6 +1396,7 @@ 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; }
@@ -1579,6 +1555,20 @@ 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
@@ -1653,6 +1643,12 @@ void D_SRB2Main(void)
 	strcpy(srb2, "SRB2Kart");
 	D_MakeTitleString(srb2);

+#if defined (__OS2__) && !defined (HAVE_SDL)
+	// set PM window title
+	snprintf(pmData->title, sizeof (pmData->title), "SRB2Kart" VERSIONSTRING ": %s", title);
+	pmData->title[sizeof (pmData->title) - 1] = '\0';
+#endif
+
 	if (devparm)
 		CONS_Printf(M_GetText("Development mode ON.\n"));

@@ -1776,6 +1772,10 @@ 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");

@@ -1819,19 +1819,17 @@ void D_SRB2Main(void)
 	// conversion sometimes needs the palette
 	V_ReloadPalette();

-	D_CheckMapReplacements(false);
+	D_CheckMaps(false);

+	W_InitMultipleFiles(startuppwads, startuppwadcount, true);
+
+	// Only search for pwad maps if we actually have a pwad added
 	if (startuppwadcount > 0)
 	{
-		CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n");
-		W_InitMultipleFiles(startuppwads, startuppwadcount, true);
-
-		// Only search for pwad maps if we actually have a pwad added
-		D_CheckMapReplacements(true);
-
-		D_CleanFile(startuppwads, startuppwadcount);
+		D_CheckMaps(true);
 	}

+	D_CleanFile(startuppwads, startuppwadcount);
 	startuppwadcount = 0;

 	cht_Init();
@@ -1918,7 +1916,7 @@ void D_SRB2Main(void)
 	CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
 	R_Init();

-#if SOUND == SOUND_DUMMY
+#if SOUND==SOUND_DUMMY
 	sound_disabled = true;
 	music_disabled = true;
 #else
@@ -2031,13 +2029,9 @@ void D_SRB2Main(void)
 	if (M_CheckProtoParam("replay"))
 	{
 		const char *replayurl = M_GetProtoParam();
+		char *replayname = strrchr(replayurl, '/');

-		if (!replayurl)
-			I_Error("REPLAY: Invalid URL.");
-
-		gconst char *replayname = strrchr(replayurl, '/');
-
-		if (!replayname)
+		if (!replayname || !replayurl)
 			I_Error("REPLAY: Invalid URL.");

 #define REPLAYDIR "/DownloadedReplays/"
@@ -2151,8 +2145,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
 	}
@@ -38,6 +38,8 @@ 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
@@ -612,8 +612,12 @@ void Net_WaitAllAckReceived(UINT32 timeout)

 static void InitNode(node_t *node)
 {
-	memset(node, 0, sizeof(node_t));
+	node->acktosend_head = node->acktosend_tail = 0;
+	memset(node->acktosend, 0, sizeof(node->acktosend));
+	node->firstacktosend = 0;
 	node->nextacknum = 1;
+	node->remotefirstack = 0;
+	node->flags = 0;
 }

 static void InitAck(void)
@@ -27,6 +27,7 @@ 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)

@@ -21,7 +21,10 @@ extern "C" {

 #include "command.h"

-void SendWeaponPref(UINT8 splitplayer);
+void SendWeaponPref(void);
+void SendWeaponPref2(void);
+void SendWeaponPref3(void);
+void SendWeaponPref4(void);

 // console vars
 extern consvar_t cv_playername;
@@ -51,6 +54,10 @@ extern consvar_t cv_mousevisible;
 //WTF
 extern consvar_t cv_mouseturn;
 extern consvar_t cv_usejoystick[4]; //MAXSPLITSCREENPLAYERS
+#ifdef LJOYSTICK
+extern consvar_t cv_joyport;
+extern consvar_t cv_joyport2;
+#endif
 extern consvar_t cv_joyscale[4]; //MAXSPLITSCREENPLAYERS

 // normally in p_mobj but the .h is not read
@@ -89,6 +96,11 @@ 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;
@@ -146,10 +158,8 @@ extern consvar_t cv_pingstyle;

 //extern consvar_t cv_smallpos;
 extern consvar_t cv_showminimapnames;
-extern consvar_t cv_showminimapfinished;
 extern consvar_t cv_minihead;
 extern consvar_t cv_showminimapangle;
-extern consvar_t cv_spinoutroll;

 extern consvar_t cv_showlapemblem;

@@ -285,7 +295,7 @@ typedef union {
 // add game commands, needs cleanup
 void D_RegisterServerCommands(void);
 void D_RegisterClientCommands(void);
-void D_SendPlayerConfig(UINT8 splitplayer);
+void D_SendPlayerConfig(void);
 void Command_ExitGame_f(void);
 void Command_Retry_f(void);
 void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
@@ -112,12 +112,10 @@ static fileused_t transferFiles[UINT8_MAX + 1];
 INT32 fileneedednum = 0; // Number of files needed to join the server
 fileneeded_t fileneeded[MAX_WADFILES] = {}; // List of needed files
 #ifdef HAVE_THREADS
-static I_mutex downloadmutex;
+static I_Mutex downloadmutex;
 #endif
 char downloaddir[512] = "DOWNLOAD";

-INT32 addontypes[NUMADDONTYPES] = {0};
-
 file_download_t filedownload = {};

 #ifdef HAVE_CURL
@@ -137,8 +135,6 @@ HTTP_login *curl_logins = NULL;
 static void CURLGetFile(void);
 #endif

-static addontype_t GetAddonType(const char *name);
-
 /** Fills a serverinfo packet with information about wad files loaded.
  *
  * \todo Give this function a better name since it is in global scope.
@@ -167,9 +163,7 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
 			continue;
 		}

-		strncpy(wadfilename, wadfiles[i]->filename, MAX_WADPATH);
-		wadfilename[MAX_WADPATH-1] = '\0';
-		nameonly(wadfilename);
+		nameonly(strcpy(wadfilename, wadfiles[i]->filename));

 		// Look below at the WRITE macros to understand what these numbers mean.
 		const size_t len = strlen(wadfilename) + 1;
@@ -231,11 +225,8 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
 		fileneeded[i].willsend = (UINT8)(filestatus >> 4);
 		fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size
 		fileneeded[i].file = NULL; // The file isn't open yet
-		READSTRINGL(p, fileneeded[i].filename, MAX_WADPATH); // The next bytes are the file name
+		READSTRINGN(p, fileneeded[i].filename, MAX_WADPATH); // The next bytes are the file name
 		READMEM(p, fileneeded[i].md5sum, 16); // The last 16 bytes are the file checksum
-
-		// Should be good place to calculate that?
-		fileneeded[i].type = GetAddonType(fileneeded[i].filename);
 	}
 }

@@ -259,10 +250,9 @@ void CL_PrepareDownloadSaveGame(const char *tmpsave)
  */
 boolean CL_CheckDownloadable(void)
 {
-	UINT8 i, dlstatus = 0;
+	UINT8 i,dlstatus = 0;

 	for (i = 0; i < fileneedednum; i++)
-	{
 		if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
 		{
 			if (fileneeded[i].willsend == 1)
@@ -273,7 +263,6 @@ boolean CL_CheckDownloadable(void)
 			else //if (fileneeded[i].willsend == 2)
 				dlstatus = 2;
 		}
-	}

 	// Downloading locally disabled
 	if (!dlstatus && M_CheckParm("-nodownload"))
@@ -284,17 +273,15 @@ boolean CL_CheckDownloadable(void)

 	// not downloadable, put reason in console
 	CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n"));
-
 	for (i = 0; i < fileneedednum; i++)
-	{
 		if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
 		{
 			CONS_Printf(" * \"%s\" (%dK)", fileneeded[i].filename, fileneeded[i].totalsize >> 10);

-			if (fileneeded[i].status == FS_MD5SUMBAD)
-				CONS_Printf(M_GetText(" wrong version, md5: "));
-			else
-				CONS_Printf(M_GetText(" not found, md5: "));
+				if (fileneeded[i].status == FS_MD5SUMBAD)
+					CONS_Printf(M_GetText(" wrong version, md5: "));
+				else
+					CONS_Printf(M_GetText(" not found, md5: "));

 			{
 				INT32 j;
@@ -305,7 +292,6 @@ boolean CL_CheckDownloadable(void)
 			}
 			CONS_Printf("\n");
 		}
-	}

 	switch (dlstatus)
 	{
@@ -319,7 +305,6 @@ boolean CL_CheckDownloadable(void)
 			CONS_Printf(M_GetText("All files downloadable, but you have chosen to disable downloading locally.\n"));
 			break;
 	}
-
 	return false;
 }

@@ -557,7 +542,7 @@ INT32 CL_CheckFiles(void)
 		if (fileneeded[i].status != FS_OPEN)
 			filestoload++;

-		if (fileneeded[i].status != FS_NOTCHECKED) // since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
+		if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
 			continue;

 		CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
@@ -565,18 +550,14 @@ INT32 CL_CheckFiles(void)
 		// Check in already loaded files
 		for (j = mainwads+1; j < numwadfiles; j++)
 		{
-			if (!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
-			{
-				strncpy(wadfilename, wadfiles[j]->filename, MAX_WADPATH);
-				wadfilename[MAX_WADPATH-1] = '\0';
-				nameonly(wadfilename);
+			nameonly(strcpy(wadfilename, wadfiles[j]->filename));

-				if (fasticmp(wadfilename, fileneeded[i].filename))
-				{
-					CONS_Debug(DBG_NETPLAY, "already loaded\n");
-					fileneeded[i].status = FS_OPEN;
-					return 4;
-				}
+			if (fasticmp(wadfilename, fileneeded[i].filename) &&
+				!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
+			{
+				CONS_Debug(DBG_NETPLAY, "already loaded\n");
+				fileneeded[i].status = FS_OPEN;
+				return 4;
 			}
 		}

@@ -594,48 +575,6 @@ INT32 CL_CheckFiles(void)
 		return 1; //everything is FS_OPEN or FS_FOUND, proceed to loading
 }

-static addontype_t GetAddonType(const char *name)
-{
-	const char *prefix = strchr(name, '_');
-
-	// Doesn't have prefix (no '_' character or it is too far and is probably not for prefix but for something like version)
-	// KRBCL_ is longest prefix i can think of so this should be enough
-	if (prefix == NULL || prefix - name > 5)
-		return ADDON_MISC;
-
-	// Skip 'K'
-	if (*name == 'K')
-		++name;
-
-	switch (*name)
-	{
-		case 'L':
-			return ADDON_SCRIPT;
-		break;
-
-		case 'R':
-		case 'B':
-			return ADDON_MAP;
-		break;
-
-		case 'C':
-			return ADDON_CHARACTER;
-		break;
-	}
-
-	return ADDON_MISC;
-}
-
-void CL_CheckAddonTypes(void)
-{
-	memset(&addontypes, 0, sizeof(addontypes));
-
-	for (INT32 i = 0; i < fileneedednum; i++)
-	{
-		addontypes[fileneeded[i].type]++;
-	}
-}
-
 // Load it now
 boolean CL_LoadServerFiles(void)
 {
@@ -657,7 +596,7 @@ boolean CL_LoadServerFiles(void)
 		else
 		{
 			const char *s;
-			switch (fileneeded[i].status)
+			switch(fileneeded[i].status)
 			{
 			case FS_NOTFOUND:
 				s = "FS_NOTFOUND";
@@ -700,7 +639,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)

 	char wadfilename[MAX_WADPATH];

-	if (cv_noticedownload.value && I_GetNodeAddress)
+	if (cv_noticedownload.value)
 		CONS_Printf("Sending file \"%s\" (id %d) to node %d (%s)\n", filename, fileid, node, I_GetNodeAddress(node));

 	// Find the last file in the list and set a pointer to its "next" field
@@ -725,9 +664,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 	// Look for the requested file through all loaded files
 	for (wadnum = 0; wadfiles[wadnum]; wadnum++)
 	{
-		// im a certified strlcpy hater
-		strncpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
-		wadfilename[MAX_WADPATH-1] = '\0';
+		strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
 		nameonly(wadfilename);

 		if (fasticmp(wadfilename, p->id.filename))
@@ -1023,7 +960,7 @@ void Got_Filetxpak(void)
 		|| fastcmp(filename, "music.kart")
 		|| fastcmp(filename, "patch.kart")
 		))
-		I_Error("Tried to download base-game file: \"%s\"", filename);
+		I_Error("Tried to download \"%s\"", filename);

 	if (filenum >= fileneedednum)
 	{
@@ -1080,23 +1017,23 @@ void Got_Filetxpak(void)
 	{
 		const char *s;

-		switch (file->status)
+		switch(file->status)
 		{
-			case FS_NOTFOUND:
-				s = "FS_NOTFOUND";
-				break;
-			case FS_FOUND:
-				s = "FS_FOUND";
-				break;
-			case FS_OPEN:
-				s = "FS_OPEN";
-				break;
-			case FS_MD5SUMBAD:
-				s = "FS_MD5SUMBAD";
-				break;
-			default:
-				s = "unknown";
-				break;
+		case FS_NOTFOUND:
+			s = "FS_NOTFOUND";
+			break;
+		case FS_FOUND:
+			s = "FS_FOUND";
+			break;
+		case FS_OPEN:
+			s = "FS_OPEN";
+			break;
+		case FS_MD5SUMBAD:
+			s = "FS_MD5SUMBAD";
+			break;
+		default:
+			s = "unknown";
+			break;
 		}

 		I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
@@ -1208,7 +1145,7 @@ filestatus_t checkfilemd5(char *filename, const UINT8 *wantedmd5sum)
 	fhandle = fopen(filename, "rb");
 	if (fhandle)
 	{
-		md5_stream(fhandle, md5sum);
+		md5_stream(fhandle,md5sum);
 		fclose(fhandle);
 		if (!memcmp(wantedmd5sum, md5sum, 16))
 			return FS_FOUND;
@@ -1490,7 +1427,7 @@ void CURLPrepareFile(const char* url, int dfilenum)
 		filedownload.http_running = true;

 #ifdef HAVE_THREADS
-		I_spawn_thread("http-download", (I_thread_fn)CURLGetFile, NULL);
+		(void)!I_SpawnThread("http-download", (I_ThreadFn)CURLGetFile, NULL);
 #endif
 	}
 	else
@@ -1503,15 +1440,15 @@ void CURLAbortFile(void)

 #ifdef HAVE_THREADS
 	// lock and unlock to wait for the download thread to exit
-	I_lock_mutex(&downloadmutex);
-	I_unlock_mutex(downloadmutex);
+	I_LockMutex(&downloadmutex);
+	I_UnlockMutex(downloadmutex);
 #endif
 }

 static void CURLGetFile(void)
 {
 #ifdef HAVE_THREADS
-	I_lock_mutex(&downloadmutex);
+	I_LockMutex(&downloadmutex);
 #endif
 	CURLMcode mc; /* return code used by curl_multi_wait() */
 	CURLcode easyres; /* Return from easy interface */
@@ -1612,7 +1549,7 @@ static void CURLGetFile(void)

 	filedownload.http_running = false;
 #ifdef HAVE_THREADS
-	I_unlock_mutex(downloadmutex);
+	I_UnlockMutex(downloadmutex);
 #endif
 }

@@ -40,15 +40,6 @@ typedef enum
 	FS_FALLBACK, // HTTP failed
 } filestatus_t;

-typedef enum addontype_e
-{
-	ADDON_SCRIPT,
-	ADDON_MAP,
-	ADDON_CHARACTER,
-	ADDON_MISC,
-	NUMADDONTYPES,
-} addontype_t;
-
 typedef struct
 {
 	UINT8 willsend; // Is the server willing to send it?
@@ -60,13 +51,11 @@ typedef struct
 	UINT32 totalsize;
 	filestatus_t status; // The value returned by recsearch
 	boolean justdownloaded; // To prevent late fragments from causing an I_Error
-	addontype_t type;
 } fileneeded_t;

 extern INT32 fileneedednum;
 extern fileneeded_t fileneeded[MAX_WADFILES];
 extern char downloaddir[512];
-extern INT32 addontypes[NUMADDONTYPES];

 typedef struct
 {
@@ -102,7 +91,6 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
 void CL_PrepareDownloadSaveGame(const char *tmpsave);

 INT32 CL_CheckFiles(void);
-void CL_CheckAddonTypes(void);
 boolean CL_LoadServerFiles(void);
 void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod,
 	UINT8 fileid);
@@ -566,8 +566,6 @@ typedef struct player_s
 	fixed_t fovadd; // adjust FOV for hw rendering

 	SINT8 driftlevel; // just for controller rumble for now
-
-	UINT8 stairjank;
 } player_t;

 #endif
@@ -2,6 +2,5 @@ i_system.c
 i_main.c
 i_video.c
 i_sound.c
-i_threads.c
 dosstr.c
 endtxt.c
@@ -68,12 +68,6 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 #include <time.h>
 #if defined (__linux__)
 #include <sys/vfs.h>
-#elif defined(__APPLE__)
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <mach/mach.h>
 #else
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -162,7 +156,8 @@ const char *wadSearchPaths[] = {

 /**	\brief WAD file to look for
 */
-#define WADKEYWORD "srb2.srb"
+#define WADKEYWORD1 "srb2.srb"
+#define WADKEYWORD2 "srb2.wad"
 /**	\brief holds wad path
 */
 static char returnWadPath[256];
@@ -525,23 +520,16 @@ void I_OutputMsg(const char *fmt, ...)
 {
 	size_t len;
 	char *txt;
-	va_list argptr;
+	va_list  argptr;

-	if (!fmt)
-		return;
-
-	va_start(argptr, fmt);
+	va_start(argptr,fmt);
 	len = vsnprintf(NULL, 0, fmt, argptr);
 	va_end(argptr);
 	if (len == 0)
 		return;

-	txt = (char*)(malloc(len+1));
-
-	if (!txt)
-		I_Error("I_OutputMsg: Out of memory!\n");
-
-	va_start(argptr, fmt);
+	txt = malloc(len+1);
+	va_start(argptr,fmt);
 	vsprintf(txt, fmt, argptr);
 	va_end(argptr);

@@ -747,22 +735,6 @@ const char *I_GetJoyName(INT32 joyindex)
 	return NULL;
 }

-void I_SetJoystickFocus(void)
-{
-}
-
-boolean I_GamepadHasLED(INT32 playernum)
-{
-	(void)playernum;
-	return false;
-}
-
-boolean I_GamepadHasRumble(INT32 playernum)
-{
-	(void)playernum;
-	return false;
-}
-
 void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
 {
 	(void)playernum;
@@ -1012,7 +984,7 @@ void I_SleepDuration(precise_t duration)
 #endif
 }

-static volatile sig_atomic_t g_in_exiting_signal_handler = false;
+boolean g_in_exiting_signal_handler = false;

 static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg)
 {
@@ -1035,13 +1007,8 @@ 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 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.");
+		case SIGTERM: // Software termination signal from kill
+			sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a kill signal.");
 			break;
 #endif
 #ifdef SIGBREAK
@@ -1081,11 +1048,6 @@ static void I_ReportSignal(int num, int coredumped)
 	I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
 }

-boolean I_In_Exiting_Signal_Handler(void)
-{
-	return g_in_exiting_signal_handler;
-}
-
 #ifndef NEWSIGNALHANDLER
 FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
 {
@@ -1105,17 +1067,11 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
 }
 #endif

-static volatile sig_atomic_t interrupted = 0;
-
-boolean I_Interrupted(void)
+FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
 {
-	return interrupted;
-}
-
-static void quit_handler(int num)
-{
-	(void)num;
-	interrupted = 1;
+	signal(num, SIG_DFL); //default signal action
+	raise(num);
+	I_Quit();
 }

 #ifdef HAVE_LIBBACKTRACE
@@ -1374,28 +1330,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
 			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);
@@ -1425,12 +1371,6 @@ static void I_Fork(void)
 }
 #endif/*NEWSIGNALHANDLER*/

-int I_OpenURL(const char *url)
-{
-	(void)url;
-	return -1;
-}
-
 INT32 I_StartupSystem(void)
 {
 	I_StartupConsole();
@@ -1441,8 +1381,8 @@ INT32 I_StartupSystem(void)
 		I_Fork();
 #endif
 #ifdef HAVE_THREADS
-	I_start_threads();
-	I_AddExitFunc(I_stop_threads);
+	I_StartThreads();
+	I_AddExitFunc(I_StopThreads);
 #endif
 	I_RegisterSignals();
 #ifndef NOMUMBLE
@@ -1461,8 +1401,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
@@ -1478,18 +1418,16 @@ 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);
 }

@@ -1535,6 +1473,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)

 			I_OutputMsg("SRB2Kart %s Recursive Error", buffer);

+			W_Shutdown();
 			exit(-1); // recursive errors detected
 		}
 	}
@@ -1552,6 +1491,8 @@ 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
@@ -1567,6 +1508,8 @@ 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
@@ -1672,10 +1615,9 @@ void I_ShutdownSystem(void)
 {
 	INT32 c;

-#ifdef NEWSIGNALHANDLER
-	if (M_CheckParm("-nofork"))
+#ifndef NEWSIGNALHANDLER
+	I_ShutdownConsole();
 #endif
-		I_ShutdownConsole();

 	for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
 		if (quit_funcs[c])
@@ -1820,12 +1762,20 @@ const char *I_ClipboardPaste(void)
 */
 static boolean isWadPathOk(const char *path)
 {
-	char *wad3path = (char*)(malloc(256));
+	char *wad3path = malloc(256);

 	if (!wad3path)
 		return false;

-	sprintf(wad3path, pandf, path, WADKEYWORD);
+	sprintf(wad3path, pandf, path, WADKEYWORD1);
+
+	if (FIL_ReadFileOK(wad3path))
+	{
+		free(wad3path);
+		return true;
+	}
+
+	sprintf(wad3path, pandf, path, WADKEYWORD2);

 	if (FIL_ReadFileOK(wad3path))
 	{
@@ -1842,17 +1792,12 @@ static void pathonly(char *s)
 	size_t j;

 	for (j = strlen(s); j != (size_t)-1; j--)
-	{
 		if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
 		{
-			if (s[j] == ':')
-				s[j+1] = 0;
-			else
-				s[j] = 0;
-
+			if (s[j] == ':') s[j+1] = 0;
+			else s[j] = 0;
 			return;
 		}
-	}
 }

 /**	\brief	search for srb2.srb in the given path
@@ -1868,7 +1813,7 @@ static const char *searchWad(const char *searchDir)
 	static char tempsw[256] = "";
 	filestatus_t fstemp;

-	strcpy(tempsw, WADKEYWORD);
+	strcpy(tempsw, WADKEYWORD1);
 	fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
 	if (fstemp == FS_FOUND)
 	{
@@ -1989,22 +1934,17 @@ const char *I_LocateWad(void)
 static long get_entry(const char* name, const char* buf)
 {
 	long val;
-	const char* hit = strstr(buf, name);
-
-	if (hit == NULL)
-	{
+	char* hit = strstr(buf, name);
+	if (hit == NULL) {
 		return -1;
 	}

 	errno = 0;
 	val = strtol(hit + strlen(name), NULL, 10);
-
-	if (errno != 0)
-	{
+	if (errno != 0) {
 		CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
 		return -1;
 	}
-
 	return val;
 }
 #endif
@@ -2029,13 +1969,13 @@ size_t I_GetFreeMem(size_t *total)
 		*total = 32 << 20;
 	return 32 << 20;
 #elif defined (_WIN32)
-	MEMORYSTATUSEX info;
+	MEMORYSTATUS info;

-	info.dwLength = sizeof (MEMORYSTATUSEX);
-	GlobalMemoryStatusEx( &info );
+	info.dwLength = sizeof (MEMORYSTATUS);
+	GlobalMemoryStatus( &info );
 	if (total)
-		*total = (size_t)info.ullTotalPhys;
-	return (size_t)info.ullAvailPhys;
+		*total = (size_t)info.dwTotalPhys;
+	return (size_t)info.dwAvailPhys;
 #elif defined (__OS2__)
 	UINT32 pr_arena;

@@ -2068,7 +2008,7 @@ size_t I_GetFreeMem(size_t *total)
 	{
 		// Error
 		if (total)
-			*total = 0;
+			*total = 0L;
 		return 0;
 	}

@@ -2077,12 +2017,12 @@ size_t I_GetFreeMem(size_t *total)
 	{
 		// Error
 		if (total)
-			*total = 0;
+			*total = 0L;
 		return 0;
 	}

 	memTag += sizeof (MEMTOTAL);
-	totalKBytes = strtoul(memTag, NULL, 10);
+	totalKBytes = (size_t)atoi(memTag);

 	if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL)
 	{
@@ -2096,7 +2036,7 @@ size_t I_GetFreeMem(size_t *total)
 		{
 			// Error
 			if (total)
-				*total = 0;
+				*total = 0L;
 			return 0;
 		}
 		freeKBytes = MemAvailable;
@@ -2104,46 +2044,16 @@ size_t I_GetFreeMem(size_t *total)
 	else
 	{
 		memTag += sizeof (MEMAVAILABLE);
-		freeKBytes = strtoul(memTag, NULL, 10);
+		freeKBytes = atoi(memTag);
 	}

 	if (total)
 		*total = totalKBytes << 10;
 	return freeKBytes << 10;
-#elif defined(__APPLE__)
-	/* macOS */
-	mach_port_t host = mach_host_self();
-	kern_return_t kr;
-	mach_msg_type_number_t count;
-	vm_size_t v_page_size;
-	struct vm_statistics64 vm_stats;
-	uint64_t total_mem, free_mem;
-	size_t size;
-
-	size = sizeof(total_mem);
-	if (sysctlbyname("hw.memsize", &total_mem, &size, NULL, 0) < 0)
-		total_mem = 0;
-
-	kr = host_page_size(host, &v_page_size);
-	if (kr != KERN_SUCCESS)
-		v_page_size = 4096;
-
-	count = HOST_VM_INFO64_COUNT;
-	kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stats, &count);
-	if (kr == KERN_SUCCESS)
-		free_mem = (uint64_t)(vm_stats.free_count + vm_stats.inactive_count) * v_page_size;
-	else
-		free_mem = 0;
-
-	if (total)
-		*total = (size_t)total_mem;
-	return (size_t)free_mem;
 #else
 	// Guess 48 MB.
 	if (total)
-	{
 		*total = 48<<20;
-	}
 	return 48<<20;
 #endif
 }
@@ -13,10 +13,6 @@
 #ifndef __DEHACKED_H__
 #define __DEHACKED_H__

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "m_fixed.h" // for get_number
 #include "info.h"

@@ -75,9 +71,4 @@ typedef struct
 } MYFILE;
 #define myfeof(a) (a->data + a->size <= a->curpos)
 char *myfgets(char *buf, size_t bufsize, MYFILE *f);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
 #endif
@@ -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.
@@ -81,12 +81,10 @@ typedef struct
 	INT16 flags;
 	INT16 special;
 	INT16 tag;
-	// sidenum[1] will be NO_INDEX if one sided
+	// sidenum[1] will be 0xffff if one sided
 	UINT16 sidenum[2];
 } ATTRPACK maplinedef_t;

-#define NO_INDEX 0xffff
-
 //
 // LineDef attributes.
 //
@@ -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"
-#define VERSIONSTRINGW L"Saturn v9.3"
+#define VERSIONSTRING "Saturn v9.2"
+#define VERSIONSTRINGW L"Saturn v9.2"

 #define SATURN_TESTING // comment out for saturn release builds!

@@ -516,6 +516,22 @@ extern boolean capslock;
 // i_system.c, replace getchar() once the keyboard has been appropriated
 INT32 I_GetKey(void);

+/* http://www.cse.yorku.ca/~oz/hash.html */
+static inline
+UINT32 quickncasehash (const char *p, size_t n)
+{
+	size_t i = 0;
+	UINT32 x = 5381;
+
+	while (i < n && p[i])
+	{
+		x = (x * 33) ^ tolower(p[i]);
+		i++;
+	}
+
+	return x;
+}
+
 #ifndef __cplusplus
 #ifndef min // Double-Check with WATTCP-32's cdefs.h
 #define min(x, y) (((x) < (y)) ? (x) : (y))
@@ -573,13 +589,6 @@ INT32 I_GetKey(void);
 // NOTE: you WILL have nasal troubles if the variable is not initialized
 #define CLEANUP(f) __attribute__((__cleanup__(f)))

-// the GNU constructor and destructor attributes
-// The constructor attribute causes the function to be called automatically before execution enters main ().
-// Similarly, the destructor attribute causes the function to be called automatically after main () has completed or exit () has been called.
-// Functions with these attributes are useful for initializing data that will be used implicitly during the execution of the program.
-#define CONSTRUCTOR __attribute__((constructor, used))
-#define DESTRUCTOR __attribute__((destructor, used))
-
 // An assert-type mechanism.
 #ifdef PARANOIA
 #define I_Assert(e) ((e) ? (void)0 : I_Error("assert failed: %s, file %s, line %d", #e, __FILE__, __LINE__))
@@ -602,13 +611,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 // None of these that are disabled in the normal build are guaranteed to work perfectly
 // Compile them at your own risk!

-// undefine to enable fixes and features that are not vanilla compatible
-#define COMPAT_VANILLA
-// if we build with 32 player (or more!) support we dont need to care vanilla compat
-#if MAXPLAYERS > 16
-#undef COMPAT_VANILLA
-#endif
-
 //-- SATURN __
 /// Detect if a client is on Saturn in the clientconfig.
 /// To seperately allow them to join or block joining from vanilla clients.
@@ -673,13 +675,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 #undef UPDATE_ALERT
 #endif

-// overwrite some of those
-// when not compiling in vanilla compat mode
-#ifndef COMPAT_VANILLA
-	#define SATURNJOIN
-	#define SATURNPAK
-#endif
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
@@ -54,6 +54,7 @@ extern INT16 maptol;
 extern UINT8 globalweather;
 extern INT32 curWeather;
 extern INT32 cursaveslot;
+extern INT16 lastmapsaved;
 extern boolean gamecomplete;

 #define PRECIP_NONE  0
@@ -77,6 +78,7 @@ extern boolean imcontinuing; // Temporary flag while continuing
 extern UINT8 modeattacking;

 // menu demo things
+extern UINT8  numDemos;
 extern UINT32 demoDelayTime;
 extern UINT32 demoIdleTime;

@@ -112,8 +114,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];
@@ -203,6 +205,12 @@ extern struct quake
 	fixed_t radius, intensity;
 } quake;

+// NiGHTS grades
+typedef struct
+{
+	UINT32 grade[6]; // D, C, B, A, S, X (F: failed to reach any of these)
+} nightsgrades_t;
+
 // Custom Lua values
 // (This is not ifdeffed so the map header structure can stay identical, just in case.)
 typedef struct
@@ -253,16 +261,28 @@ typedef struct
 	UINT8 numlaps;        ///< Number of laps in circuit mode, unless overridden.
 	SINT8 unlockrequired; ///< Is an unlockable required to play this level? -1 if no.
 	UINT8 levelselect;    ///< Is this map available in the level select? If so, which map list is it available in?
+	SINT8 bonustype;      ///< What type of bonus does this level have? (-1 for null.)
+	SINT8 saveoverride;   ///< Set how the game is allowed to save (1 for always, -1 for never, 0 is 2.1 default)
+
 	UINT8 levelflags;     ///< LF_flags:  merged eight booleans into one UINT8 for space, see below
 	UINT8 menuflags;      ///< LF2_flags: options that affect record attack / nights mode menus

+	// NiGHTS stuff.
+	UINT8 numGradedMares;   ///< Internal. For grade support.
+	nightsgrades_t *grades; ///< NiGHTS grades. Allocated dynamically for space reasons. Be careful.
+
 	// SRB2kart
+	//boolean automap;    ///< Displays a level's white map outline in modified games
 	fixed_t mobj_scale;   ///< Replacement for TOL_ERZ3

 	mapheader_lighting_t lighting;			///< Wall and sprite lighting
 	mapheader_lighting_t lighting_encore;	///< Alternative lighting for Encore mode
 	boolean use_encore_lighting;			///< Whether to use separate Encore lighting

+	// Music stuff.
+	UINT32 musinterfadeout;  ///< Fade out level music on intermission screen in milliseconds
+	char musintername[7];    ///< Intermission screen music.
+
 	// Lua stuff.
 	// (This is not ifdeffed so the map header structure can stay identical, just in case.)
 	UINT8 numCustomOptions;     ///< Internal. For Lua custom value support.
@@ -359,6 +379,8 @@ typedef struct
 {
 	tic_t time; ///< Time in which the level was finished.
 	tic_t lap;  ///< Best lap time for this level.
+	//UINT32 score; ///< Score when the level was finished.
+	//UINT16 rings; ///< Rings when the level was finished.
 } recorddata_t;

 /** Setup for one NiGHTS map.
@@ -372,19 +394,34 @@ typedef struct
 #define GRADE_A 5
 #define GRADE_S 6

+/*typedef struct
+{
+	// 8 mares, 1 overall (0)
+	UINT8	nummares;
+	UINT32	score[9];
+	UINT8	grade[9];
+	tic_t	time[9];
+} nightsdata_t;*/
+
+//extern nightsdata_t *nightsrecords[NUMMAPS];
 extern recorddata_t *mainrecords[NUMMAPS];

 // mapvisited is now a set of flags that says what we've done in the map.
 #define MV_VISITED     1
 #define MV_BEATEN      2
 #define MV_ALLEMERALDS 4
+//#define MV_ULTIMATE     8
+//#define MV_PERFECT     16
 #define MV_MAX         7 // used in gamedata check
 extern UINT8 mapvisited[NUMMAPS];

-extern UINT32 token;     ///< Number of tokens collected in a level
+// Temporary holding place for nights data for the current map
+//nightsdata_t ntemprecords;
+
+extern UINT32 token; ///< Number of tokens collected in a level
 extern UINT32 tokenlist; ///< List of tokens collected
-extern INT32  tokenbits; ///< Used for setting token bits
-extern INT32  sstimer;   ///< Time allotted in the special stage
+extern INT32 tokenbits; ///< Used for setting token bits
+extern INT32 sstimer; ///< Time allotted in the special stage
 extern UINT32 bluescore; ///< Blue Team Scores
 extern UINT32 redscore;  ///< Red Team Scores

@@ -400,6 +437,9 @@ 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
@@ -421,6 +461,7 @@ extern UINT8 introtoplay;
 extern UINT8 creditscutscene;

 extern UINT8 use1upSound;
+extern UINT8 maxXtraLife; // Max extra lives from rings

 extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations

@@ -485,6 +526,7 @@ 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
@@ -68,21 +68,8 @@ extern "C" {
 	#define strnicmp(x,y,n) strncasecmp(x,y,n)
 #endif

-// glibc 2.43 made alot of standard lib functions propagate the constness of its input pointers
-// to not cause warnings or compile issues on older glibc versions we do this silly thing
-// to not have a gazillion glibc version checks
-#if defined(__GLIBC_PREREQ)
-#if __GLIBC_PREREQ(2, 43)
-	#define gconst const
-#else
-	#define gconst
-#endif
-#else
-	#define gconst
-#endif
-
-#ifndef _GNU_SOURCE
 char *nongnu_strcasestr(const char *in, const char *what);
+#ifndef _GNU_SOURCE
 #define strcasestr nongnu_strcasestr
 #endif

@@ -140,9 +127,9 @@ size_t strlcpy(char *dst, const char *src, size_t dsize);
 #define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst)

 /* Boolean type definition */
-#include <stdbool.h>

 #ifndef _WIN32
+#include <stdbool.h>
 // dont use stdbools _BOOL type
 // its smaller (1 byte) than the old interger bool (4 bytes)
 // which results in packed struct sizes being mismatched between vanilla and this
@@ -150,7 +137,9 @@ size_t strlcpy(char *dst, const char *src, size_t dsize);
 // which we cant use as enumeration constants
 typedef int32_t boolean;
 #else
-#define boolean int32_t
+#define false FALSE
+#define true TRUE
+#define boolean BOOL
 #endif

 /* 7.18.2.1  Limits of exact-width integer types */
@@ -234,6 +223,8 @@ typedef int32_t boolean;

 	#define FUNCNOINLINE __attribute__((noinline))

+	#define FUNCWARNRV __attribute__((warn_unused_result))
+
 	#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) // >= GCC 4.4
 		#ifdef __i386__ // i386 only
 			#define FUNCTARGET(X)  __attribute__ ((__target__ (X)))
@@ -279,6 +270,9 @@ typedef int32_t boolean;
 #ifndef FUNCTARGET
 #define FUNCTARGET(x)
 #endif
+#ifndef FUNCWARNRV
+#define FUNCWARNRV
+#endif
 #ifndef ATTRPACK
 #define ATTRPACK
 #endif
@@ -1110,6 +1110,14 @@ 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;
@@ -361,8 +361,6 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 	// on for fade-to-black
 	for (;;)
 	{
-		I_HandleInterrupt();
-
 		// get fademask first so we can tell if it exists or not
 		fmask = F_GetFadeMask(wipetype, wipeframe++);

@@ -390,11 +388,11 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 		if (rendermode != render_none && drawMenu)
 		{
 #ifdef HAVE_THREADS
-			I_lock_mutex(&m_menu_mutex);
+			I_LockMutex(&m_menu_mutex);
 #endif
 			M_Drawer(); // menu is drawn even on top of wipes
 #ifdef HAVE_THREADS
-			I_unlock_mutex(m_menu_mutex);
+			I_UnlockMutex(m_menu_mutex);
 #endif
 		}

@@ -111,12 +111,10 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 	char *searchname;
 	int depthleft = maxsearchdepth;
 	char searchpath[MAXFILEPATH];
-	size_t *searchpathindex = NULL;
+	size_t *searchpathindex;

 	dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
 	searchpathindex = (size_t *)malloc(maxsearchdepth * sizeof(size_t));
-	if (!searchpathindex)
-		I_Error("out of memory while searching for file %s\n", filename);

 	strcpy(searchpath, startpath);
 	searchpathindex[--depthleft] = strlen(searchpath) + 1;
@@ -66,10 +66,12 @@
 #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?
@@ -447,8 +449,7 @@ void G_WriteDemoExtraData(void)
 	{
 		static UINT8 timeout = 0;

-		if (timeout)
-			timeout--;
+		if (timeout) timeout--;

 		if (demo_writerng == 1 || (demo_writerng == 2 && timeout == 0))
 		{
@@ -468,7 +469,6 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)

 	if (!demobuf.p || !demo.deferstart)
 		return;
-
 	ziptic = READUINT8(demobuf.p);

 	if (ziptic & ZT_FWD)
@@ -490,12 +490,11 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)

 	// what in the actual fuck is this???
 	// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
-	const player_t *player = &players[displayplayers[0]];
-	if (((player->mo && player->speed > 0) // Moving
+	if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
 		|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
-		|| (player->kartstuff[k_respawn]) // Respawning
-		|| (player->spectator || objectplacing)) // Not a physical player
-		&& !(player->kartstuff[k_spinouttimer] && player->kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
+		|| (players[displayplayers[0]].kartstuff[k_respawn]) // Respawning
+		|| (players[displayplayers[0]].spectator || objectplacing)) // Not a physical player
+		&& !(players[displayplayers[0]].kartstuff[k_spinouttimer] && players[displayplayers[0]].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
 		localangle[0] += (cmd->angleturn<<16);

 	if (!(demoflags & DF_GHOST) && *demobuf.p == DEMOMARKER)
@@ -518,49 +517,49 @@ void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)

 	if (cmd->forwardmove != oldcmd[playernum].forwardmove)
 	{
-		WRITEUINT8(demobuf.p, cmd->forwardmove);
+		WRITEUINT8(demobuf.p,cmd->forwardmove);
 		oldcmd[playernum].forwardmove = cmd->forwardmove;
 		ziptic |= ZT_FWD;
 	}

 	if (cmd->sidemove != oldcmd[playernum].sidemove)
 	{
-		WRITEUINT8(demobuf.p, cmd->sidemove);
+		WRITEUINT8(demobuf.p,cmd->sidemove);
 		oldcmd[playernum].sidemove = cmd->sidemove;
 		ziptic |= ZT_SIDE;
 	}

 	if (cmd->angleturn != oldcmd[playernum].angleturn)
 	{
-		WRITEINT16(demobuf.p, cmd->angleturn);
+		WRITEINT16(demobuf.p,cmd->angleturn);
 		oldcmd[playernum].angleturn = cmd->angleturn;
 		ziptic |= ZT_ANGLE;
 	}

 	if (cmd->buttons != oldcmd[playernum].buttons)
 	{
-		WRITEUINT16(demobuf.p, cmd->buttons);
+		WRITEUINT16(demobuf.p,cmd->buttons);
 		oldcmd[playernum].buttons = cmd->buttons;
 		ziptic |= ZT_BUTTONS;
 	}

 	if (cmd->aiming != oldcmd[playernum].aiming)
 	{
-		WRITEINT16(demobuf.p, cmd->aiming);
+		WRITEINT16(demobuf.p,cmd->aiming);
 		oldcmd[playernum].aiming = cmd->aiming;
 		ziptic |= ZT_AIMING;
 	}

 	if (cmd->driftturn != oldcmd[playernum].driftturn)
 	{
-		WRITEINT16(demobuf.p, cmd->driftturn);
+		WRITEINT16(demobuf.p,cmd->driftturn);
 		oldcmd[playernum].driftturn = cmd->driftturn;
 		ziptic |= ZT_DRIFT;
 	}

 	if (cmd->latency != oldcmd[playernum].latency)
 	{
-		WRITEUINT8(demobuf.p, cmd->latency);
+		WRITEUINT8(demobuf.p,cmd->latency);
 		oldcmd[playernum].latency = cmd->latency;
 		ziptic |= ZT_LATENCY;
 	}
@@ -716,7 +715,7 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
 	if (!(demoflags & DF_GHOST))
 		return; // No ghost data to write.

-	if (ghost->player && nightsplayer(ghost->player) && ghost->tracer)
+	if (ghost->player && ghost->player->pflags & PF_NIGHTSMODE && ghost->tracer)
 	{
 		// We're talking about the NiGHTS thing, not the normal platforming thing!
 		ziptic |= GZT_NIGHTS;
@@ -729,8 +728,8 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)

 	// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
 	if (abs(ghost->x-oldghost[playernum].x) > MAXMOM
-	||  abs(ghost->y-oldghost[playernum].y) > MAXMOM
-	||  abs(ghost->z-oldghost[playernum].z) > MAXMOM
+	|| abs(ghost->y-oldghost[playernum].y) > MAXMOM
+	|| abs(ghost->z-oldghost[playernum].z) > MAXMOM
 	|| ((UINT8)(leveltime & 255) > 0 && (UINT8)(leveltime & 255) <= (UINT8)cv_netdemosyncquality.value)) // Hack to enable slightly nicer resyncing
 	{
 		oldghost[playernum].x = ghost->x;
@@ -934,7 +933,7 @@ void G_ConsAllGhostTics(void)
 void G_ConsGhostTic(INT32 playernum)
 {
 	UINT8 ziptic;
-	fixed_t px, py, pz, gx, gy, gz;
+	fixed_t px,py,pz,gx,gy,gz;
 	mobj_t *testmo;
 	fixed_t syncleeway;
 	boolean nightsfail = false;
@@ -979,7 +978,7 @@ void G_ConsGhostTic(INT32 playernum)

 	if (ziptic & GZT_NIGHTS)
 	{
-		if (!testmo || !testmo->player || !nightsplayer(testmo->player) || !testmo->tracer)
+		if (!testmo || !testmo->player || !(testmo->player->pflags & PF_NIGHTSMODE) || !testmo->tracer)
 			nightsfail = true;
 		else
 			testmo = testmo->tracer;
@@ -1347,7 +1346,7 @@ fadeghost:
 					}
 					else
 					{
-						mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height, 3*FRACUNIT), MT_THOK);
+						mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK);
 						mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
 						mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<<FF_TRANSSHIFT;
 						mobj->tics = -1; // nope.
@@ -1378,7 +1377,7 @@ fadeghost:
 				UINT16 i, health;
 				UINT16 count = READUINT16(g->p);
 				//UINT32 type;
-				fixed_t x, y, z;
+				fixed_t x,y,z;
 				angle_t angle;
 				mobj_t *poof;

@@ -1521,9 +1520,7 @@ void G_PreviewRewind(tic_t previewtime)

 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		player_t *player = &players[i];
-
-		if (!playeringame[i] || player->spectator)
+		if (!playeringame[i] || players[i].spectator)
 		{
 			if (info->playerinfo[i].player.mo)
 			{
@@ -1535,35 +1532,35 @@ void G_PreviewRewind(tic_t previewtime)

 		if (!info->playerinfo[i].ingame || !info->playerinfo[i].player.mo)
 		{
-			if (player->mo)
-				player->mo->flags2 |= MF2_DONTDRAW;
+			if (players[i].mo)
+				players[i].mo->flags2 |= MF2_DONTDRAW;

 			continue;
 		}

-		if (!player->mo)
+		if (!players[i].mo)
 			continue; //@TODO spawn temp object to act as a player display

-		player->mo->flags2 &= ~MF2_DONTDRAW;
+		players[i].mo->flags2 &= ~MF2_DONTDRAW;

-		P_UnsetThingPosition(player->mo);
+		P_UnsetThingPosition(players[i].mo);
 #define TWEEN(pr) info->playerinfo[i].mobj.pr + FixedMul((INT32) (next_info->playerinfo[i].mobj.pr - info->playerinfo[i].mobj.pr), tweenvalue)
-		player->mo->x = TWEEN(x);
-		player->mo->y = TWEEN(y);
-		player->mo->z = TWEEN(z);
-		player->mo->angle = TWEEN(angle);
+		players[i].mo->x = TWEEN(x);
+		players[i].mo->y = TWEEN(y);
+		players[i].mo->z = TWEEN(z);
+		players[i].mo->angle = TWEEN(angle);
 #undef TWEEN
-		P_SetThingPosition(player->mo);
+		P_SetThingPosition(players[i].mo);

-		player->frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue);
+		players[i].frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue);

-		player->mo->sprite = info->playerinfo[i].mobj.sprite;
-		player->mo->frame = info->playerinfo[i].mobj.frame;
+		players[i].mo->sprite = info->playerinfo[i].mobj.sprite;
+		players[i].mo->frame = info->playerinfo[i].mobj.frame;

-		player->realtime = info->playerinfo[i].player.realtime;
+		players[i].realtime = info->playerinfo[i].player.realtime;

 		for (j = 0; j < NUMKARTSTUFF; j++)
-			player->kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
+			players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
 	}

 	for (i = splitscreen; i >= 0; i--)
@@ -1656,12 +1653,10 @@ void G_RecordDemo(const char *name)
 		maxsize = cv_maxdemosize.value*1024*1024;

 		demobuf.buffer = Z_Malloc(maxsize + 100*1024, PU_STATIC, NULL);
+		demoend = demobuf.buffer + maxsize;

 		if (demobuf.buffer)
-		{
-			demoend = demobuf.buffer + maxsize;
 			demo.recording = true;
-		}
 		else
 			CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n");
 	}
@@ -1696,7 +1691,7 @@ void G_BeginRecording(void)
 		return;
 	}

-	memset(name, 0, sizeof(name));
+	memset(name,0,sizeof(name));

 	demobuf.p = demobuf.buffer;
 	demoflags = DF_GHOST|(multiplayer ? DF_MULTIPLAYER : (modeattacking<<DF_ATTACKSHIFT));
@@ -1710,9 +1705,9 @@ void G_BeginRecording(void)

 	// Setup header.
 	memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
-	WRITEUINT8(demobuf.p, VERSION);
-	WRITEUINT8(demobuf.p, SUBVERSION);
-	WRITEUINT16(demobuf.p, DEMOVERSION);
+	WRITEUINT8(demobuf.p,VERSION);
+	WRITEUINT8(demobuf.p,SUBVERSION);
+	WRITEUINT16(demobuf.p,DEMOVERSION);

 	// Full replay title
 	demobuf.p += 64;
@@ -1741,7 +1736,7 @@ void G_BeginRecording(void)

 	// game data
 	memcpy(demobuf.p, "PLAY", 4); demobuf.p += 4;
-	WRITEINT16(demobuf.p, gamemap);
+	WRITEINT16(demobuf.p,gamemap);
 	memcpy(demobuf.p, mapmd5, 16); demobuf.p += 16;

 	WRITEUINT8(demobuf.p, demoflags);
@@ -1773,8 +1768,8 @@ void G_BeginRecording(void)
 			break;
 		case ATTACKING_RECORD: // 1
 			demotime_p = demobuf.p;
-			WRITEUINT32(demobuf.p, UINT32_MAX); // time
-			WRITEUINT32(demobuf.p, UINT32_MAX); // lap
+			WRITEUINT32(demobuf.p,UINT32_MAX); // time
+			WRITEUINT32(demobuf.p,UINT32_MAX); // lap
 			break;
 		default: // 3
 			break;
@@ -1831,9 +1826,9 @@ void G_BeginRecording(void)
 	if (demoflags & DF_LUAVARS)
 		LUA_Archive(&demobuf, false);

-	memset(&oldcmd, 0, sizeof(oldcmd));
-	memset(&oldghost, 0, sizeof(oldghost));
-	memset(&ghostext, 0, sizeof(ghostext));
+	memset(&oldcmd,0,sizeof(oldcmd));
+	memset(&oldghost,0,sizeof(oldghost));
+	memset(&ghostext,0,sizeof(ghostext));

 	for (i = 0; i < MAXPLAYERS; i++)
 	{
@@ -1873,19 +1868,19 @@ void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT
 	// Name
 	memset(temp, 0, 16);
 	strncpy(temp, name, 16);
-	memcpy(demobuf.p, temp, 16);
+	memcpy(demobuf.p,temp,16);
 	demobuf.p += 16;

 	// Skin
 	memset(temp, 0, 16);
 	strncpy(temp, skins[skinnum].name, 16);
-	memcpy(demobuf.p, temp, 16);
+	memcpy(demobuf.p,temp,16);
 	demobuf.p += 16;

 	// Color
 	memset(temp, 0, 16);
 	strncpy(temp, KartColor_Names[color], 16);
-	memcpy(demobuf.p, temp, 16);
+	memcpy(demobuf.p,temp,16);
 	demobuf.p += 16;

 	// Score/time/whatever
@@ -1999,6 +1994,7 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick)
 	UINT8 totalfiles, filesloaded, nmusfilecount;
 	char filename[MAX_WADPATH];
 	UINT8 md5sum[16];
+	boolean toomany = false;
 	boolean alreadyloaded;
 	UINT8 i, j;
 	UINT8 error = 0;
@@ -2008,44 +2004,53 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick)

 	for (i = 0; i < totalfiles; ++i)
 	{
-		strlcpy(filename, (char *)(*pp), sizeof filename);
-		SKIPSTRING((*pp));
+		if (toomany)
+			SKIPSTRING((*pp));
+		else
+		{
+			strlcpy(filename, (char *)(*pp), sizeof filename);
+			SKIPSTRING((*pp));
+		}

 		READMEM((*pp), md5sum, 16); // hue hue peepee

-		alreadyloaded = false;
-		nmusfilecount = 0;
-
-		for (j = 0; j < numwadfiles; ++j)
+		if (!toomany)
 		{
-			if (wadfiles[j]->important && j > mainwads)
-				nmusfilecount++;
-			else
-				continue;
+			alreadyloaded = false;
+			nmusfilecount = 0;

-			if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
+			for (j = 0; j < numwadfiles; ++j)
 			{
-				alreadyloaded = true;
+				if (wadfiles[j]->important && j > mainwads)
+					nmusfilecount++;
+				else
+					continue;

-				if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER)
-					error |= DFILE_ERROR_OUTOFORDER;
+				if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
+				{
+					alreadyloaded = true;

-				break;
+					if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER)
+						error |= DFILE_ERROR_OUTOFORDER;
+
+					break;
+				}
 			}
-		}

-		if (alreadyloaded)
-		{
-			filesloaded++;
-			continue;
-		}
+			if (alreadyloaded)
+			{
+				filesloaded++;
+				continue;
+			}

-		if (numwadfiles >= MAX_WADFILES)
+			if (numwadfiles >= MAX_WADFILES)
+				error = DFILE_ERROR_CANNOTLOAD;
+			else if (!quick && findfile(filename, md5sum, false) != FS_FOUND)
+				error = DFILE_ERROR_CANNOTLOAD;
+			else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER)
+				error |= DFILE_ERROR_NOTLOADED;
+		} else
 			error = DFILE_ERROR_CANNOTLOAD;
-		else if (!quick && findfile(filename, md5sum, false) != FS_FOUND)
-			error = DFILE_ERROR_CANNOTLOAD;
-		else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER)
-			error |= DFILE_ERROR_NOTLOADED;
 	}

 	// Get final file count
@@ -2344,7 +2349,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 		extrainfo_p += 16;

 		// Skin
-		memcpy(temp, extrainfo_p, 16);
+		memcpy(temp,extrainfo_p,16);
 		extrainfo_p += 16;
 		pdemo->standings[count].skin = UINT8_MAX;

@@ -2358,12 +2363,12 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
 		}

 		// Color
-		memcpy(temp, extrainfo_p, 16);
+		memcpy(temp,extrainfo_p,16);
 		extrainfo_p += 16;

 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (fasticmp(KartColor_Names[i], temp)) // SRB2kart
+			if (fasticmp(KartColor_Names[i],temp)) // SRB2kart
 			{
 				pdemo->standings[count].color = i;
 				break;
@@ -2600,7 +2605,7 @@ void G_DoPlayDemo(char *defdemoname)
 	boolean skiperrors = false;
 #endif
 	boolean spectator;
-	UINT8 slots[MAXPLAYERS] = {}, kartspeed[MAXPLAYERS] = {}, kartweight[MAXPLAYERS] = {}, numslots = 0;
+	UINT8 slots[MAXPLAYERS], kartspeed[MAXPLAYERS], kartweight[MAXPLAYERS], numslots = 0;

 	G_InitDemoRewind();

@@ -2611,7 +2616,7 @@ void G_DoPlayDemo(char *defdemoname)
 	if (defdemoname == NULL)
 	{
 		demobuf.p = demobuf.buffer;
-		pdemoname = ZZ_Calloc(1); // Easier than adding checks for this everywhere it's freed
+		pdemoname = ZZ_Alloc(1); // Easier than adding checks for this everywhere it's freed
 	}
 	else
 	{
@@ -2623,7 +2628,7 @@ void G_DoPlayDemo(char *defdemoname)
 			n++;

 		pdemoname = ZZ_Alloc(strlen(n)+1);
-		strcpy(pdemoname, n);
+		strcpy(pdemoname,n);

 		M_SetPlaybackMenuPointer();

@@ -2832,15 +2837,15 @@ void G_DoPlayDemo(char *defdemoname)
 	if (demo.version == 0x0001)
 	{
 		// Player name
-		memcpy(player_names[0], demobuf.p, 16);
+		memcpy(player_names[0],demobuf.p,16);
 		demobuf.p += 16;

 		// Skin
-		memcpy(skin, demobuf.p, 16);
+		memcpy(skin,demobuf.p,16);
 		demobuf.p += 16;

 		// Color
-		memcpy(color, demobuf.p, 16);
+		memcpy(color,demobuf.p,16);
 		demobuf.p += 16;

 		demobuf.p += 5; // Backwards compat - some stats
@@ -2873,7 +2878,7 @@ void G_DoPlayDemo(char *defdemoname)
 		// Set color
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
-			if (fasticmp(KartColor_Names[i], color)) // SRB2kart
+			if (fasticmp(KartColor_Names[i],color)) // SRB2kart
 			{
 				players[0].skincolor = i;
 				break;
@@ -2893,9 +2898,9 @@ void G_DoPlayDemo(char *defdemoname)
 			return;
 		}

-		memset(&oldcmd, 0, sizeof(oldcmd));
-		memset(&oldghost, 0, sizeof(oldghost));
-		memset(&ghostext, 0, sizeof(ghostext));
+		memset(&oldcmd,0,sizeof(oldcmd));
+		memset(&oldghost,0,sizeof(oldghost));
+		memset(&ghostext,0,sizeof(ghostext));

 		CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));

@@ -2999,16 +3004,16 @@ void G_DoPlayDemo(char *defdemoname)
 		players[p].spectator = spectator;

 		// Name
-		memcpy(player_names[p], demobuf.p, 16);
+		memcpy(player_names[p],demobuf.p,16);
 		demobuf.p += 16;

 		// Skin
-		memcpy(skin, demobuf.p, 16);
+		memcpy(skin,demobuf.p,16);
 		demobuf.p += 16;
 		SetPlayerSkin(p, skin);

 		// Color
-		memcpy(color, demobuf.p, 16);
+		memcpy(color,demobuf.p,16);
 		demobuf.p += 16;

 		for (i = 0; i < MAXSKINCOLORS; i++)
@@ -3085,9 +3090,6 @@ post_compat:
 	if (cv_director.value)
 		CV_SetValue(&cv_director, 0);

-	if (demo.timing)
-		G_DoneLevelLoad();
-
 	demo.deferstart = true;
 }
 #undef SKIPERRORS
@@ -3226,15 +3228,15 @@ void G_AddGhost(char *defdemoname)
 	if (ghostversion == 0x0001)
 	{
 		// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
-		memcpy(name, p, 16);
+		memcpy(name, p,16);
 		p += 16;

 		// Skin
-		memcpy(skin, p, 16);
+		memcpy(skin, p,16);
 		p += 16;

 		// Color
-		memcpy(color, p, 16);
+		memcpy(color, p,16);
 		p += 16;

 		// Ghosts do not have a player structure to put this in.
@@ -3386,7 +3388,7 @@ void G_AddGhost(char *defdemoname)

 	for (i = 0; i < MAXSKINCOLORS; i++)
 	{
-		if (fasticmp(KartColor_Names[i], color)) // SRB2kart
+		if (fasticmp(KartColor_Names[i],color)) // SRB2kart
 		{
 			gh->mo->color = (UINT8)i;
 			break;
@@ -3478,7 +3480,7 @@ void G_UpdateStaffGhostName(lumpnum_t l)
 	if (ghostversion == 0x0001)
 	{
 		// Player name
-		memcpy(dummystaffname, p, 16);
+		memcpy(dummystaffname, p,16);
 		dummystaffname[16] = '\0';
 		return; // Not really a failure but whatever
 	}
@@ -3515,11 +3517,10 @@ 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;
@@ -61,11 +61,17 @@

 gameaction_t gameaction = 0;
 gamestate_t gamestate = GS_NULL;
+UINT8 ultimatemode = false;

 boolean botingame = false;
 UINT8 botskin = 0;
 UINT8 botcolor = 0;

+JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
+
+// 1024 bytes is plenty for a savegame
+#define SAVEGAMESIZE (1024)
+
 // SRB2kart
 char gamedatafilename[64] = "kartdata.dat";
 char timeattackfolder[64] = "kart";
@@ -84,6 +90,7 @@ 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;
@@ -93,6 +100,7 @@ boolean savemoddata = false;
 UINT8 paused = 0;
 UINT8 modeattacking = ATTACKING_NONE;
 boolean imcontinuing = false;
+boolean runemeraldmanager = false;

 boolean netgame = false; // only true if packets are broadcast
 boolean multiplayer = false;
@@ -104,6 +112,7 @@ 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)
@@ -181,6 +190,9 @@ 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
@@ -198,7 +210,10 @@ const INT32 wipeoutslowtime = 20;
 const INT32 wantedreduce = 5*TICRATE;
 const INT32 wantedfrequency = 10*TICRATE;

+INT32 gameovertics = 15*TICRATE;
+
 UINT8 use1upSound = 0;
+UINT8 maxXtraLife = 2; // Max extra lives from rings

 UINT8 introtoplay = 0;
 UINT8 creditscutscene = 0;
@@ -753,7 +768,7 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
 	if (retaxis > (+JOYAXISRANGE))
 		retaxis = +JOYAXISRANGE;

-	if (!DigitalGamepadStyle(pnum) && axissel < AXISDEAD)
+	if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
 	{
 		const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;

@@ -801,8 +816,8 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)

 	const UINT8 forplayer = (ssplayer-1);

-	const boolean analogjoystickmove  = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer);
-	const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer);
+	const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
+	const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;

 	turnright = InputDown(gc_turnright, ssplayer);
 	turnleft = InputDown(gc_turnleft, ssplayer);
@@ -857,8 +872,7 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
 static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
 {
 	INT32 axis = 0;
-	const UINT8 forplayer = (ssplayer-1);
-	const boolean usejoystick = cv_usejoystick[forplayer].value;
+	const boolean usejoystick = cv_usejoystick[(ssplayer-1)].value;

 	// check for inputs and return button commands
 	// for stuff like joining with item button, saltyhop, honking, etc.
@@ -894,7 +908,7 @@ static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
 #undef CHECKINPUT

 	axis = JoyAxis(AXISLOOKBACK, ssplayer);
-	camspin[forplayer] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
+	camspin[ssplayer-1] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));

 	// Reset to our spec player if we watch someone else.
 	if ((cmd->driftturn || cmd->buttons)
@@ -991,7 +1005,10 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	player_t *player = P_GetLocalPlayerForNum(forplayer);

 	camera_t *thiscam = &camera[forplayer];
-	const boolean freecam = thiscam->freecam;
+	const boolean freecam = camera[forplayer].freecam;
+
+	const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
+	const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;

 	lang = localangle[forplayer];
 	laim = localaiming[forplayer];
@@ -1023,9 +1040,6 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 		return;
 	}

-	const boolean analogjoystickmove  = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer);
-	const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer);
-
 	usejoystick = (analogjoystickmove || gamepadjoystickmove);
 	turnright = InputDown(gc_turnright, ssplayer);
 	turnleft = InputDown(gc_turnleft, ssplayer);
@@ -1289,6 +1303,8 @@ 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

@@ -1310,7 +1326,6 @@ static void G_DoLoadLevel(boolean resetplayer)
 	{
 		// fail so reset game stuff
 		Command_ExitGame_f();
-		P_FreeCorruptMapWarnings();
 		return;
 	}

@@ -1344,8 +1359,6 @@ static void G_DoLoadLevel(boolean resetplayer)

 	// clear hud messages remains (usually from game startup)
 	CON_ClearHUD();
-	// print any map errors now due to clearhud above :chaosleep:
-	P_PrintCorruptMapWarnings();

 	server_lagless = !cv_gentlemens.value;

@@ -3345,6 +3358,18 @@ 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);
@@ -3383,7 +3408,7 @@ static void G_DoContinued(void)
 	token = 0;

 	// Reset # of lives
-	pl->lives = 3;
+	pl->lives = (ultimatemode) ? 1 : 3;

 	D_MapChange(gamemap, gametype, false, false, 0, false, false);

@@ -3877,7 +3902,7 @@ void G_SaveGame(UINT32 savegameslot)
 		char name[VERSIONSIZE];
 		size_t length;

-		save.p = save.buffer = (UINT8 *)Z_Malloc(1024, PU_STATIC, NULL); // 1024 bytes is plenty for a savegame
+		save.p = save.buffer = (UINT8 *)Z_Malloc(SAVEGAMESIZE, PU_STATIC, NULL);
 		if (!save.p)
 		{
 			CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
@@ -4027,6 +4052,7 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
 	if (W_CheckNumForName(mapname) == LUMPERROR)
 	{
 		I_Error("Internal game map '%s' not found\n", mapname);
+		Command_ExitGame_f();
 		return;
 	}

@@ -4091,7 +4117,6 @@ char *G_BuildMapTitle(INT32 mapnum)
 		const char *actnum = NULL;

 		len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
-
 		if (strlen(mapheaderinfo[mapnum-1]->zonttl) > 0)
 		{
 			zonetext = M_GetText(mapheaderinfo[mapnum-1]->zonttl);
@@ -4102,7 +4127,6 @@ char *G_BuildMapTitle(INT32 mapnum)
 			zonetext = M_GetText("Zone");
 			len += strlen(zonetext) + 1;	// ' ' + zonetext
 		}
-
 		if (strlen(mapheaderinfo[mapnum-1]->actnum) > 0)
 		{
 			actnum = M_GetText(mapheaderinfo[mapnum-1]->actnum);
@@ -4116,10 +4140,8 @@ char *G_BuildMapTitle(INT32 mapnum)

 		sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);

-		if (zonetext)
-			sprintf(title + strlen(title), " %s", zonetext);
-		if (actnum)
-			sprintf(title + strlen(title), " %s", actnum);
+		if (zonetext) sprintf(title + strlen(title), " %s", zonetext);
+		if (actnum) sprintf(title + strlen(title), " %s", actnum);
 	}

 	return title;
@@ -4131,7 +4153,6 @@ static void measurekeywords(mapsearchfreq_t *fr,
 {
 	char *qp;
 	char *sp;
-
 	if (wanttable)
 		(*dimp) = Z_Realloc((*dimp), 255 * sizeof (struct searchdim),
 				PU_STATIC, NULL);
@@ -4146,12 +4167,10 @@ static void measurekeywords(mapsearchfreq_t *fr,
 				(*dimp)[(*cuntp)].pos = sp - s;
 				(*dimp)[(*cuntp)].siz = strlen(qp);
 			}
-
 			(*cuntp)++;
 			fr->total++;
 		}
 	}
-
 	if (wanttable)
 		(*dimp) = Z_Realloc((*dimp), (*cuntp) * sizeof (struct searchdim),
 				PU_STATIC, NULL);
@@ -39,8 +39,12 @@ 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];

@@ -118,11 +122,10 @@ extern consvar_t cv_driftsparkpulse;
 extern consvar_t cv_gravstretch;
 extern consvar_t cv_sloperoll;
 extern consvar_t cv_sliptideroll;
-extern consvar_t cv_stairjank;
-extern consvar_t cv_stairjanksfx;
 extern consvar_t cv_slamsound;
 extern consvar_t cv_sloperolldist;
 extern consvar_t cv_sparkroll;
+extern consvar_t cv_spinoutroll;

 extern consvar_t cv_squishdance, cv_squishdancespeed;

@@ -228,11 +231,10 @@ void G_SaveGameData(boolean force);

 void G_SaveGame(UINT32 slot);

-#define G_RaceGametype()   (G_IsGameType(GT_RACE))
+#define G_GametypeHasTeams() (G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF))
 #define G_BattleGametype() (G_IsGameType(GT_MATCH))
-
-#define G_GametypeHasTeams() (UNLIKELY(G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF)))
-#define G_TagGametype()      (UNLIKELY(G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK)))
+#define G_RaceGametype() (G_IsGameType(GT_RACE))
+#define G_TagGametype() (G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK))

 FUNCINLINE static ATTRINLINE boolean G_IsGameType(int type)
 {
@@ -250,6 +252,7 @@ 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

@@ -66,30 +66,13 @@ consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = {

 static CV_PossibleValue_t rumblestrength_cons_t[] = {{FRACUNIT/4, "MIN"}, {FRACUNIT*4, "MAX"}, {0, NULL}};

-consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS] = {
+consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS] = {
 	{"rumblestrength",  "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"rumblestrength2", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"rumblestrength3", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"rumblestrength4", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
 };

-#define IMPL_RUMBLE_TYPE(type)\
-consvar_t cv_rumble_##type [MAXSPLITSCREENPLAYERS] = {\
-	{"rumble_"  #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
-	{"rumble2_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
-	{"rumble3_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
-	{"rumble4_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}\
-};
-
-IMPL_RUMBLE_TYPE(spinout);
-IMPL_RUMBLE_TYPE(sneakerboost);
-IMPL_RUMBLE_TYPE(offroad);
-IMPL_RUMBLE_TYPE(bananadrag);
-IMPL_RUMBLE_TYPE(stairjank);
-IMPL_RUMBLE_TYPE(brakedrift);
-IMPL_RUMBLE_TYPE(driftcharge);
-
-
 static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
 consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
 	{"gamepadled",  "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
@@ -98,7 +81,6 @@ 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};

@@ -957,11 +939,6 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)
 		return;
 	}

-	if (!I_GamepadHasLED(playernum))
-	{
-		return;
-	}
-
 	// so we can override this
 	skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
 	byte_color = V_GetColor(colortranslations[skincolor][8]).s;
@@ -997,22 +974,12 @@ void G_DeviceLEDTick(void)
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
-		{
 			continue;
-		}
-
-		// does not have a configurable led! :c
-		if (!I_GamepadHasLED(i))
-		{
-			continue;
-		}

 		newcolor = G_GetSkinColorForGamepad(i);

 		if (curcolor[i] == newcolor) // dont update if same colour
-		{
 			continue;
-		}

 		G_SetPlayerGamepadIndicatorColor(i, newcolor);
 		curcolor[i] = newcolor;
@@ -1053,8 +1020,8 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
 	// doesent need to be super precise
 	// but ensure this is within range (0-65535)
 	// placed here so it applies to lua aswell
-	low_strength = (UINT16)min(FixedMul(low_strength, cv_rumble_strength[playernum].value), UINT16_MAX);
-	high_strength = (UINT16)min(FixedMul(high_strength, cv_rumble_strength[playernum].value), UINT16_MAX);
+	low_strength = (UINT16)min(FixedMul(low_strength, cv_rumblestrength[playernum].value), UINT16_MAX);
+	high_strength = (UINT16)min(FixedMul(high_strength, cv_rumblestrength[playernum].value), UINT16_MAX);

 	I_GamepadRumble(playernum, low_strength, high_strength, duration);
 }
@@ -1076,7 +1043,7 @@ void G_DeviceRumbleTick(void)
 {
 	UINT8 i;

-	if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL || demo.playback)
+	if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL)
 	{
 		return;
 	}
@@ -1088,12 +1055,6 @@ void G_DeviceRumbleTick(void)
 			continue;
 		}

-		// does not support rumble! :c
-		if (!I_GamepadHasRumble(i))
-		{
-			continue;
-		}
-
 		if (camera[i].freecam)
 		{
 			continue;
@@ -1107,11 +1068,6 @@ void G_DeviceRumbleTick(void)

 		const player_t *player = P_GetLocalPlayerForNum(i);

-		if (!player)
-		{
-			continue;
-		}
-
 		// allow lua to do some crap for spectators
 		if (player->spectator || !player->mo)
 		{
@@ -1127,20 +1083,17 @@ void G_DeviceRumbleTick(void)
 			continue;
 		}

-		if (cv_rumble_spinout[i].value
-			&& player->kartstuff[k_spinouttimer])
+		if (player->kartstuff[k_spinouttimer])
 		{
 			//low = high = FRACUNIT / 6;
 			low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
 		}
-		else if (cv_rumble_sneakerboost[i].value
-			&& (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))))
+		else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2)))
 		{
 			low = high = RUMBLE_STRONG;
 		}
-		else if (cv_rumble_offroad[i].value
-			&& (player->kartstuff[k_offroad])
-			&& (player->speed != 0)
+		else if ((player->kartstuff[k_offroad])
+			&& player->speed != 0
 			&& P_IsObjectOnGround(player->mo))
 		{
 			// weaken this depending on if you got hyu or invinc
@@ -1157,37 +1110,26 @@ void G_DeviceRumbleTick(void)
 				low = high = RUMBLE_MODERATE;
 			}
 		}
-		else if (cv_rumble_bananadrag[i].value
-			&& (player->kartstuff[k_bananadrag] > TICRATE)
-			&& (player->speed != 0)
+		else if ((player->kartstuff[k_bananadrag] > TICRATE)
+			&& player->speed != 0
 			&& P_IsObjectOnGround(player->mo))
 		{
 			if (leveltime & 1) // this is actually funny lel
 				high = RUMBLE_MODERATE;
 		}
-		else if (cv_rumble_stairjank[i].value
-			&& (player->stairjank > 8)
-			&& (player->speed != 0)
-			&& P_IsObjectOnGround(player->mo))
-		{
-			low = high = RUMBLE_VERYWEAK;
-		}

-		if (cv_rumble_brakedrift[i].value
-			&& player->kartstuff[k_brakedrift])
+		if (player->kartstuff[k_brakedrift])
 		{
 			high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
 		}

 		// pulse when gettin new driftlevel
 		// let this come last
-		if (cv_rumble_driftcharge[i].value
-			&& player->kartstuff[k_driftcharge]
+		if (player->kartstuff[k_driftcharge]
 			&& player->driftlevel)
 		{
 			high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);

-			// make it rumble slightly longer the higher your driftlevel!
 			if (player->driftlevel == 2)
 				lenght = 114;
 			else if (player->driftlevel == 3)
@@ -100,10 +100,9 @@ typedef enum
 	gc_custom2, // Lua scriptable
 	gc_custom3, // Lua scriptable
 	gc_director,
-	// freecam specific controls
-	gc_freecam,  // Toggle for freecam while ingame
-	gc_camfloat, // alternative button for raising camera
-	gc_camsink,  // alternative button for sinking camera
+	gc_freecam, // Toggle for freecam while ingame
+	gc_camfloat, // alternative button for raising cam
+	gc_camsink, // alternative button for sinking
 	gc_strafeleft,
 	gc_straferight,
 	num_gamecontrols
@@ -113,20 +112,10 @@ typedef enum
 extern consvar_t cv_mousexsens, cv_mouseysens;
 extern consvar_t cv_controlperkey;
 extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
-
+extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];

-extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_spinout[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_sneakerboost[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_offroad[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_bananadrag[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_stairjank[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_brakedrift[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_rumble_driftcharge[MAXSPLITSCREENPLAYERS];
-
-extern consvar_t cv_gamepadifunfocused;
 extern consvar_t cv_gamepadledifunfocused;
 extern consvar_t cv_rumbleifunfocused;

@@ -52,6 +52,7 @@ typedef enum
 } gameaction_t;

 extern gamestate_t gamestate;
+extern UINT8 ultimatemode; // was sk_insane
 extern gameaction_t gameaction;

 extern boolean botingame;
@@ -183,7 +183,6 @@ static int comparePolygons(const void *p1, const void *p2)

 	UINT32 downloaded1 = poly1->texture ? poly1->texture->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
 	UINT32 downloaded2 = poly2->texture ? poly2->texture->downloaded : 0;
-
 	diff64 = downloaded1 - downloaded2;
 	if (diff64 != 0) return diff64;

@@ -12,21 +12,20 @@
 /// \brief convert SRB2 map

 #include "../doomdef.h"
-
+#include "../doomstat.h"
 #ifdef HWRENDER
-
 #include "hw_main.h"
 #include "hw_glob.h"
+#include "../r_local.h"
 #include "../z_zone.h"
-
-#ifdef HWR_LOADING_SCREEN
 #include "../console.h"
+#include "../v_video.h"
 #include "../m_menu.h"
-#include "../p_setup.h" // levelfadecol
+#include "../i_system.h"
+#include "../m_argv.h"
 #include "../i_video.h"
-#endif
-
-//#define DEBUG_HWBSP
+#include "../w_wad.h"
+#include "../p_setup.h" // levelfadecol

 // --------------------------------------------------------------------------
 // This is global data for planes rendering
@@ -34,20 +33,19 @@

 extrasubsector_t *extrasubsectors = NULL;

-// extra subsectors are subsectors without segs, added for the plane polygons
-#define NUM_EXTRA_SUBSECTORS 50
-static size_t num_alloc_extra_subsector;
+// newsubsectors are subsectors without segs, added for the plane polygons
+#define NEWSUBSECTORS 50
+static size_t totsubsectors;
 #ifdef PARANOIA
-size_t num_extra_subsector;
+size_t addsubsector;
 #else
-static size_t num_extra_subsector;
+static size_t addsubsector;
 #endif

-typedef struct {
+typedef struct
+{
 	float x, y;
 	float dx, dy;
-	polyvertex_t divpt;
-	float divfrac;
 } fdivline_t;

 // when loading the map, this is set to true if portals are found.
@@ -55,7 +53,7 @@ typedef struct {
 boolean gl_maphasportals = false;

 // Determine on mapload if current map has any Horizonlines present
-// avoids doing a bunch of work during rendering
+// so we can avoid rather hot checks in HWR_Subsector
 boolean gl_maphashorizonlines = false;

 // ==========================================================================
@@ -82,25 +80,26 @@ static poly_t *HWR_AllocPoly(INT32 numpts)
 	return p;
 }

-/// TODO: polygons should be freed in reverse order for efficiency,
+/// \todo polygons should be freed in reverse order for efficiency,
 /// for now don't free because it doesn't free in reverse order
 static void HWR_FreePoly(poly_t *poly)
 {
 	Z_Free(poly);
 }

-// Return interception along bsp line (partline),
+// Return interception along bsp line,
 // with the polygon segment
-
-// Return the division in partline div fields.
-// divfrac = how far along partline vector is crossing pt
-static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t *v2)
+//
+static float bspfrac;
+static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
+	polyvertex_t *v2)
 {
-	double frac1, frac2;
-	double num; // numerator
-	double den; // denominator
-	double v1x, v1y, v1dx, v1dy; // polygon side vector, v1->v2
-	double v3x, v3y, v3dx, v3dy; // partline vector
+	static polyvertex_t pt;
+	double frac;
+	double num;
+	double den;
+	double v1x, v1y, v1dx, v1dy;
+	double v2x, v2y, v2dx, v2dy;

 	// a segment of a polygon
 	v1x  = v1->x;
@@ -109,118 +108,111 @@ static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t
 	v1dy = v2->y - v1->y;

 	// the bsp partition line
-	v3x  = partline->x;
-	v3y  = partline->y;
-	v3dx = partline->dx;
-	v3dy = partline->dy;
+	v2x  = bsp->x;
+	v2y  = bsp->y;
+	v2dx = bsp->dx;
+	v2dy = bsp->dy;

-	den = v3dy*v1dx - v3dx*v1dy;
+	den = v2dy*v1dx - v2dx*v1dy;

-	if (fabs(den) < 1.0E-36) // avoid check of float for exact 0
-		return false;  // partline and polygon side are effectively parallel
+	if (fabsf((float)den) < 1.0E-36f) // avoid checking exactly for 0.0
+		return NULL;       // parallel

 	// first check the frac along the polygon segment,
 	// (do not accept hit with the extensions)
-	num = (v3x - v1x)*v3dy + (v1y - v3y)*v3dx;
-	frac1 = num / den;
+	num = (v2x - v1x)*v2dy + (v1y - v2y)*v2dx;
+	frac = num / den;

-	// 0= cross at v1, 1.0= cross at v2
-	if (frac1 < 0.0 || frac1 > 1.0)  // double
-		return false;  // not within the polygon side
+	if (frac < 0.0l || frac > 1.0l)
+		return NULL;

 	// now get the frac along the BSP line
 	// which is useful to determine what is left, what is right
-	num = (v3x - v1x)*v1dy + (v1y - v3y)*v1dx;
-	frac2 = num / den;
+	num = (v2x - v1x)*v1dy + (v1y - v2y)*v1dx;
+	frac = num / den;
+	bspfrac = (float)frac;

-	partline->divfrac = frac2;  // how far along partline vector
+	// find the interception point along the partition line
+	pt.x = (float)(v2x + v2dx*frac);
+	pt.y = (float)(v2y + v2dy*frac);

-	// [WDJ] find the interception point along the segment.
-	// It should be slightly more accurate because it is always closer to the
-	// crossing point than arbitrary positions on the partition line.
-	partline->divpt.x = v1x + v1dx*frac1;
-	partline->divpt.y = v1y + v1dy*frac1;
-
-	return true;
+	return &pt;
 }

-// BOOMEDIT.WAD has a vertex error of .21
 #define DIVLINE_VERTEX_DIFF 0.45f

 // if two vertice coords have a x and/or y difference
 // of less or equal than 1 FRACUNIT, they are considered the same
 // point. Note: hardcoded value, 1.0f could be anything else.
-static boolean SameVertex(polyvertex_t *p1, polyvertex_t *p2)
+static boolean SameVertice (polyvertex_t *p1, polyvertex_t *p2)
 {
-	if (fabsf(p2->x - p1->x) > DIVLINE_VERTEX_DIFF)
+	if (fabsf( p2->x - p1->x ) > DIVLINE_VERTEX_DIFF)
 		return false;
-	if (fabsf(p2->y - p1->y) > DIVLINE_VERTEX_DIFF)
+	if (fabsf( p2->y - p1->y ) > DIVLINE_VERTEX_DIFF)
 		return false;

 	// p1 and p2 are considered the same vertex
 	return true;
 }

+
 // split a _CONVEX_ polygon in two convex polygons
 // outputs:
 //   frontpoly : polygon on right side of bsp line
 //   backpoly  : polygon on left side
 //
-// Called from: WalkBSPNode
-static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
-                       poly_t *poly,            // the convex poly we split
-                       poly_t **frontpoly,      // return one poly here
-                       poly_t **backpoly)       // return the other here
+static void SplitPoly (fdivline_t *bsp,         //splitting parametric line
+                       poly_t *poly,            //the convex poly we split
+                       poly_t **frontpoly,      //return one poly here
+                       poly_t **backpoly)       //return the other here
 {
 	INT32 i, j;
 	polyvertex_t *pv;

-	INT32 ps, pe; // poly start, end
-	INT32 ps_online, pe_online;
-	INT32 nptfront, nptback;
+	INT32 ps = -1, pe = -1;
+	INT32  nptfront, nptback;
 	polyvertex_t vs = {};
 	polyvertex_t ve = {};
 	polyvertex_t lastpv = {};
-	float ps_frac = 0.0f, pe_frac = 0.0f;        // used to tell which poly is on
-	                                             // the front side of the bsp partition line
-	ps = pe = -1;
-    ps_online = pe_online = 0;
+	float fracs = 0.0f, frace = 0.0f;        //used to tell which poly is on
+	                                         // the front side of the bsp partition line
+	INT32 psonline = 0, peonline = 0;

 	for (i = 0; i < poly->numpts; i++)
 	{
-		// i, j are one side of the poly
-		j = i+1;
+		j = i + 1;
 		if (j == poly->numpts)
-			j = 0;  // wrap poly
+			j = 0;

 		// start & end points
-		if (!fracdivline(dlnp, &poly->pts[i], &poly->pts[j]))
+		pv = fracdivline(bsp, &poly->pts[i], &poly->pts[j]);
+
+		if (pv == NULL)
 			continue;

-		// have dividing pt
 		if (ps < 0)
 		{
 			// first point
 			ps = i;
-			vs = dlnp->divpt;
-			ps_frac = dlnp->divfrac;
+			vs = *pv;
+			fracs = bspfrac;
 		}
 		else
 		{
-			// the partition line can traverse a junction between two segments
+			//the partition line traverse a junction between two segments
 			// or the two points are so close, they can be considered as one
 			// thus, don't accept, since split 2 must be another vertex
-			if (SameVertex(&dlnp->divpt, &lastpv))
+			if (SameVertice(pv, &lastpv))
 			{
 				if (pe < 0)
 				{
 					ps = i;
-					ps_online = 1;
+					psonline = 1;
 				}
 				else
 				{
 					pe = i;
-					pe_online = 1;
+					peonline = 1;
 				}
 			}
 			else
@@ -228,25 +220,24 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 				if (pe < 0)
 				{
 					pe = i;
-					ve = dlnp->divpt;
-					pe_frac = dlnp->divfrac;
+					ve = *pv;
+					frace = bspfrac;
 				}
 				else
 				{
-					// a frac, not same vertice as last one
-					// we already got pt2 so pt 2 is not on the line,
-					// so we probably got back to the start point
-					// which is on the line
-					if (SameVertex(&dlnp->divpt, &vs))
-						ps_online = 1;
-
+				// a frac, not same vertice as last one
+				// we already got pt2 so pt 2 is not on the line,
+				// so we probably got back to the start point
+				// which is on the line
+					if (SameVertice(pv, &vs))
+						psonline = 1;
 					break;
 				}
 			}
 		}

 		// remember last point intercept to detect identical points
-		lastpv = dlnp->divpt;
+		lastpv = *pv;
 	}

 	// no split: the partition line is either parallel and
@@ -263,34 +254,28 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 		// linedefs where each side point the same sector, that is:
 		// the deep water effect with the original Doom

-		//TODO: make sure front poly is to front of partition line?
+		/// \todo make sure front poly is to front of partition line?

 		*frontpoly = poly;
-		*backpoly  = NULL;
+		*backpoly = NULL;
 		return;
 	}

-	//if (ps >= 0 && pe < 0)
 	if (pe < 0)
 	{
 		//I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe);
 		*frontpoly = poly;
-		*backpoly  = NULL;
+		*backpoly = NULL;
 		return;
 	}

-	if (pe <= ps)
-	{
-		//I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe);
-		*frontpoly = poly;
-		*backpoly  = NULL;
-		return;
-	}
+	if (UNLIKELY(pe <= ps))
+		I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe);

-	// Number of points on each side, _not_ counting those
-	// that may lie just on the line.
-	nptback  = pe - ps - pe_online;
-	nptfront = poly->numpts - pe_online - ps_online - nptback;
+	// number of points on each side, _not_ counting those
+	// that may lie just one the line
+	nptback  = pe - ps - peonline;
+	nptfront = poly->numpts - peonline - psonline - nptback;

 	if (nptback > 0)
 		*backpoly = HWR_AllocPoly(2 + nptback);
@@ -310,9 +295,11 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 		*pv++ = ve;
 		i = pe;

-		do {
+		do
+		{
 			if (++i == poly->numpts)
 				i = 0;
+
 			*pv++ = poly->pts[i];
 		} while (i != ps && --nptfront);
 	}
@@ -325,81 +312,68 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 		*pv++ = vs;
 		i = ps;

-		do {
+		do
+		{
 			if (++i == poly->numpts)
 				i = 0;
+
 			*pv++ = poly->pts[i];
 		} while (i != pe && --nptback);
 	}

 	// make sure frontpoly is the one on the 'right' side
 	// of the partition line
-	if (ps_frac > pe_frac)
+	if (fracs > frace)
 	{
-		poly_t*      swappoly;
-		swappoly   = *backpoly;
-		*backpoly  = *frontpoly;
+		poly_t *swappoly;
+		swappoly = *backpoly;
+		*backpoly = *frontpoly;
 		*frontpoly = swappoly;
 	}

-	HWR_FreePoly(poly);
+	HWR_FreePoly (poly);
 }

-// checks if any line is a portal or horizonline, for optimization
-static inline void CheckForPortalsAndHorizonLines(seg_t *lseg, const line_t *line)
-{
-	// portal check
-	if (!gl_maphasportals && lseg->side == 0 && line->special == PORTALSPECIAL)
-	{
-		// Find the other side!
-		INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, -1);

-		if (line == &lines[line2])
-			line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2);
-
-		if (line2 >= 0) // found it!
-			gl_maphasportals = 1;
-	}
-
-	// horizonline check
-	if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
-		gl_maphashorizonlines = true;
-}
-
-// Use each seg of the poly as a partition line, keep only the
+// use each seg of the poly as a partition line, keep only the
 // part of the convex poly to the front of the seg (that is,
-// the part inside the sector). The part behind the seg, is
-// the void space and is cut out.
+// the part inside the sector), the part behind the seg, is
+// the void space and is cut out
 //
-//  poly : surrounding convex polygon, non-destructive
-//  lseg : array of seg
-//  segcount : number of seg in the array
-// Return frontpoly, which may be new or ptr to poly.
-// Called from: HWR_SubsecPoly
-static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
+static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
 {
 	INT32 i, j;
-	poly_t* frontpoly = poly;  // default, return same poly
 	polyvertex_t *pv;
-	INT32 poly_num_pts = 0, ps, pe;
+	INT32 nump = 0, ps, pe;
 	polyvertex_t vs = {}, ve = {},
 				 p1 = {}, p2 = {};
-	float ps_frac = 0.0f;
-	vertex_t *v1, *v2;
+	float fracs = 0.0f;
 	fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
+	poly_t *temppoly;

 	// for each seg of the subsector
-	for (; segcount--; lseg++)
+	for (; count--; lseg++)
 	{
 		// x, y, dx, dy (like a divline)
 		const line_t *line = lseg->linedef;

-		if (!line)
-			continue;
+		// portal check
+		if (UNLIKELY(!gl_maphasportals && line->special == PORTALSPECIAL && lseg->side == 0))
+		{
+			// Find the other side!
+			INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, -1);

-		CheckForPortalsAndHorizonLines(lseg, line);
+			if (line == &lines[line2])
+				line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2);

-		if (line->sidenum[1] != NO_INDEX)
+			if (line2 >= 0) // found it!
+				gl_maphasportals = 1;
+		}
+
+		if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
+			gl_maphashorizonlines = true;
+
+		if (line->sidenum[1] != 0xffff)
 		{
 			if (sides[line->sidenum[0]].sector == sides[line->sidenum[1]].sector)
 			{
@@ -411,21 +385,10 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
 			}
 		}

-		if (lseg->side) // side 1
-		{
-			v1 = line->v2;
-			v2 = line->v1;
-		}
-		else // side 0
-		{
-			v1 = line->v1;
-			v2 = line->v2;
-		}
-
-		p1.x = FixedToFloat(v1->x);
-		p1.y = FixedToFloat(v1->y);
-		p2.x = FixedToFloat(v2->x);
-		p2.y = FixedToFloat(v2->y);
+		p1.x = FIXED_TO_FLOAT(lseg->side ? line->v2->x : line->v1->x);
+		p1.y = FIXED_TO_FLOAT(lseg->side ? line->v2->y : line->v1->y);
+		p2.x = FIXED_TO_FLOAT(lseg->side ? line->v1->x : line->v2->x);
+		p2.y = FIXED_TO_FLOAT(lseg->side ? line->v1->y : line->v2->y);

 		cutseg.x = p1.x;
 		cutseg.y = p1.y;
@@ -438,130 +401,125 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)

 		for (i = 0; i < poly->numpts; i++)
 		{
-			// i, j are one side of the poly
-			j = i+1;
+			j = i + 1;
 			if (j == poly->numpts)
 				j = 0;

-			if (!fracdivline(&cutseg, &poly->pts[i], &poly->pts[j]))
+			pv = fracdivline(&cutseg, &poly->pts[i], &poly->pts[j]);
+
+			if (pv == NULL)
 				continue;

-			// have dividing pt
 			if (ps < 0)
 			{
 				ps = i;
-				vs = cutseg.divpt;
-				ps_frac = cutseg.divfrac;
-				continue;
-			}
-
-			// frac 1 on previous segment,
-			//     0 on the next,
-			// the split line goes through one of the convex poly
-			// vertices, happens quite often since the convex
-			// poly is already adjacent to the subsector segs
-			// on most borders
-			if (SameVertex(&cutseg.divpt, &vs))
-				continue;
-
-			if (ps_frac <= cutseg.divfrac)
-			{
-				poly_num_pts = 2 + poly->numpts - (i-ps);
-				pe = ps;
-				ps = i;
-				ve = cutseg.divpt;
+				vs = *pv;
+				fracs = bspfrac;
 			}
 			else
 			{
-				poly_num_pts = 2 + (i-ps);
-				pe = i;
-				ve = vs;
-				vs = cutseg.divpt;
-			}
+				//frac 1 on previous segment,
+				//     0 on the next,
+				//the split line goes through one of the convex poly
+				// vertices, happens quite often since the convex
+				// poly is already adjacent to the subsector segs
+				// on most borders
+				if (SameVertice(pv, &vs))
+					continue;

-			// found 2nd point
-			break;
+				if (fracs <= bspfrac)
+				{
+					nump = 2 + poly->numpts - (i-ps);
+					pe = ps;
+					ps = i;
+					ve = *pv;
+				}
+				else
+				{
+					nump = 2 + (i-ps);
+					pe = i;
+					ve = vs;
+					vs = *pv;
+				}
+
+				//found 2nd point
+				break;
+			}
 		}

 		// there was a split
 		if (ps >= 0)
 		{
-			// need 2 points
+			//need 2 points
 			if (pe >= 0)
 			{
 				// generate FRONT poly
-				frontpoly = HWR_AllocPoly(poly_num_pts);
+				temppoly = HWR_AllocPoly(nump);

-				pv = frontpoly->pts;
+				pv = temppoly->pts;
 				*pv++ = vs;
 				*pv++ = ve;

-				do {
-					if (++ps == poly->numpts)  // poly wrap
+				do
+				{
+					if (++ps == poly->numpts)
 						ps = 0;
 					*pv++ = poly->pts[ps];
 				} while (ps != pe);

 				HWR_FreePoly(poly);
-				poly = frontpoly;
+				poly = temppoly;
 			}
 #ifdef DEBUG_HWBSP
+			// hmmm... maybe we should NOT accept this, but this happens
+			// only when the cut is not needed it seems (when the cut
+			// line is aligned to one of the borders of the poly, and
+			// only some times..)
 			else
 			{
-				// hmmm... maybe we should NOT accept this, but this happens
-				// only when the cut is not needed it seems (when the cut
-				// line is aligned to one of the borders of the poly, and
-				// only some times..)
-				// [WDJ] This happens often (27 times in Doom2 map01).
 				skipcut++;
-				//I_Error("CutOutPoly: only one point for split line (%d %d) %d", ps, pe, debugpos);
+				I_Error("CutOutPoly: only one point for split line (%d %d) %d", ps, pe, debugpos);
 			}
 #endif
 		}
 	}
-
-	return frontpoly;
+	return poly;
 }

 // At this point, the poly should be convex and the exact
-// layout of the subsector. It is not always the case,
+// layout of the subsector, it is not always the case,
 // so continue to cut off the poly into smaller parts with
 // each seg of the subsector.
 //
-//  ssindex : subsec index, 0..(numsubsectors-1)
-//  poly : surrounding convex polygon, non-destructive
-// Called from WalkBSPNode
-static inline void HWR_SubsecPoly(INT32 ssindex, poly_t *poly)
+static inline void HWR_SubsecPoly(INT32 num, poly_t *poly)
 {
-	INT16 segcount;
+	INT16 count;
 	subsector_t *sub;
 	seg_t *lseg;

-	sub = &subsectors[ssindex];
-	segcount = sub->numlines;
+	sub = &subsectors[num];
+	count = sub->numlines;
 	lseg = &segs[sub->firstline];

 	if (poly)
 	{
-		poly = CutOutSubsecPoly(lseg, segcount, poly);
+		poly = CutOutSubsecPoly(lseg,count,poly);
 #ifdef DEBUG_HWBSP
 		totalsubsecpolys++;
 #endif
 		//extra data for this subsector
-		extrasubsectors[ssindex].planepoly = poly;
+		extrasubsectors[num].planepoly = poly;
 	}
 }

-// The bsp divline does not have enough precision.
-// Search for the segs source of this divline.
-static inline void SetDivline(node_t *bsp, fdivline_t *divline)
+// the bsp divline have not enouth presition
+// search for the segs source of this divline
+static inline void SearchDivline(node_t *bsp, fdivline_t *divline)
 {
-	// MAR - If you don't use the same partition line that the BSP uses,
-	// the front/back polys won't match the subsectors in the BSP!
-	divline->x  = FixedToFloat(bsp->x);
-	divline->y  = FixedToFloat(bsp->y);
-	divline->dx = FixedToFloat(bsp->dx);
-	divline->dy = FixedToFloat(bsp->dy);
+	divline->x  = FIXED_TO_FLOAT(bsp->x);
+	divline->y  = FIXED_TO_FLOAT(bsp->y);
+	divline->dx = FIXED_TO_FLOAT(bsp->dx);
+	divline->dy = FIXED_TO_FLOAT(bsp->dy);
 }

 //Hurdler: implement a loading status
@@ -574,25 +532,20 @@ static void loading_status(void)
 	char s[16];
 	int x, y;

-	/*if (g_reloadinggamestate)
-	{
-		return;
-	}*/
-
 	I_OsPolling();
 	CON_Drawer();
 	sprintf(s, "%d%%", (++ls_percent)<<1);
 	x = BASEVIDWIDTH/2;
 	y = BASEVIDHEIGHT/2;
-	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); // Black background to match fade in effect
+	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // Black background to match fade in effect
 	//V_DrawPatchFill(srb2back); // SRB2 background, ehhh too bright.
 	M_DrawTextBox(x-58, y-8, 13, 1);
 	V_DrawString(x-50, y, V_YELLOWMAP, "Loading...");
 	V_DrawRightAlignedString(x+50, y, V_YELLOWMAP, s);

 	// Is this really necessary at this point..?
-	V_DrawCenteredString(BASEVIDWIDTH/2, 40, V_YELLOWMAP, "OPENGL MODE IS INCOMPLETE AND SOME");
-	V_DrawCenteredString(BASEVIDWIDTH/2, 50, V_YELLOWMAP, "VISUAL FEATURES ARE MISSING/BROKEN.");
+	V_DrawCenteredString(BASEVIDWIDTH/2, 40, V_YELLOWMAP, "OPENGL MODE IS INCOMPLETE AND MAY");
+	V_DrawCenteredString(BASEVIDWIDTH/2, 50, V_YELLOWMAP, "NOT DISPLAY SOME SURFACES.");
 	V_DrawCenteredString(BASEVIDWIDTH/2, 70, V_YELLOWMAP, "USE AT SONIC'S RISK.");

 	I_UpdateNoVsync();
@@ -623,14 +576,14 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 			{
 				CONS_Debug(DBG_RENDER, "Adding a new subsector\n");

-				if (num_extra_subsector == numsubsectors + NUM_EXTRA_SUBSECTORS)
-					I_Error("WalkBSPNode: not enough num_extra_subsectors\n");
-				else if (num_extra_subsector > 0x7fff)
-					I_Error("WalkBSPNode: num_extra_subsector > 0x7fff\n");
+				if (UNLIKELY(addsubsector == numsubsectors + NEWSUBSECTORS))
+					I_Error("WalkBSPNode: not enough addsubsectors\n");
+				else if (UNLIKELY(addsubsector > 0x7fff))
+					I_Error("WalkBSPNode: addsubsector > 0x7fff\n");

-				*leafnode = (UINT16)((UINT16)num_extra_subsector | NF_SUBSECTOR);
-				extrasubsectors[num_extra_subsector].planepoly = poly;
-				num_extra_subsector++;
+				*leafnode = (UINT16)((UINT16)addsubsector | NF_SUBSECTOR);
+				extrasubsectors[addsubsector].planepoly = poly;
+				addsubsector++;
 			}

 			//add subsectors without segs here?
@@ -640,8 +593,8 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 		{
 			HWR_SubsecPoly(bspnum & ~NF_SUBSECTOR, poly);

-#ifdef HWR_LOADING_SCREEN
 			//Hurdler: implement a loading status
+#ifdef HWR_LOADING_SCREEN
 			if (ls_count-- <= 0)
 			{
 				ls_count = numsubsectors/50;
@@ -660,7 +613,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 	}

 	bsp = &nodes[bspnum];
-	SetDivline(bsp, &fdivline);
+	SearchDivline(bsp, &fdivline);
 	SplitPoly(&fdivline, poly, &frontpoly, &backpoly);
 	poly = NULL;

@@ -703,12 +656,12 @@ void HWR_FreeExtraSubsectors(void)
 	extrasubsectors = NULL;
 }

-#define MAXDIST (1.5f)
+#define MAXDIST 1.5f
 // BP: can't move vertex: DON'T change polygon geometry! (convex)
 //#define MOVEVERTEX

 // Is vertex va  within the seg v1, v2
-static boolean PointInSeg(polyvertex_t *va, polyvertex_t *v1, polyvertex_t *v2)
+static boolean PointInSeg(polyvertex_t *va,polyvertex_t *v1,polyvertex_t *v2)
 {
 	register float ax, ay, bx, by, cx, cy, d, norm;

@@ -783,8 +736,8 @@ static boolean PointInSeg(polyvertex_t *va, polyvertex_t *v1, polyvertex_t *v2)
 	if (cx*cx+cy*cy <= MAXDIST*MAXDIST)
 	{
 		// ajust a little the point position
-		va->x = ax*d+v1->x;
-		va->y = ay*d+v1->y;
+		a->x = ax*d+v1->x;
+		a->y = ay*d+v1->y;
 		// anyway the correction is not enouth
 		return true;
 	}
@@ -796,10 +749,10 @@ static boolean PointInSeg(polyvertex_t *va, polyvertex_t *v1, polyvertex_t *v2)

 static INT32 numsplitpoly;

-static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
+static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly)
 {
 	poly_t  *q;
-	INT32 j, k;
+	INT32 j,k;

 	if (bspnum & NF_SUBSECTOR)
 	{
@@ -819,12 +772,12 @@ static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
 				if (k == numpts)
 					k = 0;

-				if (!SameVertex(p, &q->pts[j]) &&
-					!SameVertex(p, &q->pts[k]) &&
-					 PointInSeg(p, &q->pts[j], &q->pts[k]))
+				if (!SameVertice(p, &q->pts[j])
+					&& !SameVertice(p, &q->pts[k])
+					&& PointInSeg(p, &q->pts[j], &q->pts[k]))
 				{
-					INT32 n;
 					poly_t *newpoly = HWR_AllocPoly(numpts+1);
+					INT32 n;

 					for (n = 0; n <= j; n++)
 						newpoly->pts[n] = q->pts[n];
@@ -845,17 +798,16 @@ static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
 		return;
 	}

-	// Not a subsector, visit left and right children.
-	if ((FixedToFloat(nodes[bspnum].bbox[0][BOXBOTTOM])-MAXDIST <= p->y) &&
-		(FixedToFloat(nodes[bspnum].bbox[0][BOXTOP   ])+MAXDIST >= p->y) &&
-		(FixedToFloat(nodes[bspnum].bbox[0][BOXLEFT  ])-MAXDIST <= p->x) &&
-		(FixedToFloat(nodes[bspnum].bbox[0][BOXRIGHT ])+MAXDIST >= p->x))
+	if ((FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXBOTTOM])-MAXDIST <= p->y) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXTOP   ])+MAXDIST >= p->y) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXLEFT  ])-MAXDIST <= p->x) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXRIGHT ])+MAXDIST >= p->x))
 		SearchSegInBSP(nodes[bspnum].children[0], p, poly);

-	if ((FixedToFloat(nodes[bspnum].bbox[1][BOXBOTTOM])-MAXDIST <= p->y) &&
-		(FixedToFloat(nodes[bspnum].bbox[1][BOXTOP   ])+MAXDIST >= p->y) &&
-		(FixedToFloat(nodes[bspnum].bbox[1][BOXLEFT  ])-MAXDIST <= p->x) &&
-		(FixedToFloat(nodes[bspnum].bbox[1][BOXRIGHT ])+MAXDIST >= p->x))
+	if ((FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXBOTTOM])-MAXDIST <= p->y) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXTOP   ])+MAXDIST >= p->y) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXLEFT  ])-MAXDIST <= p->x) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXRIGHT ])+MAXDIST >= p->x))
 		SearchSegInBSP(nodes[bspnum].children[1], p, poly);
 }

@@ -864,43 +816,38 @@ static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
 // but we must use a different structure : polygone pointing on segs
 // segs pointing on polygone and on vertex (too mush complicated, well not
 // realy but i am soo lasy), the methode discibed is also better for segs presition
-static void SolveTProblem(void)
+static INT32 SolveTProblem(void)
 {
 	poly_t *p;
-	INT32 i, numpts;
-	size_t ssnum;
+	INT32 i;
+	size_t l;

-	if (!cv_glsolvetjoin.value)
-		return;
+	if (cv_glsolvetjoin.value == 0)
+		return 0;

 	CONS_Debug(DBG_RENDER, "Solving T-joins. This may take a while. Please wait...\n");

-#ifdef HWR_LOADING_SCREEN
-	CON_Drawer(); //let the user know what we are doing
-	I_FinishUpdate(); // page flip or blit buffer
-#endif
-
 	numsplitpoly = 0;

-	for (ssnum = 0; ssnum < num_extra_subsector; ssnum++)
+	for (l = 0; l < addsubsector; l++)
 	{
-		p = extrasubsectors[ssnum].planepoly;
+		p = extrasubsectors[l].planepoly;

-		if (!p || p->numpts == 0)
+		if (!p)
 			continue;

-		numpts = p->numpts;
-
-		for (i = 0; i < numpts; i++)
+		for (i = 0; i < p->numpts; i++)
 			SearchSegInBSP((INT32)numnodes-1, &p->pts[i], p);
 	}

 #ifdef DEBUG_HWBSP
 	CONS_Debug(DBG_RENDER, "numsplitpoly %d\n", numsplitpoly);
-	CONS_Debug(DBG_RENDER, "%d point divides a polygon line\n", numsplitpoly);
 #endif
+
+	return numsplitpoly;
 }

+
 // call this routine after the BSP of a Doom wad file is loaded,
 // and it will generate all the convex polys for the hardware renderer
 void HWR_CreatePlanePolygons(INT32 bspnum)
@@ -918,7 +865,7 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 #endif

 	// reset the portal and horizonline flag
-	gl_maphasportals = gl_maphashorizonlines = false;
+	gl_maphasportals = gl_maphashorizonlines = 0;

 	// find min/max boundaries of map
 #ifdef DEBUG_HWBSP
@@ -935,35 +882,39 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 	HWR_FreeExtraSubsectors();

 	// allocate extra data for each subsector present in map
-	num_alloc_extra_subsector = numsubsectors + NUM_EXTRA_SUBSECTORS;
-	extrasubsectors = (extrasubsector_t*)calloc(num_alloc_extra_subsector, sizeof(*extrasubsectors));
+	totsubsectors = numsubsectors + NEWSUBSECTORS;
+	extrasubsectors = calloc(totsubsectors, sizeof(*extrasubsectors));
 	if (UNLIKELY(!extrasubsectors))
-		I_Error("couldn't malloc extrasubsectors num_alloc_extra_subsector %s\n", sizeu1(num_alloc_extra_subsector));
+		I_Error("couldn't malloc extrasubsectors totsubsectors %s\n", sizeu1(totsubsectors));

 	// number of the first new subsector that might be added
-	num_extra_subsector = numsubsectors;
+	addsubsector = numsubsectors;

 	// construct the initial convex poly that encloses the full map
 	rootp = HWR_AllocPoly(4);
 	rootpv = rootp->pts;

-	// clockwise polygon
-	rootpv->x = FixedToFloat(rootbbox[BOXLEFT  ]);
-	rootpv->y = FixedToFloat(rootbbox[BOXBOTTOM]);  //lr
+	rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXLEFT  ]);
+	rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXBOTTOM]);  //lr
 	rootpv++;
-	rootpv->x = FixedToFloat(rootbbox[BOXLEFT  ]);
-	rootpv->y = FixedToFloat(rootbbox[BOXTOP   ]);  //ur
+	rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXLEFT  ]);
+	rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXTOP   ]);  //ur
 	rootpv++;
-	rootpv->x = FixedToFloat(rootbbox[BOXRIGHT ]);
-	rootpv->y = FixedToFloat(rootbbox[BOXTOP   ]);  //ul
+	rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXRIGHT ]);
+	rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXTOP   ]);  //ul
 	rootpv++;
-	rootpv->x = FixedToFloat(rootbbox[BOXRIGHT ]);
-	rootpv->y = FixedToFloat(rootbbox[BOXBOTTOM]);  //ll
+	rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXRIGHT ]);
+	rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXBOTTOM]);  //ll
 	rootpv++;

 	WalkBSPNode(bspnum, rootp, NULL, rootbbox);

+#ifdef DEBUG_HWBSP
+	i = SolveTProblem();
+	CONS_Debug(DBG_RENDER, "%d point divides a polygon line\n",i);
+#else
 	SolveTProblem();
+#endif

 #ifdef DEBUG_HWBSP
 	//debug debug..
@@ -15,6 +15,8 @@

 #ifdef HWRENDER

+#include <unordered_set>
+
 #include "hw_main.h"
 #include "hw_glob.h"
 #include "hw_gl.h"
@@ -98,7 +100,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
 			position = 0;
 		}

-		position = max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
+		position = std::max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);

 		if (position + count >= pblockheight)
 			count = pblockheight - position;
@@ -162,7 +164,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
 	fixed_t xfrac, xfracstep;
 	fixed_t yfracstep, scale_y;
 	const column_t *patchcol;
-	UINT8 *block = (UINT8 *)(mipmap->data);
+	UINT8 *block = static_cast<UINT8 *>(mipmap->data);
 	INT32 bpp;
 	INT32 blockmodulo;
 	RGBA_t *palette;
@@ -212,7 +214,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
 	fixed_t xfrac, xfracstep;
 	fixed_t yfracstep, scale_y;
 	const column_t *patchcol;
-	UINT8 *block = (UINT8 *)(mipmap->data);
+	UINT8 *block = static_cast<UINT8 *>(mipmap->data);
 	INT32 bpp;
 	INT32 blockmodulo;
 	INT32 width, height;
@@ -288,7 +290,7 @@ static UINT8 *MakeBlock(GLMipmap_t *glMipmap)
 	INT32 blocksize = (glMipmap->width * glMipmap->height);

 	bpp = format2bpp(glMipmap->format);
-	block = (UINT8 *)(Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data)));
+	block = static_cast<UINT8 *>(Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data)));

 	switch (bpp)
 	{
@@ -325,7 +327,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
 	texture = textures[texnum];

 	gltex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
-	gltex->mipmap.format = (GLTextureFormat_t)(textureformat);
+	gltex->mipmap.format = static_cast<GLTextureFormat_t>(textureformat);

 	// hack the Legacy skies..
 	if (UNLIKELY(memcmp(texture->name, "SKY", 3) == 0 &&
@@ -344,7 +346,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
 		colormap += COLORMAP_REMAPOFFSET;
 #endif

-	gltex->mipmap.colormap = (GLColormap_t *)(Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL));
+	gltex->mipmap.colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL));
 	gltex->mipmap.colormap->source = colormap;
 	memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));

@@ -377,7 +379,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
 	// Composite the columns together.
 	for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
 	{
-		pdata = (UINT8 *)(W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL));
+		pdata = static_cast<UINT8 *>(W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL));
 		realpatch = (softwarepatch_t *)pdata;

 		HWR_DrawTexturePatchInCache(&gltex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
@@ -413,7 +415,7 @@ void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipma
 		glMipmap->flags = 0;

 		// setup the texture info
-		glMipmap->format = (GLTextureFormat_t)(patchformat);
+		glMipmap->format = static_cast<GLTextureFormat_t>(patchformat);

 		glPatch->max_s = (float)patch->width / (float)glMipmap->width;
 		glPatch->max_t = (float)patch->height / (float)glMipmap->height;
@@ -446,7 +448,7 @@ typedef struct
 } GLMapTextureSet_t; // idk i suck at naming things

 static size_t gl_numtextures = 0; // Texture count
-static GLMapTextureSet_t *gl_textures = NULL; // For all textures
+static GLMapTextureSet_t *gl_textures; // For all textures

 static void HWR_FreeTextureData(patch_t *patch)
 {
@@ -455,7 +457,7 @@ static void HWR_FreeTextureData(patch_t *patch)
 	if (!patch || !patch->hardware)
 		return;

-	glPatch = (GLPatch_t *)(patch->hardware);
+	glPatch = static_cast<GLPatch_t *>(patch->hardware);

 	if (vid.glstate == VID_GL_LIBRARY_LOADED)
 		GL_DeleteTexture(glPatch->mipmap);
@@ -471,7 +473,7 @@ void HWR_FreeTexture(patch_t *patch)

 	if (patch->hardware)
 	{
-		GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
+		GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);

 		HWR_FreeTextureColormaps(patch);

@@ -497,7 +499,7 @@ static void HWR_FreeTextureColormaps(patch_t *patch)
 	if (!patch)
 		return;

-	pat = (GLPatch_t *)(patch->hardware);
+	pat = static_cast<GLPatch_t *>(patch->hardware);
 	if (!pat)
 		return;

@@ -570,8 +572,7 @@ void HWR_ClearAllTextures(void)
 /*static void HWR_FreeColormapCache(void)
 {
 	HWR_FreePatchCache(false);
-}
-*/
+}*/

 void HWR_InitMapTextures(void)
 {
@@ -613,21 +614,23 @@ void HWR_FreeMapTextures(void)
 	gl_numtextures = 0;
 }

-#define NAME    flatcheck
-#define KEY_TY  UINT32
-#define HASH_FN vt_hash_integer
-#define CMPR_FN vt_cmpr_integer
-#include "../verstable.h"
-
 static void HWR_PrecacheLevelFlats(void)
 {
 	// lookup for flats that may´ve been already loaded
-	flatcheck flatpresent;
+	// too lazy to make a hashtable or smth so unordered set will do :carbuncle:
+	std::unordered_set<UINT32> flatpresent;
 	size_t i, j;
 	INT32 k;

-	flatcheck_init(&flatpresent);
-	flatcheck_reserve(&flatpresent, numlevelflats);
+	auto load_flat = [&](lumpnum_t lump, boolean noencoremap)
+	{
+		// flat already loaded?
+		if (flatpresent.count(lump) == 0)
+		{
+			HWR_GetFlat(lump, noencoremap);
+			flatpresent.insert(lump);
+		}
+	};

 	// special case for encore
 #ifdef GLENCORE
@@ -646,23 +649,14 @@ static void HWR_PrecacheLevelFlats(void)

 				const levelflat_t *levelflat = &levelflats[pic];

-				if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
-				{
-					HWR_GetFlat(levelflat->lumpnum, R_NoEncore(sec, ceiling));
-					flatcheck_insert(&flatpresent, levelflat->lumpnum);
-				}
+				load_flat(levelflat->lumpnum, R_NoEncore(sec, ceiling));

 				if (levelflat->speed) // is it an animated flat ?
 				{
 					// start from 0, occasionally basenumlump != flat->lumpnum
 					for (k = 0; k < levelflat->numpics; k++)
 					{
-						lumpnum_t lump = levelflat->baselumpnum + k;
-						if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
-						{
-							HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
-							flatcheck_insert(&flatpresent, lump);
-						}
+						load_flat(levelflat->baselumpnum + k, R_NoEncore(sec, ceiling));
 					}
 				}
 			}
@@ -677,29 +671,18 @@ static void HWR_PrecacheLevelFlats(void)
 		{
 			const levelflat_t *levelflat = &levelflats[i];

-			if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
-			{
-				HWR_GetFlat(levelflat->lumpnum, false);
-				flatcheck_insert(&flatpresent, levelflat->lumpnum);
-			}
+			load_flat(levelflat->lumpnum, false);

 			if (levelflat->speed) // is it an animated flat ?
 			{
 				// start from 0, occasionally basenumlump != flat->lumpnum
 				for (k = 0; k < levelflat->numpics; k++)
 				{
-					lumpnum_t lump = levelflat->baselumpnum + k;
-					if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
-					{
-						HWR_GetFlat(lump, false);
-						flatcheck_insert(&flatpresent, lump);
-					}
+					load_flat(levelflat->baselumpnum + k, false);
 				}
 			}
 		}
 	}
-
-	flatcheck_cleanup(&flatpresent);
 }

 static void HWR_PrecacheLevelTextures(void)
@@ -709,7 +692,7 @@ static void HWR_PrecacheLevelTextures(void)
 	size_t i, j, f;
 	INT32 h;

-	texturepresent = (char *)(calloc(gl_numtextures, sizeof(*texturepresent)));
+	texturepresent = static_cast<char *>(calloc(gl_numtextures, sizeof(*texturepresent)));
 	if (texturepresent == NULL)
 		I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");

@@ -729,7 +712,7 @@ static void HWR_PrecacheLevelTextures(void)
 		for (j = 0; j < 2; j++)
 		{
 			// check if single-sided linedef
-			if (line->sidenum[j] == NO_INDEX)
+			if (line->sidenum[j] == 0xffff)
 				continue;

 			const side_t *side = &sides[line->sidenum[j]];
@@ -884,7 +867,7 @@ void HWR_LoadMapTextures(size_t pnumtextures)
 	HWR_FreeMapTextures();

 	gl_numtextures = pnumtextures;
-	gl_textures = (GLMapTextureSet_t *)(calloc(gl_numtextures, sizeof(*gl_textures))); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
+	gl_textures = static_cast<GLMapTextureSet_t *>(calloc(gl_numtextures, sizeof(*gl_textures))); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t

 	if (gl_textures == NULL)
 		I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
@@ -981,7 +964,7 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
 	W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &glMipmap->data));

 #ifdef GLENCORE
-	flat = (UINT8 *)(glMipmap->data);
+	flat = static_cast<UINT8 *>(glMipmap->data);
 	for (steppy = 0; steppy < size; steppy++)
 	{
 		if (flat[steppy] == HWR_PATCHES_CHROMAKEY_COLORINDEX)
@@ -992,6 +975,7 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)

 		flat[steppy] = glMipmap->colormap->source[flat[steppy]];
 	}
+#endif

 	if (haschromakey)
 	{
@@ -1003,7 +987,6 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
 			glMipmap->flags &= ~TF_CHROMAKEYED;
 		}
 	}
-#endif
 }

 // Download a Doom 'flat' to the hardware cache and make it ready for use
@@ -1025,7 +1008,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
 		if (!noencoremap && encoremap)
 			colormap += COLORMAP_REMAPOFFSET;
 #endif
-		glMipmap->colormap = (GLColormap_t *)(Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
+		glMipmap->colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
 		glMipmap->colormap->source = colormap;
 		memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 	}
@@ -1049,7 +1032,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
 // --------------------+
 static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
 {
-	GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
+	GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);

 	if (!glMipmap->downloaded)
 	{
@@ -1070,7 +1053,7 @@ static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
 // ----------------------+
 static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
 {
-	GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
+	GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
 	HWR_MakePatch(patch, glPatch, glMipmap, true);

 	// If hardware does not have the texture, then call GL_SetTexture to upload it
@@ -1106,7 +1089,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)

 	if (!patch->hardware)
 		Patch_CreateGL(patch);
-	glPatch = (GLPatch_t *)(patch->hardware);
+	glPatch = static_cast<GLPatch_t *>(patch->hardware);

 	// Blatant hack for encore colormapping aside...
 	if (colormap == colormaps || colormap == NULL || colormap == (const UINT8*)(COLORMAP_REMAPOFFSET))
@@ -1130,9 +1113,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 				HWR_UpdatePatchMipmap(patch, glMipmap);
 			}
 			else
-			{
 				HWR_LoadPatchMipmap(patch, glMipmap);
-			}

 			return;
 		}
@@ -1144,12 +1125,12 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 	//              (it have a liste of mipmap)
 	//    this malloc is cleared in HWR_FreeColormapCache
 	//    (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
-	newMipmap = (GLMipmap_t *)(calloc(1, sizeof (*newMipmap)));
+	newMipmap = static_cast<GLMipmap_t *>(calloc(1, sizeof (*newMipmap)));
 	if (newMipmap == NULL)
 		I_Error("%s: Out of memory", "HWR_GetMappedPatch");
 	glMipmap->nextcolormap = newMipmap;

-	newMipmap->colormap = (GLColormap_t *)(Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
+	newMipmap->colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
 	newMipmap->colormap->source = colormap;
 	memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));

@@ -1172,7 +1153,7 @@ patch_t *HWR_GetCachedGLPatchPwad(UINT16 wadnum, UINT16 lumpnum)
 	{
 		void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
 		Patch_Create(NULL, 0, ptr);
-		Patch_AllocateHardwarePatch((patch_t *)(ptr));
+		Patch_AllocateHardwarePatch(static_cast<patch_t *>(ptr));
 	}

 	return (patch_t *)(lumpcache[lumpnum]);
@@ -1189,7 +1170,7 @@ static void HWR_DrawFadeMaskInCache(GLMipmap_t *mipmap, INT32 pblockwidth, INT32
 {
 	INT32 i,j;
 	fixed_t posx, posy, stepx, stepy;
-	UINT8 *block = (UINT8 *)(mipmap->data); // places the data directly into here
+	UINT8 *block = static_cast<UINT8 *>(mipmap->data); // places the data directly into here
 	UINT8 *flat;
 	UINT8 *dest, *src, texel;
 	RGBA_t col;
@@ -1345,7 +1326,7 @@ void HWR_SetPalette(RGBA_t *palette)
 static void HWR_SetPaletteLookup(RGBA_t *palette)
 {
 	int r, g, b;
-	UINT8 *lut = (UINT8 *)(Z_Malloc(
+	UINT8 *lut = static_cast<UINT8 *>(Z_Malloc(
 		HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*sizeof(UINT8),
 		PU_STATIC, NULL));
 #define STEP_SIZE (256/HWR_PALETTE_LUT_SIZE)
@@ -1390,7 +1371,7 @@ void HWR_SetMapPalette(void)
 		if (palsize < 768) // 256 * 3
 			I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");

-		RGB_data = (UINT8 *)(W_CacheLumpNum(lumpnum, PU_CACHE));
+		RGB_data = static_cast<UINT8 *>(W_CacheLumpNum(lumpnum, PU_CACHE));
 		// we got the RGB palette now, but we need it in RGBA format.
 		for (i = 0; i < 256; i++)
 		{
@@ -1425,7 +1406,7 @@ static UINT32 HWR_CreateLightTable(UINT8 *lighttable)
 {
 	UINT32 i, id;
 	RGBA_t *palette = HWR_GetTexturePalette();
-	RGBA_t *hw_lighttable = (RGBA_t *)(Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL));
+	RGBA_t *hw_lighttable = static_cast<RGBA_t *>(Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL));

 	// To make the palette index -> RGBA mapping easier for the shader,
 	// the hardware lighttable is composed of RGBA colors instead of palette indices.
@@ -319,17 +319,16 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
 	double clipfov;
 	double floatangle;
 	angle_t a1;
-	float tilt;
+
+	float tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
+
+	if (tilt > 90.0f)
+		tilt = 90.0f;

 	// 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;
@@ -54,7 +54,7 @@ struct GLMipmap_s
 	UINT16					width, height;
 	UINT32					downloaded; // The GPU has this texture.

-	struct GLMipmap_s		*nextcolormap;
+	struct	GLMipmap_s		*nextcolormap;
 	struct GLColormap_s		*colormap;
 };
 typedef struct GLMipmap_s GLMipmap_t;
@@ -96,6 +96,7 @@ typedef struct
 typedef struct
 {
 	float x, y, z;
+	fixed_t x2, y2, z2;
 } polyvertex_t;

 // a convex 'plane' polygon, clockwise order
@@ -32,6 +32,20 @@

 #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};
@@ -43,7 +57,8 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
 {
 	FOutVector v[4];
 	FBITFIELD flags;
-	float cx, cy;
+	float cx = FIXED_TO_FLOAT(x);
+	float cy = FIXED_TO_FLOAT(y);
 	UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
 	UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT);
 	GLPatch_t *hwrPatch;
@@ -57,9 +72,6 @@ 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;

@@ -138,7 +150,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
 				if (!column->topdelta)
 				{
 					const UINT8 *source = (const UINT8 *)(column) + 3;
-					HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]);
+					HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
 				}
 			}

@@ -210,7 +222,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p

 	if (alphalevel)
 	{
-		FSurfaceInfo Surf = {};
+		FSurfaceInfo Surf;
 		Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;

 		switch (alphalevel)
@@ -232,7 +244,8 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
 {
 	FOutVector v[4];
 	FBITFIELD flags;
-	float cx, cy;
+	float cx = FIXED_TO_FLOAT(x);
+	float cy = FIXED_TO_FLOAT(y);
 	UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
 	GLPatch_t *hwrPatch;

@@ -245,9 +258,6 @@ 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;

@@ -292,7 +302,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
 				if (!column->topdelta)
 				{
 					const UINT8 *source = (const UINT8 *)(column) + 3;
-					HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]);
+					HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
 				}
 			}

@@ -375,7 +385,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
 	// clip it since it is used for bunny scroll in doom I
 	if (alphalevel)
 	{
-		FSurfaceInfo Surf = {};
+		FSurfaceInfo Surf;
 		Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;

 		switch (alphalevel)
@@ -480,7 +490,7 @@ void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum)
 void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 {
 	FOutVector  v[4];
-	FSurfaceInfo Surf = {};
+	FSurfaceInfo Surf;
 	FBITFIELD poly_flags = PF_NoTexture|PF_Modulated|PF_NoDepthTest;

 	v[0].x = v[3].x = -1.0f;
@@ -533,7 +543,7 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 void HWR_DrawConsoleBack(UINT32 color, INT32 height)
 {
 	FOutVector  v[4];
-	FSurfaceInfo Surf = {};
+	FSurfaceInfo Surf;

 	// setup some neat-o translucency effect
 	if (!height) //cool hack 0 height is full height
@@ -588,7 +598,7 @@ void HWR_drawAMline(const fline_t *fl, INT32 color)
 void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 {
 	FOutVector v[4];
-	FSurfaceInfo Surf = {};
+	FSurfaceInfo Surf;
 	float fx, fy, fw, fh, fwait = 0;
 	RGBA_t *palette;

@@ -692,7 +702,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32 options)
 {
 	FOutVector v[4];
-	FSurfaceInfo Surf = {};
+	FSurfaceInfo Surf;
 	float fx, fy, fw, fh;

 	if (w < 0 || h < 0)
@@ -810,7 +820,7 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 {
 	FOutVector v[4];
-	FSurfaceInfo Surf = {};
+	FSurfaceInfo Surf;
 	float fx, fy, fw, fh;

 	if (w < 0 || h < 0)
@@ -954,20 +964,6 @@ 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
 // --------------------------------------------------------------------------
@@ -32,12 +32,8 @@ 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);
@@ -67,7 +63,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);
+void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader);

 void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]);

@@ -76,7 +72,6 @@ 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);

@@ -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
@@ -54,7 +54,7 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32
 // --------
 extern extrasubsector_t *extrasubsectors;
 #ifdef PARANOIA
-extern size_t num_extra_subsector;
+extern size_t addsubsector;
 #endif

 void HWR_FreeExtraSubsectors(void);
@@ -102,7 +102,7 @@ void HWR_SetViewSize(void);
 void HWR_AddCommands(void);

 void HWR_RenderPlayerView(void);
-void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level);
+void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level, boolean allow_portals);

 void HWR_ClearSkyDome(void);
 void HWR_BuildSkyDome(void);
@@ -151,19 +151,14 @@ 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)
+FUNCINLINE static ATTRINLINE void HWR_DrawScreenFinalTexture(INT32 width, INT32 height, boolean useshader)
 {
-	GL_DrawScreenFinalTexture(HWD_SCREENTEXTURE_GENERIC2, width, height);
+	GL_DrawScreenFinalTexture(HWD_SCREENTEXTURE_GENERIC2, width, height, useshader);
 }

 // hw_main.c: Segs
@@ -213,6 +208,7 @@ extern consvar_t cv_glportals;

 extern consvar_t cv_glpaletterendering;
 extern consvar_t cv_glpalettedepth;
+extern consvar_t cv_glflashpal;

 FUNCINLINE static ATTRINLINE boolean HWR_UseShader(void)
 {
@@ -224,6 +220,11 @@ FUNCINLINE static ATTRINLINE boolean HWR_ShouldUsePaletteRendering(void)
 	return (cv_glpaletterendering.value && (pLocalPalette != NULL) && HWR_UseShader());
 }

+FUNCINLINE static ATTRINLINE boolean HWR_PalRenderFlashpal(void)
+{
+	return (cv_glflashpal.value && HWR_ShouldUsePaletteRendering());
+}
+
 // Returns a pointer to the palette which should be used for caching textures.
 FUNCINLINE static ATTRINLINE RGBA_t *HWR_GetTexturePalette(void)
 {
@@ -693,15 +693,17 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
 	GLPatch_t *hwrBlendPatch = blendgpatch->hardware;
 	UINT16 w = gpatch->width, h = gpatch->height;
 	UINT32 size = w*h;
-	RGBA_t *image, *blendimage, *cur;
-	RGBA_t blendcolor = {};
+	RGBA_t *image, *blendimage, *cur, blendcolor;
 	RGBA_t *palette = HWR_GetTexturePalette();
-	UINT8 translation[17] = {}; // First the color index
-	UINT8 cutoff[17] = {}; // Brightness cutoff before using the next color
+	UINT8 translation[17]; // First the color index
+	UINT8 cutoff[17]; // Brightness cutoff before using the next color
 	UINT8 translen = 0;
 	UINT8 i;
-	UINT8 colorbrightnesses[17] = {};
-	UINT8 color_match_lookup[256] = {}; // optimization attempt
+	UINT8 colorbrightnesses[17];
+	UINT8 color_match_lookup[256]; // optimization attempt
+
+	memset(translation, 0, sizeof(translation));
+	memset(cutoff, 0, sizeof(cutoff));

 	if (glMipmap->width == 0)
 	{
@@ -714,10 +716,14 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
 		glMipmap->format = GL_TEXFMT_RGBA;
 	}

-	Z_Free(glMipmap->data);
-	glMipmap->data = NULL;
+	if (glMipmap->data)
+	{
+		Z_Free(glMipmap->data);
+		glMipmap->data = NULL;
+	}

-	cur = Z_Calloc(size*4, PU_HWRMODELTEXTURE, &glMipmap->data);
+	cur = Z_Malloc(size*4, PU_HWRMODELTEXTURE, &glMipmap->data);
+	memset(cur, 0x00, size*4);

 	image = hwrPatch->mipmap->data;
 	blendimage = hwrBlendPatch->mipmap->data;
@@ -1031,6 +1037,7 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
 	GLPatch_t *glPatch = patch->hardware;
 	GLMipmap_t *glMipmap, *newMipmap;

+
 	if (blendgpatch == NULL || colormap == colormaps || colormap == NULL)
 	{
 		// Don't do any blending
@@ -1099,7 +1106,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 	INT32 frame = 0;
 	INT32 nextFrame = -1;
 	FTransform p;
-	FSurfaceInfo Surf = {};
+	FSurfaceInfo Surf;

 	if (!cv_glmdls.value || spr->precip)
 		return;
@@ -1153,11 +1160,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 		INT32 durs = spr->mobj->state->tics;
 		INT32 tics = spr->mobj->tics;
 		//mdlframe_t *next = NULL;
-
-		//const UINT8 flip = (UINT8)(!(spr->mobj->eflags & MFE_VERTICALFLIP) != !R_ThingVerticallyFlipped(spr->mobj)); // :chaosleep:
 		const UINT8 flip = (UINT8)((spr->mobj->eflags & MFE_VERTICALFLIP) == MFE_VERTICALFLIP);
-		const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !R_ThingHorizontallyFlipped(spr->mobj));
-
+		const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !(spr->mobj->frame & FF_HORIZONTALFLIP));
 		spritedef_t *sprdef;
 		spriteframe_t *sprframe;
 		spriteinfo_t *sprinfo;
@@ -1339,8 +1343,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 		if (spr->mobj->frame & FF_ANIMATE)
 		{
 			// set duration and tics to be the correct values for FF_ANIMATE states
-			durs = spr->mobj->state->var2;
-			tics = (INT32)spr->mobj->anim_duration;
+			durs = (float)spr->mobj->state->var2;
+			tics = (float)spr->mobj->anim_duration;
 		}

 		//FIXME: this is not yet correct
@@ -1403,11 +1407,12 @@ void HWR_DrawMD2(gl_vissprite_t *spr)

 		const angle_t sliptideroll = ((cv_sliptideroll.value && spr->mobj->player) ? spr->mobj->player->sliproll : 0);
 		const SINT8 flipfactor = flip ? -1 : 1;
-		const angle_t thingrollangle = (spr->mobj->rollangle - spr->mobj->temprollangle);

-		if (thingrollangle || sliptideroll)
+		if (spr->mobj->rollangle || sliptideroll)
 		{
-			angle_t rollang = sliptideroll ? (thingrollangle + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])) : thingrollangle;
+			angle_t rollang = sliptideroll
+			? (spr->mobj->rollangle) + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])
+			: (spr->mobj->rollangle);

 			rollang *= flipfactor;

@@ -1477,7 +1482,7 @@ void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t c
 	patch_t *gpatch, *blendgpatch;
 	GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
 	FTransform p;
-	FSurfaceInfo Surf = {};
+	FSurfaceInfo Surf;

 	if (!md2->model)
 	{
@@ -1528,6 +1533,7 @@ void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t c
 	if (blendgpatch)
 		hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);

+	memset(&Surf, 0x00, sizeof(FSurfaceInfo));
 	Surf.PolyColor.rgba = 0xFFFFFFFF;
 	Surf.PolyFlags = PF_Occlude | PF_Modulated;

@@ -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,6 +503,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 		}
 	}*/

+
 	free(buffer);

 	return retModel;
@@ -80,8 +80,8 @@ void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg)
 	gl_portal_t *portal = HWR_Portal_Add(seg);

 	// Offset the portal view by the linedef centers
-	line_t* start = &lines[line1];
-	line_t* dest  = &lines[line2];
+	line_t* start	= &lines[line1];
+	line_t* dest	= &lines[line2];

 	angle_t dangle = R_PointToAngle2(0, 0, dest->dx, dest->dy) - R_PointToAngle2(start->dx, start->dy, 0, 0);

@@ -99,7 +99,7 @@ void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg)
 	dest_c.y = dest->v1->y/2 + dest->v2->y/2;

 	disttopoint = R_PointToDist2(start_c.x, start_c.y, viewx, viewy);
-	angtopoint  = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy);
+	angtopoint = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy);
 	angtopoint += dangle;

 	portal->viewx = dest_c.x + FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
@@ -170,7 +170,7 @@ void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float
 	HWR_PortalFrame(portal);

 	// call HWR_RenderViewpoint
-	HWR_RenderPortalViewpoint(portal, stencil_level + 1);
+	HWR_RenderPortalViewpoint(portal, stencil_level + 1, true);

 	// return to current frame
 	if (rootportal)
@@ -220,9 +220,9 @@ boolean HWR_PortalCheckBBox(const fixed_t *bspcoord)
 	if (!portalclipline)
 		return true;

-	if (HWR_PortalCheckPointSide(bspcoord[BOXLEFT],  bspcoord[BOXTOP])    ||
-		HWR_PortalCheckPointSide(bspcoord[BOXLEFT],  bspcoord[BOXBOTTOM]) ||
-		HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXTOP])    ||
+	if (HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXTOP]) ||
+		HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]) ||
+		HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXTOP]) ||
 		HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]))
 	{
 		return true;
@@ -109,7 +109,7 @@ boolean HWR_InitShaders(void)
 // returns INT32_MAX if not found
 static INT32 strstr_int(const char *str1, const char *str2)
 {
-	gconst char *location = strstr(str1, str2);
+	char *location = strstr(str1, str2);
 	if (location)
 		return location - str1;
 	else
@@ -365,17 +365,13 @@ static void HWR_CompileShader(int index)
 	if (vertex_source)
 	{
 		char *preprocessed = HWR_PreprocessShader(vertex_source);
-		if (!preprocessed)
-			return;
-
+		if (!preprocessed) return;
 		GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_VERTEX);
 	}
 	if (fragment_source)
 	{
 		char *preprocessed = HWR_PreprocessShader(fragment_source);
-		if (!preprocessed)
-			return;
-
+		if (!preprocessed) return;
 		GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_FRAGMENT);
 	}

@@ -391,10 +387,8 @@ void HWR_CompileShaders(void)
 	{
 		int custom_index = gl_shadertargets[i].custom_shader;
 		HWR_CompileShader(i);
-
 		if (!gl_shaders[i].compiled)
 			CONS_Alert(CONS_ERROR, "HWR_CompileShaders: Compilation failed for base %s shader!\n", shaderxlat[i].type);
-
 		if (custom_index != -1)
 		{
 			HWR_CompileShader(custom_index);
@@ -76,30 +76,35 @@
 //

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

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

 	// maybe, just maybe, we support the standart extensions
-	if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) &&
-		GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) &&
-		GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions))
+	if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions)
+		&& GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions)
+		&& GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions))
 		return FBO_ARB;

 	// nope, try the older 2.1 extensions
-	if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions) &&
-		GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions) &&
-		GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions))
+	if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions)
+		&& GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions)
+		&& GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions))
 	{
 		// perhaps we may even support a stencil attachment
 		if (GL_isExtAvailable("GL_EXT_packed_depth_stencil", gl_extensions))
@@ -885,7 +885,7 @@ void SetupGLFunc4(void)
 	{ \
 		GL_MSG_Warning("failed to get OpenGL FBO function: %s\n", #func); \
 		GL_DBG_Printf("\nFBO: No framebuffer object support\n"); \
-		supportFBO = FBO_NONE; \
+		supportFBO = false; \
 		return; \
 	} \

@@ -1068,13 +1068,6 @@ 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
@@ -1122,7 +1115,7 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect)

 	const GLfloat deltaZ = FAR_CLIPPING_PLANE - NEAR_CLIPPING_PLANE;

-	if ((fabsf(deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
+	if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
 	{
 		return;
 	}
@@ -1284,7 +1277,7 @@ void GL_SetStates(void)

 	pglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);

-	pglDisable(GL_STENCIL_TEST);
+	pglEnable(GL_STENCIL_TEST);
 	pglEnable(GL_DEPTH_TEST);    // check the depth buffer
 	pglDepthMask(GL_TRUE);       // enable writing to depth buffer
 	pglClearDepth(1.0f);
@@ -1314,16 +1307,6 @@ 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
 // -----------------+
@@ -1400,19 +1383,19 @@ void GL_Flush(void)
 // -----------------+
 INT32 GL_isExtAvailable(const char *extension, const GLubyte *start)
 {
-	gconst GLubyte *where, *terminator;
+	GLubyte         *where, *terminator;

 	if (!extension || !start)
 		return 0;

-	where = (gconst GLubyte *)strchr(extension, ' ');
+	where = (GLubyte *) strchr(extension, ' ');

 	if (where || *extension == '\0')
 		return 0;

 	for (;;)
 	{
-		where = (gconst GLubyte *)strstr((const char *)start, extension);
+		where = (GLubyte *) strstr((const char *) start, extension);

 		if (!where)
 			break;
@@ -1465,19 +1448,6 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
 	if (tex != HWD_SCREENTEXTURE_GENERIC2)
 		GL_DrawScreenTexture(tex, NULL, 0);

-#ifdef USE_FBO_OGL
-	// FIXME: this is incredibly stupid
-	// but the final screen texture will NOT be drawn in the downsample fbo
-	if (tex == HWD_SCREENTEXTURE_GENERIC2 &&
-		UseScreenFBO() && HWR_ShouldUsePaletteRendering())
-	{
-		GL_SetShader(HWR_GetShaderFromTarget(SHADER_PALETTE_POSTPROCESS));
-		GL_EnableShader();
-		GL_DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0);
-		GL_UnSetShader();
-	}
-#endif
-
 	image = malloc(screen_width*screen_height*3);
 	pglPixelStorei(GL_PACK_ALIGNMENT, 1);
 	pglReadPixels(0, 0, screen_width, screen_height, GL_RGB, GL_UNSIGNED_BYTE, image);
@@ -1596,7 +1566,6 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color)
 		angle = atanf((v2->y-v1->y)/(v2->x-v1->x));
 	else
 		angle = (float)N_PI_DEMI;
-
 	dx = sinf(angle) / (float)screen_width;
 	dy = cosf(angle) / (float)screen_height;

@@ -1711,7 +1680,7 @@ static void GL_SetBlendMode(FBITFIELD flags)

 void GL_SetBlend(FBITFIELD PolyFlags)
 {
-	const FBITFIELD Xor = CurrentPolyFlags^PolyFlags;
+	const FBITFIELD Xor = CurrentPolyFlags^PolyFlags;;

 	if (Xor & (PF_Blending|PF_RemoveYWrap|PF_ForceWrapX|PF_ForceWrapY|PF_Occlude|PF_NoTexture|PF_Modulated|PF_NoDepthTest|PF_Decal|PF_Skydecal|PF_Invisible))
 	{
@@ -2503,7 +2472,7 @@ void GL_RenderSkyDome(gl_sky_t *sky)
 	GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);

 	// Build the sky dome! Yes!
-	if (sky->rebuild || !sky->vbo)
+	if (sky->rebuild)
 	{
 		// delete VBO when already exists
 		if (sky->vbo)
@@ -2928,7 +2897,7 @@ void GL_CreateModelVBOs(model_t *model)
 	}
 }

-#define BUFFER_OFFSET(i) ((void*)(i))
+#define BUFFER_OFFSET(i) ((char*)(i))

 void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
 {
@@ -3221,8 +3190,8 @@ void GL_SetTransform(FTransform *stransform)
 	{
 		float dy = stransform->viewaiming * 2;

-		if (stransform->fliptype == TRANSFORM_FLIP ||
-			stransform->fliptype == TRANSFORM_MIRRORFLIP)
+		if (stransform->fliptype == TRANSFORM_FLIP
+			|| stransform->fliptype == TRANSFORM_MIRRORFLIP)
 			dy *= -1.0f;

 		pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f);
@@ -3247,7 +3216,7 @@ void GL_SetTransform(FTransform *stransform)
 #ifdef USE_FBO_OGL
 static void GL_Framebuffer_DeleteAttachments(void)
 {
-	if (supportFBO == FBO_NONE || !framebufferobject.init)
+	if (!supportFBO || !framebufferobject.init)
 		return;

 	// Unbind the framebuffer
@@ -3267,13 +3236,21 @@ static void GL_Framebuffer_DeleteAttachments(void)

 static void GL_Framebuffer_Generate(void)
 {
-	if (supportFBO == FBO_NONE || framebufferobject.init || !UseScreenFBO())
+	if (!supportFBO || framebufferobject.init || !UseScreenFBO())
 		return;

 	// Generate the framebuffer
 	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);

@@ -3287,10 +3264,10 @@ static void GL_Framebuffer_Generate(void)
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 		Clamp2D(GL_TEXTURE_WRAP_S);
 		Clamp2D(GL_TEXTURE_WRAP_T);
+		pglBindTexture(GL_TEXTURE_2D, 0);

 		// Attach the framebuffer texture to the framebuffer
 		pglFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, framebufferobject.tex, 0);
-		pglBindTexture(GL_TEXTURE_2D, 0);
 	}

 	// Generate the renderbuffer
@@ -3325,18 +3302,6 @@ 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 = FBO_NONE;
-		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
-		return;
-	}
-
 	// Unbind the framebuffer
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);

@@ -3345,7 +3310,7 @@ static void GL_Framebuffer_Generate(void)

 void GL_Framebuffer_Unbind(void)
 {
-	if (supportFBO == FBO_NONE || !framebufferobject.init)
+	if (!supportFBO || !framebufferobject.init)
 		return;

 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
@@ -3354,22 +3319,18 @@ void GL_Framebuffer_Unbind(void)

 void GL_Framebuffer_Enable(void)
 {
-	if (supportFBO == FBO_NONE || !UseScreenFBO())
+	if (!supportFBO || !UseScreenFBO())
 		return;

 	GL_Framebuffer_Generate();

-	// failed
-	if (supportFBO == FBO_NONE || !framebufferobject.init)
-		return;
-
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
 	pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
 }

 void GL_Framebuffer_Disable(void)
 {
-	if (supportFBO == FBO_NONE || !framebufferobject.init)
+	if (!supportFBO || !framebufferobject.init)
 		return;

 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
@@ -3757,7 +3718,7 @@ void GL_MakeScreenTexture(int tex)
 	tex_downloaded = screenTextures[tex];
 }

-void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)
+void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader)
 {
 	float xfix, yfix;
 	float origaspect, newaspect;
@@ -3810,6 +3771,9 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)

 	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);
@@ -3817,6 +3781,9 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)

 	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);

+	if (useshader)
+		pglUseProgram(0);
+
 	tex_downloaded = screenTextures[tex];
 }

@@ -0,0 +1,79 @@
+[Project]
+FileName=r_opengl.dev
+Name=r_opengl
+Ver=1
+IsCpp=1
+Type=3
+Compiler=-D_M_IX86=500_@@_-Wall_@@_-D_WINDOWS_@@_-DUSE_WGL_SWAP_@@_-Os_@@_-fomit-frame-pointer_@@_
+CppCompiler=
+Includes=
+Linker=--def ../r_mingw.def_@@_-lgdi32_@@_
+Libs=
+UnitCount=3
+Folders=
+ObjFiles=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=C:\srb2demo2
+ObjectOutput=..\..\..\objs\Mingw\r_opengl
+OverrideOutput=1
+OverrideOutputName=r_opengl.dll
+HostApplication=
+CommandLine=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=00000000000000000111d0
+UseCustomMakefile=0
+CustomMakefile=
+
+[Unit1]
+FileName=ogl_win.c
+Folder=
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=r_opengl.c
+Folder=
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=r_opengl.h
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=r_opengl.exe
+ProductName=r_opengl
+ProductVersion=0.1
+AutoIncBuildNr=0
+
@@ -0,0 +1,105 @@
+# Microsoft Developer Studio Project File - Name="r_opengl" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=r_opengl - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "r_opengl.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "r_opengl.mak" CFG="r_opengl - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "r_opengl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "r_opengl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "r_opengl - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "r_opengl___Win32_Release"
+# PROP BASE Intermediate_Dir "r_opengl___Win32_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\bin\VC\Release\r_opengl"
+# PROP Intermediate_Dir "..\..\..\objs\VC\Release\r_opengl"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /G5 /W3 /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x80c /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Release\r_opengl.pdb" /machine:I386 /out:"C:\srb2demo2\r_opengl.dll"
+# SUBTRACT LINK32 /pdb:none /debug
+
+!ELSEIF  "$(CFG)" == "r_opengl - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\..\objs\Debug"
+# PROP BASE Intermediate_Dir "..\..\..\objs\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\bin\VC\Debug\r_opengl"
+# PROP Intermediate_Dir "..\..\..\objs\VC\Debug\r_opengl"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x80c /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Debug\r_opengl.pdb" /debug /machine:I386 /out:"C:\srb2demo2\r_opengld.dll" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "r_opengl - Win32 Release"
+# Name "r_opengl - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\ogl_win.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_opengl.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_opengl.h
+# End Source File
+# End Target
+# End Project
@@ -62,7 +62,7 @@ static int hms_started;

 static char *hms_api;
 #ifdef HAVE_THREADS
-static I_mutex hms_api_mutex;
+static I_Mutex hms_api_mutex;
 #endif

 static char *hms_server_token;
@@ -90,9 +90,9 @@ Printf_url (const char *url)
 	boolean startup;

 #ifdef HAVE_THREADS
-	I_lock_mutex(&con_mutex);
+	I_LockMutex(&con_mutex);
 	startup = con_startup;
-	I_unlock_mutex(con_mutex);
+	I_UnlockMutex(con_mutex);
 #else
 	startup = con_startup;
 #endif
@@ -183,7 +183,7 @@ HMS_connect (const char *format, ...)
 	}

 #ifdef HAVE_THREADS
-	I_lock_mutex(&hms_api_mutex);
+	I_LockMutex(&hms_api_mutex);
 #endif

 	seek = strlen(hms_api) + 1;/* + '/' */
@@ -195,7 +195,7 @@ HMS_connect (const char *format, ...)
 	sprintf(url, "%s/", hms_api);

 #ifdef HAVE_THREADS
-	I_unlock_mutex(hms_api_mutex);
+	I_UnlockMutex(hms_api_mutex);
 #endif

 	va_start (ap, format);
@@ -225,10 +225,9 @@ HMS_connect (const char *format, ...)
 	{
 		cc = curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
-#ifdef LOGMESSAGES
+
 		cc = curl_easy_setopt(curl, CURLOPT_STDERR, logstream);
 		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
-#endif
 	}

 	if (M_CheckParm("-bindaddr") && M_IsNextParm())
@@ -318,7 +317,6 @@ static void
 HMS_end (struct HMS_buffer *buffer)
 {
 	curl_easy_cleanup(buffer->curl);
-	free(buffer->errbuf);
 	free(buffer->buffer);
 	free(buffer);
 }
@@ -479,12 +477,12 @@ HMS_fetch_servers (msg_server_t *list, int query_id)
 			if (address && port)
 			{
 #ifdef HAVE_THREADS
-				I_lock_mutex(&ms_QueryId_mutex);
+				I_LockMutex(&ms_QueryId_mutex);
 				{
 					if (query_id != ms_QueryId)
 						doing_shit = 0;
 				}
-				I_unlock_mutex(ms_QueryId_mutex);
+				I_UnlockMutex(ms_QueryId_mutex);

 				if (! doing_shit)
 					break;
@@ -613,14 +611,14 @@ void
 HMS_set_api (char *api)
 {
 #ifdef HAVE_THREADS
-	I_lock_mutex(&hms_api_mutex);
+	I_LockMutex(&hms_api_mutex);
 #endif
 	{
 		free(hms_api);
 		hms_api = Strip_trailing_slashes(api);
 	}
 #ifdef HAVE_THREADS
-	I_unlock_mutex(hms_api_mutex);
+	I_UnlockMutex(hms_api_mutex);
 #endif
 }

@@ -97,6 +97,7 @@ static textinput_t w_chat;
 static boolean headsupactive = false;
 boolean hu_showscores = false; // draw rankings
 static char hu_tick;
+static tic_t hu_emoteanim = 0;
 emote_autocomplete_t emote_autocomplete = {0};

 static huddrawlist_h luahuddrawlist_scores = NULL;
@@ -115,12 +116,154 @@ 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};

-// stuff from SRB2-Banpyura thx alot! :3
-consvar_t cv_chat_xoffset = {"chat_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chat_yoffset = {"chat_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chat_showlimit = {"chat_showlimit", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+//======================================================================
+//                 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;
@@ -138,7 +281,6 @@ static void Command_Say_f(void);
 static void Command_Sayto_f(void);
 static void Command_Sayteam_f(void);
 static void Command_CSay_f(void);
-static void Command_Mute_f(void);
 static void Got_Saycmd(const UINT8 **p, INT32 playernum);

 void HU_LoadGraphics(void)
@@ -266,7 +408,8 @@ void HU_Init(void)
 	COM_AddCommand("csay", Command_CSay_f);
 	RegisterNetXCmd(XD_SAY, Got_Saycmd);

-	COM_AddCommand("muteplayer", Command_Mute_f);
+	// set shift translation table
+	shiftxform = english_shiftxform;

 	if (dedicated || rendermode == render_none)
 		return;
@@ -293,6 +436,11 @@ void HU_Start(void)
 	headsupactive = true;
 }

+void HU_Shiftform(void)
+{
+	shiftxform = (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
+}
+
 //======================================================================
 //                            EXECUTION
 //======================================================================
@@ -349,9 +497,7 @@ static void HU_removeChatText_Log(void)
 	{
 		chat_log[i] = chat_log[i+1];
 	}
-
 	chat_nummsg_log--; // lost 1 msg.
-	chat_log[chat_nummsg_log] = NULL;
 }

 static void Chatlogsize_OnChange(void)
@@ -370,7 +516,6 @@ static void Chatlogsize_OnChange(void)
 	if (new_chat_log == NULL)
 	{
        free(chat_log);
-		chat_log = NULL;
 		return;
 	}
 	chat_log = new_chat_log;
@@ -396,8 +541,6 @@ void HU_AddChatText(const char *text, boolean playsound)
 		HU_removeChatText_Log();

 	chat_log[chat_nummsg_log] = malloc(HU_MSGBUFSIZE);
-	if (!chat_log[chat_nummsg_log])
-		I_Error("HU_AddChatText: out of memory for chat log\n");
 	strcpy(chat_log[chat_nummsg_log], text);
 	++chat_nummsg_log;

@@ -480,10 +623,7 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
 		// with that logic, characters 4 and 5 are our numbers:
 		const char *newmsg;
 		INT32 spc = 1; // used if nodenum[1] is a space.
-		CLEANUP(pfree) char *nodenum = (char*)malloc(3);
-		if (!nodenum)
-			I_Error("DoSayCommand: out of memory for sending pm\n");
-
+		CLEANUP(pfree) char *nodenum = (char*) malloc(3);
 		memcpy(nodenum, msg+3, 2);
 		nodenum[2] = '\0';

@@ -764,7 +904,7 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
 	target = READSINT8(*p);
 	flags = READUINT8(*p);
 	msg = buf;
-	READSTRINGN(*p, msg, HU_MAXMSGLEN + 1);
+	READSTRINGL(*p, msg, HU_MAXMSGLEN + 1);

 	if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
 	{
@@ -952,6 +1092,7 @@ void HU_Ticker(void)
 		return;

 	hu_tick++;
+	hu_emoteanim++;
 	hu_tick &= 7; // currently only to blink chat input cursor

 	if (PLAYER1INPUTDOWN(gc_scores))
@@ -971,7 +1112,7 @@ void HU_Ticker(void)
 		size_t i = 0;

 		// handle spam while we're at it:
-		for (; (i < MAXPLAYERS); i++)
+		for(; (i < MAXPLAYERS); i++)
 		{
 			if (stop_spamming[i] > 0)
 				stop_spamming[i]--;
@@ -987,8 +1128,7 @@ void HU_Ticker(void)
 		}
 	}

-	if (cechotimer > 0)
-		--cechotimer;
+	if (cechotimer > 0) --cechotimer;

 	// Animate the desynch dots
 	if (hu_resynching
@@ -1030,42 +1170,21 @@ static boolean HU_clearChatSpaces(void)
 	return nothingbutspaces;
 }

-static void DoMute(const char *name, boolean chat)
+static void DoMute(const char *name)
 {
 	INT32 pnum = D_LookupPlayer(name);

-	// Shortcut to reuse this function for console and chat command
-#define PRINT(msg, sound) do { \
-	if (chat) \
-		HU_AddChatText((msg), (sound)); \
-	else \
-		CONS_Printf("%s\n", msg); \
-} while (0)
-
-	if (pnum < 0 || !playeringame[pnum])
+	if (pnum < 0)
 	{
-		PRINT("\x85""ERROR: \x80Player not found.", false);
+		HU_AddChatText("\x85""ERROR: \x80Player not found.", false);
 		return;
 	}

 	player_muted[pnum] = !player_muted[pnum];

-	PRINT(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false);
+	HU_AddChatText(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false);
 	if (player_muted[pnum])
-		PRINT("Use same command to unmute them.", false);
-
-#undef PRINT
-}
-
-static void Command_Mute_f(void)
-{
-	if (COM_Argc() < 2)
-	{
-		CONS_Printf(M_GetText("mute <playername|playernum>: mute/unmute a player\n"));
-		return;
-	}
-
-	DoMute(COM_Argv(1), false);
+		HU_AddChatText("Use same command to unmute them.", false);
 }

 static void HU_SendChatMessage(void)
@@ -1099,7 +1218,7 @@ static void HU_SendChatMessage(void)
 	if (msglength >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute
 	{
 		if (msglength > 6)
-			DoMute(msg+6, true);
+			DoMute(msg+6);
 		else
 			HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false);

@@ -1110,9 +1229,7 @@ static void HU_SendChatMessage(void)
 	{
 		INT32 spc = 1; // used if nodenum[1] is a space.
 		const char *newmsg;
-		CLEANUP(pfree) char *nodenum = (char*)malloc(3);
-		if (!nodenum)
-			I_Error("HU_SendChatMessage: out of memory for sending pm\n");
+		CLEANUP(pfree) char *nodenum = (char*) malloc(3);

 		// what we're gonna do now is check if the node exists
 		// with that logic, characters 4 and 5 are our numbers:
@@ -1140,7 +1257,6 @@ static void HU_SendChatMessage(void)
 				return;
 			}
 		}
-
 		// I'm very bad at C, I swear I am, additional checks eww!
 		if (spc != 0)
 		{
@@ -1287,15 +1403,13 @@ boolean HU_Responder(event_t *ev)
 			chat_on = false;
 			I_SetTextInput(false);
 		}
-		else if ((c == KEY_UPARROW || c == KEY_PGUP || c == KEY_MOUSEWHEELUP) &&
-			     ((chat_scroll > 0) && !OLDCHAT)) // CHAT SCROLLING YAYS!
+		else if ((c == KEY_UPARROW || c == KEY_MOUSEWHEELUP) && chat_scroll > 0 && !OLDCHAT) // CHAT SCROLLING YAYS!
 		{
 			chat_scroll--;
 			justscrolledup = true;
 			chat_scrolltime = 4;
 		}
-		else if ((c == KEY_DOWNARROW || c == KEY_PGDN || c == KEY_MOUSEWHEELDOWN) &&
-			    ((chat_scroll < chat_maxscroll) && (chat_maxscroll > 0) && !OLDCHAT))
+		else if ((c == KEY_DOWNARROW || c == KEY_MOUSEWHEELDOWN) && chat_scroll < chat_maxscroll && chat_maxscroll > 0 && !OLDCHAT)
 		{
 			chat_scroll++;
 			justscrolleddown = true;
@@ -1375,12 +1489,7 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)

 // 30/7/18: chaty is now the distance at which the lowest point of the chat will be drawn if that makes any sense.

-// let's use this as our coordinates, shh
-// :chao: guess this just works lol
-#define chatx ((INT16)(13 + (cv_chat_xoffset.value)))
-#define chaty ((INT16)(169 + (cv_chat_yoffset.value)))
-
-#define CHATSNAP (V_SNAPTOBOTTOM|V_SNAPTOLEFT)
+INT16 chatx = 13, chaty = 169; // let's use this as our coordinates, shh

 // chat stuff by VincyTM LOL XD!

@@ -1407,7 +1516,7 @@ static void HU_drawMiniChat(void)

 	for (; i > 0; i--)
 	{
-		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i-1]);
+		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i-1]);
 		size_t j = 0;
 		INT32 linescount = 0;
 		emote_t *emote = NULL;
@@ -1464,14 +1573,15 @@ static void HU_drawMiniChat(void)

 	y = chaty - charheight*(msglines+1);

+#ifdef NETSPLITSCREEN
 	if (splitscreen)
 	{
 		y -= BASEVIDHEIGHT/2;
-
 		if (splitscreen > 1)
 			y += 16;
 	}
 	else
+#endif
 		y -= (cv_kartspeedometer.value ? 16 : 0);

 	dx = 0;
@@ -1485,7 +1595,7 @@ static void HU_drawMiniChat(void)
 		INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below...
 		INT32 transflag = (timer >= 0 && timer <= 9) ? (timer*V_10TRANS) : 0; // you can make bad jokes out of this one.
 		size_t j = 0;
-		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it.
+		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it.
 		UINT8 *colormap = NULL;
 		emote_t *emote = NULL;
 		int emotelen = 0;
@@ -1518,9 +1628,9 @@ static void HU_drawMiniChat(void)
 			else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
 			{
 				if (cv_chatbacktint.value) // on request of wolfy
-					V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|CHATSNAP);
+					V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);

-				M_DrawEmote(x+dx+2, y+dy, emote, CHATSNAP|transflag);
+				M_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
 				dx += EMOTEWIDTH - charwidth;

 				j += emotelen;
@@ -1528,9 +1638,9 @@ static void HU_drawMiniChat(void)
 			else
 			{
 				if (cv_chatbacktint.value) // on request of wolfy
-					V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|CHATSNAP);
+					V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);

-				V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |CHATSNAP|transflag, !cv_allcaps.value, colormap);
+				V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag, !cv_allcaps.value, colormap);
 			}

 			dx += charwidth;
@@ -1569,15 +1679,18 @@ 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;
@@ -1585,19 +1698,20 @@ static void HU_drawChatLog(INT32 offset)
 			y += 16;
 	}
 	else
+#endif
 		y -= (cv_kartspeedometer.value ? 16 : 0);


 	chat_topy = y + chat_scroll*charheight;
 	chat_bottomy = chat_topy + boxh*charheight;

-	V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|CHATSNAP); // log box
+	V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); // log box

 	for (i = 0; i < chat_nummsg_log; i++) // iterate through our chatlog
 	{
 		INT32 clrflag = 0;
 		INT32 j = 0;
-		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it.
+		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it.
 		UINT8 *colormap = NULL;
 		emote_t *emote = NULL;
 		int emotelen = 0;
@@ -1627,7 +1741,7 @@ static void HU_drawChatLog(INT32 offset)
 			{
 				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
 				{
-					M_DrawEmote(x+dx+2, y+dy+1, emote, CHATSNAP);
+					M_DrawEmote(x+dx+2, y+dy+1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 					dx += EMOTEWIDTH - charwidth;
 				}
 				j += emotelen;
@@ -1635,7 +1749,7 @@ static void HU_drawChatLog(INT32 offset)
 			else
 			{
 				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
-					V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |CHATSNAP, !cv_allcaps.value, colormap);
+					V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT, !cv_allcaps.value, colormap);
 				else
 					j++; // don't forget to increment this or we'll get stuck in the limbo.
 			}
@@ -1672,9 +1786,9 @@ static void HU_drawChatLog(INT32 offset)

 	// draw arrows to indicate that we can (or not) scroll.
 	if (chat_scroll > 0)
-		V_DrawCharacter(chatx-9, ((justscrolledup) ? (chat_topy-1) : (chat_topy)), CHATSNAP | highlight | '\x1A', false); // up arrow
+		V_DrawCharacter(chatx-9, ((justscrolledup) ? (chat_topy-1) : (chat_topy)), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1A', false); // up arrow
 	if (chat_scroll < chat_maxscroll)
-		V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), CHATSNAP | highlight | '\x1B', false); // down arrow
+		V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1B', false); // down arrow

 	justscrolleddown = false;
 	justscrolledup = false;
@@ -1692,14 +1806,13 @@ static void HU_DrawChat(void)
 	INT32 boxw = cv_chatwidth.value;
 	INT32 t = 0, c = 0, y = chaty - (typelines*charheight);
 	UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday!
-	UINT32 charcount = 0;
 	INT32 cflag = 0;
-	INT32 pm_offset = 0; // for cases when you type emote while also doing /pm
 	size_t select_start = 0, select_end = 0;
 	const char *ntalk = "Say: ", *ttalk = "Team: ";
 	const char *talk = ntalk;
 	const char *mute = "Chat has been muted.";

+#ifdef NETSPLITSCREEN
 	if (splitscreen)
 	{
 		y -= BASEVIDHEIGHT/2;
@@ -1710,6 +1823,7 @@ static void HU_DrawChat(void)
 		}
 	}
 	else
+#endif
 		y -= (cv_kartspeedometer.value ? 16 : 0);

 	if (teamtalk)
@@ -1724,7 +1838,7 @@ static void HU_DrawChat(void)
 		cflag = V_GRAYMAP; // set text in gray if chat is muted.
 	}

-	V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | CHATSNAP);
+	V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);

 	while (talk[i])
 	{
@@ -1732,7 +1846,7 @@ static void HU_DrawChat(void)
 			++i;
 		else
 		{
-			V_DrawChatCharacter(chatx + c + 2, y, talk[i] |CHATSNAP|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag));
+			V_DrawChatCharacter(chatx + c + 2, y, talk[i] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag));
 			i++;
 		}

@@ -1750,7 +1864,7 @@ static void HU_DrawChat(void)
 	typelines = 1;

 	if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4)
-		V_DrawChatCharacter(chatx+2+c, y+1, '_'|CHATSNAP|t, !cv_allcaps.value, NULL);
+		V_DrawChatCharacter(chatx+2+c, y+1, '_'|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);

 	if (w_chat.select != w_chat.cursor)
 	{
@@ -1767,23 +1881,17 @@ static void HU_DrawChat(void)

 		if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
 		{
-			M_DrawEmote(chatx + c + 2, y-1, emote, CHATSNAP|t);
+			M_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
 			c += EMOTEWIDTH - charwidth;
 			i += emotelen-1;
 			drawwidth = EMOTEWIDTH;
-			if (cv_chat_showlimit.value)
-				charcount += emotelen;
 		}
 		else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
-		{
-			V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | CHATSNAP | t, !cv_allcaps.value, NULL);
-			if (cv_chat_showlimit.value)
-				charcount++;
-		}
+			V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL);

 		// Draw selection
 		if (i >= select_start && i < select_end)
-			V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|CHATSNAP|t);
+			V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);

 		++i;

@@ -1792,7 +1900,7 @@ static void HU_DrawChat(void)
 			INT32 cursorx = (c+charwidth < boxw-charwidth) ? (chatx + 2 + c+charwidth) : (chatx+1); // we may have to go down.
 			INT32 cursory = (cursorx != chatx+1) ? (y) : (y+charheight);
 			if (hu_tick < 4)
-				V_DrawChatCharacter(cursorx, cursory+1, '_' |CHATSNAP|t, !cv_allcaps.value, NULL);
+				V_DrawChatCharacter(cursorx, cursory+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);

 			if (cursorx == chatx+1 && saylen == i-1) // a weirdo hack
 			{
@@ -1810,11 +1918,62 @@ static void HU_DrawChat(void)
 		}
 	}

-	if (cv_chat_showlimit.value)
+	if (emote_autocomplete.emotestart != -1 && (emote_autocomplete.complete[0] || (w_chat.cursor - emote_autocomplete.emotestart) > 1))
 	{
-		// Limit
-		const INT32 clr = ((HU_MAXMSGLEN - charcount) > 64 ? V_TRANSLUCENT : (charcount == HU_MAXMSGLEN ? V_REDMAP : V_YELLOWMAP));
-		V_DrawSmallString(chatx, y+7, CHATSNAP|clr, va("%d/%d", charcount, HU_MAXMSGLEN));
+		emote_t *suggest;
+		int skip = 0;
+
+		const char *complete;
+		int complete_len;
+
+		if (emote_autocomplete.complete[0])
+		{
+			complete = emote_autocomplete.complete;
+			complete_len = strlen(complete);
+		}
+		else
+		{
+			complete = &w_chat_buf[emote_autocomplete.emotestart];
+			complete_len = w_chat.cursor - emote_autocomplete.emotestart;
+		}
+
+		// A bit of copy-paste from /pm code :p
+		INT32 suggesty = chaty - charheight - 1;
+		size_t longest_suggestion_length = 0;
+
+		while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
+		{
+			longest_suggestion_length = max(longest_suggestion_length, strlen(suggest->name));
+			++skip;
+		}
+
+		skip = 0;
+
+#ifdef NETSPLITSCREEN
+		if (splitscreen)
+		{
+			suggesty -= BASEVIDHEIGHT/2;
+			if (splitscreen > 1)
+				suggesty += 16;
+		}
+		else
+#endif
+			suggesty -= (cv_kartspeedometer.value ? 16 : 0);
+
+		while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
+		{
+			V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*skip), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+
+			// Highlight currently suggested emote
+			int hlflag = 0;
+			if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
+				hlflag = V_YELLOWMAP;
+
+			V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
+			M_DrawEmote(chatx + boxw + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+
+			++skip;
+		}
 	}

 	// handle /pm list. It's messy, horrible and I don't care.
@@ -1823,7 +1982,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;
@@ -1831,13 +1990,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]));
 		}
@@ -1852,7 +2011,6 @@ static void HU_DrawChat(void)
 			{
 				char nodenum[3];
 				UINT32 n;
-
 				// right, that's half important: (w_chat_buf[4] may be a space since /pm0 msg is perfectly acceptable!)
 				if (!isdigit(w_chat_buf[3]) || !(isdigit(w_chat_buf[4]) || (w_chat_buf[4] == ' ') || (w_chat_buf[4] == 0)))
 					break;
@@ -1890,79 +2048,16 @@ static void HU_DrawChat(void)
 			}

 			// fill it like the chat so the text doesn't become hard to read because of the hud.
-			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | CHATSNAP);
+			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);

-			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), CHATSNAP|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i]));
+			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i]));
 			count++;
 		}

 		if (count == 0) // no results.
 		{
-			pm_offset = 48 + 2;
-			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | CHATSNAP); // fill it like the chat so the text doesn't become hard to read because of the hud.
-			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), CHATSNAP|V_ALLOWLOWERCASE, "NO RESULT.");
-		}
-		else
-		{
-			pm_offset = (longest_name_length+4)*4 + 2;
-		}
-	}
-
-	if (emote_autocomplete.emotestart != -1 && (emote_autocomplete.complete[0] || (w_chat.cursor - emote_autocomplete.emotestart) > 1))
-	{
-		emote_t *suggest;
-		int skip = 0;
-
-		const char *complete;
-		int complete_len;
-
-		if (emote_autocomplete.complete[0])
-		{
-			complete = emote_autocomplete.complete;
-			complete_len = strlen(complete);
-		}
-		else
-		{
-			complete = &w_chat_buf[emote_autocomplete.emotestart];
-			complete_len = w_chat.cursor - emote_autocomplete.emotestart;
-		}
-
-		// A bit of copy-paste from /pm code :p
-		INT32 suggesty = chaty - charheight - 1;
-		size_t longest_suggestion_length = 0;
-
-		while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
-		{
-			longest_suggestion_length = max(longest_suggestion_length, strlen(suggest->name));
-			++skip;
-		}
-
-		INT32 emote_suggest_boxw = (longest_suggestion_length+2)*4 + EMOTEWIDTH;
-
-		skip = 0;
-
-		if (splitscreen)
-		{
-			suggesty -= BASEVIDHEIGHT/2;
-			if (splitscreen > 1)
-				suggesty += 16;
-		}
-		else
-			suggesty -= (cv_kartspeedometer.value ? 16 : 0);
-
-		while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
-		{
-			V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, CHATSNAP);
-
-			// Highlight currently suggested emote
-			int hlflag = 0;
-			if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
-				hlflag = V_YELLOWMAP;
-
-			V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|CHATSNAP|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
-			M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, CHATSNAP);
-
-			++skip;
+			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
+			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
 		}
 	}

@@ -1974,7 +2069,6 @@ static void HU_DrawChat(void)
 static void HU_DrawChat_Old(void)
 {
 	INT32 t = 0, c = 0, y = HU_INPUTY;
-	UINT32 charcount = 0;
 	size_t i = 0;
 	const char *ntalk = "Say: ", *ttalk = "Say-Team: ";
 	const char *talk = ntalk;
@@ -2020,17 +2114,11 @@ static void HU_DrawChat_Old(void)
 		{
 			M_DrawScaledEmote((HU_INPUTX + c)<<FRACBITS, (y+con_scalefactor*2)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART | V_NOSCALEPATCH | t);
 			i += emotelen-1;
-
-			if (cv_chat_showlimit.value)
-				charcount += emotelen;
 		}
 		else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
 		{
 			//charwidth = hu_font[w_chat[i]-HU_FONTSTART]->width * con_scalefactor;
 			V_DrawCharacter(HU_INPUTX + c, y, w_chat_buf[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
-
-			if (cv_chat_showlimit.value)
-				charcount++;
 		}

 		// Draw selection
@@ -2043,7 +2131,7 @@ static void HU_DrawChat_Old(void)
 		{
 			INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down.
 			INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight);
-			V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' | cv_constextsize.value | V_NOSCALESTART |t, !cv_allcaps.value);
+			V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
 		}

 		c += charwidth;
@@ -2053,24 +2141,6 @@ static void HU_DrawChat_Old(void)
 			y += charheight;
 		}
 	}
-
-	// console chat users are FINALLY being fed!
-	if (cv_chat_showlimit.value)
-	{
-		const char *lim = va(" (%i/%i)", charcount, HU_MAXMSGLEN);
-		for (i = 0; lim[i]; i++)
-		{
-			V_DrawCharacter(HU_INPUTX + c, y, lim[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
-
-			c += charwidth;
-			if (c >= vid.width) // text wrapping
-			{
-				c = 0;
-				y += charheight;
-			}
-		}
-	}
-
 }

 static void HU_DrawCEcho(void)
@@ -2259,13 +2329,12 @@ static void HU_DrawSongCreditsBox(void)
 		y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup - interpoffset)/FRACUNIT;
 	}

-	bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2) - 2; // arbitrary value, looks a bit better
+	bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2);

 	if (bgt < NUMTRANSMAPS)
 	{
-		const UINT8 accent = colortranslations[K_GetHudColor()][7];
-		V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, accent|flags|(bgt<<V_ALPHASHIFT));
-		V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, accent|flags|(bgt<<V_ALPHASHIFT));
+		V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, 28|flags|(bgt<<V_ALPHASHIFT));
+		V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, 30|flags|(bgt<<V_ALPHASHIFT));
 	}

 	if (cursongcredit.trans < NUMTRANSMAPS)
@@ -2292,22 +2361,7 @@ void HU_DrawSongCredits(void)
 	}
 }

-static void HU_ForceShowChat(void)
-{
-	// only matters for non console chat
-	// see m_menu for how forceshowchat is set
-	if (!chat_on && forceshowchat)
-	{
-		// only print this if theres nothing in chat already
-		if (chat_nummsg_log == 0)
-		{
-			HU_AddChatText("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", false);
-		}

-		HU_DrawChat();
-	}
-}
-	
 // Heads up displays drawer, call each frame
 //
 void HU_Drawer(void)
@@ -2315,8 +2369,6 @@ void HU_Drawer(void)
 	if (cv_vhseffect.value && ((paused && !camera[R_GetViewNumber()].freecam) || (demo.playback && cv_playbackspeed.value > 1)))
 		V_DrawVhsEffect(demo.rewinding);

-	HU_ForceShowChat();
-
 	// draw chat string plus cursor
 	if (chat_on)
 	{
@@ -2396,7 +2448,8 @@ void HU_Drawer(void)
 //                   IN-LEVEL MULTIPLAYER RANKINGS
 //======================================================================

-static int Ping_gfx_num(int lag)
+static int
+Ping_gfx_num (int lag)
 {
 	if (lag < 2)
 		return 0;
@@ -2410,7 +2463,8 @@ static int Ping_gfx_num(int lag)
 		return 4;
 }

-static int Ping_gfx_color(UINT32 lag)
+static int
+Ping_gfx_color (UINT32 lag)
 {
 	if (lag < 2)
 		return SKINCOLOR_JAWZ;
@@ -2433,7 +2487,8 @@ static int Ping_gfx_color(UINT32 lag)
 		return SKINCOLOR_WHITE; // to make the flashing work
 }

-static const UINT8 *Ping_gfx_colormap(UINT32 lag, boolean gentleman)
+static const UINT8 *
+Ping_gfx_colormap (UINT32 lag, boolean gentleman)
 {
 	const UINT8 *colormap = NULL;

@@ -2453,7 +2508,8 @@ static const UINT8 *Ping_gfx_colormap(UINT32 lag, boolean gentleman)
 	return colormap;
 }

-static UINT32 Ping_conversion(UINT32 lag)
+static UINT32
+Ping_conversion (UINT32 lag)
 {
 	if (cv_pingmeasurement.value)
 	{
@@ -2570,26 +2626,6 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
 	}
 }

-void HU_drawLocalPlayerPing(INT32 x, INT32 y, INT32 flags)
-{
-	UINT32 lag = localplayerping;
-	const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag));
-
-	if (gentleman)
-	{
-		lag = simulated_lag;
-	}
-
-	if (cv_pingstyle.value == 0) // kart
-	{
-		HU_drawKartPing(x, y, lag, flags, gentleman);
-	}
-	else if (cv_pingstyle.value == 1) // old style ping
-	{
-		HU_drawOldPing(x, y, lag, flags, gentleman);
-	}
-}
-
 //
 // HU_DrawSpectatorTicker
 //
@@ -42,6 +42,15 @@
 #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
 //------------------------------------
@@ -59,7 +68,12 @@ 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.

@@ -88,10 +102,6 @@ extern patch_t *tallminus;
 // set true whenever the tab rankings are being shown for any reason
 extern boolean hu_showscores;

-extern consvar_t cv_chat_xoffset;
-extern consvar_t cv_chat_yoffset;
-extern consvar_t cv_chat_showlimit;
-
 // init heads up data at game startup.
 void HU_Init(void);

@@ -100,6 +110,8 @@ 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);
@@ -108,7 +120,8 @@ void HU_Drawer(void);
 char HU_dequeueChatChar(void);
 void HU_clearChatChars(void);
 void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags);	// Lat': Ping drawer for scoreboard.
-void HU_drawLocalPlayerPing(INT32 x, INT32 y, INT32 flags);
+//void HU_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);
@@ -36,7 +36,28 @@ extern "C" {
 "JOYBUTTONS is greater than INT64 bits can hold"
 #endif

-#define DigitalGamepadStyle(i) (cv_joyscale[i].value == 0)
+/**	\brief	The struct JoyType_s
+
+ share some joystick information (maybe 2 for splitscreen), to the game input code,
+ actually, we need to know if it is a gamepad or analog controls
+*/
+
+struct JoyType_s
+{
+	/*! 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;
+
+};
+typedef struct JoyType_s JoyType_t;
+/**	\brief Joystick info
+	for palyer[sic] 1-4's joystick/gamepad
+*/
+
+extern JoyType_t Joystick[MAXSPLITSCREENPLAYERS];

 #ifdef __cplusplus
 } // extern "C"
@@ -14,9 +14,6 @@
 #ifndef __I_SYSTEM__
 #define __I_SYSTEM__

-// page for Saturn issue reports
-#define SATURNISSUEPAGE "https://github.com/Indev450/SRB2Kart-Saturn/issues"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -46,7 +43,7 @@ extern UINT8 graphics_started;
 extern UINT8 keyboard_started;

 /** \brief Set to true when inside a signal handler that will exit the program. */
-boolean I_In_Exiting_Signal_Handler(void);
+extern boolean g_in_exiting_signal_handler;

 /**	\brief	The I_GetFreeMem function

@@ -151,11 +148,6 @@ extern INT32 numcontrollers;
 */
 const char *I_GetJoyName(INT32 joyindex);

-void I_SetJoystickFocus(void);
-
-boolean I_GamepadHasLED(INT32 playernum);
-boolean I_GamepadHasRumble(INT32 playernum);
-
 void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
 void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 blue);

@@ -203,19 +195,6 @@ INT32 I_StartupSystem(void);
 */
 void I_ShutdownSystem(void);

-/**	\brief To check if a Interrupt or Terminate Signal was fired
- */
-boolean I_Interrupted(void);
-static inline void I_HandleInterrupt(void)
-{
-	if (I_Interrupted())
-		I_Quit();
-}
-
-/** \brief Open A URL
- */
-int I_OpenURL(const char *url);
-
 /**	\brief	The I_GetDiskFreeSpace function

 	\param	freespace	a INT64 pointer to hold the free space amount
@@ -392,9 +392,6 @@ static const char *SOCK_GetNodeAddress(INT32 node)
 	if (node == 0)
 		return "self";

-	if (node < 0 || node > MAXNETNODES)
-		return NULL;
-
 	if (!nodeconnected[node])
 		return NULL;

@@ -499,10 +496,8 @@ static void cleanupnodes(void)

 	// Why can't I start at zero?
 	for (j = 1; j < MAXNETNODES; j++)
-	{
 		if (!(nodeingame[j] || SV_SendingFile(j)))
 			nodeconnected[j] = false;
-	}
 }

 static SINT8 getfreenode(void)
@@ -512,13 +507,11 @@ static SINT8 getfreenode(void)
 	cleanupnodes();

 	for (j = 0; j < MAXNETNODES; j++)
-	{
 		if (!nodeconnected[j])
 		{
 			nodeconnected[j] = true;
 			return j;
 		}
-	}

 	/** \warning No free node? Just in case a node might not have been freed properly,
 	  *          look if there are connected nodes that aren't in game, and forget them.
@@ -819,7 +812,7 @@ static void SOCK_Send(void)
 static void SOCK_FreeNodenum(INT32 numnode)
 {
 	// can't disconnect from self :)
-	if (numnode <= 0 || numnode > MAXNETNODES)
+	if (!numnode || numnode > MAXNETNODES)
 		return;

 	DEBFILE(va("Free node %d (%s)\n", numnode, SOCK_GetNodeAddress(numnode)));
@@ -1439,12 +1432,14 @@ static void SOCK_RegisterHolePunch(void)

 static boolean SOCK_OpenSocket(void)
 {
-	memset(clientaddress, 0, sizeof(clientaddress));
+	size_t i;
+
+	memset(clientaddress, 0, sizeof (clientaddress));

-	memset(nodeconnected, false, sizeof(nodeconnected));
 	nodeconnected[0] = true; // always connected to self
+	for (i = 1; i < MAXNETNODES; i++)
+		nodeconnected[i] = false;
 	nodeconnected[BROADCASTADDR] = true;
-
 	I_NetSend = SOCK_Send;
 	I_NetGet = SOCK_Get;
 	I_NetCloseSocket = SOCK_CloseSocket;
@@ -1484,7 +1479,7 @@ static boolean SOCK_Ban(INT32 node)
 {
 	INT32 ban;

-	if (node < 0 || node > MAXNETNODES)
+	if (node > MAXNETNODES)
 		return false;

 	ban = numbans;
@@ -1694,7 +1689,6 @@ boolean I_InitTcpNetwork(void)
 			hardware_MAXPACKETLENGTH = MAXPACKETLENGTH;
 		}
 	}
-
 	if (M_CheckProtoParam("ip"))
 	{
 		COM_ImmedExecute(va("exec \"%s"PATHSEP"kartexec.cfg\" -noerror\n", srb2home));
@@ -1,4 +1,4 @@
-// SONIC ROBO BLAST 2
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
 // Copyright (C) 2020-2023 by James R.
 //
@@ -9,12 +9,14 @@
 /// \file  i_threads.c
 /// \brief Multithreading abstraction

-#if defined (__unix__) || (!defined(__APPLE__) && defined (UNIXCOMMON))
+#ifdef HAVE_THREADS
+#if defined (__unix__) || defined(UNIXCOMMON)

 #include <pthread.h>

-#include "../i_threads.h"
-#include "../doomdef.h"
+#include "i_threads.h"
+#include "doomdef.h"
+#include "doomtype.h"

 typedef struct thread_s thread_t;

@@ -22,7 +24,7 @@ struct thread_s
 {
 	thread_t *next;
 	void *userdata;
-	I_thread_fn func;
+	I_ThreadFn func;
 	pthread_t thread;
 };

@@ -41,12 +43,8 @@ static void *HandleThread(void *data)
 	return NULL;
 }

-void
-I_spawn_thread (
-	const char  * name,
-	I_thread_fn   entry,
-	void        * userdata
-)
+FUNCWARNRV
+int I_SpawnThread(const char *name, I_ThreadFn entry, void *userdata)
 {
 	thread_t *thread;
 	(void)name;
@@ -66,17 +64,20 @@ I_spawn_thread (
 	if (thread == NULL)
 	{
 		thread = malloc(sizeof(thread_t));
+		if (thread == NULL)
+			return false;
 		thread->next = thread_list;
 		thread_list = thread;
 	}

 	thread->func = entry;
 	thread->userdata = userdata;
-	pthread_create(&thread->thread, NULL, HandleThread, thread);
+	int err = pthread_create(&thread->thread, NULL, HandleThread, thread);
 	pthread_mutex_unlock(&thread_lock);
+	return err == 0;
 }

-int I_thread_is_stopped(void)
+int I_ThreadIsStopped(void)
 {
 	thread_t *thread;
 	pthread_mutex_lock(&thread_lock);
@@ -94,11 +95,11 @@ int I_thread_is_stopped(void)
 	return true;
 }

-void I_start_threads(void)
+void I_StartThreads(void)
 {
 }

-void I_stop_threads(void)
+void I_StopThreads(void)
 {
 	thread_t *thread = thread_list;
 	while (thread != NULL)
@@ -109,7 +110,7 @@ void I_stop_threads(void)
 	}
 }

-void I_lock_mutex(I_mutex *anchor)
+void I_LockMutex(I_Mutex *anchor)
 {
 	pthread_mutex_lock(&thread_lock);
 	if (*anchor == NULL)
@@ -127,25 +128,25 @@ void I_lock_mutex(I_mutex *anchor)
 	pthread_mutex_lock(*anchor);
 }

-void I_unlock_mutex(I_mutex id)
+void I_UnlockMutex(I_Mutex id)
 {
 	pthread_mutex_unlock(id);
 }

-void I_hold_cond(I_cond *cond_anchor, I_mutex mutex_id)
+void I_HoldCond(I_Cond *condAnchor, I_Mutex mutexId)
 {
-	I_Assert(mutex_id != NULL);
+	I_Assert(mutexId != NULL);
 	pthread_mutex_lock(&thread_lock);
-	if (*cond_anchor == NULL)
+	if (*condAnchor == NULL)
 	{
-		*cond_anchor = malloc(sizeof(pthread_cond_t));
-		pthread_cond_init(*cond_anchor, NULL);
+		*condAnchor = malloc(sizeof(pthread_cond_t));
+		pthread_cond_init(*condAnchor, NULL);
 	}
 	pthread_mutex_unlock(&thread_lock);
-	pthread_cond_wait(*cond_anchor, mutex_id);
+	pthread_cond_wait(*condAnchor, mutexId);
 }

-void I_wake_one_cond(I_cond *anchor)
+void I_WakeOneCond(I_Cond *anchor)
 {
 	pthread_mutex_lock(&thread_lock);
 	if (*anchor == NULL)
@@ -157,7 +158,7 @@ void I_wake_one_cond(I_cond *anchor)
 	pthread_cond_signal(*anchor);
 }

-void I_wake_all_cond(I_cond *anchor)
+void I_WakeAllCond(I_Cond *anchor)
 {
 	pthread_mutex_lock(&thread_lock);
 	if (*anchor == NULL)
@@ -168,12 +169,17 @@ void I_wake_all_cond(I_cond *anchor)
 	pthread_mutex_unlock(&thread_lock);
 	pthread_cond_broadcast(*anchor);
 }
+
+thread_handle_t I_GetCurrentThread(void)
+{
+	return pthread_self();
+}
 #elif defined (_WIN32)
 #include <windows.h>

-#include "../i_threads.h"
-#include "../doomdef.h"
-#include "../doomtype.h"
+#include "i_threads.h"
+#include "doomdef.h"
+#include "doomtype.h"

 typedef struct thread_s thread_t;

@@ -181,9 +187,9 @@ struct thread_s
 {
 	thread_t *next;
 	void *userdata;
-	I_thread_fn func;
+	I_ThreadFn func;
 	HANDLE thread;
-	DWORD thread_id;
+	DWORD threadId;
 };

 // we use a linked list to avoid moving memory blocks when allocating new threads.
@@ -201,7 +207,8 @@ static DWORD __stdcall HandleThread(void *data)
 	return 0;
 }

-void I_spawn_thread(const char *name, I_thread_fn entry, void *userdata)
+FUNCWARNRV
+int I_SpawnThread(const char *name, I_ThreadFn entry, void *userdata)
 {
 	thread_t *thread;
 	(void)name;
@@ -219,17 +226,20 @@ void I_spawn_thread(const char *name, I_thread_fn entry, void *userdata)
 	if (thread == NULL)
 	{
 		thread = malloc(sizeof(thread_t));
+		if (thread == NULL)
+			return false;
 		thread->next = thread_list;
 		thread_list = thread;
 	}

 	thread->func = entry;
 	thread->userdata = userdata;
-	thread->thread = CreateThread(NULL, 0, HandleThread, thread, 0, &thread->thread_id);
+	thread->thread = CreateThread(NULL, 0, HandleThread, thread, 0, &thread->threadId);
 	LeaveCriticalSection(&thread_lock);
+	return thread->thread != NULL;
 }

-int I_thread_is_stopped(void)
+int I_ThreadIsStopped(void)
 {
 	thread_t *thread;
 	EnterCriticalSection(&thread_lock);
@@ -247,12 +257,12 @@ int I_thread_is_stopped(void)
 	return true;
 }

-void I_start_threads(void)
+void I_StartThreads(void)
 {
 	InitializeCriticalSection(&thread_lock);
 }

-void I_stop_threads(void)
+void I_StopThreads(void)
 {
 	thread_t *thread = thread_list;
 	while (thread != NULL)
@@ -264,7 +274,7 @@ void I_stop_threads(void)
 	DeleteCriticalSection(&thread_lock);
 }

-void I_lock_mutex(I_mutex *anchor)
+void I_LockMutex(I_Mutex *anchor)
 {
 	EnterCriticalSection(&thread_lock);
 	if (*anchor == NULL)
@@ -276,25 +286,25 @@ void I_lock_mutex(I_mutex *anchor)
 	EnterCriticalSection(*anchor);
 }

-void I_unlock_mutex(I_mutex id)
+void I_UnlockMutex(I_Mutex id)
 {
 	LeaveCriticalSection(id);
 }

-void I_hold_cond(I_cond *cond_anchor, I_mutex mutex_id)
+void I_HoldCond(I_Cond *condAnchor, I_Mutex mutexId)
 {
-	I_Assert(mutex_id != NULL);
+	I_Assert(mutexId != NULL);
 	EnterCriticalSection(&thread_lock);
-	if (*cond_anchor == NULL)
+	if (*condAnchor == NULL)
 	{
-		*cond_anchor = malloc(sizeof(CONDITION_VARIABLE));
-		InitializeConditionVariable(*cond_anchor);
+		*condAnchor = malloc(sizeof(CONDITION_VARIABLE));
+		InitializeConditionVariable(*condAnchor);
 	}
 	LeaveCriticalSection(&thread_lock);
-	SleepConditionVariableCS(*cond_anchor, mutex_id, INFINITE);
+	SleepConditionVariableCS(*condAnchor, mutexId, INFINITE);
 }

-void I_wake_one_cond(I_cond *anchor)
+void I_WakeOneCond(I_Cond *anchor)
 {
 	EnterCriticalSection(&thread_lock);
 	if (*anchor == NULL)
@@ -306,7 +316,7 @@ void I_wake_one_cond(I_cond *anchor)
 	WakeConditionVariable(*anchor);
 }

-void I_wake_all_cond(I_cond *anchor)
+void I_WakeAllCond(I_Cond *anchor)
 {
 	EnterCriticalSection(&thread_lock);
 	if (*anchor == NULL)
@@ -317,48 +327,66 @@ void I_wake_all_cond(I_cond *anchor)
 	LeaveCriticalSection(&thread_lock);
 	WakeAllConditionVariable(*anchor);
 }
+
+void *I_GetCurrentThread(void)
+{
+	return GetCurrentThread();
+}
 #else
-void I_spawn_thread(const char *name, I_thread_fn entry, void *userdata)
+#include "i_threads.h"
+
+FUNCWARNRV
+int I_SpawnThread(const char *name, I_ThreadFn entry, void *userdata)
 {
 	(void)name;
 	entry(userdata);
+	return true;
 }

-int I_thread_is_stopped(void)
+int I_ThreadIsStopped(void)
+{
+	return true;
+}
+
+void I_StartThreads(void)
 {
 }

-void I_start_threads(void)
+void I_StopThreads(void)
 {
 }

-void I_stop_threads(void)
-{
-}
-
-void I_lock_mutex(I_mutex *anchor)
+void I_LockMutex(I_Mutex *anchor)
 {
 	(void)anchor;
 }

-void I_unlock_mutex(I_mutex id)
+void I_UnlockMutex(I_Mutex id)
 {
 	(void)id;
 }

-void I_hold_cond(I_cond *cond_anchor, I_mutex mutex_id)
+void I_HoldCond(I_Cond *condAnchor, I_Mutex mutexId)
 {
-	(void)cond_anchor;
-	(void)mutex_id;
+	(void)condAnchor;
+	(void)mutexId;
 }

-void I_wake_one_cond(I_cond *anchor)
+void I_WakeOneCond(I_Cond *anchor)
 {
 	(void)anchor;
 }

-void I_wake_all_cond(I_cond *anchor)
+void I_WakeAllCond(I_Cond *anchor)
 {
 	(void)anchor;
 }
+
+void *I_GetCurrentThread(void)
+{
+	return NULL;
+}
 #endif
+
+
+#endif // HAVE_THREADS
@@ -1,6 +1,6 @@
 // SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2020 by James R.
+// Copyright (C) 2020-2023 by James R.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -14,34 +14,46 @@
 #ifndef I_THREADS_H
 #define I_THREADS_H

+#include "doomtype.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-typedef void (*I_thread_fn)(void *userdata);
+typedef void (*I_ThreadFn)(void *userdata);

-typedef void * I_mutex;
-typedef void * I_cond;
+typedef void * I_Mutex;
+typedef void * I_Cond;

-void      I_start_threads (void);
-void      I_stop_threads  (void);
+#ifdef __linux__
+typedef long unsigned int thread_handle_t;
+#else
+typedef void *thread_handle_t;
+#endif

-void      I_spawn_thread (const char *name, I_thread_fn, void *userdata);
+void      I_StartThreads (void);
+void      I_StopThreads  (void);
+
+FUNCWARNRV
+int       I_SpawnThread (const char *name, I_ThreadFn, void *userdata);

 /* check in your thread whether to return early */
-int       I_thread_is_stopped (void);
+int       I_ThreadIsStopped (void);

-void      I_lock_mutex      (I_mutex *);
-void      I_unlock_mutex    (I_mutex);
+void      I_LockMutex      (I_Mutex *);
+void      I_UnlockMutex    (I_Mutex);

-void      I_hold_cond       (I_cond *, I_mutex);
+void      I_HoldCond       (I_Cond *, I_Mutex);

-void      I_wake_one_cond   (I_cond *);
-void      I_wake_all_cond   (I_cond *);
+void      I_WakeOneCond   (I_Cond *);
+void      I_WakeAllCond   (I_Cond *);
+
+thread_handle_t I_GetCurrentThread(void);

 #ifdef __cplusplus
 } // extern "C"
 #endif

 #endif/*I_THREADS_H*/
+
 #endif/*HAVE_THREADS*/
@@ -452,11 +452,7 @@ void A_SpawnFreshCopy(void *actor);
 extern boolean actionsoverridden[NUMACTIONS];

 // ratio of states to sprites to mobj types is roughly 6 : 1 : 1
-#ifdef COMPAT_VANILLA
 #define NUMMOBJFREESLOTS 1024
-#else
-#define NUMMOBJFREESLOTS 4096 // should be sufficient
-#endif
 #define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
 #define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)

@@ -446,12 +446,6 @@ void K_UpdateDirector(void)
 			}
 		}

-		// not sure if we should just stop here?
-		if (targetposition == MAXPLAYERS)
-		{
-			break;
-		}
-
 		target = directorinfo.sortedplayers[targetposition];

 		// stop here since we're already viewing this player
@@ -83,7 +83,6 @@ IMPL_HUD_OFFSET(stat);   // Stats

 // extra hud things
 consvar_t cv_showstats = {"showstats", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_showstats_skinname = {"showstats_skinname", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};

 consvar_t cv_highresportrait = {"highresportrait", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // make char potraits use their high-res version instead

@@ -93,13 +92,10 @@ consvar_t cv_showinput = {"showinput", "Off", CV_SAVE, inputdisplay_cons_t, NULL
 static CV_PossibleValue_t minihead_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Others"}, {0, NULL}};
 consvar_t cv_minihead         = {"smallminimapplayers", "Off", CV_SAVE, minihead_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_showminimapnames = {"showminimapnames", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_showminimapfinished = {"showminimapfinished", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};

 CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
 consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

-consvar_t cv_spinoutroll = {"spinoutroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 static CV_PossibleValue_t posanim_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Smooth"}, {0, NULL}};
 consvar_t cv_posanim        = {"postitionanimation", "On", CV_SAVE, posanim_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_smallposnum    = {"smallpositionnumber", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -112,11 +108,6 @@ consvar_t cv_fancyroulette = {"animatedroulette", "Off", CV_SAVE, CV_OnOff, NULL
 consvar_t cv_darkitembox   = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // itembox gets a dark border with specific items
 consvar_t cv_multiitemicon = {"multiitemicon", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};

-enum { ROULETTECOLOR_NONE = -1, ROULETTECOLOR_HUD, ROULETTECOLOR_PLAYER, ROULETTECOLOR_ITEM };
-static CV_PossibleValue_t roulettecolor_cons_t[] = {
-	{ROULETTECOLOR_NONE, "None"}, {ROULETTECOLOR_HUD, "Hud"}, {ROULETTECOLOR_PLAYER, "Player"}, {ROULETTECOLOR_ITEM, "Item"}, {0, NULL}};
-consvar_t cv_roulettecolor = {"roulettecolor", "Hud", CV_SAVE, roulettecolor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_showlaptimes = {"showlaptimes", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};

 consvar_t cv_biglaps = {"biglaphud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // here for ppl who dont want to make 2 more patches for their custom hud
@@ -216,7 +207,6 @@ void K_RegisterKartHudStuff(void)
 	CV_RegisterVar(&cv_kartspeedometer);

 	CV_RegisterVar(&cv_showstats);
-	CV_RegisterVar(&cv_showstats_skinname);
 	CV_RegisterVar(&cv_showinput);

 	CV_RegisterVar(&cv_posanim);
@@ -231,9 +221,7 @@ void K_RegisterKartHudStuff(void)

 	CV_RegisterVar(&cv_minihead);
 	CV_RegisterVar(&cv_showminimapnames);
-	CV_RegisterVar(&cv_showminimapfinished);
 	CV_RegisterVar(&cv_showminimapangle);
-	CV_RegisterVar(&cv_spinoutroll);

 	CV_RegisterVar(&cv_showlapemblem);

@@ -251,8 +239,6 @@ void K_RegisterKartHudStuff(void)
 	CV_RegisterVar(&cv_multiitemicon);
 	CV_RegisterVar(&cv_huditemamount);

-	CV_RegisterVar(&cv_roulettecolor);
-
 	CV_RegisterVar(&cv_highresportrait);

 	CV_RegisterVar(&cv_nametag);
@@ -284,6 +270,7 @@ 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};

@@ -321,6 +308,7 @@ 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};

@@ -486,6 +474,11 @@ 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);
@@ -540,6 +533,14 @@ 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 --
@@ -874,7 +875,7 @@ void K_LoadKartHUDGraphics(void)

 	kp_yougotem = (patch_t *)W_CachePatchName("YOUGOTEM", PU_HUDGFX);

-	if (found_extra_kart || found_extra2_kart)
+	if (found_extra_kart || found_extra2_kart || found_extra3_kart)
 		K_LoadSaturnHUDGraphics();
 }

@@ -930,21 +931,21 @@ const char *K_GetItemPatch(UINT8 item, boolean tiny)

 //}

-static INT32 ITEM_X, ITEM_Y;	// Item Window
-static INT32 TIME_X, TIME_Y;	// Time Sticker
-static INT32 LAPS_X, LAPS_Y;	// Lap Sticker
-static INT32 SPDM_X, SPDM_Y;	// Speedometer
-static INT32 POSI_X, POSI_Y;	// Position Number
-static INT32 FACE_X, FACE_Y;	// Top-four Faces
-static INT32 STCD_X, STCD_Y;	// Starting countdown
-static INT32 CHEK_Y;			// CHECK graphic
-static INT32 MINI_X, MINI_Y;	// Minimap
-static INT32 WANT_X, WANT_Y;	// Battle WANTED poster
+INT32 ITEM_X, ITEM_Y;	// Item Window
+INT32 TIME_X, TIME_Y;	// Time Sticker
+INT32 LAPS_X, LAPS_Y;	// Lap Sticker
+INT32 SPDM_X, SPDM_Y;	// Speedometer
+INT32 POSI_X, POSI_Y;	// Position Number
+INT32 FACE_X, FACE_Y;	// Top-four Faces
+INT32 STCD_X, STCD_Y;	// Starting countdown
+INT32 CHEK_Y;			// CHECK graphic
+INT32 MINI_X, MINI_Y;	// Minimap
+INT32 WANT_X, WANT_Y;	// Battle WANTED poster

 // This is for the P2 and P4 side of splitscreen. Then we'll flip P1's and P2's to the bottom with V_SPLITSCREEN.
-static INT32 ITEM2_X, ITEM2_Y;
-static INT32 LAPS2_X, LAPS2_Y;
-static INT32 POSI2_X, POSI2_Y;
+INT32 ITEM2_X, ITEM2_Y;
+INT32 LAPS2_X, LAPS2_Y;
+INT32 POSI2_X, POSI2_Y;

 static void K_initKartHUD(void)
 {
@@ -1144,9 +1145,10 @@ enum
 	SPEEDO_DIAL,
 	SPEEDO_PMETER,
 	SPEEDO_PMETERSMOL,
+	SPEEDO_EXTRA3,
 };

-static UINT8 K_GetSpeedometerStyle(void)
+static SINT8 K_GetSpeedometerStyle(void)
 {
 	if (cv_newspeedometer.value == 2 && xtra_speedo)
 		return SPEEDO_EXTRA;
@@ -1158,6 +1160,8 @@ static UINT8 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;
 }
@@ -1175,6 +1179,8 @@ 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;
 	}
@@ -1186,6 +1192,7 @@ enum
 	GAUGE_SMALL,
 	GAUGE_BIGNUM,
 	GAUGE_NUMONLY,
+	GAUGE_EXTRA,
 };

 static SINT8 K_GetDriftgaugeStyle(void)
@@ -1198,6 +1205,8 @@ 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
@@ -1349,12 +1358,10 @@ 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;
 }
@@ -1396,6 +1403,7 @@ static void K_drawKartStats(void)
 		{
 			case SPEEDO_EXTRA:
 			case SPEEDO_ACHII:
+			case SPEEDO_EXTRA3:
 				spdoffset = -10;
 				break;
 			case SPEEDO_DIAL:
@@ -1407,6 +1415,8 @@ static void K_drawKartStats(void)
 				break;
 		}
 	}
+	else
+		spdoffset = 0;

 	if (G_BattleGametype() && ((speedostyle != SPEEDO_DIAL) || splitscreen))
 		spdoffset += ((stplyr->kartstuff[k_bumper] ? -5 : -8));
@@ -1426,16 +1436,13 @@ static void K_drawKartStats(void)
 		fakeskin = K_GetPlayerSkin(stplyr);

 		// Skin name
-		if (cv_showstats_skinname.value)
+		if (K_IsHighResolution()) // V_DrawSmallString becomes a mess at low resolutions lel
 		{
-			if (K_IsHighResolution()) // V_DrawSmallString becomes a mess at low resolutions lel
-			{
-				V_DrawSmallString(x+20, y+12, flags2, fakeskin->realname);
-			}
-			else
-			{
-				V_DrawThinString(x+20, y+7, flags2, fakeskin->realname);
-			}
+			V_DrawSmallString(x+20, y+12, flags2, fakeskin->realname);
+		}
+		else
+		{
+			V_DrawThinString(x+20, y+7, flags2, fakeskin->realname);
 		}

 		// Icon and stats
@@ -1517,77 +1524,74 @@ static void K_drawKartItem(void)

 	if (stplyr->kartstuff[k_itemroulette])
 	{
-		if (cv_roulettecolor.value == ROULETTECOLOR_PLAYER)
-			localcolor = stplyr->skincolor;
-		else if (cv_roulettecolor.value != ROULETTECOLOR_NONE)
-			localcolor = K_GetHudColor();
+		localcolor = K_GetHudColor();

 		switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3)
 		{
 			// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
 			case 0: // Sneaker
 				localpatch = kp_sneaker[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_RASPBERRY;
+				//localcolor = SKINCOLOR_RASPBERRY;
 				break;
 			case 1: // Banana
 				localpatch = kp_banana[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_YELLOW;
+				//localcolor = SKINCOLOR_YELLOW;
 				break;
 			case 2: // Orbinaut
 				localpatch = kp_orbinaut[3+offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL;
+				//localcolor = SKINCOLOR_STEEL;
 				break;
 			case 3: // Mine
 				localpatch = kp_mine[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET;
+				//localcolor = SKINCOLOR_JET;
 				break;
 			case 4: // Grow
 				localpatch = kp_grow[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TEAL;
+				//localcolor = SKINCOLOR_TEAL;
 				break;
 			case 5: // Hyudoro
 				localpatch = kp_hyudoro[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL;
+				//localcolor = SKINCOLOR_STEEL;
 				break;
 			case 6: // Rocket Sneaker
 				localpatch = kp_rocketsneaker[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE;
+				//localcolor = SKINCOLOR_TANGERINE;
 				break;
 			case 7: // Jawz
 				localpatch = kp_jawz[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JAWZ;
+				//localcolor = SKINCOLOR_JAWZ;
 				break;
 			case 8: // Self-Propelled Bomb
 				localpatch = kp_selfpropelledbomb[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET;
+				//localcolor = SKINCOLOR_JET;
 				break;
 			case 9: // Shrink
 				localpatch = kp_shrink[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ORANGE;
+				//localcolor = SKINCOLOR_ORANGE;
 				break;
 			case 10: // Invincibility
 				localpatch = localinv;
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_GREY;
+				//localcolor = SKINCOLOR_GREY;
 				break;
 			case 11: // Eggman Monitor
 				localpatch = kp_eggman[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ROSE;
+				//localcolor = SKINCOLOR_ROSE;
 				break;
 			case 12: // Ballhog
 				localpatch = kp_ballhog[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_LILAC;
+				//localcolor = SKINCOLOR_LILAC;
 				break;
 			case 13: // Thunder Shield
 				localpatch = kp_thundershield[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_CYAN;
+				//localcolor = SKINCOLOR_CYAN;
 				break;
 			/*case 14: // Pogo Spring
 				localpatch = kp_pogospring[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE;
+				localcolor = SKINCOLOR_TANGERINE;
 				break;
 			case 15: // Kitchen Sink
 				localpatch = kp_kitchensink[offset];
-				if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL;
+				localcolor = SKINCOLOR_STEEL;
 				break;*/
 			default:
 				break;
@@ -2092,7 +2096,7 @@ static void K_DrawKartPositionNum(INT32 num)
 			fy = POSI_Y;
 			fflags = V_SNAPTOLEFT|((stplyrnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P3 to the bottom.
 			flipdraw = true;
-			if (num >= 10)
+			if (num && num >= 10)
 				fx += W;	// this seems dumb, but we need to do this in order for positions above 10 going off screen.
 		}
 		else // else, that means we're P2 or P4.
@@ -2174,9 +2178,8 @@ static boolean K_drawKartPositionFaces(void)
 	UINT8 *colormap;

 	ranklines = 0;
-
-	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));
+	memset(rankplayer, 0, sizeof (rankplayer));

 	for (i = 0; i < MAXPLAYERS; i++)
 	{
@@ -2191,7 +2194,8 @@ static boolean K_drawKartPositionFaces(void)
 	if (numplayersingame <= 1)
 		return true;

-	memset(completed, 0, sizeof (completed));
+	if (!LUA_HudEnabled(hud_minirankings))
+		return false; // Don't proceed but still return true for free play above if HUD is disabled.

 	for (j = 0; j < numplayersingame; j++)
 	{
@@ -2248,7 +2252,6 @@ static boolean K_drawKartPositionFaces(void)

 		if (!playeringame[rankplayer[i]])
 			continue;
-
 		if (player->spectator || !player->mo)
 			continue;

@@ -2426,7 +2429,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) && !stplyr->exiting && (K_UseColorHud() ? big_lap_color : big_lap));
+	return (cv_biglaps.value && (cv_numlaps.value > 9) && (K_UseColorHud() ? big_lap_color : big_lap) && (!stplyr->exiting));
 }

 static void K_drawKartLaps(void)
@@ -2635,7 +2638,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
@@ -2704,28 +2707,34 @@ static void K_drawKartSpeedometer(void)

 		V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, metric);
 	}
-	else if (speedostyle == SPEEDO_EXTRA || speedostyle == SPEEDO_ACHII) // why bother if we dont?
+	else if (speedostyle == SPEEDO_EXTRA) // why bother if we dont?
 	{
-		patch_t *speedopat;
-		UINT8 *colormap = NULL;
-
-		if (K_UseColorSpeedo(speedostyle)) //Colourized hud
+		if (K_UseColorSpeedo(SPEEDO_EXTRA)) //Colourized hud
 		{
-			colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+			UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+			V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerclr, colormap);
+		}
+		else
+			V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallsticker);

-			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]);
+		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
 		{
-			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_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_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, speedopat, colormap);
 	}
 #ifdef ROTSPRITE
 	else if (speedostyle == SPEEDO_DIAL)  // why bother if we dont?
@@ -2738,36 +2747,46 @@ 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 spdinterval[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 speedIntervals[22] = {2, 5, 7, 10, 12, 15, 17,
+												20, 22, 25, 27, 30, 32,
+												35, 37, 40, 42, 45, 47,
+												50, 52, 55};

-		const fixed_t spd = FixedDiv(stplyr->speed, mapobjectscale) / FRACUNIT;
+		fuspeed = FixedDiv(stplyr->speed, mapobjectscale)/FRACUNIT;

-		if (spd > 54)
+		for (INT32 i = 0; i < 22; ++i)
 		{
-			spdpatch = (leveltime & 4) ? 24 : 23;
-		}
-		else
-		{
-			for (INT32 i = 0; i < 22; ++i)
+			if (fuspeed < speedIntervals[i])
 			{
-				if (spd < spdinterval[i])
-				{
-					spdpatch = i;
-					break;
-				}
+				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]);
 	}
 }
@@ -2795,7 +2814,7 @@ static void K_drawKartBumpersOrKarma(void)
 	{
 		const UINT8 speedostyle = K_GetSpeedometerStyle();

-		if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII))
+		if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII) || (speedostyle == SPEEDO_EXTRA3))
 			fy += 5;
 		else
 			fy += 7;
@@ -2887,12 +2906,10 @@ 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;

@@ -2974,7 +2991,7 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe
 		if (stplyrnum > 0)
 			y = y + yres;
 	}
-	else if (splitscreen >= 2) // 3P or 4P
+	if (splitscreen >= 2) // 3P or 4P
 	{
 		x = x>>1;
 		y = y>>1;
@@ -3034,11 +3051,9 @@ 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;

@@ -3247,12 +3262,13 @@ static void K_drawDriftGauge(void)
 	if (!splitscreen && !camera->chase)
 		return;

-	// i will skip the drift early return and you cant stop me!
-	if (!forceshowhud)
-	{
-		if (!stplyr->kartstuff[k_drift])
-			return;
-	}
+	if (forceshowhud)
+		goto skipcrap; // i will skip the drift early return and you cant stop me!
+
+	if (!stplyr->kartstuff[k_drift])
+		return;
+
+skipcrap:

 	if (P_MobjWasRemoved(stplyr->mo))
 		return;
@@ -3277,11 +3293,12 @@ static void K_drawDriftGauge(void)
 	{
 		case GAUGE_DEFAULT:
 		case GAUGE_SMALL:
+		case GAUGE_EXTRA:
 		case GAUGE_BIGNUM:
 			{
 				patch_t *driftpatch = NULL;

-				if (gaugestyle == GAUGE_DEFAULT || gaugestyle == GAUGE_BIGNUM)
+				if (gaugestyle == GAUGE_DEFAULT || gaugestyle == GAUGE_BIGNUM || gaugestyle == GAUGE_EXTRA)
 				{
 					barx = basex - vid.dup*23;
 					BAR_WIDTH = vid.dup*47;
@@ -3294,15 +3311,30 @@ static void K_drawDriftGauge(void)

 				bary = basey - vid.dup*2;

-				if (K_UseColorHud()) // Colourized hud
+				if (gaugestyle == GAUGE_EXTRA) // i hate hud code i hate hud code i hate hud code i hate hud code i hate hud code.....
 				{
-					colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-					driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmallcolor : driftgaugecolor);
+					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);
 				}
 				else
-					driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmall : driftgauge);
+				{
+					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);

-				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
 				{
@@ -3600,7 +3632,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(player);
+	const boolean minihead = K_useSmallMinimapHead(mo->player);

 	// thx wanted reticle for having weird offsets very cool
 	wntdamxpos = minihead ? amxpos + (1<<FRACBITS) : amxpos - (4<<FRACBITS);
@@ -3742,9 +3774,6 @@ static void K_drawKartMinimap(void)
 			if (!players[i].mo || players[i].spectator)
 				continue;

-			if (!cv_showminimapfinished.value && players[i].exiting)
-				continue;
-
 			if (P_IsDisplayPlayer(&players[i]))
 			{
 				// Draw display players on top of everything else
@@ -3789,7 +3818,7 @@ static void K_drawKartMinimap(void)

 		if (cv_showminimapangle.value && (minidoticon || minilighticon) && !playertimedout)
 		{
-			UINT8 *colormap = NULL;
+			UINT8 *colormap;
 			drawinfo_t dims;
 			fixed_t interpx, interpy;
 			fixed_t xoff = 0, yoff = 0;
@@ -3800,27 +3829,10 @@ static void K_drawKartMinimap(void)
 			if (encoremode)
 				ang = ANGLE_180 - ang;

-			if (mobj->color)
-			{
-				if (mobj->colorized)
-				{
-					colormap = R_GetTranslationColormap(TC_RAINBOW, mobj->color, GTC_CACHE);
-				}
-				else
-				{
-					const INT32 skinnum = K_GetMobjLocalSkinNum(mobj->skin, mobj->localskin, mobj->skinlocal);
-
-					// special case if startcolor is not the default (160 / Green)
-					if (skinnum && skins[skinnum].starttranscolor != skins[0].starttranscolor)
-					{
-						colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE);
-					}
-					else
-					{
-						colormap = R_GetLocalTranslationColormap(mobj->skin, mobj->localskin, mobj->color, GTC_CACHE, mobj->skinlocal);
-					}
-				}
-			}
+			if (mobj->colorized)
+				colormap = R_GetTranslationColormap(TC_RAINBOW, mobj->color, GTC_CACHE);
+			else
+				colormap = R_GetLocalTranslationColormap(mobj->skin, mobj->localskin, mobj->color, GTC_CACHE, mobj->skinlocal);

 			interpx = lerp(mobj->old_x, mobj->x);
 			interpy = lerp(mobj->old_y, mobj->y);
@@ -3941,23 +3953,10 @@ static void K_drawBattleFullscreen(void)

 	INT32 x = BASEVIDWIDTH/2;
 	INT32 y = (-64*FRACUNIT) + cardanim; // card animation goes from 0 to 164, 164 is the middle of the screen
-	INT32 splitflags = splitscreen ? V_SNAPTOTOP : 0; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead
+	INT32 splitflags = V_SNAPTOTOP; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead
 	fixed_t scale = FRACUNIT;
 	boolean drawcomebacktimer = true;	// lazy hack because it's cleaner in the long run.

-	// Small hack, if we're not in splitscreen we will not use V_SNAPTOTOP, instead we will just slightly offset
-	// y position so "attack or protect" doesn't slightly show before popping in
-	// We will also reduce this when is closer to finishing so when its at the bottom, the "hack offset" is 0
-	if (!splitscreen)
-	{
-		fixed_t offset = ((vid.height - vid.dup*BASEVIDHEIGHT)/vid.dup) * FRACUNIT/2;
-
-		// cardanim goes from 0 to 164, so when it is 164 offset will be multiplied by (1 - 164/164) = 0 :3
-		offset = FixedMul(offset, FRACUNIT - FixedDiv(cardanim, 164*FRACUNIT));
-
-		y -= offset;
-	}
-
 	if (!LUA_HudEnabled(hud_battlecomebacktimer))
 		drawcomebacktimer = false;

@@ -3998,7 +3997,6 @@ 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)
@@ -4045,12 +4043,12 @@ static void K_drawBattleFullscreen(void)
 			if (K_UseColorHud()) // Colourized hud
 			{
 				UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, splitflags, kp_timeoutstickerclr, colormap);
+				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutstickerclr, colormap);
 			}
 			else
-				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, splitflags, kp_timeoutsticker, NULL);
+				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutsticker, NULL);

-			V_DrawKartString(x-txoff, ty, splitflags, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
+			V_DrawKartString(x-txoff, ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
 		}
 	}

@@ -4063,7 +4061,7 @@ static void K_drawBattleFullscreen(void)
 		{
 			if (i == displayplayers[0])
 				continue;
-			if (playeringame[i])
+			if (playeringame[i] && !stplyr->spectator)
 				return;
 		}

@@ -4280,7 +4278,6 @@ static void K_drawInput(void)

 	y -= FRACUNIT;

-	// stick displays
 	if (cv_showinput.value == 2 || cv_showinput.value == 3)
 	{
 		INT32 axis;
@@ -4290,7 +4287,7 @@ static void K_drawInput(void)
 		const INT32 joyy = y>>FRACBITS;
 		static const INT32 joyxoffs = -8;
 		static const INT32 joyyoffs = -24;
-		const boolean usejoysprite = (cv_showinput.value == 3 && joystickicon);
+		const boolean usejoysprite  = (cv_showinput.value == 3 && joystickicon);

 		// O backing
 		if (usejoysprite)
@@ -4308,19 +4305,38 @@ static void K_drawInput(void)
 		// kart does not have anything we can get analogue joystick y axis values from
 		// during normal gameplay, so replicate shit here

-		const boolean analogjoystickmove = (!demo.playback && P_IsLocalPlayer(stplyr) && cv_usejoystick[stplyrnum].value && !DigitalGamepadStyle(stplyrnum));
-		axis = analogjoystickmove ? JoyAxis(AXISAIM, stplyrnum+1) : 0;
-
-		if (axis != 0)
-		{
-			hudforward -= ((axis * KART_FULLTURN) / JOYAXISRANGE);
-		}
-		else
+		// this is horrid but we cant get actual input in replays so uhh
+		if (demo.playback || !P_IsLocalPlayer(stplyr)) // yeah...........
 		{
 			hudforward = stplyr->kartstuff[k_throwdir] * KART_FULLTURN;
 		}
+		else
+		{
+			const boolean analogjoystickmove = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
+			const boolean gamepadjoystickmove = cv_usejoystick[stplyrnum].value && Joystick[stplyrnum].bGamepadStyle;
+			const UINT8 ssplayer = stplyrnum+1;

-		hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN);
+			axis = JoyAxis(AXISAIM, ssplayer);
+
+			if (analogjoystickmove && axis != 0)
+			{
+				// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
+				hudforward -= ((axis * KART_FULLTURN) / (JOYAXISRANGE-1));
+			}
+			else
+			{
+				if (InputDown(gc_aimforward, ssplayer) || (gamepadjoystickmove && axis < 0))
+				{
+					hudforward += KART_FULLTURN;
+				}
+				if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
+				{
+					hudforward-= KART_FULLTURN;
+				}
+			}
+
+			hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN);
+		}

 		if (cmd->driftturn || hudforward)
 		{
@@ -4354,7 +4370,7 @@ static void K_drawInput(void)
 			}
 		}
 	}
-	else // wheel
+	else
 	{
 		if (!cmd->driftturn) // no turn
 			target = 0;
@@ -4401,7 +4417,6 @@ 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
@@ -4410,9 +4425,6 @@ static void K_drawChallengerScreen(void)

 static void K_drawLapStartAnim(void)
 {
-	if (!cv_showlapemblem.value)
-		return;
-
 	// This is an EVEN MORE insanely complicated animation.
 	const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation];
 	UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
@@ -4456,10 +4468,9 @@ static void K_drawLapStartAnim(void)
 		V_DrawFixedPatch(leftx, y, FRACUNIT, vflags, kp_lapanim_lap[min(progress/2, 6)], NULL);

 		char *lapnum = va("%02d", stplyr->laps + 1);
+		const size_t laplength = strlen(lapnum);

-		const int laplength = (int)strlen(lapnum);
-
-		for (int i = 0; i < laplength; i++)
+		for (int i = 0; i < (int)laplength; i++)
 		{
 			int digit = lapnum[i] - '0';
 			int frame = min(2, progress/2 - 8 - (i*2));
@@ -4507,7 +4518,6 @@ static void K_drawDistributionDebugger(void)
 		kp_orbinaut[4],
 		kp_jawz[1]
 	};
-
 	INT32 useodds = 0;
 	INT32 pingame = 0, bestbumper = 0;
 	INT32 i;
@@ -4524,10 +4534,8 @@ 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];
 	}
@@ -4589,11 +4597,7 @@ static void K_drawCheckpointDebugger(void)
 	else
 		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((numstarposts/2) + stplyr->starpostnum)));

-	// really gnarly hack
-	const INT32 prevcheck = (stprevnextchecks[0] != INT32_MAX) ? stprevnextchecks[0]: stplyr->kartstuff[k_prevcheck];
-	const INT32 nextcheck = (stprevnextchecks[1] != INT32_MAX) ? stprevnextchecks[1]: stplyr->kartstuff[k_nextcheck];
-
-	V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", prevcheck, nextcheck));
+	V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck]));
 }

 // determines if gametype info (laps/bumpers) should be hidden
@@ -4685,7 +4689,6 @@ void K_drawKartHUD(void)
 	{
 		if (LUA_HudEnabled(hud_battlefullscreen))
 			K_drawBattleFullscreen();
-
 		return;
 	}

@@ -4845,7 +4848,7 @@ void K_drawKartHUD(void)
 	{
 		if (stplyr->exiting)
 			K_drawKartFinish();
-		else if (stplyr->kartstuff[k_lapanimation] && !splitscreen)
+		else if (stplyr->kartstuff[k_lapanimation] && !splitscreen && cv_showlapemblem.value)
 			K_drawLapStartAnim();
 	}

@@ -35,13 +35,11 @@ extern consvar_t cv_darkitembox;
 extern consvar_t cv_biglaps;
 extern consvar_t cv_highresportrait;
 extern consvar_t cv_showstats;
-extern consvar_t cv_showstats_skinname;
 extern consvar_t cv_fancyroulette;
 extern consvar_t cv_showlaptimes;
 extern consvar_t cv_battlespeedo;
 extern consvar_t cv_multiitemicon;
 extern consvar_t cv_huditemamount;
-extern consvar_t cv_roulettecolor;

 // for use in timeattack menu
 extern patch_t *kp_facenum[MAXPLAYERS+1];
@@ -32,8 +32,6 @@ extern consvar_t cv_bananajitter;
 extern consvar_t cv_bananthrowroll;
 extern consvar_t cv_airsparks;

-extern INT32 stprevnextchecks[2];
-
 boolean K_IsPlayerLosing(player_t *player);
 boolean K_IsPlayerWanted(player_t *player);
 INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush);
@@ -59,7 +57,7 @@ boolean K_ShouldSlopeRoll(mobj_t *mobj);
 void K_RollMobjBySlopes(mobj_t *mo, pslope_t *slope);
 void K_SpawnBoostTrail(player_t *player);
 void K_SpawnSparkleTrail(mobj_t *mo);
-mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent);
+void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent);
 void K_DriftDustHandling(mobj_t *spawner);
 void K_PuntMine(mobj_t *mine, mobj_t *punter);
 void K_DoSneaker(player_t *player, INT32 type);
@@ -3055,44 +3055,58 @@ static int lib_kSetHyuCountdown(lua_State *L)

 static int lib_gSetPlayerGamepadIndicatorColor(lua_State *L)
 {
-	INT32 pnum = -1;
-	player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
+	INT32 player = -1;
+	player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
 	UINT8 color = (UINT8)luaL_checkinteger(L, 2); // skincolor

-	if (!player)
+	if (!plr)
 		return LUA_ErrInvalid(L, "player_t");

 	if (color >= MAXTRANSLATIONS)
 		return luaL_error(L, "color %d out of range (0 - %d).", color, MAXTRANSLATIONS-1);

-	pnum = P_GetLocalPlayerNumForPlayer(player);
+	for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
+	{
+		if (plr - players == displayplayers[i])
+		{
+			player = i;
+			break;
+		}
+	}

 	// Not a local player
-	if (pnum == -1) return 0;
+	if (player == -1) return 0;

 	// pls update with color 0 when youre done with changing led stuff so it can get player color again
-	G_SetPlayerGamepadIndicatorColor(pnum, color);
+	G_SetPlayerGamepadIndicatorColor(player, color);

 	return 0;
 }

 static int lib_gPlayerDeviceRumble(lua_State *L)
 {
-	INT32 pnum = -1;
-	player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
+	INT32 player = -1;
+	player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
 	UINT16 low_strength = (UINT16)luaL_checkinteger(L, 2); // low frequency rumble motor strenght
 	UINT16 high_strength = (UINT16)luaL_checkinteger(L, 3); // high frequency rumble motor strenght
 	UINT32 duration = (UINT32)luaL_optinteger(L, 4, 84); // duration of rumble in ms

-	if (!player)
+	if (!plr)
 		return LUA_ErrInvalid(L, "player_t");

-	pnum = P_GetLocalPlayerNumForPlayer(player);
+	for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
+	{
+		if (plr - players == displayplayers[i])
+		{
+			player = i;
+			break;
+		}
+	}

 	// Not a local player
-	if (pnum == -1) return 0;
+	if (player == -1) return 0;

-	G_PlayerDeviceRumble(pnum, low_strength, high_strength, duration);
+	G_PlayerDeviceRumble(player, low_strength, high_strength, duration);

 	return 0;
 }
@@ -358,8 +358,7 @@ static int lib_cvRegisterVar(lua_State *L)
 #define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))

 	lua_pushnil(L);
-	while (lua_next(L, 1))
-	{
+	while (lua_next(L, 1)) {
 		// stack: cvar table, cvar userdata, key/index, value
 		//            1             2            3        4
 		i = 0;
@@ -369,40 +368,26 @@ static int lib_cvRegisterVar(lua_State *L)
 		else if (lua_isstring(L, 3))
 			k = lua_tostring(L, 3);

-		if (i == 1 || (k && fasticmp(k, "name")))
-		{
+		if (i == 1 || (k && fasticmp(k, "name"))) {
 			if (!lua_isstring(L, 4))
 				TYPEERROR("name", LUA_TSTRING)
-
 			cvar->name = Z_StrDup(lua_tostring(L, 4));
-		}
-		else if (i == 2 || (k && fasticmp(k, "defaultvalue")))
-		{
+		} else if (i == 2 || (k && fasticmp(k, "defaultvalue"))) {
 			if (!lua_isstring(L, 4))
 				TYPEERROR("defaultvalue", LUA_TSTRING)
-
 			cvar->defaultvalue = Z_StrDup(lua_tostring(L, 4));
-		}
-		else if (i == 3 || (k && fasticmp(k, "flags")))
-		{
+		} else if (i == 3 || (k && fasticmp(k, "flags"))) {
 			if (!lua_isnumber(L, 4))
 				TYPEERROR("flags", LUA_TNUMBER)
-
 			cvar->flags = (INT32)lua_tointeger(L, 4);
-		}
-		else if (i == 4 || (k && fasticmp(k, "PossibleValue")))
-		{
-			if (lua_islightuserdata(L, 4))
-			{
+		} else if (i == 4 || (k && fasticmp(k, "PossibleValue"))) {
+			if (lua_islightuserdata(L, 4)) {
 				CV_PossibleValue_t *pv = lua_touserdata(L, 4);
-
 				if (pv == CV_OnOff || pv == CV_YesNo || pv == CV_Unsigned || pv == CV_Natural)
 					cvar->PossibleValue = pv;
 				else
 					FIELDERROR("PossibleValue", "CV_PossibleValue_t expected, got unrecognised pointer")
-			}
-			else if (lua_istable(L, 4))
-			{
+			} else if (lua_istable(L, 4)) {
 				// Accepts tables in the form of {MIN=0, MAX=9999} or {Red=0, Green=1, Blue=2}
 				// and converts them to CV_PossibleValue_t {{0,"MIN"},{9999,"MAX"}} or {{0,"Red"},{1,"Green"},{2,"Blue"}}
 				//
@@ -413,9 +398,7 @@ static int lib_cvRegisterVar(lua_State *L)
 				CV_PossibleValue_t *cvpv;

 				lua_pushnil(L);
-
-				while (lua_next(L, 4))
-				{
+				while (lua_next(L, 4)) {
 					count++;
 					lua_pop(L, 1);
 				}
@@ -429,9 +412,7 @@ static int lib_cvRegisterVar(lua_State *L)

 				i = 0;
 				lua_pushnil(L);
-
-				while (lua_next(L, 4))
-				{
+				while (lua_next(L, 4)) {
 					// stack: [...] PossibleValue table, index, value
 					//                       4             5      6
 					if (lua_type(L, 5) != LUA_TSTRING
@@ -442,19 +423,14 @@ static int lib_cvRegisterVar(lua_State *L)
 					i++;
 					lua_pop(L, 1);
 				}
-
 				cvpv[i].value = 0;
 				cvpv[i].strvalue = NULL;
 				cvar->PossibleValue = cvpv;
-			}
-			else
+			} else
 				FIELDERROR("PossibleValue", va("%s or CV_PossibleValue_t expected, got %s", lua_typename(L, LUA_TTABLE), luaL_typename(L, -1)))
-		}
-		else if (i == 5 || (k && fasticmp(k, "func")))
-		{
+		} else if (i == 5 || (k && fasticmp(k, "func"))) {
 			if (!lua_isfunction(L, 4))
 				TYPEERROR("func", LUA_TFUNCTION)
-
 			lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange");
 			I_Assert(lua_istable(L, 5));
 			lua_pushlightuserdata(L, cvar);
@@ -462,13 +438,9 @@ static int lib_cvRegisterVar(lua_State *L)
 			lua_rawset(L, 5);
 			lua_pop(L, 1);
 			cvar->func = Lua_OnChange;
-
-			if (i == 5 && !(cvar->flags & CV_CALL))
-			{
-				category = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
-			}
 		}
-		else if ((cvar->flags & CV_CALL && i == 6)
+		else if (((i == 5 && !(cvar->flags & CV_CALL))
+				|| (cvar->flags & CV_CALL && i == 6))
 				|| (k && fasticmp(k, "category")))
 		{
 			category = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
@@ -479,7 +451,6 @@ static int lib_cvRegisterVar(lua_State *L)
 		{
 			menu_name = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
 		}
-
 		lua_pop(L, 1);
 	}
 #undef FIELDERROR
@@ -65,8 +65,6 @@ static stringhook_t stringHooks[STRING_HOOK(MAX)];

 bool hook_important = true;

-#define NONMOHOOK ((mobjtype_t)-1)
-
 // This will be indexed by hook id, the value of which fetches the registry.
 static int * hookRefs;
 static int   nextid;
@@ -201,7 +199,7 @@ FUNCINLINE static ATTRINLINE void add_hook(hook_t *map)

 FUNCINLINE static ATTRINLINE void add_mobj_hook(lua_State *L, int hook_type)
 {
-	mobjtype_t mobj_type = luaL_optnumber(L, 3, MT_NULL);
+	mobjtype_t   mobj_type = luaL_optnumber(L, 3, MT_NULL);

 	luaL_argcheck(L, mobj_type < NUMMOBJTYPES, 3, "invalid mobjtype_t");

@@ -295,17 +293,18 @@ 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;       /* != NONMOHOOK 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 */
+	INT32        status;/* return status to calling function */
+	void       * userdata;
+	int          hook_type;
+	mobjtype_t   mobj_type;/* >0 if mobj hook */
+	boolean      force_mobj;// allows mobj_type equal 0
+	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 */
 };

 enum {
@@ -365,8 +364,10 @@ FUNCINLINE static ATTRINLINE boolean prepare_hook
 		int default_status,
 		int hook_type
 ){
+	hook->force_mobj = false;
+
 	return init_hook_type(hook, default_status,
-			hook_type, NONMOHOOK, NULL,
+			hook_type, 0, NULL,
 			hookIds[hook_type].numHooks);
 }

@@ -380,6 +381,8 @@ FUNCINLINE static ATTRINLINE boolean prepare_mobj_hook
 	const mobjtype_t mobj_type =
 		primary_mobj ? primary_mobj->type : NUMMOBJTYPES;

+	hook->force_mobj = true;
+
 	return init_hook_type(hook, default_status,
 			hook_type, mobj_type, NULL,
 			mobj_hook_available(hook_type, mobj_type));
@@ -392,8 +395,10 @@ FUNCINLINE static ATTRINLINE boolean prepare_string_hook
 		int          hook_type,
 		const char * string
 ){
+	hook->force_mobj = false;
+
 	if (init_hook_type(hook, default_status,
-				hook_type, NONMOHOOK, string,
+				hook_type, 0, string,
 				stringHooks[hook_type].ref))
 	{
 		lua_pushstring(gL, string);
@@ -409,7 +414,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_hud_hook
 		int hook_type
 ){
 	return init_hook_type(hook, 0,
-			hook_type, NONMOHOOK, NULL,
+			hook_type, 0, NULL,
 			hudHookIds[hook_type].numHooks);
 }

@@ -530,48 +535,10 @@ static int call_string_hooks(Hook_State *hook)
 	return calls;
 }

-FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
-{
-	static UINT8 seen = 0; // so we dont have to check all this shit constantly
-	int numCalls = call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
-
-	if (!seen && numCalls > 0 && mobj_type == MT_NULL && (
-		   hook->hook_type == MOBJ_HOOK(MobjThinker    )
-		|| hook->hook_type == MOBJ_HOOK(MobjCollide    )
-		|| hook->hook_type == MOBJ_HOOK(MobjMoveCollide)
-		|| hook->hook_type == MOBJ_HOOK(MobjFuse       )
-		|| hook->hook_type == MOBJ_HOOK(MobjThinker    )
-		|| hook->hook_type == MOBJ_HOOK(BossThinker    )
-	))
-	{
-		seen = 1;
-		CONS_Alert(
-			CONS_WARNING, "%s\n", va(
-			"%s hooks not attached to a specific mobj type may cause performance issues!",
-			mobjHookNames[hook->hook_type])
-		);
-
-		// print which script triggered it, ty indev <3
-		for (int k = 0; k < mobjHookIds[mobj_type][hook->hook_type].numHooks; ++k)
-		{
-			lua_getref(gL, hookRefs[mobjHookIds[mobj_type][hook->hook_type].ids[k].id]);
-
-			lua_Debug ar;
-			lua_getinfo(gL, ">S", &ar);
-
-			CONS_Printf("%s:%d\n", ar.short_src, ar.linedefined);
-		}
-	}
-
-	return numCalls;
-}
-
-/*
 FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
 {
 	return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
 }
-*/

 static int call_hooks
 (
@@ -587,13 +554,14 @@ static int call_hooks
 	{
 		calls += call_string_hooks(hook);
 	}
-	//else if (hook->mobj_type > 0)
-	else if (hook->mobj_type != NONMOHOOK)
+	else if (hook->force_mobj)
 	{
 		/* call generic mobj hooks first */
 		calls += call_mobj_type_hooks(hook, MT_NULL);
+
 		if (hook->mobj_type < NUMMOBJTYPES)
 			calls += call_mobj_type_hooks(hook, hook->mobj_type);
+
 		ps_lua_mobjhooks.value.i += calls;
 	}
 	else
@@ -647,7 +615,7 @@ FUNCINLINE static ATTRINLINE void res_hud(Hook_State *hook)

 int LUA_HookMobj(mobj_t *mobj, int hook_type)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_mobj_hook(&hook, false, hook_type, mobj))
 	{
 		LUA_PushUserdata(gL, mobj, META_MOBJ);
@@ -658,7 +626,7 @@ int LUA_HookMobj(mobj_t *mobj, int hook_type)

 int LUA_Hook2Mobj(mobj_t *t1, mobj_t *t2, int hook_type)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_mobj_hook(&hook, 0, hook_type, t1))
 	{
 		LUA_PushUserdata(gL, t1, META_MOBJ);
@@ -670,14 +638,14 @@ int LUA_Hook2Mobj(mobj_t *t1, mobj_t *t2, int hook_type)

 void LUA_HookVoid(int type)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, 0, type))
 		call_hooks(&hook, 0, res_none);
 }

 void LUA_HookInt(INT32 number, int hook_type)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, 0, hook_type))
 	{
 		lua_pushinteger(gL, number);
@@ -687,7 +655,7 @@ void LUA_HookInt(INT32 number, int hook_type)

 /*void LUA_HookBool(boolean value, int hook_type)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, 0, hook_type))
 	{
 		//lua_pushboolean(gL, value);
@@ -697,7 +665,7 @@ void LUA_HookInt(INT32 number, int hook_type)

 int LUA_HookPlayer(player_t *player, int hook_type)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, false, hook_type))
 	{
 		LUA_PushUserdata(gL, player, META_PLAYER);
@@ -708,7 +676,7 @@ int LUA_HookPlayer(player_t *player, int hook_type)

 int LUA_HookTiccmd(player_t *player, ticcmd_t *cmd, int hook_type)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, false, hook_type))
 	{
 		LUA_PushUserdata(gL, player, META_PLAYER);
@@ -727,7 +695,7 @@ int LUA_HookTiccmd(player_t *player, ticcmd_t *cmd, int hook_type)

 void LUA_HookHUD(int hook_type, huddrawlist_h list)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hud_hook(&hook, hook_type))
 	{
 		LUA_SetHudHook(hook_type, list);
@@ -755,7 +723,7 @@ static void hook_think_frame(int type)
 	int hook_index = 0;
 	precise_t time_taken = 0;

-	Hook_State hook = {};
+	Hook_State hook;

 	const hook_t * map = &hookIds[type];
 	int k;
@@ -815,7 +783,7 @@ void LUA_HookPostThinkFrame(void)

 int LUA_HookTouchSpecial(mobj_t *special, mobj_t *toucher)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(TouchSpecial), special))
 	{
 		LUA_PushUserdata(gL, special, META_MOBJ);
@@ -834,7 +802,7 @@ static int damage_hook
 		int     hook_type,
 		Hook_Callback results_handler
 ){
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_mobj_hook(&hook, 0, hook_type, target))
 	{
 		LUA_PushUserdata(gL, target, META_MOBJ);
@@ -922,8 +890,8 @@ int LUA_HookBotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
 {
 	const char *skin = ((skin_t *)tails->skin)->name;

-	Hook_State hook = {};
-	BotAI_State botai = {};
+	Hook_State hook;
+	BotAI_State botai;

 	if (prepare_string_hook(&hook, false, STRING_HOOK(BotAI), skin))
 	{
@@ -943,7 +911,7 @@ int LUA_HookBotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)

 void LUA_HookLinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_string_hook
 			(&hook, 0, STRING_HOOK(LinedefExecute), line->text))
 	{
@@ -956,7 +924,7 @@ void LUA_HookLinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)

 int LUA_HookPlayerMsg(int source, int target, int flags, char *msg, int mute)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, false, HOOK(PlayerMsg)))
 	{
 		LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player
@@ -985,7 +953,7 @@ int LUA_HookPlayerMsg(int source, int target, int flags, char *msg, int mute)

 int LUA_HookHurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(HurtMsg), inflictor))
 	{
 		LUA_PushUserdata(gL, player, META_PLAYER);
@@ -999,7 +967,7 @@ int LUA_HookHurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source)
 void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save)
 {
 	const hook_t * map = &hookIds[HOOK(NetVars)];
-	Hook_State hook = {};
+	Hook_State hook;
 	/* this is a remarkable case where the stack isn't reset */
 	if (map->numHooks > 0)
 	{
@@ -1029,7 +997,7 @@ void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save)

 void LUA_HookPlayerQuit(player_t *plr, int reason)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, 0, HOOK(PlayerQuit)))
 	{
 		LUA_PushUserdata(gL, plr, META_PLAYER); // Player that quit
@@ -1092,7 +1060,7 @@ int LUA_HookMusicChange(const char *oldname, struct MusicChange *param)
 	const int type = HOOK(MusicChange);
 	const hook_t * map = &hookIds[type];

-	Hook_State hook = {};
+	Hook_State hook;

 	int k;

@@ -1128,7 +1096,7 @@ int LUA_HookMusicChange(const char *oldname, struct MusicChange *param)

 int LUA_HookMusicCredit(musicdef_t *musicdef)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, 0, HOOK(MusicCredit)))
 	{
 		LUA_PushUserdata(gL, musicdef, META_MUSICDEF);
@@ -1146,7 +1114,7 @@ static int kartdamage_hook
 		int       hook_type,
 		Hook_Callback results_handler
 ){
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, 0, hook_type))
 	{
 		LUA_PushUserdata(gL, player, META_PLAYER);
@@ -1195,7 +1163,7 @@ boolean LUA_HookPlayerExplode(player_t *player, mobj_t *inflictor, mobj_t *sourc

 void LUA_HookSetupVote(INT16 result[], INT16 maxresults, UINT8 gt, UINT8 secondgt)
 {
-	Hook_State hook = {};
+	Hook_State hook;
 	if (prepare_hook(&hook, 0, HOOK(SetupVote)))
 	{
 		// { 0, 0, 0, 0, }
@@ -644,22 +644,20 @@ static int libd_drawScaled(lua_State *L)
 // KART: draw patch on minimap from x, y coordinates on the map
 static int libd_drawOnMinimap(lua_State *L)
 {
-	fixed_t x, y, scale;    // coordinates of the object
-	patch_t *patch;         // patch we want to draw
-	UINT8 *colormap = NULL; // do we want to colormap this patch?
-	boolean centered;       // the patch is centered and doesn't need readjusting on x/y coordinates.
+	fixed_t x, y, scale;	// coordinates of the object
+	patch_t *patch;	// patch we want to draw
+	UINT8 *colormap = NULL;	// do we want to colormap this patch?
+	boolean centered;	// the patch is centered and doesn't need readjusting on x/y coordinates.
 	huddrawlist_h list;
+	patch_t *AutomapPic = NULL;
 	drawinfo_t info;

-	// variables used to replicate k_kart's mmap drawer:
-	patch_t *AutomapPic;
-
 	// variables used for actually drawing the icon:
 	INT32 splitflags, minimaptrans;
 	fixed_t amnumxpos, amnumypos;
 	fixed_t amxpos, amypos;
 	INT32 mm_x, mm_y;
-	fixed_t patchw, patchh;
+	fixed_t patchw = 0, patchh = 0;

 	HUDONLY // only run this function in hud hooks

@@ -724,11 +722,8 @@ static int libd_drawOnMinimap(lua_State *L)

 	mm_y -= AutomapPic->topoffset;

-	if (centered)
-	{
-		patchw = patchh = 0; // patch is supposedly already centered, don't butt in.
-	}
-	else
+	// patch is supposedly already centered, don't butt in.
+	if (!centered)
 	{
 		// scale patch coords
 		patchw = (patch->width * scale / 2);
@@ -1302,7 +1297,7 @@ static int lib_hudsetvotebackground(lua_State *L)

 		if (strlen(prefix) != 4)
 		{
-			return luaL_argerror(L, 1, "prefix should be 4 characters wide");
+			return luaL_argerror(L, 1, "prefix should 4 characters wide");
 		}

 		strncpy(VoteScreen.luaPrefix, prefix, 4);
@@ -650,34 +650,34 @@ void LUA_HUD_DrawList(huddrawlist_h list)
 			case DI_DrawString:
 				switch(item->align)
 				{
-					// hu_font
-					case align_left:
-						V_DrawString(LERPS(x), LERPS(y), item->flags, itemstr);
-						break;
-					case align_center:
-						V_DrawCenteredString(LERPS(x), LERPS(y), item->flags, itemstr);
-						break;
-					case align_right:
-						V_DrawRightAlignedString(LERPS(x), LERPS(y), item->flags, itemstr);
-						break;
-					case align_fixed:
-						V_DrawStringAtFixed(LERPS(x), LERPS(y), item->flags, itemstr);
-						break;
-					// hu_font, 0.5x scale
-					case align_small:
-						V_DrawSmallString(LERPS(x), LERPS(y), item->flags, itemstr);
-						break;
-					case align_smallright:
-						V_DrawRightAlignedSmallString(LERPS(x), LERPS(y), item->flags, itemstr);
-						break;
-					// tny_font
-					case align_thin:
-						V_DrawThinString(LERPS(x), LERPS(y), item->flags, itemstr);
-						break;
-					case align_thinright:
-						V_DrawRightAlignedThinString(LERPS(x), LERPS(y), item->flags, itemstr);
-						break;
-					}
+				// hu_font
+				case align_left:
+					V_DrawString(LERPS(x), LERPS(y), item->flags, itemstr);
+					break;
+				case align_center:
+					V_DrawCenteredString(LERPS(x), LERPS(y), item->flags, itemstr);
+					break;
+				case align_right:
+					V_DrawRightAlignedString(LERPS(x), LERPS(y), item->flags, itemstr);
+					break;
+				case align_fixed:
+					V_DrawStringAtFixed(LERPS(x), LERPS(y), item->flags, itemstr);
+					break;
+				// hu_font, 0.5x scale
+				case align_small:
+					V_DrawSmallString(LERPS(x), LERPS(y), item->flags, itemstr);
+					break;
+				case align_smallright:
+					V_DrawRightAlignedSmallString(LERPS(x), LERPS(y), item->flags, itemstr);
+					break;
+				// tny_font
+				case align_thin:
+					V_DrawThinString(LERPS(x), LERPS(y), item->flags, itemstr);
+					break;
+				case align_thinright:
+					V_DrawRightAlignedThinString(LERPS(x), LERPS(y), item->flags, itemstr);
+					break;
+				}
 				break;
 			case DI_DrawKartString:
 				V_DrawKartString(LERPS(x), LERPS(y), item->flags, itemstr);
@@ -690,6 +690,7 @@ void LUA_HUD_DrawList(huddrawlist_h list)
 				break;
 			default:
 				I_Error("can't draw draw list item: invalid draw list item type");
+				continue;
 		}
 	}
 }
@@ -652,7 +652,7 @@ static int line_get(lua_State *L)
 		LUA_PushUserdata(L, &sides[line->sidenum[0]], META_SIDE);
 		return 1;
 	case line_backside: // backside
-		if (line->sidenum[1] == NO_INDEX)
+		if (line->sidenum[1] == 0xffff)
 			return 0;
 		LUA_PushUserdata(L, &sides[line->sidenum[1]], META_SIDE);
 		return 1;
@@ -1506,6 +1506,7 @@ enum mapheaderinfo_e
 	mapheaderinfo_saveoverride,
 	mapheaderinfo_levelflags,
 	mapheaderinfo_menuflags,
+	//mapheaderinfo_automap,
 	mapheaderinfo_mobj_scale,
 };

@@ -1541,6 +1542,7 @@ static const char *const mapheaderinfo_opt[] = {
 	"saveoverride",
 	"levelflags",
 	"menuflags",
+	//"automap",
 	"mobj_scale",
 	NULL,
 };
@@ -1582,11 +1584,10 @@ static int mapheaderinfo_get(lua_State *L)
 		lua_pushinteger(L, header->muspos);
 		break;
 	case mapheaderinfo_musinterfadeout:
-		lua_pushinteger(L, 0); // unused
+		lua_pushinteger(L, header->musinterfadeout);
 		break;
 	case mapheaderinfo_musintername:
-		// uhh psure its fine to just push nil instead of empty string?
-		lua_pushstring(L, NULL);
+		lua_pushstring(L, header->musintername);
 		break;
 	case mapheaderinfo_forcecharacter:
 		lua_pushstring(L, header->forcecharacter);
@@ -1640,10 +1641,10 @@ static int mapheaderinfo_get(lua_State *L)
 		lua_pushinteger(L, header->levelselect);
 		break;
 	case mapheaderinfo_bonustype:
-		lua_pushinteger(L, 0); // unused
+		lua_pushinteger(L, header->bonustype);
 		break;
 	case mapheaderinfo_saveoverride:
-		lua_pushinteger(L, SAVE_DEFAULT); // unused
+		lua_pushinteger(L, header->saveoverride);
 		break;
 	case mapheaderinfo_levelflags:
 		lua_pushinteger(L, header->levelflags);
@@ -1651,29 +1652,28 @@ static int mapheaderinfo_get(lua_State *L)
 	case mapheaderinfo_menuflags:
 		lua_pushinteger(L, header->menuflags);
 		break;
+	/*case mapheaderinfo_automap:
+		lua_pushstring(L, header->selectheading);
+		break;*/
 	case mapheaderinfo_mobj_scale:
 		lua_pushfixed(L, header->mobj_scale);
 		break;
+	// TODO add support for reading numGradedMares and grades
 	default:
 	{
 		// Read custom vars now
 		// (note: don't include the "LUA." in your lua scripts!)
-		if (!header->numCustomOptions) {
-			lua_pushnil(L);
-			break;
-		}
-
 		UINT8 j = 0;
-		const char *cusoptstr = lua_tostring(L, 2);
-		for (;j < header->numCustomOptions && !fastcmp(cusoptstr, header->customopts[j].option); ++j);
+		for (;j < header->numCustomOptions && !fastcmp(lua_tostring(L, 2), header->customopts[j].option); ++j);

-		if (j < header->numCustomOptions)
+		if(j < header->numCustomOptions)
 			lua_pushstring(L, header->customopts[j].value);
 		else
 			lua_pushnil(L);
 	}
 	}
 	return 1;
+
 }

 int LUA_MapLib(lua_State *L)
@@ -713,12 +713,9 @@ static UINT8 GetUserdataArchType(int index)

 static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 {
-	int type = lua_type(gL, myindex);
-
 	if (myindex < 0)
 		myindex = lua_gettop(gL)+1+myindex;
-
-	switch (type)
+	switch (lua_type(gL, myindex))
 	{
 	case LUA_TNONE:
 	case LUA_TNIL:
@@ -728,12 +725,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 	case LUA_TLIGHTUSERDATA:
 	case LUA_TTHREAD:
 	case LUA_TFUNCTION:
-	{
-		const char *typestr = (type == LUA_TLIGHTUSERDATA ? "light userdata" : (type == LUA_TTHREAD ? "thread" : (type == LUA_TFUNCTION ? "function" : "??")));
-		CONS_Alert(CONS_ERROR, M_GetText("Archived an invalid value! (%s)\n"), typestr);
 		WRITEUINT8(*p, ARCH_NULL);
 		return 2;
-	}
 	case LUA_TBOOLEAN:
 		WRITEUINT8(*p, ARCH_BOOLEAN);
 		WRITEUINT8(*p, lua_toboolean(gL, myindex));
@@ -986,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;
 	}
@@ -1002,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;
 	}
@@ -1014,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);
@@ -1072,9 +1065,8 @@ 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)
 			{
-				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
+				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);
 				continue;
 			}
 			else if (e == 3) // nil key due to invalid userdata. NOT an error.
@@ -1088,15 +1080,11 @@ 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
-			{
-				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
-			}
+				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_pop(gL, 1);
-		}

+		}
 		lua_pop(gL, 1);
 		WRITEUINT8(*p, ARCH_TEND);
 	}
@@ -13,10 +13,6 @@
 #define LZF_H
 #include <stdio.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /***********************************************************************
 **
 **	lzf -- an extremely fast/free compression/decompression-method
@@ -75,9 +71,5 @@ size_t
 lzf_decompress (const void *const in_data,  size_t in_len,
                void             *out_data, size_t out_len);

-#ifdef __cplusplus
-} // extern "C"
-#endif
-
 #endif

@@ -556,7 +556,7 @@ static void GIF_framewrite(void)
 		}
 		else if (gif_dynamicdelay ==(UINT8) 1)
 		{
-			float delayf = ceilf(100.0f/NEWTICRATE);
+			float delayf = ceil(100.0f/NEWTICRATE);

 			delay = (UINT16)((I_GetPreciseTime() - gif_prevframetime)) / (I_GetPrecisePrecision() / 1000000) /10/1000;

@@ -249,6 +249,9 @@ 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)
 {
@@ -256,6 +259,7 @@ void Command_CheatNoClip_f(void)

 	REQUIRE_INLEVEL;
 	REQUIRE_SINGLEPLAYER;
+	REQUIRE_NOULTIMATE;

 	plyr = &players[consoleplayer];
 	plyr->pflags ^= PF_NOCLIP;
@@ -270,6 +274,7 @@ void Command_CheatGod_f(void)

 	REQUIRE_INLEVEL;
 	REQUIRE_SINGLEPLAYER;
+	REQUIRE_NOULTIMATE;

 	plyr = &players[consoleplayer];
 	plyr->pflags ^= PF_GODMODE;
@@ -284,6 +289,7 @@ void Command_CheatNoTarget_f(void)

 	REQUIRE_INLEVEL;
 	REQUIRE_SINGLEPLAYER;
+	REQUIRE_NOULTIMATE;

 	plyr = &players[consoleplayer];
 	plyr->pflags ^= PF_INVIS;
@@ -587,6 +593,7 @@ void Command_Devmode_f(void)
 #ifndef _DEBUG
 	REQUIRE_SINGLEPLAYER;
 #endif
+	REQUIRE_NOULTIMATE;

 	if (COM_Argc() > 1)
 	{
@@ -766,7 +773,7 @@ boolean OP_FreezeObjectplace(void)
 	if (!objectplacing)
 		return false;

-	if (nightsmode && nightsplayer(&players[consoleplayer]))
+	if ((maptol & TOL_NIGHTS) && (players[consoleplayer].pflags & PF_NIGHTSMODE))
 		return false;

 	return true;
@@ -1041,6 +1048,7 @@ void Command_ObjectPlace_f(void)
 {
 	REQUIRE_INLEVEL;
 	REQUIRE_SINGLEPLAYER;
+	REQUIRE_NOULTIMATE;

 	G_SetGameModified(multiplayer, true);

@@ -1049,7 +1057,7 @@ void Command_ObjectPlace_f(void)
 	{
 		objectplacing = true;

-		if (nightsplayer(&players[0]))
+		if ((players[0].pflags & PF_NIGHTSMODE))
 			return;

 		if (!COM_CheckParm("-silent"))
@@ -1120,7 +1128,7 @@ void Command_ObjectPlace_f(void)

 		// Don't touch the NiGHTS Objectplace stuff.
 		// ... or if the mo mysteriously vanished.
-		if (!players[0].mo || nightsplayer(&players[0]))
+		if (!players[0].mo || (players[0].pflags & PF_NIGHTSMODE))
 			return;

 		// If still in dummy state, get out of it.
@@ -29,6 +29,7 @@ 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;
@@ -47,10 +48,18 @@ 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);
@@ -479,13 +479,32 @@ UINT8 M_CheckLevelEmblems(void)
 	// Update Score, Time, Rings emblems
 	for (i = 0; i < numemblems; ++i)
 	{
-		// Requires time on map <= x
-		if (emblemlocations[i].type != ET_TIME || emblemlocations[i].collected)
+		if (emblemlocations[i].type <= ET_SKIN || emblemlocations[i].collected)
 			continue;

 		levelnum = emblemlocations[i].level;
 		valToReach = emblemlocations[i].var;
-		res = (G_GetBestTime(levelnum) <= (unsigned)valToReach);
+
+		switch (emblemlocations[i].type)
+		{
+			/*case ET_SCORE: // Requires score on map >= x
+				res = (G_GetBestScore(levelnum) >= (unsigned)valToReach);
+				break;*/
+			case ET_TIME: // Requires time on map <= x
+				res = (G_GetBestTime(levelnum) <= (unsigned)valToReach);
+				break;
+			/*case ET_RINGS: // Requires rings on map >= x
+				res = (G_GetBestRings(levelnum) >= valToReach);
+				break;
+			case ET_NGRADE: // Requires NiGHTS grade on map >= x
+				res = (G_GetBestNightsGrade(levelnum, 0) >= valToReach);
+				break;
+			case ET_NTIME: // Requires NiGHTS time on map <= x
+				res = (G_GetBestNightsTime(levelnum, 0) <= (unsigned)valToReach);
+				break;*/
+			default: // unreachable but shuts the compiler up.
+				continue;
+		}

 		emblemlocations[i].collected = res;
 		if (res)