Merge branch 'Saturn-Next' into Saturn

release 9.2
2025-12-06 15:45:51 +01:00 · 2025-12-06 15:33:41 +01:00 · 2025-12-06 15:33:08 +01:00
123 changed files with 1900 additions and 2312 deletions
@@ -1,46 +1,14 @@
 cmake_minimum_required(VERSION 3.5)
-
-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()
-
 # DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
 # Version change is fine.
 project(SRB2
 	VERSION 1.6
-	LANGUAGES C CXX)
+	LANGUAGES C)

-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-#set(CMAKE_CXX_EXTENSIONS OFF)    # optional but recommended: disables GNU extensions, forces pure ISO C++
-set(CMAKE_CXX_EXTENSIONS ON)
-set(CMAKE_C_EXTENSIONS ON)
-
-##### PACKAGE CONFIGURATION #####
-
-set(SRB2_CPACK_GENERATOR "" CACHE STRING "Generator to use for making a package. E.g., ZIP, TGZ, DragNDrop (OSX only). Leave blank for default generator.")
-
-if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
-	if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
-		set(SRB2_CPACK_GENERATOR "ZIP")
-	elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-		set(SRB2_CPACK_GENERATOR "TGZ")
-	elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
-		set(SRB2_CPACK_GENERATOR "TGZ")
-	endif()
+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()

-set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
-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")
-set(CPACK_PACKAGE_VERSION_MAJOR ${SRB2_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${SRB2_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${SRB2_VERSION_PATCH})
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}")
-include(CPack)
-
 # Set up CMAKE path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")

@@ -105,7 +73,6 @@ endif()
 # OS macros
 if (UNIX)
 	add_definitions(-DUNIXCOMMON)
-	add_link_options(-rdynamic) # Use -rdynamic so a backtrace log shows function names
 endif()

 if(CMAKE_COMPILER_IS_GNUCC)
@@ -128,12 +95,14 @@ set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")

 # Set EXE names so the assets CMakeLists can refer to its target
 set(SRB2_SDL2_EXE_NAME srb2kart CACHE STRING "Executable binary output name")
+set(SRB2_WIN_EXE_NAME srb2kartdd CACHE STRING "Executable binary output name for DirectDraw build")

 include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)

 add_subdirectory(src)
 add_subdirectory(assets)

+
 ## config.h generation
 set(GIT_EXECUTABLE "git" CACHE FILEPATH "Path to git binary")
 include(GitUtilities)
@@ -142,3 +111,25 @@ git_current_branch(SRB2_GIT_BRANCH "${CMAKE_SOURCE_DIR}")
 set(SRB2_COMP_BRANCH "${SRB2_GIT_BRANCH}")
 set(SRB2_COMP_REVISION "${SRB2_COMP_COMMIT}")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
+
+##### PACKAGE CONFIGURATION #####
+
+if(${CMAKE_SYSTEM} MATCHES "Windows")
+	set(CPACK_GENERATOR "ZIP")
+endif()
+if(${CMAKE_SYSTEM} MATCHES "Linux")
+	set(CPACK_GENERATOR "TGZ")
+endif()
+if(${CMAKE_SYSTEM} MATCHES "Darwin")
+	set(CPACK_GENERATOR "DragNDrop")
+endif()
+
+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")
+set(CPACK_PACKAGE_VERSION_MAJOR ${SRB2_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${SRB2_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${SRB2_VERSION_PATCH})
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}")
+include(CPack)
@@ -22,14 +22,14 @@ We also have a Flatpak available on [Flathub](https://flathub.org/en/apps/org.sr

 See [SRB2 Wiki/Source code compiling](http://wiki.srb2.org/wiki/Source_code_compiling). The compiling process for SRB2Kart is largely identical to SRB2.

-For Windows only the Makefile build system with GCC or Clang compiler is supported.
+Currently only the Makefile build system with GCC or Clang compiler is supported.
+CMake is NOT supported at the moment, but will be availible again soon.
+
 Visual C++ (MSVC) is unsupported.

 64-bit Windows builds are supported and recommended over 32-bit builds, they will build automatically when using the MSYS2 MinGW 64-bit executable (requires the mingw-w64-x86_64-gcc package), no extra flags needed!
 The specific DLLs can be found under /libs/dll-binaries/(i686 for 32bit/x86_64 for 64-bit)/ or in the Release packages

-MacOS and Linux can be build with CMake, but it is recommended to use the Makefile for Linux over CMake
-
 Alternatively the [srb2bld](https://github.com/Bijman/srb2bld) script by Bijman can be used aswell!

 ## Disclaimer
@@ -1,10 +1,5 @@
 ## Assets Target Configuration ##

-if(${CMAKE_SYSTEM} MATCHES Linux)
-	# Asset installation isn't part of the Linux target
-	return()
-endif()
-
 # For prepending the current source path, later
 FUNCTION(PREPEND var prefix)
   SET(listVar "")
@@ -1,6 +1,6 @@
 include(LibFindMacros)

-libfind_pkg_check_modules(GME_PKGCONF LIBGME)
+libfind_pkg_check_modules(GME_PKGCONF GME)

 find_path(GME_INCLUDE_DIR
 	NAMES gme.h
@@ -8,7 +8,6 @@ find_path(GME_INCLUDE_DIR
 		${GME_PKGCONF_INCLUDE_DIRS}
 		"/usr/include/gme"
 		"/usr/local/include/gme"
-	PATH_SUFFIXES gme
 )

 find_library(GME_LIBRARY
@@ -21,4 +20,4 @@ find_library(GME_LIBRARY

 set(GME_PROCESS_INCLUDES GME_INCLUDE_DIR)
 set(GME_PROCESS_LIBS GME_LIBRARY)
-libfind_process(GME)
+libfind_process(GME)
@@ -1,6 +1,6 @@
 include(LibFindMacros)

-libfind_pkg_check_modules(OPENMPT_PKGCONF LIBOPENMPT)
+libfind_pkg_check_modules(OPENMPT_PKGCONF OPENMPT)

 find_path(OPENMPT_INCLUDE_DIR
 	NAMES libopenmpt.h
@@ -8,7 +8,6 @@ find_path(OPENMPT_INCLUDE_DIR
 		${OPENMPT_PKGCONF_INCLUDE_DIRS}
 		"/usr/include/libopenmpt"
 		"/usr/local/include/libopenmpt"
-	PATH_SUFFIXES libopenmpt
 )

 find_library(OPENMPT_LIBRARY
@@ -21,4 +20,4 @@ find_library(OPENMPT_LIBRARY

 set(OPENMPT_PROCESS_INCLUDES OPENMPT_INCLUDE_DIR)
 set(OPENMPT_PROCESS_LIBS OPENMPT_LIBRARY)
-libfind_process(OPENMPT)
+libfind_process(OPENMPT)
@@ -1,33 +0,0 @@
-include(LibFindMacros)
-
-libfind_pkg_check_modules(LIBBACKTRACE_PKGCONF LIBBACKTRACE)
-
-find_path(LIBBACKTRACE_INCLUDE_DIR
-	NAMES backtrace.h
-	PATHS
-		${LIBBACKTRACE_PKGCONF_INCLUDE_DIRS}
-		"/usr/include"
-		"/usr/local/include"
-)
-
-find_library(LIBBACKTRACE_LIBRARY
-	NAMES backtrace
-	PATHS
-		${LIBBACKTRACE_PKGCONF_LIBRARY_DIRS}
-		"/usr/lib"
-		"/usr/local/lib"
-)
-
-set(LIBBACKTRACE_PROCESS_INCLUDES LIBBACKTRACE_INCLUDE_DIR)
-set(LIBBACKTRACE_PROCESS_LIBS LIBBACKTRACE_LIBRARY)
-libfind_process(LIBBACKTRACE)
-
-if(LIBBACKTRACE_FOUND AND NOT TARGET libbacktrace)
-	add_library(libbacktrace UNKNOWN IMPORTED)
-	set_target_properties(
-		libbacktrace
-		PROPERTIES
-		IMPORTED_LOCATION "${LIBBACKTRACE_LIBRARY}"
-		INTERFACE_INCLUDE_DIRECTORIES "${LIBBACKTRACE_INCLUDE_DIR}"
-	)
-endif()
@@ -1,4 +1,4 @@
-# Version 2.4
+# Version 2.2
 # Public Domain, originally written by Lasse Kärkkäinen <tronic>
 # Maintained at https://github.com/Tronic/cmake-modules
 # Please send your improvements as pull requests on Github.
@@ -52,10 +52,6 @@ function (libfind_pkg_detect PREFIX)
  if (libraryargs)
    find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
  endif()
-  # Read pkg-config version
-  if (${PREFIX}_PKGCONF_VERSION)
-    set(${PREFIX}_VERSION ${${PREFIX}_PKGCONF_VERSION} PARENT_SCOPE)
-  endif()
 endfunction()

 # Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
@@ -129,39 +125,24 @@ function (libfind_process PREFIX)

  # Process deps to add to
  foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
-    if (DEFINED ${i}_INCLUDE_OPTS)
+    if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
      # The package seems to export option lists that we can use, woohoo!
      list(APPEND includeopts ${${i}_INCLUDE_OPTS})
-    else()
-      if (DEFINED ${i}_INCLUDE_DIR)
-        # Singular forms can be used
-        list(APPEND includeopts ${i}_INCLUDE_DIR)
-      else()
-        if (DEFINED ${i}_INCLUDE_DIRS)
-          # Plural forms can be used
-          list(APPEND includeopts ${i}_INCLUDE_DIRS)
-        else()
-          # Oh no, we don't know the option names
-          message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes. Aieeh!")
-        endif()
-      endif()
-    endif()
-
-    if (DEFINED ${i}_LIBRARY_OPTS)
-      # The package seems to export option lists that we can use, woohoo!
      list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
    else()
-      if (DEFINED ${i}_LIBRARY)
+      # If plural forms don't exist or they equal singular forms
+      if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR
+          ({i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES))
        # Singular forms can be used
-        list(APPEND libraryopts ${i}_LIBRARY)
-      else()
-        if (DEFINED ${i}_LIBRARIES)
-          # Plural forms can be used
-          list(APPEND libraryopts ${i}_LIBRARIES)
-        else()
-          # Oh no, we don't know the option names
-          message(FATAL_ERROR "We couldn't determine config variable names for ${i} libraries. Aieeh!")
+        if (DEFINED ${i}_INCLUDE_DIR)
+          list(APPEND includeopts ${i}_INCLUDE_DIR)
        endif()
+        if (DEFINED ${i}_LIBRARY)
+          list(APPEND libraryopts ${i}_LIBRARY)
+        endif()
+      else()
+        # Oh no, we don't know the option names
+        message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes and libs. Aieeh!")
      endif()
    endif()
  endforeach()
@@ -228,12 +209,12 @@ function (libfind_process PREFIX)
        message(STATUS "  ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
        message(STATUS "  ${PREFIX}_LIBRARIES=${libs}")
      endif()
+      set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
+      set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
+      set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
+      set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
+      set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
    endif()
-    set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
-    set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
-    set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
-    set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
-    set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
    return()
  endif()

@@ -2,8 +2,6 @@

 # Core sources
 set(SRB2_CORE_SOURCES
-	core/memory.cpp
-	core/thread_pool.cpp
 	am_map.c
 	b_bot.c
 	command.c
@@ -20,21 +18,17 @@ set(SRB2_CORE_SOURCES
 	f_wipe.c
 	filesrch.c
 	g_game.c
-	g_demo.c
 	g_input.c
 	hu_stuff.c
 	i_tcp.c
 	info.c
-	k_hud.c
 	lzf.c
 	m_aatree.c
 	m_anigif.c
 	m_argv.c
 	m_bbox.c
 	m_cheat.c
-	m_curl.c
 	m_cond.c
-	m_emotes.cpp
 	m_fixed.c
 	m_menu.c
 	m_textinput.c
@@ -46,25 +40,19 @@ set(SRB2_CORE_SOURCES
 	mserv.c
 	http-mserv.c
 	qs22j.c
-	r_skins.c
 	s_sound.c
 	screen.c
 	sounds.c
 	st_stuff.c
-	string.c
+	#string.c
 	tables.c
 	v_video.c
 	w_wad.c
 	y_inter.c
-	z_zone.cpp
+	z_zone.c
 )

 set(SRB2_CORE_HEADERS
-	core/memory.h
-	core/thread_pool.h
-	m_curl.h
-	m_emotes.h
-	k_hud.h
 	am_map.h
 	b_bot.h
 	byteptr.h
@@ -90,7 +78,6 @@ set(SRB2_CORE_HEADERS
 	fastcmp.h
 	filesrch.h
 	g_game.h
-	g_demo.h
 	g_input.h
 	g_state.h
 	hu_stuff.h
@@ -122,7 +109,6 @@ set(SRB2_CORE_HEADERS
 	md5.h
 	mserv.h
 	qs22j.h
-	r_skins.h
 	s_sound.h
 	screen.h
 	sounds.h
@@ -137,18 +123,18 @@ set(SRB2_CORE_HEADERS
 )

 set(SRB2_CORE_RENDER_SOURCES
-	r_bsp.cpp
+	r_bsp.c
 	r_data.c
-	r_draw.cpp
-	r_fps.cpp
-	r_main.cpp
-	r_patch.cpp
-	r_patchrotation.cpp
-	r_plane.cpp
-	r_segs.cpp
+	r_draw.c
+	r_fps.c
+	r_main.c
+	r_patch.c
+	r_patchrotation.c
+	r_plane.c
+	r_segs.c
 	r_sky.c
 	r_splats.c
-	r_things.cpp
+	r_things.c
 	r_portal.c

 	r_bsp.h
@@ -176,7 +162,7 @@ set(SRB2_CORE_GAME_SOURCES
 	p_inter.c
 	p_lights.c
 	p_map.c
-	p_maputl.cpp
+	p_maputl.c
 	p_mobj.c
 	p_polyobj.c
 	p_saveg.c
@@ -191,7 +177,6 @@ set(SRB2_CORE_GAME_SOURCES
 	k_kart.c
 	k_stats.c
 	i_time.c
-	i_threads.c

 	p_local.h
 	p_maputl.h
@@ -208,6 +193,10 @@ set(SRB2_CORE_GAME_SOURCES
 	k_stats.h
 )

+if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+	set(SRB2_CORE_SOURCES ${SRB2_CORE_SOURCES} string.c)
+endif()
+
 prepend_sources(SRB2_CORE_SOURCES)
 prepend_sources(SRB2_CORE_HEADERS)
 prepend_sources(SRB2_CORE_RENDER_SOURCES)
@@ -237,23 +226,10 @@ set(SRB2_CONFIG_HWRENDER ON CACHE BOOL
 	"Enable hardware rendering through OpenGL.")
 set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL
 	"Use statically linked OpenGL. NOT RECOMMENDED.")
+set(SRB2_CONFIG_USE_FBO_OGL ON CACHE BOOL
+	"Enable OpenGL FBO Downsampling support.")
 set(SRB2_CONFIG_DEDICATED OFF CACHE BOOL
 	"Build a dedicated server.")
-set(SRB2_CONFIG_LIBBACKTRACE ON CACHE BOOL
-	"Enable using libbacktrace for crashlogs.")
-set(SRB2_CONFIG_LTO ON CACHE BOOL
-	"Enable link time optimizations, improves performance at the cost of longer link times.")
-set(SRB2_CONFIG_ASAN OFF CACHE BOOL
-	"Compile with AddressSanitizer (libasan).")
-set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
-	"Compile with UndefinedBehaviorSanitizer (libubsan).")
-
-set(SRB2_CONFIG_SATURNPAK ON CACHE BOOL
-	"Enable Saturn specific special packet. Required for using the newer resynch system")
-set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
-	"Enable Saturn specific allowjoin toggle.")
-set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL
-	"Enable hardware renderer (OpenGL) FBO downsampling support")

 if(${SRB2_CONFIG_DEDICATED})
 	set(SRB2_CONFIG_HAVE_GME NO)
@@ -493,36 +469,16 @@ if(${SRB2_CONFIG_HAVE_CURL})
 	endif()
 endif()

-if(${SRB2_CONFIG_LIBBACKTRACE})
-	if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
-        if(${SRB2_SYSTEM_BITS} EQUAL 64)
-			set(LIBBACKTRACE_FOUND ON)
-			set(LIBBACKTRACE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libbacktrace/include)
-			set(LIBBACKTRACE_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libbacktrace/lib/x86_64 -lbacktrace")
-		else() # 32-bit
-			message(WARNING "libbacktrace is unsupported on 32-bit builds.")
-		endif()
-	else()
-		find_package(libbacktrace)
-	endif()
-	if(${LIBBACKTRACE_FOUND})
-		set(SRB2_HAVE_LIBBACKTRACE ON)
-		add_definitions(-DHAVE_LIBBACKTRACE)
-	else()
-		message(WARNING "You have specified that libbacktrace is available but it was not found.")
-	endif()
-endif()
-
 if(${SRB2_CONFIG_HWRENDER})
 	add_definitions(-DHWRENDER)
 	set(SRB2_HWRENDER_SOURCES
 		${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.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
-		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_portal.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.c
@@ -537,6 +493,7 @@ if(${SRB2_CONFIG_HWRENDER})
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.h
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_data.h
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_defs.h
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_dll.h
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_gl.h
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_glob.h
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.h
@@ -555,6 +512,7 @@ if(${SRB2_CONFIG_HWRENDER})
 	set(SRB2_R_OPENGL_HEADERS
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.h
 	)
+
 endif()

 if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL})
@@ -567,40 +525,25 @@ if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL})
 	endif()
 endif()

-if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_SCREENFBO})
-	add_definitions(-DUSE_FBO_OGL)
-endif()
-
-if(${SRB2_CONFIG_SATURNPAK})
-	add_definitions(-DDOSATURNPAK)
-endif()
-
-if(${SRB2_CONFIG_SATURNJOIN})
-	add_definitions(-DDOSATURNJOIN)
+if(${SRB2_CONFIG_HWRENDER})
+	if(${SRB2_CONFIG_USE_FBO_OGL})
+		set(SRB2_USE_FBO_OGL ON)
+		add_definitions(-DUSE_FBO_OGL)
+	endif()
 endif()

 # Targets

 # Compatibility flag with later versions of GCC
 # We should really fix our code to not need this
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-	if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|x64|amd64|AMD64|em64t|EM64T)")
-		add_compile_options(-mno-ms-bitfields)
-	endif()
-	add_compile_options(-Wno-trigraphs)
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mno-ms-bitfields)
 endif()

-# TODO: fix prng and P_CreateBlockmap overflow at some point
-add_compile_options(-fwrapv)
-
-if (${CMAKE_BUILD_TYPE} MATCHES Debug)
-	add_compile_options(-O0)
-else()
-	add_compile_options(-O3)
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value)
 endif()

-add_compile_options(-g)
-
 add_definitions(-DCMAKECONFIG)

 #add_library(SRB2Core STATIC
@@ -8,6 +8,11 @@ ifdef MINGW
 libs+=-mconsole
 endif

+ifndef NOTHREADS
+opts+=-DHAVE_THREADS
+sources+=dedicated/i_threads.c
+endif
+
 NOOPENMPT=1
 NOLIBGME=1
 NOHW=1
@@ -64,9 +64,9 @@ endif

 # This must have high to low order.
 gcc_versions:=\
-	152 151 150 15\
+	151 150 15\
 	142 141 140 14\
-	133 132 131 130 13\
+	132 131 130 13\
 	123 122 121 120 12\
 	114 113 112 111 110 11\
 	105 104 103 102 101 100 10\
@@ -77,7 +77,7 @@ gcc_versions:=\
 	55 54 53 52 51 50\
 	49 48 47 46 45 44 43 42 41 40

-latest_gcc_version:=15.2
+latest_gcc_version:=15.1.1

 # Automatically set version flag, but not if one was
 # manually set. And don't bother if this is a clean only
@@ -27,11 +27,6 @@ endif
 sources+=$(call List,hardware/Sourcefile)
 endif

-ifndef NOTHREADS
-opts+=-DHAVE_THREADS
-sources+=i_threads.c
-endif
-
 ifndef NOMD5
 sources+=md5.c
 endif
@@ -40,6 +40,11 @@ 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,10 +20,7 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\
 CXXFLAGS+= -Wno-aggregate-return

 # -W -Wno-unused
-WFLAGS:=-Wall -Wno-trigraphs -Wnull-dereference
-ifdef GCC152
-WFLAGS+=-Wzero-as-null-pointer-constant
-endif
+WFLAGS:=-Wall -Wno-trigraphs
 ifndef GCC295
 #WFLAGS+=-Wno-packed
 endif
@@ -226,6 +226,10 @@ const char *I_LocateWad(void)
  return "/sdcard/srb2";
 }

+void I_GetJoystickEvents(void){}
+
+void I_GetJoystick2Events(void){}
+
 char *I_GetEnv(const char *name)
 {
  LOGW("I_GetEnv() called?!");
@@ -527,7 +527,7 @@ static int str_find_aux (lua_State *L, int find) {
        if (find) {
          lua_pushinteger(L, s1-s+1);  /* start */
          lua_pushinteger(L, res-s);   /* end */
-          return push_captures(&ms, NULL, NULL) + 2;
+          return push_captures(&ms, NULL, 0) + 2;
        }
        else
          return push_captures(&ms, s1, res);
@@ -772,10 +772,10 @@ union luai_Cast { double l_d; long l_l; };

 #include <stdio.h>
 #if defined(__GNUC__)
-#define l_likely(x)		(__builtin_expect(!!(x), 1))
-#define l_unlikely(x)	(__builtin_expect(!!(x), 0))
+#define l_likely(x)	(__builtin_expect(((x) != 0), 1))
+#define l_unlikely(x)	(__builtin_expect(((x) != 0), 0))
 #else
-#define l_likely(x)		(x)
+#define l_likely(x)	(x)
 #define l_unlikely(x)	(x)
 #endif

@@ -237,13 +237,10 @@ void COM_ImmedExecute(const char *ptext)
 	char line[1024] = "";
 	INT32 quotes;

-	const size_t txtlength = strlen(ptext);
-
-	while (i < txtlength)
+	while (i < strlen(ptext))
 	{
 		quotes = 0;
-
-		for (j = 0; i < txtlength; i++,j++)
+		for (j = 0; i < strlen(ptext); i++,j++)
 		{
 			if (ptext[i] == '\"' && !quotes && i > 0 && ptext[i-1] != ' ') // Malformed command
 				return;
@@ -655,7 +652,7 @@ static void COM_Alias_f(void)
 		CONS_Printf(M_GetText("All aliases that start with \x87'%s'\x80 are:\n"), begin);

 		int count = 0;
-		for (cmdalias_t *head = com_alias; head != NULL; head = head->next)
+		for (cmdalias_t *head = com_alias; head->next != NULL; head = head->next)
 		{
 			if (strncmp(begin, head->name, szBegin) == 0)
 			{
@@ -676,7 +673,7 @@ static void COM_Alias_f(void)
 		/* Display alias subtext, show all aliases. */
 		CONS_Printf(M_GetText("alias <name> <command>: create a shortcut command that executes other command(s)\n"));

-		for (cmdalias_t *head = com_alias; head != NULL; head = head->next)
+		for (cmdalias_t *head = com_alias; head->next != NULL; head = head->next)
 		{
 			CONS_Printf(alias_format, head->name, head->value);
 		}
@@ -13,13 +13,13 @@
 #ifndef __COMMAND_H__
 #define __COMMAND_H__

-#include <stdio.h>
-#include "doomdef.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

+#include <stdio.h>
+#include "doomdef.h"
+
 //===================================
 // Command buffer & command execution
 //===================================
@@ -11,6 +11,21 @@

 #ifdef CMAKECONFIG

+// Base SRB2 hashes
+#define ASSET_HASH_SRB2_SRB      "${SRB2_ASSET_srb2.srb_HASH}"
+#ifdef USE_PATCH_DTA
+#define ASSET_HASH_PATCH_DTA     "${SRB2_ASSET_patch.dta_HASH}"
+#endif
+
+// SRB2Kart-specific hashes
+#define ASSET_HASH_GFX_KART      "${SRB2_ASSET_gfx.kart_HASH}"
+#define ASSET_HASH_TEXTURES_KART "${SRB2_ASSET_textures.kart_HASH}"
+#define ASSET_HASH_CHARS_KART    "${SRB2_ASSET_chars.kart_HASH}"
+#define ASSET_HASH_MAPS_KART     "${SRB2_ASSET_maps.kart_HASH}"
+#ifdef USE_PATCH_KART
+#define ASSET_HASH_PATCH_KART    "00000000000000000000000000000000"
+#endif
+
 #define SRB2_COMP_REVISION       "${SRB2_COMP_REVISION}"
 #define SRB2_COMP_BRANCH         "${SRB2_COMP_BRANCH}"

@@ -18,10 +33,30 @@

 #else

-#define SRB2_COMP_REVISION       ""
-#define SRB2_COMP_BRANCH         ""
+/* Manually defined asset hashes for non-CMake builds
+ * Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb
+ * Last updated 2018 / 12 / 23 - SRB2 v2.1.22 - patch.dta
+ * Last updated 2019 / 01 / 18 - Kart v1.0.2 - Main assets
+ * Last updated 2020 / 08 / 30 - Kart v1.3 - patch.kart
+ * Last updated 2022 / 08 / 16 - Kart v1.4 - Main assets
+ * Last updated 2022 / 08 / 19 - Kart v1.5 - gfx.kart
+ * Last updated 2022 / 11 / 01 - Kart v1.6 - gfx.kart, maps.kart
+ */

-#define CMAKE_ASSETS_DIR         ""
+// Base SRB2 hashes
+#define ASSET_HASH_SRB2_SRB      "c1b9577687f8a795104aef4600720ea7"
+#ifdef USE_PATCH_DTA
+#define ASSET_HASH_PATCH_DTA     "b04fd9624bfd94dc96dcf4f400f7deb4"
+#endif
+
+// SRB2Kart-specific hashes
+#define ASSET_HASH_GFX_KART      "06f86ee16136eb8a7043b15001797034"
+#define ASSET_HASH_TEXTURES_KART "abb53d56aba47c3a8cb0f764da1c8b80"
+#define ASSET_HASH_CHARS_KART    "e2c428347dde52858a3dacd29fc5b964"
+#define ASSET_HASH_MAPS_KART     "d051e55141ba736582228c456953cd98"
+#ifdef USE_PATCH_KART
+#define ASSET_HASH_PATCH_KART    "00000000000000000000000000000000"
+#endif

 #endif
 #endif
@@ -44,14 +44,14 @@
 #define MAXHUDLINES 20

 #ifdef HAVE_THREADS
-I_Mutex con_mutex;
+I_mutex con_mutex;

 // 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 (!g_in_exiting_signal_handler) { I_LockMutex(&con_mutex); }
-#  define Unlock_state()  if (!g_in_exiting_signal_handler) { I_UnlockMutex(con_mutex); }
+#  define Lock_state()    if (!g_in_exiting_signal_handler) { I_lock_mutex(&con_mutex); }
+#  define Unlock_state()  if (!g_in_exiting_signal_handler) { I_unlock_mutex(con_mutex); }
 #else/*HAVE_THREADS*/
 #  define Lock_state()
 #  define Unlock_state()
@@ -22,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
@@ -332,7 +332,7 @@ void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(const UINT8 **p, INT32 playernu
 #ifdef PARANOIA
 	if (id >= MAXNETXCMD)
 		I_Error("Command id %d too big", id);
-	if (listnetxcmd[id] != NULL)
+	if (listnetxcmd[id] != 0)
 		I_Error("Command id %d already used", id);
 #endif
 	listnetxcmd[id] = cmd_f;
@@ -365,7 +365,7 @@ void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_
 		CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %d... (size: %d, needed: %s)\n"), id, localtextcmd[playerid][0], sizeu1(nparam));
 		if (buf == NULL)
 		{
-			textcmdbuf[playerid] = (textcmdbuf_t*)Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL);
+			textcmdbuf[playerid] = Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL);
 			textcmdbuf[playerid]->cmd[0] = 0;
 			textcmdbuf[playerid]->next = NULL;
 			WriteNetXCmd(textcmdbuf[playerid]->cmd, id, param, nparam);
@@ -377,7 +377,7 @@ void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_

 		if (buf->cmd[0]+2+nparam > MAXTEXTCMD)
 		{
-			buf->next = (textcmdbuf_t*)Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL);
+			buf->next = Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL);
 			buf->next->cmd[0] = 0;
 			buf->next->next = NULL;
 			WriteNetXCmd(buf->next->cmd, id, param, nparam);
@@ -454,13 +454,13 @@ static UINT8* D_GetTextcmd(tic_t tic, INT32 playernum)
 	// If we don't have an entry for the tic, make it.
 	if (!textcmdtic)
 	{
-		textcmdtic = *tctprev = (textcmdtic_t*)Z_Calloc(sizeof (textcmdtic_t), PU_STATIC, NULL);
+		textcmdtic = *tctprev = Z_Calloc(sizeof (textcmdtic_t), PU_STATIC, NULL);
 		textcmdtic->tic = tic;
 	}

 	// If we don't have an entry for the player, make it.
 	if (!textcmdtic->playercmds[playernum])
-		textcmdtic->playercmds[playernum] = (UINT8*)Z_Calloc(MAXTEXTCMD, PU_STATIC, NULL);
+		textcmdtic->playercmds[playernum] = Z_Calloc(MAXTEXTCMD, PU_STATIC, NULL);

 	return textcmdtic->playercmds[playernum];
 }
@@ -1141,7 +1141,7 @@ typedef enum
 static void GetPackets(void);

 static cl_mode_t cl_mode = CL_SEARCHING;
-static UINT16 cl_lastcheckedfilecount = 0; // used for full file list
+static UINT16 cl_lastcheckedfilecount = 0;	// used for full file list

 // Player name send/load

@@ -1182,7 +1182,7 @@ static void CV_LoadPlayerNames(UINT8 **p)
 //
 // Keep the local client informed of our status.
 //
-static void CL_DrawConnectionStatus(void)
+static inline void CL_DrawConnectionStatus(void)
 {
 	INT32 ccstime = I_GetTime();

@@ -1217,26 +1217,24 @@ static void CL_DrawConnectionStatus(void)
 			case CL_DOWNLOADSAVEGAME:
 				if (filedownload.current != -1)
 				{
-					INT32 dldlength = 0;
-					fileneeded_t *file = &fileneeded[filedownload.current];
-					UINT32 currentsize = file->currentsize;
-					UINT32 totalsize   = file->totalsize;
+					UINT32 currentsize = fileneeded[filedownload.current].currentsize;
+					UINT32 totalsize = fileneeded[filedownload.current].totalsize;
+					INT32 dldlength;

 					cltext = M_GetText("Downloading game state...");
 					Net_GetNetStat();

-					if (totalsize != 0)
-						dldlength = (INT32)((currentsize/(double)totalsize) * 256);
+					dldlength = (INT32)((currentsize/(double)totalsize) * 256);
 					if (dldlength > 256)
 						dldlength = 256;
 					V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 111);
 					V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 96);

 					V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
-						va(" %4uK/%4uK", currentsize>>10, totalsize>>10));
+						va(" %4uK/%4uK",currentsize>>10,totalsize>>10));

 					V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
-						va("%3.1fK/s ", ((double)getbps)/1024.0));
+						va("%3.1fK/s ", ((double)getbps)/1024));
 				}
 				else
 					cltext = M_GetText("Waiting to download game state...");
@@ -1272,30 +1270,29 @@ static void CL_DrawConnectionStatus(void)
 	{
 		if (cl_mode == CL_CHECKFILES)
 		{
-			INT32 totalfileslength = 0;
+			INT32 totalfileslength;
 			INT32 checkednum = 0;
 			INT32 i;

 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP|MENUCAPS, "Press ESC to abort");

-			// ima just count files here
+			//ima just count files here
 			for (i = 0; i < fileneedednum; i++)
 				if (fileneeded[i].status != FS_NOTCHECKED)
 					checkednum++;

 			// Loading progress
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS, "Checking server addons...");
-			if (fileneedednum != 0)
-				totalfileslength = (INT32)((checkednum/(double)fileneedednum) * 256);
+			totalfileslength = (INT32)((checkednum/(double)(fileneedednum)) * 256);
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
-				va(" %2u/%2u Files", checkednum, fileneedednum));
+				va(" %2u/%2u Files",checkednum,fileneedednum));
 		}
 		else if (cl_mode == CL_LOADFILES)
 		{
-			INT32 totalfileslength = 0;
+			INT32 totalfileslength;
 			INT32 loadcompletednum = 0;
 			INT32 i;

@@ -1308,13 +1305,12 @@ static void CL_DrawConnectionStatus(void)

 			// Loading progress
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS, "Loading server addons...");
-			if (fileneedednum != 0)
-				totalfileslength = (INT32)((loadcompletednum/(double)fileneedednum) * 256);
+			totalfileslength = (INT32)((loadcompletednum/(double)(fileneedednum)) * 256);
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
-				va(" %2u/%2u Files", loadcompletednum, fileneedednum));
+				va(" %2u/%2u Files",loadcompletednum,fileneedednum));
 		}
 		else if (cl_mode == CL_VIEWSERVER)
 		{
@@ -1442,36 +1438,31 @@ static void CL_DrawConnectionStatus(void)
 		}
 		else if (filedownload.current != -1)
 		{
-			INT32 dldlength = 0;
-			INT32 totalfileslength = 0;
-			UINT32 totaldldsize = 0;
+			INT32 dldlength;
+			INT32 totalfileslength;
+			UINT32 totaldldsize;
 			static char tempname[28];
 			fileneeded_t *file = &fileneeded[filedownload.current];
 			char *filename = file->filename;
-			UINT32 currentsize = file->currentsize;
-			UINT32 totalsize   = file->totalsize;

 			// Draw the bottom box.
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-58-8, 32, 1);
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-14, V_YELLOWMAP|MENUCAPS, "Press ESC to abort");

 			Net_GetNetStat();
-			if (totalsize != 0)
-				dldlength = (INT32)((currentsize/(double)totalsize) * 256);
+			dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256);
 			if (dldlength > 256)
 				dldlength = 256;
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, 256, 8, 175);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, dldlength, 8, 160);

 			memset(tempname, 0, sizeof(tempname));
-
 			// offset filename to just the name only part
 			filename += strlen(filename) - nameonlylength(filename);
-			const size_t filenamelength = strlen(filename);

-			if (filenamelength > sizeof(tempname)-1) // too long to display fully
+			if (strlen(filename) > sizeof(tempname)-1) // too long to display fully
 			{
-				size_t endhalfpos = filenamelength-10;
+				size_t endhalfpos = strlen(filename)-10;
 				// display as first 14 chars + ... + last 10 chars
 				// which should add up to 27 if our math(s) is correct
 				snprintf(tempname, sizeof(tempname), "%.14s...%.10s", filename, filename+endhalfpos);
@@ -1490,30 +1481,29 @@ static void CL_DrawConnectionStatus(void)
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-22, V_YELLOWMAP|MENUCAPS,
 				va(M_GetText("\"%s\""), tempname));
 			V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, V_20TRANS|V_MONOSPACE|MENUCAPS,
-				va(" %4uK/%4uK", currentsize>>10, totalsize>>10));
+				va(" %4uK/%4uK",file->currentsize>>10,file->totalsize>>10));
 			V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-58, V_20TRANS|V_MONOSPACE|MENUCAPS,
-				va("%3.1fK/s ", ((double)getbps)/1024.0));
+				va("%3.1fK/s ", ((double)getbps)/1024));

 			// Download progress

-			if (currentsize != totalsize)
-				totaldldsize = filedownload.completedsize+currentsize; // Add in single file progress download if applicable
+			if (file->currentsize != file->totalsize)
+				totaldldsize = filedownload.completedsize+file->currentsize; //Add in single file progress download if applicable
 			else
 				totaldldsize = filedownload.completedsize;

 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-14, V_YELLOWMAP|MENUCAPS, "Overall Download Progress");
-			if (filedownload.totalsize != 0)
-				totalfileslength = (INT32)((totaldldsize/(double)filedownload.totalsize) * 256);
+			totalfileslength = (INT32)((totaldldsize/(double)filedownload.totalsize) * 256);
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);

-			if (filedownload.totalsize>>20 >= 10) // display in MB if over 10MB
+			if (filedownload.totalsize>>20 >= 10) //display in MB if over 10MB
 				V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
-					va(" %4uM/%4uM", totaldldsize>>20, filedownload.totalsize>>20));
+					va(" %4uM/%4uM",totaldldsize>>20,filedownload.totalsize>>20));
 			else
 				V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
-					va(" %4uK/%4uK", totaldldsize>>10, filedownload.totalsize>>10));
+					va(" %4uK/%4uK",totaldldsize>>10,filedownload.totalsize>>10));

 			V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
 					va("%2u/%2u Files ", filedownload.completednum, filedownload.totalnum));
@@ -1785,9 +1775,6 @@ static void SV_SendPlayerInfo(INT32 node)

 static void SV_SendMapIcon(INT32 node)
 {
-	if (node == 0)
-		return;
-
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);

 	const char *map = va("%sP", G_BuildMapName(gamemap));
@@ -1963,7 +1950,7 @@ static boolean SV_ResendingSavegameToAnyone(void)
 static void SV_SendSaveGame(INT32 node, boolean resending)
 {
 	size_t length, compressedlen;
-	savebuffer_t save = {};
+	savebuffer_t save = {0};
 	UINT8 *compressedsave;
 	UINT8 *buffertosend;

@@ -2033,7 +2020,7 @@ static consvar_t cv_dumpconsistency = {"dumpconsistency", "Off", CV_NETVAR, CV_O
 static void SV_SavedGame(void)
 {
 	size_t length;
-	savebuffer_t save = {};
+	savebuffer_t save = {0};
 	char tmpsave[264];

 	if (!cv_dumpconsistency.value)
@@ -2073,7 +2060,7 @@ static void SV_SavedGame(void)

 static void CL_LoadReceivedSavegame(boolean reloading)
 {
-	savebuffer_t save = {};
+	savebuffer_t save = {0};
 	size_t length, decompressedlen;
 	char tmpsave[264];

@@ -2830,11 +2817,11 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 			F_TitleScreenDrawer();
 			CL_DrawConnectionStatus();
 #ifdef HAVE_THREADS
-			I_LockMutex(&m_menu_mutex);
+			I_lock_mutex(&m_menu_mutex);
 #endif
 			M_Drawer(); //Needed for drawing messageboxes on the connection screen
 #ifdef HAVE_THREADS
-			I_UnlockMutex(m_menu_mutex);
+			I_unlock_mutex(m_menu_mutex);
 #endif
 			I_UpdateNoVsync(); // page flip or blit buffer
 			if (moviemode)
@@ -3485,9 +3472,6 @@ void CL_Reset(void)

 	memset(player_muted, 0, sizeof(player_muted));

-	for (INT32 i = 0; i < MAXPLAYERS; ++i)
-		playerinfo[i].node = 255;
-
 	// D_StartTitle should get done now, but the calling function will handle it
 }

@@ -4276,9 +4260,6 @@ void D_ClientServerInit(void)
 #endif
 	D_LoadBan(false);

-	for (INT32 i = 0; i < MAXPLAYERS; ++i)
-		playerinfo[i].node = 255;
-
 	gametic = 0;
 	localgametic = 0;

@@ -7187,12 +7168,12 @@ void NetUpdate(void)
 	{
 		resptime = nowtime;
 #ifdef HAVE_THREADS
-		I_LockMutex(&m_menu_mutex);
+		I_lock_mutex(&m_menu_mutex);
 #endif
 		M_Ticker();
 		refreshdirmenu = 0;
 #ifdef HAVE_THREADS
-		I_UnlockMutex(m_menu_mutex);
+		I_unlock_mutex(m_menu_mutex);
 #endif
 		CON_Ticker();
 	}
@@ -7237,7 +7218,7 @@ void CL_ClearRewinds(void)

 rewind_t *CL_SaveRewindPoint(size_t demopos)
 {
-	savebuffer_t save = {};
+	savebuffer_t save = {0};
 	rewind_t *rewind;

 	if (rewindhead && rewindhead->leveltime + REWIND_POINT_INTERVAL > leveltime)
@@ -7260,7 +7241,7 @@ rewind_t *CL_SaveRewindPoint(size_t demopos)

 rewind_t *CL_RewindToTime(tic_t time)
 {
-	savebuffer_t save = {};
+	savebuffer_t save = {0};
 	rewind_t *rewind;

 	while (rewindhead && rewindhead->leveltime > time)
@@ -80,31 +80,6 @@

 #include "lua_script.h"

-/* Manually defined asset hashes for non-CMake builds
- * Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb
- * Last updated 2018 / 12 / 23 - SRB2 v2.1.22 - patch.dta
- * Last updated 2019 / 01 / 18 - Kart v1.0.2 - Main assets
- * Last updated 2020 / 08 / 30 - Kart v1.3 - patch.kart
- * Last updated 2022 / 08 / 16 - Kart v1.4 - Main assets
- * Last updated 2022 / 08 / 19 - Kart v1.5 - gfx.kart
- * Last updated 2022 / 11 / 01 - Kart v1.6 - gfx.kart, maps.kart
- */
-
-// Base SRB2 hashes
-#define ASSET_HASH_SRB2_SRB      "c1b9577687f8a795104aef4600720ea7"
-#ifdef USE_PATCH_DTA
-#define ASSET_HASH_PATCH_DTA     "b04fd9624bfd94dc96dcf4f400f7deb4"
-#endif
-
-// SRB2Kart-specific hashes
-#define ASSET_HASH_GFX_KART      "06f86ee16136eb8a7043b15001797034"
-#define ASSET_HASH_TEXTURES_KART "abb53d56aba47c3a8cb0f764da1c8b80"
-#define ASSET_HASH_CHARS_KART    "e2c428347dde52858a3dacd29fc5b964"
-#define ASSET_HASH_MAPS_KART     "d051e55141ba736582228c456953cd98"
-#ifdef USE_PATCH_KART
-#define ASSET_HASH_PATCH_KART    "00000000000000000000000000000000"
-#endif
-
 #ifdef CMAKECONFIG
 #include "config.h"
 #else
@@ -223,13 +198,13 @@ void D_ProcessEvents(void)

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

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

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

 		if (eaten)
@@ -577,11 +552,11 @@ static boolean D_Display(void)
 	vid.recalc = false;

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

@@ -664,7 +639,7 @@ void D_SRB2Loop(void)
 	tic_t entertic = 0, oldentertics = 0, realtics = 0, rendertimeout = INFTICS;
 	double deltatics = 0.0;
 	double deltasecs = 0.0;
-	UINT64 precision = 0;
+	UINT64 precision;

 	boolean interp = false;
 	boolean doDisplay = false;
@@ -907,9 +882,7 @@ void D_ClearState(void)

 	// okay, stop now
 	// (otherwise the game still thinks we're playing!)
-#ifdef HAVE_CURL
 	CURLAbortFile();
-#endif
 	SV_StopServer();
 	SV_ResetServer();

@@ -973,9 +946,6 @@ void D_ClearState(void)
 //
 void D_StartTitle(void)
 {
-	if (dedicated)
-		I_Error("D_StartTitle is called on dedicated server");
-
 	D_ClearState();
 	multiplayer = netgame = false; // title menu shouldnt be a netgame or multiplayer lmao
 	F_StartTitleScreen();
@@ -1216,13 +1186,17 @@ static void IdentifyVersion(void)
 #endif

 	char tempsrb2path[256] = ".";
-	if (getcwd(tempsrb2path, 256) == NULL)
-		strcpy(tempsrb2path, ".");
+	getcwd(tempsrb2path, 256);

 	// get the current directory (possible problem on NT with "." as current dir)
 	if (!srb2waddir)
 	{
-		srb2waddir = tempsrb2path;
+		if (tempsrb2path[0])
+			srb2waddir = tempsrb2path;
+		else
+		{
+			srb2waddir = ".";
+		}
 	}

 #if (1) // reduce the amount of findfile by only using full cwd in this func
@@ -1895,8 +1869,7 @@ void D_SRB2Main(void)
 	if (M_CheckParm("-warp") && M_IsNextParm())
 	{
 		const char *word = M_GetNextParm();
-		pstartmap = G_FindMapByNameOrCode(word, NULL);
-
+		pstartmap = G_FindMapByNameOrCode(word, 0);
 		if (! pstartmap)
 			I_Error("Cannot find a map remotely named '%s'\n", word);
 		else
@@ -59,7 +59,7 @@ static INT16 reboundsize[MAXREBOUND];
 static INT32 rebound_head, rebound_tail;

 /// \brief max length per packet
-INT16 hardware_MAXPACKETLENGTH = 0;
+INT16 hardware_MAXPACKETLENGTH;

 boolean (*I_NetGet)(void) = NULL;
 void (*I_NetSend)(void) = NULL;
@@ -96,7 +96,7 @@ INT32 ticruned = 0, ticmiss = 0;

 // globals
 INT32 getbps = 0, sendbps = 0;
-float lostpercent = 0.0f, duppercent = 0.0f, gamelostpercent = 0.0f;
+float lostpercent = 0, duppercent = 0, gamelostpercent = 0;
 INT32 packetheaderlength = 0;

 boolean Net_GetNetStat(void)
@@ -54,9 +54,6 @@
 #include "fastcmp.h"
 #include "m_perfstats.h"

-#include "r_data.h"
-#include "r_skins.h"
-
 #ifdef NETGAME_DEVMODE
 #define CV_RESTRICT CV_NETVAR
 #else
@@ -252,7 +249,7 @@ consvar_t cv_competitionboxes = {"competitionboxes", "Random", CV_NETVAR|CV_CHEA

 #ifdef SEENAMES
 static CV_PossibleValue_t seenames_cons_t[] = {{0, "Off"}, {1, "Colorless"}, {2, "Team"}, {3, "Ally/Foe"}, {0, NULL}};
-consvar_t cv_seenames = {"seenames", "Off", CV_SAVE, seenames_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_seenames = {"seenames", "Off", CV_SAVE, seenames_cons_t, 0, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_allowseenames = {"allowseenames", "No", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 #endif

@@ -461,16 +458,16 @@ consvar_t cv_showping = {"showping", "Always", CV_SAVE, showping_cons_t, NULL, 0

 static CV_PossibleValue_t pingmeasurement_cons_t[] = {{0, "Frames"}, {1, "Milliseconds"}, {0, NULL}};
 consvar_t cv_pingmeasurement = {"pingmeasurement", "Frames", CV_SAVE, pingmeasurement_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_pingicon = {"pingicon", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_pingicon = {"pingicon", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL};

 static CV_PossibleValue_t cv_pingstyle_cons_t[] = {{0, "New"}, {1, "Old"}, {0, NULL}};
-consvar_t cv_pingstyle = {"pingstyle", "New", CV_SAVE, cv_pingstyle_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_pingstyle = {"pingstyle", "New", CV_SAVE, cv_pingstyle_cons_t, 0, 0, NULL, NULL, 0, 0, NULL};

-consvar_t cv_luaimmersion = {"luaimmersion", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_luaimmersion = {"luaimmersion", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL};

-consvar_t cv_showviewpointtext = {"showviewpointtext", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showviewpointtext = {"showviewpointtext", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL};

-consvar_t cv_showdownloadprompt = {"showdownloadprompt", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showdownloadprompt = {"showdownloadprompt", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL};

 // Intermission time Tails 04-19-2002
 static CV_PossibleValue_t inttime_cons_t[] = {{0, "MIN"}, {3600, "MAX"}, {0, NULL}};
@@ -1000,8 +997,6 @@ void D_RegisterClientCommands(void)

 		CV_RegisterVar(&cv_litesteer[i]);

-		CV_RegisterVar(&cv_autoaccel[i]);
-
 		CV_RegisterVar(&cv_usejoystick[i]);
 		CV_RegisterVar(&cv_joyscale[i]);
 		CV_RegisterVar(&cv_rumble[i]);
@@ -1009,9 +1004,6 @@ void D_RegisterClientCommands(void)
 		CV_RegisterVar(&cv_gamepadled[i]);
 	}

-	CV_RegisterVar(&cv_gamepadledifunfocused);
-	CV_RegisterVar(&cv_rumbleifunfocused);
-
 	CV_RegisterVar(&cv_usemouse);
 	CV_RegisterVar(&cv_invertmouse);
 	CV_RegisterVar(&cv_mousexsens);
@@ -2658,6 +2650,7 @@ static void Command_Map_f(void)
 		return;
 	}

+
 	last_map_cmd = I_GetTime();

 	size_t first_option;
@@ -2794,7 +2787,7 @@ static void Command_Map_f(void)
 	// G_TOLFlag handles both multiplayer gametype and ignores it for !multiplayer
 	else
 	{
-		if (mapheaderinfo[newmapnum-1] == NULL)
+		if (!mapheaderinfo[newmapnum-1])
 		{
 			CONS_Alert(CONS_WARNING, M_GetText("Invalid mapheaderinfo for Course %s (%s)\n"), realmapname, G_BuildMapName(newmapnum));
 			return;
@@ -4756,6 +4749,8 @@ static void Command_LocateLump_f(void)
 	}
 }

+#define MAXDOOMEDNUM 4095
+
 static void Command_ListDoomednums_f(void)
 {
 	INT16 i, j, k = 0, l = 0;
@@ -112,7 +112,7 @@ 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";

@@ -131,8 +131,6 @@ static UINT32 curl_origtotalfilesize;
 static char *curl_realname = NULL;
 fileneeded_t *curl_curfile = NULL;
 HTTP_login *curl_logins = NULL;
-
-static void CURLGetFile(void);
 #endif

 /** Fills a serverinfo packet with information about wad files loaded.
@@ -1081,14 +1079,12 @@ void CloseNetFile(void)

 	// Receiving a file?
 	for (i = 0; i < MAX_WADFILES; i++)
-	{
 		if (fileneeded[i].status == FS_DOWNLOADING && fileneeded[i].file)
 		{
 			fclose(fileneeded[i].file);
 			// File is not complete delete it
 			remove(fileneeded[i].filename);
 		}
-	}

 	// Remove PT_FILEFRAGMENT from acknowledge list
 	Net_AbortPacketType(PT_FILEFRAGMENT);
@@ -1102,16 +1098,17 @@ void nameonly(char *s)
 	void *ns;

 	for (j = strlen(s); j != (size_t)-1; j--)
-	{
 		if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
 		{
 			ns = &(s[j+1]);
 			len = strlen(ns);
-			memmove(s, ns, len+1);
-
+#if 0
+				memcpy(s, ns, len+1);
+#else
+				memmove(s, ns, len+1);
+#endif
 			return;
 		}
-	}
 }

 // Returns the length in characters of the last element of a path.
@@ -1165,12 +1162,8 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	filestatus_t homecheck; // store result of last file search
 	boolean badmd5 = false; // store whether md5 was bad from either of the first two searches (if nothing was found in the third)

-	// see IdentifyVersion
-	// Iwads skip findfile due to passing fullpath to W_OpenWadFile
-#if 0
-	// skip for Iwads, as they wont be in there
-	if (!startupiwadcount)
-#endif
+	// skip for startup, our mainwads wont be in there
+	if (loaded_config)
 	{
 		if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
 		{
@@ -1307,7 +1300,6 @@ void CURLPrepareFile(const char* url, int dfilenum)
 	if (!multi_handle)
 	{
 		cc = curl_global_init(CURL_GLOBAL_ALL);
-
 		if (cc < 0)
 		{
 			I_OutputMsg("libcurl: curl_global_init() returned %d\n", cc);
@@ -1316,7 +1308,6 @@ void CURLPrepareFile(const char* url, int dfilenum)
 		{
 			multi_handle = curl_multi_init();
 		}
-
 		if (!multi_handle)
 		{
 			I_OutputMsg("libcurl: curl_multi_init() failed\n");
@@ -1427,7 +1418,7 @@ void CURLPrepareFile(const char* url, int dfilenum)
 		filedownload.http_running = true;

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

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

-static void CURLGetFile(void)
+void CURLGetFile(void)
 {
 #ifdef HAVE_THREADS
-	I_LockMutex(&downloadmutex);
+	I_lock_mutex(&downloadmutex);
 #endif
 	CURLMcode mc; /* return code used by curl_multi_wait() */
 	CURLcode easyres; /* Return from easy interface */
@@ -1487,8 +1478,7 @@ static void CURLGetFile(void)
 				e = m->easy_handle;
 				easyres = m->data.result;

-				char *filename = malloc(strlen(curl_realname)+1);
-				strcpy(filename, curl_realname);
+				char *filename = Z_StrDup(curl_realname);
 				nameonly(filename);

 				if (easyres != CURLE_OK)
@@ -1526,7 +1516,7 @@ static void CURLGetFile(void)
 					}
 				}

-				free(filename);
+				Z_Free(filename);
 				curl_curfile->file = NULL;
 				filedownload.remaining--;
 				mc = curl_multi_remove_handle(multi_handle, e);
@@ -1549,7 +1539,7 @@ static void CURLGetFile(void)

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

@@ -119,6 +119,7 @@ size_t nameonlylength(const char *s);
 #ifdef HAVE_CURL
 void CURLPrepareFile(const char* url, int dfilenum);
 void CURLAbortFile(void);
+void CURLGetFile(void);
 HTTP_login * CURLGetLogin (const char *url, HTTP_login ***return_prev_next);
 size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream);
 #endif
@@ -1,75 +1,21 @@
 # Declare dedicated interface sources

-set(SRB2_DEDICATED_SOURCES
-	i_system.c
-	i_main.c
-	i_video.c
-	i_sound.c
-	i_threads.c
-	dosstr.c
-	endtxt.c
-)
+target_sourcefile(c)

-set(SRB2_DEDICATED_HEADERS
-	endtxt.h
-)
-
-source_group("Interface Code" FILES ${SRB2_DEDICATED_SOURCES} ${SRB2_DEDICATED_HEADERS})
-
-set(SRB2_DEDICATED_TOTAL_SOURCES
-	${SRB2_CORE_SOURCES}
-	${SRB2_CORE_HEADERS}
-	${SRB2_PNG_SOURCES}
-	${SRB2_PNG_HEADERS}
-	${SRB2_CORE_RENDER_SOURCES}
-	${SRB2_CORE_GAME_SOURCES}
-	${SRB2_LUA_SOURCES}
-	${SRB2_LUA_HEADERS}
-	${SRB2_BLUA_SOURCES}
-	${SRB2_BLUA_HEADERS}
-	${SRB2_DEDICATED_SOURCES}
-	${SRB2_DEDICATED_HEADERS}
-)
-
-source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS})
-source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
-source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})
-source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS})
-source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS})
+target_sources(SRB2SDL2 PRIVATE)

 if(${CMAKE_SYSTEM} MATCHES Windows)
-	set(SRB2_DEDICATED_TOTAL_SOURCES ${SRB2_DEDICATED_TOTAL_SOURCES}
-		${CMAKE_SOURCE_DIR}/src/win32/win_dbg.c
-		${CMAKE_SOURCE_DIR}/src/win32/Srb2win.rc
-	)
+	target_sources(SRB2SDL2 PRIVATE
+		../win32/win_dbg.c
+		../win32/Srb2win.rc)
 endif()

-add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32 ${SRB2_DEDICATED_TOTAL_SOURCES})
-
 if(${CMAKE_SYSTEM} MATCHES Windows)
-	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2kartd)
+	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy)
 elseif(${CMAKE_SYSTEM} MATCHES Linux)
-	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2kartd)
+	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2dlegacy)
 else()
-	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2kartd)
-endif()
-
-if(${CMAKE_SYSTEM} MATCHES Darwin)
-	find_library(CORE_FOUNDATION_LIBRARY "CoreFoundation")
-	target_link_libraries(SRB2SDL2 PRIVATE
-		${CORE_FOUNDATION_LIBRARY}
-	)
-	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
-
-	# Configure the app bundle icon and plist properties
-	target_sources(SRB2SDL2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/macosx/Srb2mac.icns")
-	set_target_properties(SRB2SDL2 PROPERTIES
-		MACOSX_BUNDLE_ICON_FILE "Srb2mac"
-		MACOSX_BUNDLE_BUNDLE_NAME "Sonic Robo Blast 2"
-		MACOSX_BUNDLE_BUNDLE_VERSION ${SRB2_VERSION}
-
-		RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/macosx/Srb2mac.icns"
-	)
+	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy)
 endif()

 if(${CMAKE_SYSTEM} MATCHES Darwin)
@@ -78,27 +24,25 @@ if(${CMAKE_SYSTEM} MATCHES Darwin)
 		${CORE_LIB}
 		${PNG_LIBRARIES}
 		${ZLIB_LIBRARIES}
-		${CURL_LIBRARIES}
 	)
 	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
 else()
 	target_link_libraries(SRB2SDL2 PRIVATE
 		${PNG_LIBRARIES}
 		${ZLIB_LIBRARIES}
-		${CURL_LIBRARIES}
 	)
+
 	if(${CMAKE_SYSTEM} MATCHES Linux)
 		target_link_libraries(SRB2SDL2 PRIVATE
 			m
 			rt
-			pthread
 		)
 	endif()
 endif()

-if(${SRB2_HAVE_LIBBACKTRACE})
-	target_link_libraries(SRB2SDL2 PRIVATE ${LIBBACKTRACE_LIBRARIES})
-endif()
+#target_link_libraries(SRB2SDL2 PRIVATE SRB2Core)
+
+set_target_properties(SRB2SDL2 PROPERTIES VERSION ${SRB2_VERSION})

 if(${CMAKE_SYSTEM} MATCHES Windows)
 	target_link_libraries(SRB2SDL2 PRIVATE
@@ -116,34 +60,19 @@ target_include_directories(SRB2SDL2 PRIVATE

 target_compile_definitions(SRB2SDL2 PRIVATE
 	-DDEDICATED
-	-DHAVE_THREADS
 )

-if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE)
-	set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
-endif()
-
-if(SRB2_CONFIG_ASAN)
-	target_compile_options(SRB2SDL2 PRIVATE -fsanitize=address)
-	target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
-endif()
-
-if(SRB2_CONFIG_UBSAN)
-	target_compile_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
-	target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
-endif()
-
 ## strip debug symbols into separate file when using gcc
-# if(CMAKE_COMPILER_IS_GNUCC)
-# 	if(${CMAKE_BUILD_TYPE} MATCHES Debug)
-# 		message(STATUS "Will make separate debug symbols in *.debug")
-# 		add_custom_command(TARGET SRB2SDL2 POST_BUILD
-# 			COMMAND ${OBJCOPY} --only-keep-debug $<TARGET_FILE:SRB2SDL2> $<TARGET_FILE:SRB2SDL2>.debug
-# 			COMMAND ${OBJCOPY} --strip-debug $<TARGET_FILE:SRB2SDL2>
-# 			COMMAND ${OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE_NAME:SRB2SDL2>.debug $<TARGET_FILE:SRB2SDL2>
-# 		)
-# 	endif()
-# endif()
+if(CMAKE_COMPILER_IS_GNUCC)
+	if(${CMAKE_BUILD_TYPE} MATCHES Debug)
+		message(STATUS "Will make separate debug symbols in *.debug")
+		add_custom_command(TARGET SRB2SDL2 POST_BUILD
+			COMMAND ${OBJCOPY} --only-keep-debug $<TARGET_FILE:SRB2SDL2> $<TARGET_FILE:SRB2SDL2>.debug
+			COMMAND ${OBJCOPY} --strip-debug $<TARGET_FILE:SRB2SDL2>
+			COMMAND ${OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE_NAME:SRB2SDL2>.debug $<TARGET_FILE:SRB2SDL2>
+		)
+	endif()
+endif()

 #### Installation ####
 if(${CMAKE_SYSTEM} MATCHES Darwin)
@@ -2,5 +2,6 @@ i_system.c
 i_main.c
 i_video.c
 i_sound.c
+i_threads.c
 dosstr.c
 endtxt.c
@@ -167,8 +167,6 @@ static char returnWadPath[256];
 #include "../i_video.h"
 #include "../i_sound.h"
 #include "../i_system.h"
-#include "../i_time.h"
-#include "../i_net.h"
 #include "../screen.h" //vid.WndParent
 #include "../d_net.h"
 #include "../g_game.h"
@@ -180,6 +178,10 @@ static char returnWadPath[256];

 #include "../m_argv.h"

+#ifdef MAC_ALERT
+#include "macosx/mac_alert.h"
+#endif
+
 #include "../d_main.h"

 #if !defined(NOMUMBLE) && defined(HAVE_MUMBLE)
@@ -194,6 +196,8 @@ UINT8 keyboard_started = false;

 #ifdef HAVE_TERMIOS
 // TERMIOS console code from Quake3: thank you!
+boolean stdin_active = true;
+
 typedef struct
 {
 	size_t cursor;
@@ -695,7 +699,11 @@ void I_JoyScale4(void)


 */
-void I_ShutdownJoystick(UINT8 index)
+void I_ShutdownJoystick(void)
+{
+}
+
+void I_GetJoystickEvents(UINT8 index)
 {
 	(void)index;
 }
@@ -1381,8 +1389,8 @@ INT32 I_StartupSystem(void)
 		I_Fork();
 #endif
 #ifdef HAVE_THREADS
-	I_StartThreads();
-	I_AddExitFunc(I_StopThreads);
+	I_start_threads();
+	I_AddExitFunc(I_stop_threads);
 #endif
 	I_RegisterSignals();
 #ifndef NOMUMBLE
@@ -1,4 +1,4 @@
-// SONIC ROBO BLAST 2 KART
+// SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2020-2023 by James R.
 //
@@ -9,14 +9,12 @@
 /// \file  i_threads.c
 /// \brief Multithreading abstraction

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

 #include <pthread.h>

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

 typedef struct thread_s thread_t;

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

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

-FUNCWARNRV
-int I_SpawnThread(const char *name, I_ThreadFn entry, void *userdata)
+void
+I_spawn_thread (
+	const char  * name,
+	I_thread_fn   entry,
+	void        * userdata
+)
 {
 	thread_t *thread;
 	(void)name;
@@ -64,20 +66,17 @@ int I_SpawnThread(const char *name, I_ThreadFn 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;
-	int err = pthread_create(&thread->thread, NULL, HandleThread, thread);
+	pthread_create(&thread->thread, NULL, HandleThread, thread);
 	pthread_mutex_unlock(&thread_lock);
-	return err == 0;
 }

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

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

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

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

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

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

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

-void I_WakeAllCond(I_Cond *anchor)
+void I_wake_all_cond(I_cond *anchor)
 {
 	pthread_mutex_lock(&thread_lock);
 	if (*anchor == NULL)
@@ -169,17 +168,12 @@ void I_WakeAllCond(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;

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

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

-FUNCWARNRV
-int I_SpawnThread(const char *name, I_ThreadFn entry, void *userdata)
+void I_spawn_thread(const char *name, I_thread_fn entry, void *userdata)
 {
 	thread_t *thread;
 	(void)name;
@@ -226,20 +219,17 @@ int I_SpawnThread(const char *name, I_ThreadFn 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->threadId);
+	thread->thread = CreateThread(NULL, 0, HandleThread, thread, 0, &thread->thread_id);
 	LeaveCriticalSection(&thread_lock);
-	return thread->thread != NULL;
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-void I_WakeAllCond(I_Cond *anchor)
+void I_wake_all_cond(I_cond *anchor)
 {
 	(void)anchor;
 }
-
-void *I_GetCurrentThread(void)
-{
-	return NULL;
-}
 #endif
-
-
-#endif // HAVE_THREADS
@@ -40,45 +40,22 @@
 #define ASMCALL
 #endif

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

-#ifdef __cplusplus               /* Only when compiled as C++ */
-    #include <algorithm>        /* std::min, std::max, std::sort, … */
-#endif
-
-#ifdef __cplusplus
-// Force libc++ to expose std::min/std::max even when <cmath> is included first (Apple clang quirk)
-#ifndef _LIBCPP_ENABLE_CXX17_REMOVED_FEATURES
-#define _LIBCPP_ENABLE_CXX17_REMOVED_FEATURES
-#endif
-#ifndef _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
-#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
-#endif
-
-// Optional: only try <version> if it actually exists (newer Xcode)
-#if __has_include(<version>)
-#include <version>
-#endif
-
-#define _USE_MATH_DEFINES
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstddef>
-#include <cstring>
-#include <climits>
-
-extern "C" {
-#else
-#include <math.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>

-#include <limits.h>
+#define _USE_MATH_DEFINES // fixes M_PI errors in r_plane.c for Visual Studio
+#ifdef __cplusplus
+#include <cmath>
+#else
+#include <math.h>
 #endif

 #include <sys/types.h>
@@ -133,7 +110,7 @@ extern char  logfilename[1024];
 #define VERSIONSTRING "Saturn v9.2"
 #define VERSIONSTRINGW L"Saturn v9.2"

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

 // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
 // And change CMakeLists.txt (not src/, but in root), for CMake users!
@@ -223,8 +223,6 @@ 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)))
@@ -270,9 +268,6 @@ typedef int32_t boolean;
 #ifndef FUNCTARGET
 #define FUNCTARGET(x)
 #endif
-#ifndef FUNCWARNRV
-#define FUNCWARNRV
-#endif
 #ifndef ATTRPACK
 #define ATTRPACK
 #endif
@@ -1172,7 +1172,9 @@ void F_StartWaitingPlayers(void)
 	randskin = M_RandomKey(numskins);
 	boolean waithires = skins[randskin].flags && SF_HIRES;

-	Z_Free(waitcolormap);
+	if (waitcolormap)
+		Z_Free(waitcolormap);
+
 	waitcolormap = R_GetTranslationColormap(randskin, skins[randskin].prefcolor, 0);

 	if (waithires)
@@ -1316,7 +1318,7 @@ boolean F_ContinueResponder(event_t *event)
 	keypressed = true;
 	imcontinuing = true;
 	continuetime = TICRATE;
-	S_StartSound(NULL, sfx_itemup);
+	S_StartSound(0, sfx_itemup);
 	return true;
 }

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

@@ -10,7 +10,7 @@ FUNCINLINE static ATTRINLINE boolean fasticmp(const char *s, const char *c)
 }

 // case-sensitive of the above
-FUNCINLINE static ATTRINLINE PUREFUNC boolean fastcmp(const char *s, const char *c)
+FUNCINLINE static ATTRINLINE boolean fastcmp(const char *s, const char *c)
 {
 	for (; *s && *s == *c; s++, c++) ;
 	return (*s == *c); // make sure both strings ended
@@ -18,7 +18,7 @@ FUNCINLINE static ATTRINLINE PUREFUNC boolean fastcmp(const char *s, const char

 // length-limited of the above
 // only true if both strings are at least l characters long AND match, case-sensitively!
-FUNCINLINE static ATTRINLINE PUREFUNC boolean fastncmp(const char *s, const char *c, UINT16 l)
+FUNCINLINE static ATTRINLINE boolean fastncmp(const char *s, const char *c, UINT16 l)
 {
 	for (; *s && *s == *c && --l; s++, c++) ;
 	return !l; // make sure you reached the end
@@ -49,7 +49,7 @@ size_t menupathindex[menudepth] = {};
 size_t menudepthleft = menudepth;

 char menusearchbuf[MAXSTRINGLENGTH+1];
-textinput_t menusearch = {};
+textinput_t menusearch;

 char **dirmenu = NULL, **coredirmenu = NULL; // core only local for this file
 size_t sizedirmenu = 0, sizecoredirmenu = 0; // ditto
@@ -271,13 +271,10 @@ static boolean filemenucmp(char *haystack, char *needle)
 {
 	static char localhaystack[128];
 	strlcpy(localhaystack, haystack, 128);
-
 	if (!cv_addons_search_case.value)
 		strupr(localhaystack);
-
 	if (cv_addons_search_type.value)
-		return (strstr(localhaystack, needle) != NULL);
-
+		return (strstr(localhaystack, needle) != 0);
 	return (!strncmp(localhaystack, needle, menusearch.length));
 }

@@ -317,7 +314,8 @@ void closefilemenu(boolean validsize)
 		coredirmenu = NULL;
 	}

-	Z_Free(refreshdirname);
+	if (refreshdirname)
+		Z_Free(refreshdirname);
 	refreshdirname = NULL;
 }

@@ -345,7 +343,8 @@ void searchfilemenu(char *tempname)

 	if (!menusearch.length)
 	{
-		Z_Free(dirmenu);
+		if (dirmenu)
+			Z_Free(dirmenu);
 		dirmenu = coredirmenu;
 		sizedirmenu = sizecoredirmenu;

@@ -387,8 +386,8 @@ void searchfilemenu(char *tempname)
 				I_Error("searchfilemenu(): could not create \"No results...\".");
 		sizedirmenu = 1;
 		dir_on[menudepthleft] = 0;
-		Z_Free(tempname);
-
+		if (tempname)
+			Z_Free(tempname);
 		return;
 	}

@@ -503,8 +502,8 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 	{
 		closedir(dirhandle);
 		closefilemenu(false);
-		Z_Free(tempname);
-
+		if (tempname)
+			Z_Free(tempname);
 		return false;
 	}

@@ -55,8 +55,6 @@
 #include "k_stats.h" // SRB2kart
 #include "r_fps.h" // frame interpolation/uncapped

-#include <errno.h>
-
 #ifdef HAVE_DISCORDRPC
 #include "discord.h"
 #endif
@@ -76,7 +74,7 @@ static tic_t demostarttime; // for comparative timing purposes

 //@TODO put these all in a struct for namespacing purposes?
 static char demoname[128];
-savebuffer_t demobuf = {};
+savebuffer_t demobuf = {0};
 static UINT8 *demotime_p, *demoinfo_p;
 static UINT8 *demoend;
 static UINT8 demoflags;
@@ -2403,69 +2401,49 @@ static long G_GetCreationTime(char *filepath)

 static char *G_GetDemoDate(menudemo_t *pdemo)
 {
-	char *endPos = NULL;
-	static char datetime[11];
+	char *datetime;
+	datetime = malloc(sizeof(pdemo->date)); // mallocma balls
+
+	// no mallocma balls... :c
+	if (!datetime)
+	{
+		return NULL;
+	}
+
 	time_t file_time = 0;
-	const char *format = NULL;
-	struct tm *tm_buf = NULL;
-	CLEANUP(pfree) char *filename = NULL;

 	// get le filepath
+	char *filename;
 	filename = strdup(pdemo->filepath);

+#if defined (_WIN32)
 	if (!filename)
 	{
-#if defined (_WIN32)
-		// if we cant get a filename try just getting the file creation time
+		// if we cant get a filename try just getting the file create time
 		file_time = G_GetCreationTime(pdemo->filepath);
 		goto skipfilenametime;
-#else
-		return NULL;
-#endif
 	}
+#else
+	if (!filename)
+	{
+		free(datetime);
+		return NULL;
+	}
+#endif

 	// get the actual filename Zzz...
 	nameonly(filename);

-	// the first 10 characters of a replay name usually is a unix timestamp
-
-	// not long enough to contain a valid timestamp
-	if (strlen(filename) < 10)
-	{
-#if defined (_WIN32)
-		// try to get file creation time
-		file_time = G_GetCreationTime(pdemo->filepath);
-		goto skipfilenametime;
-#else
-		return NULL;
-#endif
-	}
-
-#ifndef AVOID_ERRNO
-	errno = 0;
-#endif
-	// get the timestamp as actual numbers lul
-	file_time = strtol(filename, &endPos, 10);
-
-	if (endPos == filename // Empty string
-#ifndef AVOID_ERRNO
-		|| errno == ERANGE // Number out-of-range
-#endif
-		|| file_time < 0) // Number is not positive
-	{
-#if defined (_WIN32)
-		// just try and get the creation time then
-		file_time = G_GetCreationTime(pdemo->filepath);
-#else
-		return NULL;
-#endif
-	}
+	// convert it to long Zzz....
+	file_time = strtol(filename, NULL, 10);
+	free(filename); // dont need this anymore a

 #if defined (_WIN32)
 skipfilenametime:
 #endif

 	// then throw it into localtime to get an actual human readable format lmao
+	struct tm *tm_buf = NULL;
 	tm_buf = localtime(&file_time);

 	// cant believe we ended up in 1970
@@ -2478,10 +2456,14 @@ skipfilenametime:
 		tm_buf = localtime(&file_time);

 		if (tm_buf == NULL || tm_buf->tm_year <= 110)
+		{
+			free(datetime);
 			return NULL;
+		}

 		goto gotcreationtime;
 #else
+		free(datetime);
 		return NULL;
 #endif
 	}
@@ -2490,27 +2472,17 @@ skipfilenametime:
 gotcreationtime:
 #endif

+	const char *format;
+
 	// US ppl are special (:
 	if (cv_demodateformat.value == 2)
 		format = "%m.%d.%Y";
 	else if (cv_demodateformat.value == 1)
 		format = "%d.%m.%Y";
 	else
-	{
-		const char *locale = setlocale(LC_TIME, NULL);
+		format = strstr(setlocale(LC_TIME, NULL), "en_US") ? "%m.%d.%Y" : "%d.%m.%Y";

-		if (locale == NULL)
-			format = "%d.%m.%Y"; // fallback to non US format
-		else if (strstr(locale, "en_US"))
-			format = "%m.%d.%Y";
-		else
-			format = "%d.%m.%Y";
-	}
-
-	if (strftime(datetime, sizeof(datetime), format, tm_buf) == 0)
-	{
-		return NULL;
-	}
+	strftime(datetime, sizeof(pdemo->date), format, tm_buf);

 	return datetime;
 }
@@ -2519,7 +2491,6 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
 {
 	UINT8 infobuffer[96], *info_p;
 	UINT16 pdemoversion;
-	char *demodate = NULL;
 	size_t count;

 	FILE *handle = fopen(pdemo->filepath, "rb");
@@ -2558,13 +2529,13 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
 			memcpy(pdemo->title, info_p, 64);

 			// demo date
+			char *demodate;
 			demodate = G_GetDemoDate(pdemo);

 			if (demodate)
-			{
-				strlcpy(pdemo->date, demodate, sizeof(pdemo->date));
-			}
+				strncpy(pdemo->date, demodate, sizeof(pdemo->date));

+			free(demodate);
 			break;
 #ifdef DEMO_COMPAT_100
 		case 0x0001:
@@ -2824,7 +2795,7 @@ void G_DoPlayDemo(char *defdemoname)
 	demobuf.p += 4; // Extrainfo location

 	// ...*map* not loaded?
-	if (!gamemap || (gamemap > NUMMAPS) || (W_CheckNumForName(G_BuildMapName(gamemap)) == LUMPERROR))
+	if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK))
 	{
 		snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
 		CONS_Alert(CONS_ERROR, "%s", msg);
@@ -2865,16 +2836,6 @@ void G_DoPlayDemo(char *defdemoname)
 			return;
 		}

-		// ...*map* not loaded?
-		if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK))
-		{
-			snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
-			CONS_Alert(CONS_ERROR, "%s", msg);
-			M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
-			G_ResetDemoPlayback();
-			return;
-		}
-
 		// Set color
 		for (i = 0; i < MAXSKINCOLORS; i++)
 		{
@@ -132,7 +132,7 @@ UINT8 skincolor_bluering = SKINCOLOR_STEEL;
 tic_t countdowntimer = 0;
 boolean countdowntimeup = false;

-cutscene_t *cutscenes[128] = {};
+cutscene_t *cutscenes[128];

 INT16 nextmapoverride = 0;
 boolean skipstats = false;
@@ -144,7 +144,7 @@ mobj_t *blueflag = NULL;
 mapthing_t *rflagpoint = NULL;
 mapthing_t *bflagpoint = NULL;

-struct quake quake = {};
+struct quake quake;

 // Map Header Information
 mapheader_t* mapheaderinfo[NUMMAPS] = {};
@@ -228,7 +228,7 @@ tic_t racecountdown = 0, exitcountdown = 0; // for racing
 fixed_t gravity = 0;
 fixed_t mapobjectscale = FRACUNIT;

-struct maplighting maplighting = {};
+struct maplighting maplighting;

 INT16 autobalance = 0; //for CTF team balance
 INT16 teamscramble = 0; //for CTF team scramble
@@ -454,14 +454,6 @@ consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS] = {
 	{"litesteer4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
 };

-//static CV_PossibleValue_t autoaccelcons_t[] = {{0, "Off"}, {1, "Manual"}, {2, "Automatic"}, {0, NULL}};
-consvar_t cv_autoaccel[MAXSPLITSCREENPLAYERS] = {
-	{"kartautoaccel",  "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
-	{"kartautoaccel2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
-	{"kartautoaccel3", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
-	{"kartautoaccel4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
-};
-
 static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}};
 consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL};

@@ -523,8 +515,11 @@ void G_ClearRecords(void)
 	INT16 i;
 	for (i = 0; i < NUMMAPS; ++i)
 	{
-		Z_Free(mainrecords[i]);
-		mainrecords[i] = NULL;
+		if (mainrecords[i])
+		{
+			Z_Free(mainrecords[i]);
+			mainrecords[i] = NULL;
+		}
 	}
 }

@@ -805,10 +800,6 @@ static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
 static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
 static fixed_t angleturn[3] = {KART_FULLTURN/2, KART_FULLTURN, KART_FULLTURN/4}; // + slow turn

-//
-// G_HandleLocalDriftturn
-// Hack for Lua menus that check directional inputs with driftturn
-//
 static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
 {
 	INT32 axis = 0;
@@ -871,8 +862,9 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
 //
 static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
 {
+	boolean moveinput = false;
 	INT32 axis = 0;
-	const boolean usejoystick = cv_usejoystick[(ssplayer-1)].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.
@@ -907,11 +899,15 @@ static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)

 #undef CHECKINPUT

+	moveinput = (InputDown(gc_turnleft, ssplayer) || InputDown(gc_turnright, ssplayer)
+	|| InputDown(gc_aimforward, ssplayer) || InputDown(gc_aimbackward, ssplayer) ||
+	(usejoystick && JoyAxis(AXISAIM, ssplayer) != 0) || (usejoystick && JoyAxis(AXISTURN, ssplayer) != 0));
+
 	axis = JoyAxis(AXISLOOKBACK, ssplayer);
 	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)
+	if ((moveinput || cmd->buttons)
 		&& displayplayers[0] != consoleplayer && ssplayer == 1)
 	{
 		if (cv_director.value)
@@ -923,63 +919,6 @@ static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
 	}
 }

-//
-// G_HandleAutoAcceleration
-//
-static void G_HandleAutoAcceleration(ticcmd_t *cmd, player_t *player, UINT8 forplayer)
-{
-	if (!cv_autoaccel[forplayer].value)
-		return;
-
-	if (gamestate != GS_LEVEL)
-		return;
-
-	// dont accel before and during countdown
-	if (leveltime <= starttime)
-		return;
-
-	// dont do this in menus or when console is onscreen
-	if (menuactive || CON_Ready())
-		return;
-
-	// gotta have a player that aint respawning
-	if (!player->mo || player->kartstuff[k_respawn])
-		return;
-
-	// dont need for "finished" players
-	if (player->exiting || (player->pflags & PF_TIMEOVER))
-		return;
-
-	// dont do during spinout
-	if (player->kartstuff[k_spinouttimer])
-		return;
-
-	// spectators and freecam dont need special handling, see G_BuildTiccmd
-
-	if (cmd->buttons & BT_BRAKE)
-	{
-		if (cmd->buttons & BT_DRIFT ||
-			player->kartstuff[k_sneakertimer] ||
-			player->kartstuff[k_squishedtimer])
-		{
-			cmd->forwardmove = (SINT8)forwardmove[0];
-			cmd->buttons |= BT_ACCELERATE;
-		}
-		else
-		{
-			// allows us to drive backwards if we need to
-			if (cmd->forwardmove > 0)
-				cmd->forwardmove = 0;
-			cmd->buttons &= ~BT_ACCELERATE;
-		}
-	}
-	else
-	{
-		cmd->forwardmove = (SINT8)forwardmove[1];
-		cmd->buttons |= BT_ACCELERATE;
-	}
-}
-
 //
 // G_BuildTiccmd
 // Builds a ticcmd from all of the available inputs
@@ -1127,7 +1066,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 		if (InputDown(gc_accelerate, ssplayer) || (gamepadjoystickmove && axis > 0) || player->kartstuff[k_sneakertimer])
 		{
 			cmd->buttons |= BT_ACCELERATE;
-			forward = forwardmove[1]; // 50
+			forward = forwardmove[1];	// 50
 		}
 		else if (analogjoystickmove && axis > 0)
 		{
@@ -1208,8 +1147,6 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 		cmd->sidemove = (SINT8)(cmd->sidemove + side);
 	}

-	G_HandleAutoAcceleration(cmd, player, forplayer);
-
 	//{ SRB2kart - Drift support
 	// Not grouped with the rest of turn stuff because it needs to know what buttons you're pressing for rubber-burn turn
 	// limit turning to angleturn[1] to stop mouselook letting you look too fast
@@ -3498,7 +3435,7 @@ void G_LoadGameData(void)
 	INT32 i, j;
 	UINT8 modded = false;
 	UINT8 rtemp;
-	savebuffer_t save = {};
+	savebuffer_t save = {0};

 	//For records
 	tic_t rectime;
@@ -3631,7 +3568,7 @@ void G_SaveGameData(boolean force)
 	size_t length;
 	INT32 i, j;
 	UINT8 btemp;
-	savebuffer_t save = {};
+	savebuffer_t save = {0};
 	(void)force;
 	char backupfile[MAX_WADPATH+4];

@@ -3802,7 +3739,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 	size_t length;
 	char vcheck[VERSIONSIZE];
 	char savename[255];
-	savebuffer_t save = {};
+	savebuffer_t save = {0};

 	// memset savedata to all 0, fixes calling perfectly valid saves corrupt because of bots
 	memset(&savedata, 0, sizeof(savedata));
@@ -3888,7 +3825,7 @@ void G_SaveGame(UINT32 savegameslot)
 	boolean saved;
 	char savename[256] = "";
 	const char *backup;
-	savebuffer_t save = {};
+	savebuffer_t save = {0};

 	sprintf(savename, savegamename, savegameslot);
 	backup = va("%s",savename);
@@ -4158,7 +4095,7 @@ static void measurekeywords(mapsearchfreq_t *fr,
 				PU_STATIC, NULL);
 	for (qp = strtok(va("%s", q), " ");
 			qp && fr->total < 255;
-			qp = strtok(NULL, " "))
+			qp = strtok(0, " "))
 	{
 		if (( sp = strcasestr(s, qp) ))
 		{
@@ -4239,7 +4176,7 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep,
 			{
 				newmapnum = mapnum;
 				newmapname = realmapname;
-				realmapname = NULL;
+				realmapname = 0;
 				Z_Free(apromapname);
 				if (!wanttable)
 					break;
@@ -4260,7 +4197,7 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep,
 				{
 					apromapnum = mapnum;
 					apromapname = realmapname;
-					realmapname = NULL;
+					realmapname = 0;
 				}
 			}
 			else/* ...match individual keywords */
@@ -74,8 +74,6 @@ extern consvar_t cv_ydeadzone[MAXSPLITSCREENPLAYERS];

 extern consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS];

-extern consvar_t cv_autoaccel[MAXSPLITSCREENPLAYERS];
-
 extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_guest, cv_ghost_staff;

 // Hud offsets
@@ -130,7 +128,6 @@ extern consvar_t cv_spinoutroll;
 extern consvar_t cv_squishdance, cv_squishdancespeed;

 extern consvar_t cv_playerblendeffects;
-extern consvar_t cv_reducevfx;

 extern consvar_t cv_cechotoggle;

@@ -81,9 +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_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};
-
 static void rumble_off_handle(void)
 {
 	if (!cv_rumble[0].value)
@@ -933,7 +930,7 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)

 	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);

-	if (cv_gamepadled[playernum].value == 0 || (window_notinfocus && cv_gamepadledifunfocused.value == 0)
+	if (cv_gamepadled[playernum].value == 0
 	 || color >= MAXTRANSLATIONS)
 	{
 		return;
@@ -948,8 +945,6 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)

 static void G_ResetPlayerGamepadIndicatorColor(INT32 playernum)
 {
-	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
-
 	if (cv_gamepadled[playernum].value == 0)
 	{
 		I_SetGamepadIndicatorColor(playernum, 0, 0, 255);
@@ -978,8 +973,13 @@ void G_DeviceLEDTick(void)

 		newcolor = G_GetSkinColorForGamepad(i);

+		// compiler be absolutely tripping
+		// delet this if this gets fixed within gcc
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
 		if (curcolor[i] == newcolor) // dont update if same colour
 			continue;
+#pragma GCC diagnostic pop

 		G_SetPlayerGamepadIndicatorColor(i, newcolor);
 		curcolor[i] = newcolor;
@@ -994,7 +994,6 @@ void G_ResetDeviceLED(void)

 static void G_ResetPlayerDeviceRumble(INT32 playernum)
 {
-	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
 	I_GamepadRumble(playernum, 0, 0, 0);
 }

@@ -1012,7 +1011,7 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
 {
 	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);

-	if (cv_rumble[playernum].value == 0 || (window_notinfocus && cv_rumbleifunfocused.value == 0))
+	if (cv_rumble[playernum].value == 0)
 	{
 		return;
 	}
@@ -116,9 +116,6 @@ extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];

-extern consvar_t cv_gamepadledifunfocused;
-extern consvar_t cv_rumbleifunfocused;
-
 extern INT32 mousex, mousey;

 extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
@@ -391,7 +391,7 @@ void HWR_RenderBatches(void)
 				nextSurfaceInfo = nextEntry->surf;

 				if (nextPolyFlags & PF_NoTexture)
-					nextTexture = NULL;
+					nextTexture = 0;

 				if (useshader && currentShader != nextShader)
 				{
@@ -619,6 +619,7 @@ static void HWR_PrecacheLevelFlats(void)
 	// lookup for flats that may´ve been already loaded
 	// too lazy to make a hashtable or smth so unordered set will do :carbuncle:
 	std::unordered_set<UINT32> flatpresent;
+	lumpnum_t lump;
 	size_t i, j;
 	INT32 k;

@@ -648,8 +649,9 @@ static void HWR_PrecacheLevelFlats(void)
 				const INT32 pic = ceiling ? sec->ceilingpic : sec->floorpic;

 				const levelflat_t *levelflat = &levelflats[pic];
+				lump = levelflat->lumpnum;

-				load_flat(levelflat->lumpnum, R_NoEncore(sec, ceiling));
+				load_flat(lump, R_NoEncore(sec, ceiling));

 				if (levelflat->speed) // is it an animated flat ?
 				{
@@ -670,8 +672,9 @@ static void HWR_PrecacheLevelFlats(void)
 		for (i = 0; i < numlevelflats; i++)
 		{
 			const levelflat_t *levelflat = &levelflats[i];
+			lump = levelflat->lumpnum;

-			load_flat(levelflat->lumpnum, false);
+			load_flat(lump, false);

 			if (levelflat->speed) // is it an animated flat ?
 			{
@@ -335,7 +335,7 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
 	floatangle = 2.0 + (45.0 + ((double)tilt / 1.9)) * clipfov / 90.0;
 	if (floatangle >= 180.0)
 		return 0xffffffff;
-	a1 = (angle_t)lrint(ANG1 * floatangle);
+	a1 = (angle_t)xs_CRoundToInt(ANG1 * floatangle);
 	return a1;
 }

@@ -80,9 +80,6 @@ UINT32 GL_CreateLightTable(RGBA_t *hw_lighttable);
 void GL_ClearLightTables(void);
 void GL_SetScreenPalette(RGBA_t *palette);

-void GL_Draw2DModel(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex,
-                      FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
@@ -14,7 +14,6 @@
 #ifdef HWRENDER

 #include <algorithm>
-#include <vector>

 #include "../doomstat.h"
 #include "../doomdef.h"
@@ -101,8 +100,7 @@ sector_t *gl_backsector = NULL;
 static constexpr float clipping_distances[] = {1024.0f, 2048.0f, 4096.0f, 6144.0f, 8192.0f, 12288.0f, 16384.0f};
 // values for bsp culling
 // slightly higher than the far clipping plane to compensate for impreciseness
-static constexpr INT32 bsp_culling_distances[] = {
-	(1024+512)*FRACUNIT, (2048+512)*FRACUNIT, (4096+512)*FRACUNIT,
+static constexpr INT32 bsp_culling_distances[] = {(1024+512)*FRACUNIT, (2048+512)*FRACUNIT, (4096+512)*FRACUNIT,
 	(6144+512)*FRACUNIT, (8192+512)*FRACUNIT, (12288+512)*FRACUNIT, (16384+512)*FRACUNIT};

 // Performance stats
@@ -588,11 +586,15 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 	const sector_t *sec = FOFsector ? FOFsector : gl_frontsector;

 	// Get the slope pointer to simplify future code
-	if (!isceiling && sec->f_slope)
+	if (sec->f_slope && !isceiling)
 		slope = sec->f_slope;
-	else if (isceiling && sec->c_slope)
+	else if (sec->c_slope && isceiling)
 		slope = sec->c_slope;

+	// Set fixedheight to the slope's height from our viewpoint, if we have a slope
+	if (slope)
+		fixedheight = P_GetSlopeZAt(slope, viewx, viewy);
+
 	height = FixedToFloat(fixedheight);

 	// Allocate plane-vertex buffer if we need to
@@ -684,19 +686,18 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 			vert->s = (tempxsow * cosangf) - (tempytow * sinangf);\
 			vert->t = (tempxsow * sinangf) + (tempytow * cosangf);\
 		}\
-\
-		if (slope)\
-		{\
-			fixedheight = P_GetSlopeZAt(slope, FloatToFixed((vx)), FloatToFixed((vy)));\
-			height = FixedToFloat(fixedheight);\
-		}\
 \
 		vert->x = (vx);\
 		vert->y = height;\
 		vert->z = (vy);\
 \
+		if (slope)\
+		{\
+			fixedheight = P_GetSlopeZAt(slope, FloatToFixed((vx)), FloatToFixed((vy)));\
+			vert->y = FixedToFloat(fixedheight);\
+		}\
 }
-	for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++,v3d++, pv++)
+	for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++,v3d++,pv++)
 		SETUP3DVERT(v3d, pv->x, pv->y);

 	if (slope)
@@ -1783,10 +1784,10 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		// Single sided line... Deal only with the middletexture (if one exists)
 		if (gl_midtexture && gl_linedef->special != HORIZONSPECIAL) // Ignore horizon line for OGL
 		{
-			fixed_t texturevpeg;
-
 			glTex = HWR_GetTexture(gl_midtexture, noencore);

+			fixed_t texturevpeg;
+
 			// PEGGING
 			if ((gl_linedef->flags & (ML_DONTPEGBOTTOM|ML_EFFECT2)) == (ML_DONTPEGBOTTOM|ML_EFFECT2))
 				texturevpeg = gl_frontsector->floorheight + textureheight[gl_sidedef->midtexture] - gl_frontsector->ceilingheight + gl_sidedef->rowoffset;
@@ -1873,13 +1874,12 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 	//Hurdler: 3d-floors test
 	if (!gl_drawing_stencil && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors))
 	{
-		ffloor_t *rover;
-		fixed_t highcut = 0, lowcut = 0;
+		ffloor_t * rover;
+		fixed_t    highcut = 0, lowcut = 0;
 		fixed_t lowcutslope = 0, highcutslope = 0;

 		// Used for height comparisons and etc across FOFs and slopes
 		fixed_t high1, highslope1, low1, lowslope1;
-		fixed_t high2, highslope2, low2, lowslope2;

 		INT32 texnum;

@@ -1892,6 +1892,19 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		{
 			for (rover = gl_backsector->ffloors; rover; rover = rover->next)
 			{
+				boolean bothsides = false;
+				// Skip if it exists on both sectors.
+				ffloor_t * r2;
+				for (r2 = gl_frontsector->ffloors; r2; r2 = r2->next)
+					if (rover->master == r2->master)
+					{
+						bothsides = true;
+						break;
+					}
+
+				if (bothsides)
+					continue;
+
 				const ffloortype_e roverflags = rover->flags;

 				if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || (roverflags & FF_INVERTSIDES))
@@ -1903,45 +1916,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				if ((high1 < lowcut || highslope1 < lowcutslope) || (low1 > highcut || lowslope1 > highcutslope))
 					continue;

-				ffloor_t * r2;
-				for (r2 = gl_frontsector->ffloors; r2; r2 = r2->next)
-				{
-					if (r2->master == rover->master) // Skip if same control line.
-						break;
-
-					const ffloortype_e r2flags = r2->flags;
-
-					if (!(r2flags & FF_EXISTS) || !(r2flags & FF_RENDERSIDES))
-						continue;
-
-					if (rover->flags & FF_EXTRA)
-					{
-						if (!(r2flags & FF_CUTEXTRA))
-							continue;
-
-						if (r2flags & FF_EXTRA && (r2flags & (FF_TRANSLUCENT|FF_FOG)) != (rover->flags & (FF_TRANSLUCENT|FF_FOG)))
-							continue;
-					}
-					else
-					{
-						if (!(r2flags & FF_CUTSOLIDS))
-							continue;
-					}
-
-					SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight)
-					SLOPEPARAMS(*r2->b_slope, low2,  lowslope2,  *r2->bottomheight)
-
-					if ((high2 < lowcut || highslope2 < lowcutslope) || (low2 > highcut || lowslope2 > highcutslope))
-						continue;
-					if ((high1 > high2 || highslope1 > highslope2) || (low1 < low2 || lowslope1 < lowslope2))
-						continue;
-
-					break;
-				}
-
-				if (r2)
-					continue;
-
 				side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector);

 				boolean do_texture_skew;
@@ -2078,6 +2052,19 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 		{
 			for (rover = gl_frontsector->ffloors; rover; rover = rover->next)
 			{
+				boolean bothsides = false;
+				// Skip if it exists on both sectors.
+				ffloor_t * r2;
+				for (r2 = gl_backsector->ffloors; r2; r2 = r2->next)
+					if (rover->master == r2->master)
+					{
+						bothsides = true;
+						break;
+					}
+
+				if (bothsides)
+					continue;
+
 				const ffloortype_e roverflags = rover->flags;

 				if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || !(roverflags & FF_ALLSIDES))
@@ -2089,44 +2076,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
 				if ((high1 < lowcut || highslope1 < lowcutslope) || (low1 > highcut || lowslope1 > highcutslope))
 					continue;

-				ffloor_t * r2;
-				for (r2 = gl_backsector->ffloors; r2; r2 = r2->next)
-				{
-					if (r2->master == rover->master) // Skip if same control line.
-						break;
-
-					const ffloortype_e r2flags = r2->flags;
-
-					if (!(r2flags & FF_EXISTS) || !(r2flags & FF_RENDERSIDES))
-						continue;
-
-					if (rover->flags & FF_EXTRA)
-					{
-						if (!(r2flags & FF_CUTEXTRA))
-							continue;
-
-						if (r2flags & FF_EXTRA && (r2flags & (FF_TRANSLUCENT|FF_FOG)) != (rover->flags & (FF_TRANSLUCENT|FF_FOG)))
-							continue;
-					}
-					else
-					{
-						if (!(r2flags & FF_CUTSOLIDS))
-							continue;
-					}
-
-					SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight)
-					SLOPEPARAMS(*r2->b_slope, low2,  lowslope2,  *r2->bottomheight)
-
-					if ((high2 < lowcut || highslope2 < lowcutslope) || (low2 > highcut || lowslope2 > highcutslope))
-						continue;
-					if ((high1 > high2 || highslope1 > highslope2) || (low1 < low2 || lowslope1 < lowslope2))
-						continue;
-
-					break;
-				}
-				if (r2)
-					continue;
-
 				side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector);

 				boolean do_texture_skew;
@@ -2945,7 +2894,7 @@ static void HWR_Subsector(size_t num)
 	static sector_t tempsec; //SoM: 4/7/2000
 	INT32 floorlightlevel;
 	INT32 ceilinglightlevel;
-	INT32 locFloorHeight = 0, locCeilingHeight = 0;
+	INT32 locFloorHeight, locCeilingHeight;
 	INT32 cullFloorHeight, cullCeilingHeight;
 	INT32 light = 0;
 	extracolormap_t *floorcolormap;
@@ -2991,12 +2940,11 @@ static void HWR_Subsector(size_t num)

 	cullFloorHeight   = P_GetSectorFloorZAt  (gl_frontsector, viewx, viewy);
 	cullCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, viewx, viewy);
+	locFloorHeight    = P_GetSectorFloorZAt  (gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
+	locCeilingHeight  = P_GetSectorCeilingZAt(gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);

 	if (gl_frontsector->ffloors)
 	{
-		locFloorHeight    = P_GetSectorFloorZAt  (gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
-		locCeilingHeight  = P_GetSectorCeilingZAt(gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
-
 		boolean anyMoved = gl_frontsector->moved;

 		if (anyMoved == false)
@@ -3051,7 +2999,8 @@ static void HWR_Subsector(size_t num)
 			{
 				HWR_GetFlat(levelflats[gl_frontsector->floorpic].lumpnum, R_NoEncore(gl_frontsector, false));
 				HWR_RenderPlane(sub, &extrasubsectors[num], false,
-					gl_frontsector->floorheight,
+					// Hack to make things continue to work around slopes.
+					locFloorHeight == cullFloorHeight ? locFloorHeight : gl_frontsector->floorheight,
 					// We now return you to your regularly scheduled rendering.
 					PF_Occlude, floorlightlevel, levelflats[gl_frontsector->floorpic].lumpnum, NULL, 255, floorcolormap);
 			}
@@ -3066,7 +3015,8 @@ static void HWR_Subsector(size_t num)
 			{
 				HWR_GetFlat(levelflats[gl_frontsector->ceilingpic].lumpnum, R_NoEncore(gl_frontsector, true));
 				HWR_RenderPlane(sub, &extrasubsectors[num], true,
-					gl_frontsector->ceilingheight,
+					// Hack to make things continue to work around slopes.
+					locCeilingHeight == cullCeilingHeight ? locCeilingHeight : gl_frontsector->ceilingheight,
 					// We now return you to your regularly scheduled rendering.
 					PF_Occlude, ceilinglightlevel, levelflats[gl_frontsector->ceilingpic].lumpnum, NULL, 255, ceilingcolormap);
 			}
@@ -3783,15 +3733,8 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
 		blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude;
 	}

-	if (sprmo->player)
-	{
-		// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
-		if (cv_reducevfx.value && sprmo->player->kartstuff[k_hyudorotimer] > 0)
-			Surf.PolyColor.s.alpha = FixedMul(FRACUNIT/2, Surf.PolyColor.s.alpha);
-
-		if (cv_playerfade.value)
-			Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(sprmo), Surf.PolyColor.s.alpha);
-	}
+	if (cv_playerfade.value && sprmo->player)
+		Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(sprmo), Surf.PolyColor.s.alpha);

 	if (HWR_UseShader())
 	{
@@ -4080,15 +4023,8 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
 		blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude;
 	}

-	if (sprmo->player)
-	{
-		// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
-		if (cv_reducevfx.value && sprmo->player->kartstuff[k_hyudorotimer] > 0)
-			Surf.PolyColor.s.alpha = FixedMul(FRACUNIT/2, Surf.PolyColor.s.alpha);
-
-		if (cv_playerfade.value)
-			Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(sprmo), Surf.PolyColor.s.alpha);
-	}
+	if (cv_playerfade.value && sprmo->player)
+		Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(sprmo), Surf.PolyColor.s.alpha);

 	if (HWR_UseShader())
 	{
@@ -4238,7 +4174,6 @@ static int CompareVisSprites(const void *p1, const void *p2)
 static void HWR_SortVisSprites(void)
 {
 	UINT32 i;
-
 	for (i = 0; i < gl_visspritecount; i++)
 	{
 		gl_vsprorder[i] = HWR_GetVisSprite(i);
@@ -4307,29 +4242,38 @@ typedef struct

 // initial size of drawnode array
 #define DRAWNODES_INIT_SIZE 64
-// no reason to waste all the allocations since every map will have atleast one translucent thing
-static std::vector<gl_drawnode_t> drawnodes;
+gl_drawnode_t *drawnodes = NULL;
+INT32 numdrawnodes = 0;
+INT32 alloceddrawnodes = 0;

 static void *HWR_CreateDrawNode(gl_drawnode_type_t type)
 {
-	// if we didnt alloc anything yet, reserve atleast 64 nodes
-	// dont declare with it as we want our size to be 0!
-	drawnodes.reserve(DRAWNODES_INIT_SIZE);
+	gl_drawnode_t *drawnode;

-	drawnodes.emplace_back();
-	drawnodes.back().type = type;
+	if (!drawnodes)
+	{
+		alloceddrawnodes = DRAWNODES_INIT_SIZE;
+		drawnodes = static_cast<gl_drawnode_t*>(Z_Malloc(alloceddrawnodes * sizeof(gl_drawnode_t), PU_LEVEL, &drawnodes));
+	}
+	else if (numdrawnodes >= alloceddrawnodes)
+	{
+		alloceddrawnodes *= 2;
+		Z_Realloc(drawnodes, alloceddrawnodes * sizeof(gl_drawnode_t), PU_LEVEL, &drawnodes);
+	}
+
+	drawnode = &drawnodes[numdrawnodes++];
+	drawnode->type = type;

 	// not sure if returning different pointers to a union is necessary
 	switch (type)
 	{
 		case DRAWNODE_PLANE:
-			return &drawnodes.back().u.plane;
+			return &drawnode->u.plane;
 		case DRAWNODE_POLYOBJECT_PLANE:
-			return &drawnodes.back().u.polyplane;
+			return &drawnode->u.polyplane;
 		case DRAWNODE_WALL:
-			return &drawnodes.back().u.wall;
+			return &drawnode->u.wall;
 	}
-
 	return NULL;
 }

@@ -4393,15 +4337,11 @@ static int CompareDrawNodePlanes(const void *p1, const void *p2)
 // Sorts and renders the list of drawnodes for the scene being rendered.
 static void HWR_RenderDrawNodes(void)
 {
-	size_t i = 0, run_start = 0;
-	static std::vector<INT32> sortindex;
-
-	sortindex.reserve(DRAWNODES_INIT_SIZE);
+	INT32 i = 0, run_start = 0;

 	// Array for storing the rendering order.
 	// A list of indices into the drawnodes array.
-
-	const size_t numdrawnodes = drawnodes.size();
+	INT32 *sortindex;

 	if (!numdrawnodes)
 		return;
@@ -4410,7 +4350,7 @@ static void HWR_RenderDrawNodes(void)

 	PS_START_TIMING(ps_hw_nodesorttime);

-	sortindex.resize(numdrawnodes);
+	sortindex = static_cast<INT32*>(Z_Malloc(sizeof(INT32) * numdrawnodes, PU_STATIC, NULL));

 	// Reversed order
 	for (i = 0; i < numdrawnodes; i++)
@@ -4426,7 +4366,7 @@ static void HWR_RenderDrawNodes(void)
 		if (drawnodes[sortindex[run_start]].type == DRAWNODE_PLANE)
 		{
 			// found it, now look for run end
-			size_t run_end; // (inclusive)
+			INT32 run_end; // (inclusive)

 			for (i = run_start+1; i < numdrawnodes; i++)
 			{
@@ -4439,7 +4379,7 @@ static void HWR_RenderDrawNodes(void)
 			if (run_end > run_start) // if there are multiple consecutive planes, not just one
 			{
 				// consecutive run of planes found, now sort it
-				qs22j(sortindex.data() + run_start, run_end - run_start + 1, sizeof(INT32), CompareDrawNodePlanes);
+				qs22j(sortindex + run_start, run_end - run_start + 1, sizeof(INT32), CompareDrawNodePlanes);
 			}

 			run_start = run_end + 1; // continue looking for runs coming right after this one
@@ -4511,7 +4451,9 @@ static void HWR_RenderDrawNodes(void)

 	PS_STOP_TIMING(ps_hw_nodedrawtime);

-	drawnodes.clear(); // clear so our size is 0 again!
+	numdrawnodes = 0;
+
+	Z_Free(sortindex);
 }


@@ -5444,7 +5386,7 @@ static void HWR_SetTransformAiming(FTransform *trans)
 		fixed_t fixedaiming = AIMINGTODY(aimingangle);
 		trans->viewaiming = FixedToFloat(fixedaiming) * (static_cast<float>(vid.width) / static_cast<float>(vid.height)) / (static_cast<float>(BASEVIDWIDTH) / static_cast<float>(BASEVIDHEIGHT));
 		if (splitscreen == 1) // only for 2 player splitscreen
-			trans->viewaiming *= 2.125f; // splitscreen adjusts fov with 0.8, so compensate (but only halfway, since splitscreen means only half the screen is used)
+			trans->viewaiming *= 2.125; // splitscreen adjusts fov with 0.8, so compensate (but only halfway, since splitscreen means only half the screen is used)
 		trans->shearing = true;
 		gl_aimingangle = 0;
 	}
@@ -5549,7 +5491,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
 	player_t *viewplayer = &players[displayplayers[viewssnum]];
 	const float fpov = FixedToFloat(R_GetPlayerFov(viewplayer));

-	auto reset_viewstate = [&]()
+	auto reset_viewstate = [&](const float fpov)
 	{
 		HWR_SetTransform(fpov);
 		HWR_ClearSprites();
@@ -5569,7 +5511,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
 			currentportallist = &portallist;
 			HWR_SetPortalState(GLPORTAL_SEARCH);

-			reset_viewstate();
+			reset_viewstate(fpov);

 			if (rootportal)
 			{
@@ -5595,7 +5537,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
 	// draw normal things in current frame in current incremented stencil buffer area
 	HWR_SetStencilState(HWR_STENCIL_NORMAL, stencil_level);

-	reset_viewstate();
+	reset_viewstate(fpov);

 	if constexpr (Type == RenderViewpointType::kPortal)
 	{
@@ -6111,7 +6053,7 @@ static void HWR_DoPostProcessor(void)
 	const camera_t *thiscam = &camera[0];

 	// Not supported in splitscreen - someone want to add support?
-	const boolean screenwave = (!splitscreen && !cv_reducevfx.value && (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT));
+	const boolean screenwave = (!splitscreen && (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT));

 	// Capture the screen for intermission and screen waving
 	if ((lastdraw || screenwave) && gamestate != GS_INTERMISSION)
@@ -579,7 +579,7 @@ md2found:
 	fclose(f);
 }

-void HWR_AddPlayerMD2(INT32 skin, boolean local) // For MD2's that were added after startup
+void HWR_AddPlayerMD2(int skin, boolean local) // For MD2's that were added after startup
 {
 	FILE *f;
 	char name[20], filename[32];
@@ -1198,15 +1198,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 			Surf.PolyFlags = HWR_GetBlendModeFlag(blendmode);
 		}

-		if (spr->mobj->player)
-		{
-			// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
-			if (cv_reducevfx.value && spr->mobj->player->kartstuff[k_hyudorotimer] > 0)
-				Surf.PolyColor.s.alpha = FixedMul(FRACUNIT/2, Surf.PolyColor.s.alpha);
-
-			if (cv_playerfade.value)
-				Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha);
-		}
+		if (cv_playerfade.value && spr->mobj->player)
+			Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha);

 		// dont forget to enabled the depth test because we can't do this like
 		// before: polygons models are not sorted
@@ -1475,116 +1468,4 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 	}
 }

-// mostly copy paste of HWR_DrawMD2
-// very ugly but our model code kinda sucks
-void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t color, const UINT8 *colormap, fixed_t scale, INT32 frame, angle_t angle)
-{
-	patch_t *gpatch, *blendgpatch;
-	GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
-	FTransform p;
-	FSurfaceInfo Surf;
-
-	if (!md2->model)
-	{
-		char filename[64];
-		CONS_Debug(DBG_RENDER, "Loading model... (%s)\n", md2->filename);
-		sprintf(filename, "mdls/%s", md2->filename);
-		md2->model = md2_readModel(filename);
-
-		if (md2->model)
-		{
-			md2_printModelInfo(md2->model);
-			GL_CreateModelVBOs(md2->model);
-		}
-		else
-		{
-			md2->error = true;
-			return;
-		}
-	}
-
-	if (md2->model->meshes[0].numFrames > 0)
-		frame = frame % md2->model->meshes[0].numFrames;
-	else
-		frame = 0;
-
-	gpatch = (patch_t *)(md2->glpatch);
-	if (gpatch)
-		hwrPatch = ((GLPatch_t *)gpatch->hardware);
-
-	if (!gpatch || !hwrPatch ||
-	    ((!hwrPatch->mipmap->format || !hwrPatch->mipmap->downloaded) && !md2->notexturefile))
-		md2_loadTexture(md2);
-
-	gpatch = (patch_t*)(md2->glpatch);
-	if (gpatch)
-		hwrPatch = ((GLPatch_t *)gpatch->hardware);
-
-	blendgpatch = (patch_t*)(md2->blendglpatch);
-	if (blendgpatch)
-		hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
-
-	if ((gpatch && hwrPatch && hwrPatch->mipmap->format) &&
-		(!blendgpatch || !hwrBlendPatch ||
-		((!hwrBlendPatch->mipmap->format || !hwrBlendPatch->mipmap->downloaded) && !md2->noblendfile)))
-		md2_loadBlendTexture(md2);
-
-	blendgpatch = (patch_t*)(md2->blendglpatch);
-	if (blendgpatch)
-		hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
-
-	memset(&Surf, 0x00, sizeof(FSurfaceInfo));
-	Surf.PolyColor.rgba = 0xFFFFFFFF;
-	Surf.PolyFlags = PF_Occlude | PF_Modulated;
-
-	Surf.LightInfo.light_level = 255;
-	Surf.LightInfo.fade_start = 0;
-	Surf.LightInfo.fade_end = 31;
-
-	if (color != SKINCOLOR_NONE &&
-	    blendgpatch && hwrBlendPatch->mipmap->format &&
-	    gpatch->width == blendgpatch->width && gpatch->height == blendgpatch->height)
-	{
-		INT32 tcskinnum = TC_DEFAULT;
-
-		if (color)
-			tcskinnum = skinnum;
-
-		HWR_GetBlendedTexture(gpatch, blendgpatch, tcskinnum, colormap, color);
-	}
-	else if (hwrPatch && hwrPatch->mipmap->format)
-	{
-		GL_SetTexture(hwrPatch->mipmap);
-	}
-
-	memset(&p, 0x00, sizeof(FTransform));
-
-	p.x = x*vid.dup + (float)(vid.width - BASEVIDWIDTH*vid.dup)/2.f;
-	p.y = -420.f; // push it back to prevent wonky culling, idk lul
-	p.z = y*vid.dup + (float)(vid.height - BASEVIDHEIGHT*vid.dup)/2.f;
-
-	p.angley = FixedToFloat(AngleFixed(angle));
-	p.anglex = 0.f;
-	p.anglez = 0.f;
-
-	p.roll = false;
-	p.fliptype = TRANSFORM_NONE;
-
-	const float fscale = FixedToFloat(scale*vid.dup);
-
-	GL_Draw2DModel(
-			md2->model,
-			frame,
-			0.f,
-			0.f,
-			-1,
-			&p,
-			fscale,
-			fscale,
-			true, // flip it vertically lul
-			false,
-			&Surf
-		);
-}
-
 #endif //HWRENDER
@@ -45,9 +45,6 @@ void HWR_InitMD2(void);
 void HWR_DrawMD2(gl_vissprite_t *spr);
 void HWR_AddPlayerMD2(INT32 skin, boolean local);
 void HWR_AddSpriteMD2(size_t spritenum);
-void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum,
-					 skincolors_t color, const UINT8 *colormap,
-					 fixed_t scale, INT32 frame, angle_t angle);

 #ifdef __cplusplus
 } // extern "C"
@@ -274,7 +274,7 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 	if (!f)
 		return NULL;

-	retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL);
+	retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, 0);

 	//size_t fileLen;

@@ -288,13 +288,13 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 	{
 		texPos++;
 		namelen = strlen(texPos) + 1;
-		texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, NULL);
+		texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, 0);
 		strcpy(texturefilename, texPos);
 	}
 	else
 	{
 		namelen = strlen(fileName) + 1;
-		texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, NULL);
+		texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, 0);
 		strcpy(texturefilename, fileName);
 	}

@@ -316,7 +316,7 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 	header = (md2header_t*)buffer;

 	retModel->numMeshes = 1; // MD2 only has one mesh
-	retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * retModel->numMeshes, ztag, NULL);
+	retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * retModel->numMeshes, ztag, 0);
 	retModel->meshes[0].numFrames = header->numFrames;
 	// const float WUNITS = 1.0f;
 	// float dataScale = WUNITS;
@@ -332,7 +332,7 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 	if (retModel->numMaterials <= 0) // Always at least one skin, duh
 		retModel->numMaterials = 1;

-	retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, NULL);
+	retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, 0);

 	// int t;
 	for (t = 0; t < retModel->numMaterials; t++)
@@ -409,9 +409,9 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 		float *uvptr;

 		dataScale = 0.015624f; // 1 / 64.0f
-		retModel->meshes[0].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*header->numFrames, ztag, NULL);
+		retModel->meshes[0].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*header->numFrames, ztag, 0);
 		retModel->meshes[0].numVertices = header->numXYZ;
-		retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, NULL);
+		retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, 0);

 		ptr = (char*)frames;
 		for (i = 0; i < header->numFrames; i++, ptr += header->framesize)
@@ -423,12 +423,12 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 			md2vertex_t *vertex;

 			md2frame_t *framePtr = (md2frame_t*)ptr;
-			retModel->meshes[0].tinyframes[i].vertices = (short*)Z_Malloc(sizeof(short) * 3 * header->numXYZ, ztag, NULL);
-			retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, NULL);
+			retModel->meshes[0].tinyframes[i].vertices = (short*)Z_Malloc(sizeof(short) * 3 * header->numXYZ, ztag, 0);
+			retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, 0);

 			//			if (retModel->materials[0].lightmap)
 			//				retModel->meshes[0].tinyframes[i].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*header->numVerts, ztag);
-			retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, NULL);
+			retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, 0);

 			vertptr = retModel->meshes[0].tinyframes[i].vertices;
 			normptr = retModel->meshes[0].tinyframes[i].normals;
@@ -484,8 +484,8 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 		char *ptr;

 		retModel->meshes[0].numVertices = header->numTris * 3;
-		retModel->meshes[0].frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t)*header->numFrames, ztag, NULL);
-		retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, NULL);
+		retModel->meshes[0].frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t)*header->numFrames, ztag, 0);
+		retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, 0);

 		trisPtr = tris;
 		uvptr = retModel->meshes[0].uvs;
@@ -507,8 +507,8 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
 			md2vertex_t *vertex;

 			md2frame_t *framePtr = (md2frame_t*)ptr;
-			retModel->meshes[0].frames[i].normals = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
-			retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
+			retModel->meshes[0].frames[i].normals = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, 0);
+			retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, 0);
 			//			if (retModel->materials[0].lightmap)
 			//				retModel->meshes[0].frames[i].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*header->numTris*3, ztag);
 			//float *vertptr, *normptr;
@@ -168,7 +168,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 	if (!f)
 		return NULL;

-	retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL);
+	retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, 0);

 	// find length of file
 	fseek(f, 0, SEEK_END);
@@ -201,7 +201,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 	if (retModel->numMaterials <= 0) // Always at least one skin, duh
 		retModel->numMaterials = 1;

-	retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, NULL);
+	retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, 0);

 	for (t = 0; t < retModel->numMaterials; t++)
 	{
@@ -225,7 +225,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 		retModel->materials[t].spheremap = false;
 	}

-	retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t)*retModel->numMeshes, ztag, NULL);
+	retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t)*retModel->numMeshes, ztag, 0);

 	matCount = 0;
 	for (i = 0, surfEnd = 0; i < mdh->numSurfaces; i++)
@@ -298,9 +298,9 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 			unsigned short *indexptr;
 			md3Triangle *mdT;

-			retModel->meshes[i].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*mdS->numFrames, ztag, NULL);
+			retModel->meshes[i].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*mdS->numFrames, ztag, 0);
 			retModel->meshes[i].numVertices = mdS->numVerts;
-			retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numVerts, ztag, NULL);
+			retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numVerts, ztag, 0);
 			for (j = 0; j < mdS->numFrames; j++)
 			{
 				short *vertptr;
@@ -308,12 +308,12 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 				// char *tanptr;
 				int k;
 				md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
-				retModel->meshes[i].tinyframes[j].vertices = (short*)Z_Malloc(sizeof(short)*3*mdS->numVerts, ztag, NULL);
-				retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, NULL);
+				retModel->meshes[i].tinyframes[j].vertices = (short*)Z_Malloc(sizeof(short)*3*mdS->numVerts, ztag, 0);
+				retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, 0);

 //				if (retModel->materials[0].lightmap)
 //					retModel->meshes[i].tinyframes[j].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag);
-				retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, NULL);
+				retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, 0);
 				vertptr = retModel->meshes[i].tinyframes[j].vertices;
 				normptr = retModel->meshes[i].tinyframes[j].normals;

@@ -374,16 +374,16 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
 			int k;

 			retModel->meshes[i].numVertices = mdS->numTriangles * 3;//mdS->numVerts;
-			retModel->meshes[i].frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t)*mdS->numFrames, ztag, NULL);
-			retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numTriangles*3, ztag, NULL);
+			retModel->meshes[i].frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t)*mdS->numFrames, ztag, 0);
+			retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numTriangles*3, ztag, 0);

 			for (j = 0; j < mdS->numFrames; j++)
 			{
 				float *vertptr;
 				float *normptr;
 				md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
-				retModel->meshes[i].frames[j].vertices = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
-				retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
+				retModel->meshes[i].frames[j].vertices = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, 0);
+				retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, 0);
 //				if (retModel->materials[i].lightmap)
 //					retModel->meshes[i].frames[j].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag);
 				vertptr = retModel->meshes[i].frames[j].vertices;
@@ -189,7 +189,7 @@ model_t *LoadModel(const char *filename, int ztag)
 		return NULL;
 	}

-	model->mdlFilename = (char*)Z_Malloc(strlen(filename)+1, ztag, NULL);
+	model->mdlFilename = (char*)Z_Malloc(strlen(filename)+1, ztag, 0);
 	strcpy(model->mdlFilename, filename);

 	Optimize(model);
@@ -237,7 +237,7 @@ void GenerateVertexNormals(model_t *model)
 		{
 			mdlframe_t *frame = &mesh->frames[j];
 			int memTag = PU_STATIC;
-			float *newNormals = (float*)Z_Malloc(sizeof(float)*3*mesh->numTriangles*3, memTag, NULL);
+			float *newNormals = (float*)Z_Malloc(sizeof(float)*3*mesh->numTriangles*3, memTag, 0);
 			int k;
 			float *vertPtr = frame->vertices;
 			float *oldNormals;
@@ -309,7 +309,7 @@ static boolean AddMaterialToList(materiallist_t **head, material_t *material)
 	}

 	// Didn't find it, so add to the list
-	newMatNode = (materiallist_t*)Z_Malloc(sizeof(materiallist_t), PU_CACHE, NULL);
+	newMatNode = (materiallist_t*)Z_Malloc(sizeof(materiallist_t), PU_CACHE, 0);
 	newMatNode->material = material;
 	ListAdd(newMatNode, (listitem_t**)head);
 	return true;
@@ -351,7 +351,7 @@ void Optimize(model_t *model)
 	}

 	memTag = PU_STATIC;
-	newMeshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * numMeshes, memTag, NULL);
+	newMeshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * numMeshes, memTag, 0);

 	i = 0;
 	for (node = matListHead; node; node = node->next)
@@ -377,14 +377,14 @@ void Optimize(model_t *model)
 		newMesh->numFrames = 1;
 		newMesh->numTriangles = numTriangles;
 		newMesh->numVertices = numTriangles * 3;
-		newMesh->uvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, NULL);
-		newMesh->frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t), memTag, NULL);
+		newMesh->uvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, 0);
+		newMesh->frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t), memTag, 0);
 		curFrame = &newMesh->frames[0];

 		curFrame->material = curMat;
-		curFrame->normals = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, NULL);
-		curFrame->vertices = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, NULL);
-		curFrame->colors = (char*)Z_Malloc(sizeof(char)*4*numTriangles*3, memTag, NULL);
+		curFrame->normals = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
+		curFrame->vertices = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
+		curFrame->colors = (char*)Z_Malloc(sizeof(char)*4*numTriangles*3, memTag, 0);

 		// Now traverse the meshes of the model, adding in
 		// vertices/normals/uvs that match the current material
@@ -98,10 +98,10 @@ static size_t textureBufferSize = 0;
 static LTListItem *LightTablesTail = NULL;
 static LTListItem *LightTablesHead = NULL;

-static RGBA_t screenPalette[256] = {}; // the palette for the postprocessing step in palette rendering
+static RGBA_t screenPalette[256] = {0}; // the palette for the postprocessing step in palette rendering
 static GLuint screenPaletteTex = 0; // 1D texture containing the screen palette
 static GLuint paletteLookupTex = 0; // 3D texture containing RGB -> palette index lookup table
-RGBA_t myPaletteData[256] = {}; // the palette for converting textures to RGBA
+RGBA_t  myPaletteData[256] = {0}; // the palette for converting textures to RGBA

 static GLint gltexformat = GL_RGB5_A1;
 GLint   screen_width     = 0;               // used by Draw2DLine()
@@ -127,9 +127,9 @@ GLuint gl_num_extensions;
 int majorGL = 0, minorGL = 0;

 //Hurdler: 04/10/2000: added for the kick ass coronas as Boris wanted;-)
-GLfloat modelMatrix[16] = {};
-GLfloat projMatrix[16] = {};
-static GLint viewport[4];
+GLfloat modelMatrix[16] = {0};
+GLfloat projMatrix[16] = {0};
+static GLint   viewport[4];

 #ifdef USE_FBO_OGL
 enum
@@ -171,7 +171,7 @@ boolean supportstencil = false;
 //			flush all of the stored textures, leaving them unavailable at times such as between levels
 //			These need to start at 0 and be set to their number, and be reset to 0 when deleted so that Intel GPUs
 //			can know when the textures aren't there, as textures are always considered resident in their virtual memory
-static GLuint screenTextures[NUMSCREENTEXTURES] = {};
+static GLuint screenTextures[NUMSCREENTEXTURES] = {0};

 #define byte2float(byte) (GLfloat)(byte / 255.0f)

@@ -404,14 +404,6 @@ static PFNglEnableClientState pglEnableClientState;
 typedef void (APIENTRY * PFNglDisableClientState) (GLenum cap);
 static PFNglDisableClientState pglDisableClientState;

-typedef void (APIENTRY * PFNglOrtho) (GLdouble left,
-									  GLdouble right,
-									  GLdouble bottom,
-									  GLdouble top,
-									  GLdouble nearVal,
-									  GLdouble farVal);
-static PFNglOrtho pglOrtho;
-
 /* Lighting */
 typedef void (APIENTRY * PFNglShadeModel) (GLenum mode);
 static PFNglShadeModel pglShadeModel;
@@ -753,7 +745,7 @@ typedef struct gl_shaderstate_s
 static gl_shaderstate_t gl_shaderstate;

 // Shader info
-static float shader_leveltime = 0.0f;
+static float shader_leveltime = 0;
 static float shader_light_x = 0.0f;
 static float shader_light_y = 0.0f;
 static float shader_light_z = 0.0f;
@@ -866,8 +858,6 @@ void SetupGLFunc4(void)
 	GetGLfunc(glUniform3fv);
 	GetGLfunc(glGetUniformLocation);

-	GetGLfunc(glOrtho);
-
 #ifdef GLDEBUGMESSAGE
 	GetGLfunc(glDebugMessageCallback);
 #endif
@@ -3100,39 +3090,6 @@ void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics
 	pglDisable(GL_NORMALIZE);
 }

-void GL_Draw2DModel(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex,
-                      FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
-{
-	// save our matrix´s
-	pglMatrixMode(GL_PROJECTION);
-	pglPushMatrix();
-	pglMatrixMode(GL_MODELVIEW);
-	pglPushMatrix();
-
-	pglMatrixMode(GL_PROJECTION);
-	pglLoadIdentity();
-
-	// switch to ortho mode to make our lives easier
-	// thisll make sure our coords will be remapped to pixel coords
-	pglOrtho(0.0f, (float)vid.width, (float)vid.height, 0.0f, NZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
-
-	pglMatrixMode(GL_MODELVIEW);
-	pglLoadIdentity();
-
-	pglEnable(GL_DEPTH_TEST);
-	pglDepthMask(GL_TRUE);
-	pglClear(GL_DEPTH_BUFFER_BIT);
-
-	GL_DrawModelEx(model, frameIndex, duration, tics, nextFrameIndex,
-	               pos, hscale, vscale, flipped, hflipped, Surface);
-
-	// restore the matrix´s
-	pglMatrixMode(GL_PROJECTION);
-	pglPopMatrix();
-	pglMatrixMode(GL_MODELVIEW);
-	pglPopMatrix();
-}
-
 // -----------------+
 // SetTransform     :
 // -----------------+
@@ -3591,30 +3548,22 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8
 		 1.0f, -1.0f, 1.0f
 	};

+	xfix = 1/((float)screen_texsizew/(float)screen_width);
+	yfix = 1/((float)screen_texsizeh/(float)screen_height);
+
 	const GLfloat scrwf = (float)screen_width;
 	const GLfloat scrwh = (float)screen_height;

-	xfix = 1/((float)screen_texsizew/scrwf);
-	yfix = 1/((float)screen_texsizeh/scrwh);
-
-	GL_SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
-
 	// Slight fuzziness
 	GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
+	GL_SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
 	pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);

-	uint32_t r = rand();
+	const float stride = 2.f/scrwh;

-	const float ystep = 2.f/scrwh * (float)vid.udup/4.f;
-
-	for (i = 0; i < 1; i += ystep)
+	for (i = 0; i < 1; i += stride)
 	{
-		// avoid calling rand thousands of times
-		r ^= r >> 13;
-		r ^= r >> 11;
-		r ^= r << 21;
-
-		fix[2] = (float)(r & 127) / -22000.f * xfix;
+		fix[2] = (float)(rand() % 128) / -22000.f * xfix;
 		fix[0] = fix[2];
 		fix[6] = fix[0] + xfix;
 		fix[4] = fix[2] + xfix;
@@ -3632,8 +3581,8 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8
 	}

 	// Upward bar
-	GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
-	pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
+	//GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
+	//pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);

 	color[0] = color[1] = color[2] = 190;
 	color[3] = 250;
@@ -3656,14 +3605,13 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8

 	fix[1] = fix[7] += (fix[3] - fix[7])*2;
 	screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
-
 	pglTexCoordPointer(2, GL_FLOAT, 0, fix);
 	pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
 	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);

 	// Downward bar
-	GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
-	pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
+	//GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
+	//pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);

 	fix[0] = 0.0f;
 	fix[6] = xfix;
@@ -3682,7 +3630,6 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8

 	fix[1] = fix[7] += (fix[3] - fix[7])*2;
 	screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
-
 	pglTexCoordPointer(2, GL_FLOAT, 0, fix);
 	pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
 	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
@@ -3722,7 +3669,7 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 {
 	float xfix, yfix;
 	float origaspect, newaspect;
-	float xoff = 1.0f, yoff = 1.0f; // xoffset and yoffset for the polygon to have black bars around the screen
+	float xoff = 1, yoff = 1; // xoffset and yoffset for the polygon to have black bars around the screen

 	static float off[12] =
 	{
@@ -3745,19 +3692,19 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 	if (origaspect < newaspect)
 	{
 		xoff = origaspect / newaspect;
-		yoff = 1.0f;
+		yoff = 1;
 	}
 	else if (origaspect > newaspect)
 	{
-		xoff = 1.0f;
+		xoff = 1;
 		yoff = newaspect / origaspect;
 	}

 	// float off[12];
 	off[0] = off[3]  = -xoff;
 	off[1] = off[10] = -yoff;
-	off[4] = off[7]  =  yoff;
-	off[6] = off[9]  =  xoff;
+	off[4] = off[7]  = yoff;
+	off[6] = off[9]  = xoff;

 	// float fix[8];
 	fix[3] = fix[5] = yfix;
@@ -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_LockMutex(&con_mutex);
+	I_lock_mutex(&con_mutex);
 	startup = con_startup;
-	I_UnlockMutex(con_mutex);
+	I_unlock_mutex(con_mutex);
 #else
 	startup = con_startup;
 #endif
@@ -183,19 +183,19 @@ HMS_connect (const char *format, ...)
 	}

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

 	seek = strlen(hms_api) + 1;/* + '/' */

 	va_start (ap, format);
-	url = malloc(seek + vsnprintf(NULL, 0, format, ap) + sizeof HMS_QUERY_VERSION - 1 + token_length + 1);
+	url = malloc(seek + vsnprintf(0, 0, format, ap) + sizeof HMS_QUERY_VERSION - 1 + token_length + 1);
 	va_end (ap);

 	sprintf(url, "%s/", hms_api);

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

 	va_start (ap, format);
@@ -471,18 +471,18 @@ HMS_fetch_servers (msg_server_t *list, int query_id)
 			*end = '\0';

 			address = strtok(p, " ");
-			port    = strtok(NULL, " ");
-			contact = strtok(NULL, "");
+			port    = strtok(0, " ");
+			contact = strtok(0, "");

 			if (address && port)
 			{
 #ifdef HAVE_THREADS
-				I_LockMutex(&ms_QueryId_mutex);
+				I_lock_mutex(&ms_QueryId_mutex);
 				{
 					if (query_id != ms_QueryId)
 						doing_shit = 0;
 				}
-				I_UnlockMutex(ms_QueryId_mutex);
+				I_unlock_mutex(ms_QueryId_mutex);

 				if (! doing_shit)
 					break;
@@ -539,7 +539,7 @@ HMS_compare_mod_version (char *buffer, size_t buffer_size)
 	if (HMS_do(hms))
 	{
 		version      = strtok(hms->buffer, " ");
-		version_name = strtok(NULL, "\n");
+		version_name = strtok(0, "\n");

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

@@ -596,12 +596,12 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
 	}

 	// Only servers/admins can CSAY.
-	if (!server && !(IsPlayerAdmin(consoleplayer)))
+	if(!server && !(IsPlayerAdmin(consoleplayer)))
 		flags &= ~HU_CSAY;

 	// We handle HU_SERVER_SAY, not the caller.
 	flags &= ~HU_SERVER_SAY;
-	if (dedicated && !(flags & HU_CSAY))
+	if(dedicated && !(flags & HU_CSAY))
 		flags |= HU_SERVER_SAY;

 	buf[0] = target;
@@ -615,20 +615,17 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
 		strlcat(msg, COM_Argv(ix + usedargs), msgspace);
 	}

-	const size_t msglength = strlen(msg);
-
-	if (msglength > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
+	if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
 	{
 		// what we're gonna do now is check if the node exists
 		// with that logic, characters 4 and 5 are our numbers:
 		const char *newmsg;
 		INT32 spc = 1; // used if nodenum[1] is a space.
-		CLEANUP(pfree) char *nodenum = (char*) malloc(3);
+		char *nodenum = (char*) malloc(3);
 		memcpy(nodenum, msg+3, 2);
 		nodenum[2] = '\0';
-
 		// check for undesirable characters in our "number"
-		if (((nodenum[0] < '0') || (nodenum[0] > '9')) || ((nodenum[1] < '0') || (nodenum[1] > '9')))
+		if 	(((nodenum[0] < '0') || (nodenum[0] > '9')) || ((nodenum[1] < '0') || (nodenum[1] > '9')))
 		{
 			// check if nodenum[1] is a space
 			if (nodenum[1] == ' ')
@@ -637,21 +634,23 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
 			else
 			{
 				HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<node> \'.", false);
+				free(nodenum);
 				return;
 			}
 		}
-
 		// I'm very bad at C, I swear I am, additional checks eww!
 		if (spc != 0)
 		{
 			if (msg[5] != ' ')
 			{
 				HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<node> \'.", false);
+				free(nodenum);
 				return;
 			}
 		}

 		target = atoi((const char*) nodenum); // turn that into a number
+		free(nodenum);
 		//CONS_Printf("%d\n", target);

 		// check for target player, if it doesn't exist then we can't send the message!
@@ -662,13 +661,12 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
 			HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same
 			return;
 		}
-
 		buf[0] = target;
 		newmsg = msg+5+spc;
 		strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
 	}

-	SendNetXCmd(XD_SAY, buf, msglength + 1 + msg-buf);
+	SendNetXCmd(XD_SAY, buf, strlen(msg) + 1 + msg-buf);
 }

 /** Send a message to everyone.
@@ -919,12 +917,10 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
 		return;
 	}

-	const size_t msglength = strlen(msg);
-
 	//check for invalid characters (0x80 or above)
 	{
 		size_t i;
-		const size_t j = msglength;
+		const size_t j = strlen(msg);
 		for (i = 0; i < j; i++)
 		{
 			if (msg[i] & 0x80)
@@ -971,7 +967,7 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
 	}

 	// Handle "/me" actions, but only in messages to everyone.
-	if (target == 0 && msglength > 4 && strnicmp(msg, "/me ", 4) == 0)
+	if (target == 0 && strlen(msg) > 4 && strnicmp(msg, "/me ", 4) == 0)
 	{
 		msg += 4;
 		action = true;
@@ -1072,7 +1068,8 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)

 		HU_AddChatText(va(fmt2, prefix, cstart, dispname, textcolor, msg), cv_chatnotifications.value); // add to chat

-		Z_Free(tempchar);
+		if (tempchar)
+			Z_Free(tempchar);
 	}
 #ifdef _DEBUG
 	// I just want to point out while I'm here that because the data is still
@@ -1152,12 +1149,10 @@ static boolean HU_clearChatSpaces(void)
 	size_t i = 0; // Used to just check our message
 	char c; // current character we're iterating.
 	boolean nothingbutspaces = true;
-	const size_t chatlength = strlen(w_chat_buf);

-	for (; i < chatlength; i++) // iterate through message and eradicate all spaces that don't belong.
+	for (; i < strlen(w_chat_buf); i++) // iterate through message and eradicate all spaces that don't belong.
 	{
 		c = w_chat_buf[i];
-
 		if (!c)
 			break; // if there's nothing, it's safe to assume our message has ended, so let's not waste any more time here.

@@ -1166,7 +1161,6 @@ static boolean HU_clearChatSpaces(void)
 			nothingbutspaces = false;
 		}
 	}
-
 	return nothingbutspaces;
 }

@@ -1213,11 +1207,11 @@ static void HU_SendChatMessage(void)
 		return;
 	}

-	const size_t msglength = strlen(msg);
+	size_t len = strlen(msg);

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

-	if (msglength > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
+	if (len > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
 	{
 		INT32 spc = 1; // used if nodenum[1] is a space.
 		const char *newmsg;
@@ -1483,7 +1477,6 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 			x = 0;
 		}
 	}
-
 	return newstring;
 }

@@ -1522,7 +1515,7 @@ static void HU_drawMiniChat(void)
 		emote_t *emote = NULL;
 		int emotelen = 0;

-		while (msg[j]) // iterate through msg
+		while(msg[j]) // iterate through msg
 		{
 			if (msg[j] < HU_FONTSTART) // don't draw
 			{
@@ -1554,21 +1547,19 @@ static void HU_drawMiniChat(void)
 			{
 				j++;
 			}
-
 			prev_linereturn = false;
 			dx += charwidth;
-
 			if (dx >= boxw)
 			{
 				dx = 0;
 				linescount += 1;
 			}
 		}
-
 		dy = 0;
 		dx = 0;
 		msglines += linescount+1;
-		Z_Free(msg);
+		if (msg)
+			Z_Free(msg);
 	}

 	y = chaty - charheight*(msglines+1);
@@ -1600,7 +1591,7 @@ static void HU_drawMiniChat(void)
 		emote_t *emote = NULL;
 		int emotelen = 0;

-		while (msg[j]) // iterate through msg
+		while(msg[j]) // iterate through msg
 		{
 			if (msg[j] < HU_FONTSTART) // don't draw
 			{
@@ -1645,17 +1636,16 @@ static void HU_drawMiniChat(void)

 			dx += charwidth;
 			prev_linereturn = false;
-
 			if (dx >= boxw)
 			{
 				dx = 0;
 				dy += charheight;
 			}
 		}
-
 		dy += charheight;
 		dx = 0;
-		Z_Free(msg);
+		if (msg)
+			Z_Free(msg);
 	}

 	// decrement addy and make that shit smooth:
@@ -1707,7 +1697,7 @@ static void HU_drawChatLog(INT32 offset)

 	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
+	for (i=0; i<chat_nummsg_log; i++) // iterate through our chatlog
 	{
 		INT32 clrflag = 0;
 		INT32 j = 0;
@@ -1716,7 +1706,7 @@ static void HU_drawChatLog(INT32 offset)
 		emote_t *emote = NULL;
 		int emotelen = 0;

-		while (msg[j]) // iterate through msg
+		while(msg[j]) // iterate through msg
 		{
 			if (msg[j] < HU_FONTSTART) // don't draw
 			{
@@ -1761,10 +1751,10 @@ static void HU_drawChatLog(INT32 offset)
 				dy += charheight;
 			}
 		}
-
 		dy += charheight;
 		dx = 0;
-		Z_Free(msg);
+		if (msg)
+			Z_Free(msg);
 	}

 	if (((chat_scroll >= chat_maxscroll) || (chat_scrollmedown)) && !(justscrolleddown || justscrolledup || chat_scrolltime)) // was already at the bottom of the page before new maxscroll calculation and was NOT scrolling.
@@ -2001,7 +1991,7 @@ static void HU_DrawChat(void)
 			longest_name_length = max(longest_name_length, strlen(player_names[i]));
 		}

-		for (i = 0; i < MAXPLAYERS; i++)
+		for(i = 0; i < MAXPLAYERS; i++)
 		{
 			if (!playeringame[i])
 				continue;
@@ -29,10 +29,6 @@ extern "C" {
 */
 #define MAX_QUIT_FUNCS     16

-void I_GetConsoleEvents(void);
-
-extern boolean consolevent;
-extern boolean framebuffer;

 /**	\brief Graphic system had started up
 */
@@ -1510,8 +1510,11 @@ static boolean SOCK_SetBanUsername(const char *username)
 		username = "Direct IP ban";
 	}

-	Z_Free(banned[numbans - 1].username);
-	banned[numbans - 1].username = NULL;
+	if (banned[numbans - 1].username)
+	{
+		Z_Free(banned[numbans - 1].username);
+		banned[numbans - 1].username = NULL;
+	}

 	banned[numbans - 1].username = Z_StrDup(username);

@@ -1525,8 +1528,11 @@ static boolean SOCK_SetBanReason(const char *reason)
 		reason = "No reason given";
 	}

-	Z_Free(banned[numbans - 1].reason);
-	banned[numbans - 1].reason = NULL;
+	if (banned[numbans - 1].reason)
+	{
+		Z_Free(banned[numbans - 1].reason);
+		banned[numbans - 1].reason = NULL;
+	}

 	banned[numbans - 1].reason = Z_StrDup(reason);

@@ -1,6 +1,6 @@
 // SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2020-2023 by James R.
+// Copyright (C) 2020 by James R.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -14,46 +14,34 @@
 #ifndef I_THREADS_H
 #define I_THREADS_H

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

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

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

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

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

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

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

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

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

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

 #endif/*I_THREADS_H*/
-
 #endif/*HAVE_THREADS*/
@@ -21,7 +21,7 @@
 #include "m_fixed.h"
 #include "i_system.h"

-timestate_t g_time = {};
+timestate_t g_time;

 static CV_PossibleValue_t timescale_cons_t[] = {{FRACUNIT/20, "MIN"}, {20*FRACUNIT, "MAX"}, {0, NULL}};
 consvar_t cv_timescale = {"timescale", "1.0", CV_NETVAR|CV_CHEAT|CV_FLOAT, timescale_cons_t, NULL, FRACUNIT, NULL, NULL, 0, 0, NULL};
@@ -125,6 +125,8 @@ boolean I_CheckNativeRes(void);

 void I_SetBorderlessWindow(void);

+void I_HandleControllerHatRepeat(void);
+
 #ifdef USE_FBO_OGL

 void RefreshOGLSDLSurface(void);
@@ -133,15 +135,6 @@ boolean UseScreenFBO(void);
 extern boolean downsample;
 #endif

-// So we can call this from i_video event loop
-void I_ShutdownJoystick(UINT8 index);
-
-// Quick thing to make SDL_JOYDEVICEADDED events less of an abomination
-void I_UpdateJoystickDeviceIndex(UINT8 player);
-void I_UpdateJoystickDeviceIndices(UINT8 excludePlayer);
-
-void I_HandleControllerHatRepeat(void);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
@@ -19,8 +19,6 @@
 #include "sounds.h"
 #include "m_fixed.h"

-#define MAXDOOMEDNUM 4095
-
 // dehacked.c now has lists for the more named enums! PLEASE keep them up to date!
 // For great modding!!

@@ -568,7 +568,7 @@ static patch_t *kp_racefinish[6];
 static patch_t *kp_positionnum[NUMPOSNUMS][NUMPOSFRAMES];
 static patch_t *kp_winnernum[NUMPOSFRAMES];

-patch_t *kp_facenum[MAXPLAYERS+1] = {};
+patch_t *kp_facenum[MAXPLAYERS+1];
 static patch_t *kp_facehighlight[8];

 static patch_t *kp_rankbumper;
@@ -1065,7 +1065,7 @@ static void K_initKartHUD(void)
 	}

 	if (timeinmap > 113 || forceshowhud)
-		hudtrans = (UINT8)cv_translucenthud.value;
+		hudtrans = cv_translucenthud.value;
 	else if (timeinmap > 105)
 		hudtrans = ((((INT32)timeinmap) - 105)*cv_translucenthud.value)/(113-105);
 	else
@@ -1122,9 +1122,9 @@ void K_KartPlayerHUDUpdate(player_t *player)
 UINT8 K_GetHudColor(void)
 {
 	if (cv_colorizedhud.value && cv_colorizedhudcolor.value)
-		return (UINT8)cv_colorizedhudcolor.value;
+		return cv_colorizedhudcolor.value;

-	return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : (UINT8)cv_playercolor.value);
+	return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value);
 }

 boolean K_UseColorHud(void)
@@ -1526,7 +1526,7 @@ static void K_drawKartItem(void)
 	{
 		localcolor = K_GetHudColor();

-		switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3)
+		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
@@ -2195,7 +2195,7 @@ static boolean K_drawKartPositionFaces(void)
 		return true;

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

 	for (j = 0; j < numplayersingame; j++)
 	{
@@ -4468,9 +4468,7 @@ 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);
-
-		for (int i = 0; i < (int)laplength; i++)
+		for (int i = 0; i < (int)strlen(lapnum); i++)
 		{
 			int digit = lapnum[i] - '0';
 			int frame = min(2, progress/2 - 8 - (i*2));
@@ -47,8 +47,6 @@ consvar_t cv_airsparks = {"airdriftsparks", "Off", CV_SAVE, CV_OnOff, NULL, 0, N

 consvar_t cv_playerblendeffects = {"playerblendeffects", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};

-consvar_t cv_reducevfx = {"reducevfx", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 // funn-E streeetch
 static CV_PossibleValue_t stretchfactor_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
 consvar_t cv_gravstretch = {"gravstretch", "MIN", CV_SAVE|CV_FLOAT, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -484,8 +482,7 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 //
 UINT8 K_RainbowColor(void)
 {
-	const tic_t time = cv_reducevfx.value ? (leveltime >> 3) : leveltime;
-	return (UINT8)(1 + (time % (MAXSKINCOLORS-1)));
+	return (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
 }

 // Define for getting accurate color brightness readings according to how the human eye sees them.
@@ -767,8 +764,6 @@ void K_RegisterClientKartStuff(void)

 	CV_RegisterVar(&cv_playerblendeffects);

-	CV_RegisterVar(&cv_reducevfx);
-
 	CV_RegisterVar(&cv_saltyhop);
 	CV_RegisterVar(&cv_saltyhopsfx);
 	CV_RegisterVar(&cv_saltysquish);
@@ -3108,18 +3103,17 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
 	return NULL;
 }

-static UINT8 K_DriftSparkColor(player_t *player, INT32 charge)
+static UINT16 K_DriftSparkColor(player_t *player, INT32 charge)
 {
-	UINT8 color = SKINCOLOR_NONE;
-	const INT32 sparkval = K_GetKartDriftSparkValue(player);
+	UINT16 color = SKINCOLOR_NONE;

-	if (charge >= sparkval*4)
+	if (charge >= K_GetKartDriftSparkValue(player)*4)
 	{
 		color = K_RainbowColor();
 	}
-	else if (charge >= sparkval*2)
+	else if (charge >= K_GetKartDriftSparkValue(player)*2)
 	{
-		if (charge <= (sparkval*2)+(24*3))
+		if (charge <= (K_GetKartDriftSparkValue(player)*2)+(24*3))
 			color = SKINCOLOR_RASPBERRY; // transition
 		else
 			color = SKINCOLOR_KETCHUP;
@@ -3600,8 +3594,6 @@ void K_SpawnSparkleTrail(mobj_t *mo)
 	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));

-	const boolean shouldblend = (mo->player && K_PlayerEffectsShouldBlend(mo->player));
-
 	for (i = 0; i < 3; i++)
 	{
 		fixed_t newx = mo->x + mo->momx + (P_RandomRange(-rad, rad)<<FRACBITS);
@@ -3619,7 +3611,7 @@ void K_SpawnSparkleTrail(mobj_t *mo)

 		sparkle->color = mo->color;

-		if (shouldblend)
+		if (mo->player && K_PlayerEffectsShouldBlend(mo->player))
 			sparkle->blendmode = AST_ADD;
 	}

@@ -6773,7 +6765,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 		{
 			if (splitscreen)
 			{
-				if (!cv_reducevfx.value && leveltime & 1)
+				if (leveltime & 1)
 					player->mo->flags2 |= MF2_DONTDRAW;
 				else
 					player->mo->flags2 &= ~MF2_DONTDRAW;
@@ -6799,7 +6791,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 				if (P_IsDisplayPlayer(player)
 					|| (!P_IsDisplayPlayer(player) && (player->kartstuff[k_hyudorotimer] < (1*TICRATE/2) || player->kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))))
 				{
-					if (!cv_reducevfx.value && leveltime & 1)
+					if (leveltime & 1)
 						player->mo->flags2 |= MF2_DONTDRAW;
 					else
 						player->mo->flags2 &= ~MF2_DONTDRAW;
@@ -99,7 +99,8 @@ void K_EraseStats(void)
 	// The only field we want to remember
 	boolean vanilla = kartstats.vanilla;

-	Z_Free(kartstats.copy);
+	if (kartstats.copy)
+		Z_Free(kartstats.copy);

 	memset(&kartstats, 0, sizeof(kartstats_t));

@@ -1293,7 +1293,6 @@ static int lib_pPlayRinglossSound(lua_State *L)
 	player_t *player = NULL;
 	mobj_t *damager = NULL;
 	NOHUD
-	LUA_UsageWarning(L, "P_PlayRinglossSound: using this function from lua might cause desynchs, consider using S_StartSound(origin, sfx_khurt1 + P_RandomKey(2)) as workaround");
 	if (!source)
 		return LUA_ErrInvalid(L, "mobj_t");
 	if (!lua_isnone(L, 2) && lua_isuserdata(L, 2))
@@ -136,9 +136,18 @@ void LUA_HUD_DestroyDrawList(huddrawlist_h list)
 {
 	if (list == NULL) return;

-	Z_Free(list->items);
-	Z_Free(list->olditems);
-	Z_Free(list->strbuf);
+	if (list->items)
+	{
+		Z_Free(list->items);
+	}
+	if (list->olditems)
+	{
+		Z_Free(list->olditems);
+	}
+	if (list->strbuf)
+	{
+		Z_Free(list->strbuf);
+	}
 	Z_Free(list);
 }

@@ -25,7 +25,7 @@
 #include "lua_hook.h"	// cmd errors

 boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor);
-state_t *astate = NULL;
+state_t *astate;

 boolean actionsoverridden[NUMACTIONS] = {false};

@@ -475,7 +475,7 @@ int mobj_localskin_setter(lua_State *L)
 		}
 		else
 		{
-			mo->localskin = NULL;
+			mo->localskin = 0;
 			mo->skinlocal = false;
 		}
 	}
@@ -45,20 +45,20 @@ int hook_defrosting = 0;

 // List of internal libraries to load from SRB2
 static lua_CFunction liblist[] = {
-	LUA_EnumLib, 		// global metatable for enums
-	LUA_SOCLib, 		// A_Action functions, freeslot
-	LUA_BaseLib, 		// string concatination by +, CONS_Printf, p_local.h stuff (P_InstaThrust, P_Move), etc.
-	LUA_MathLib, 		// fixed_t and angle_t math functions
-	LUA_HookLib, 		// hookAdd and hook-calling functions
-	LUA_ConsoleLib, 	// console command/variable functions and structs
-	LUA_InfoLib, 		// info.h stuff: mobjinfo_t, mobjinfo[], state_t, states[]
-	LUA_MobjLib, 		// mobj_t, mapthing_t
-	LUA_PlayerLib, 		// player_t
-	LUA_SkinLib, 		// skin_t, skins[]
-	LUA_ThinkerLib, 	// thinker_t
-	LUA_MapLib, 		// line_t, side_t, sector_t, subsector_t
-	LUA_BlockmapLib, 	// blockmap stuff
-	LUA_HudLib, 		// HUD stuff
+	LUA_EnumLib, // global metatable for enums
+	LUA_SOCLib, // A_Action functions, freeslot
+	LUA_BaseLib, // string concatination by +, CONS_Printf, p_local.h stuff (P_InstaThrust, P_Move), etc.
+	LUA_MathLib, // fixed_t and angle_t math functions
+	LUA_HookLib, // hookAdd and hook-calling functions
+	LUA_ConsoleLib, // console command/variable functions and structs
+	LUA_InfoLib, // info.h stuff: mobjinfo_t, mobjinfo[], state_t, states[]
+	LUA_MobjLib, // mobj_t, mapthing_t
+	LUA_PlayerLib, // player_t
+	LUA_SkinLib, // skin_t, skins[]
+	LUA_ThinkerLib, // thinker_t
+	LUA_MapLib, // line_t, side_t, sector_t, subsector_t
+	LUA_BlockmapLib, // blockmap stuff
+	LUA_HudLib, // HUD stuff
 	NULL
 };

@@ -66,8 +66,12 @@ static lua_CFunction liblist[] = {
 static void *LUA_Alloc(void *ud, void *ptr, size_t osize, size_t nsize)
 {
 	(void)ud;
-	(void)osize;
-	return Z_Realloc(ptr, nsize, PU_LUA, NULL);
+	if (nsize == 0) {
+		if (osize != 0)
+			Z_Free(ptr);
+		return NULL;
+	} else
+		return Z_Realloc(ptr, nsize, PU_LUA, NULL);
 }

 // Panic function Lua calls when there's an unprotected error.
@@ -209,8 +213,7 @@ void LUA_ClearState(void)
 	lua_setfield(L, LUA_REGISTRYINDEX, LREG_VALID);

 	// open srb2 libraries
-	for (i = 0; liblist[i]; i++)
-	{
+	for(i = 0; liblist[i]; i++) {
 		lua_pushcfunction(L, liblist[i]);
 		lua_call(L, 0, 0);
 	}
@@ -1061,13 +1064,9 @@ static void ArchiveTables(UINT8 **p)
 		{
 			// Write key
 			e = ArchiveValue(p, TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
-			if (e == 1)
-				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)
+			if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
 			{
 				CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -2), luaL_typename(gL, -2), i);
-				lua_pop(gL, 1);
-				continue;
 			}
 			else if (e == 3) // nil key due to invalid userdata. NOT an error.
 			{
@@ -1078,12 +1077,15 @@ static void ArchiveTables(UINT8 **p)
 			// Write value
 			e = ArchiveValue(p, TABLESINDEX, -1);
 			if (e == 1)
+			{
 				n++; // the table contained a new table we'll have to archive. :(
+			}
 			else if (e == 2) // invalid value type
+			{
 				CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -2), luaL_typename(gL, -1));
+			}

 			lua_pop(gL, 1);
-
 		}
 		lua_pop(gL, 1);
 		WRITEUINT8(*p, ARCH_TEND);
@@ -1274,21 +1276,13 @@ static void UnArchiveTables(UINT8 **p, boolean network)
 			UINT8 ret;

 			ret = UnArchiveValue(p, TABLESINDEX, network);
-			if (ret == 1) // End of table
-				break;
-			else if (ret == 2) // Key contains a new table
-				n++;
-			else if (ret == 3)
+			if (ret == 3)
 			{
 				//CONS_Alert(CONS_WARNING,"Couldn't read mobj_t\n");
 				lua_pushnil(gL);
 			}
-
-			if (lua_isnil(gL, -1)) // If key is nil, skip this entry
-			{
-				lua_pop(gL, 1);
-				continue;
-			}
+			else if (ret == 1) // read key
+				break;

 			ret = UnArchiveValue(p, TABLESINDEX, network);
 			if (ret == 1)
@@ -1297,15 +1291,21 @@ static void UnArchiveTables(UINT8 **p, boolean network)
 				lua_pop(gL, 1); // Pop key
 				break;
 			}
-			else if (ret == 2) // read value
-				n++;
 			else if (ret == 3)
 			{
 				//CONS_Alert(CONS_WARNING,"Couldn't read mobj_t\n");
 				lua_pushnil(gL);
 			}
+			else if (ret == 2) // read value
+				n++;

-			lua_rawset(gL, -3);
+			if (lua_isnil(gL, -2)) // if key is nil (if a function etc was accidentally saved)
+			{
+				CONS_Alert(CONS_ERROR, "A nil key in table %d was found! (Invalid key type or corrupted save?)\n", i);
+				lua_pop(gL, 2); // pop key and value instead of setting them in the table, to prevent Lua panic errors
+			}
+			else
+				lua_rawset(gL, -3);
 		}

 		lua_pop(gL, 1);
@@ -49,19 +49,17 @@ aatree_t *M_AATreeAlloc(UINT32 flags)
 	return aatree;
 }

-static void M_AATreeFree_Node(aatree_node_t *node, bool is_string)
+static void M_AATreeFree_Node(aatree_node_t *node)
 {
-	if (node->left) M_AATreeFree_Node(node->left, is_string);
-	if (node->right) M_AATreeFree_Node(node->right, is_string);
-	if (is_string)
-		Z_Free(node->value);
+	if (node->left) M_AATreeFree_Node(node->left);
+	if (node->right) M_AATreeFree_Node(node->right);
 	Z_Free(node);
 }

 void M_AATreeFree(aatree_t *aatree)
 {
 	if (aatree->root)
-		M_AATreeFree_Node(aatree->root, (aatree->flags & AATREE_STRING) == AATREE_STRING);
+		M_AATreeFree_Node(aatree->root);

 	Z_Free(aatree);
 }
@@ -695,13 +695,16 @@ INT32 GIF_close(void)
 	fclose(gif_out);
 	gif_out = NULL;

-	Z_Free(gifbwr_buf);
+	if (gifbwr_buf)
+		Z_Free(gifbwr_buf);
 	gifbwr_buf = gifbwr_cur = NULL;

-	Z_Free(gifframe_data);
+	if (gifframe_data)
+		Z_Free(gifframe_data);
 	gifframe_data = NULL;

-	Z_Free(giflzw_hashTable);
+	if (giflzw_hashTable)
+		Z_Free(giflzw_hashTable);
 	giflzw_hashTable = NULL;

 	Z_Free(scrbuf_screens);
@@ -80,7 +80,7 @@ static UINT8 cheatf_warp(void)
 	if (success)
 	{
 		G_SaveGameData(true); //G_SetGameModified(false);
-		S_StartSound(NULL, sfx_kc42);
+		S_StartSound(0, sfx_kc42);
 	}

 	// Refresh secrets menu existing.
@@ -117,13 +117,13 @@ static UINT8 cheatf_devmode(void)
 #endif

 static cheatseq_t cheat_warp = {
-	NULL, cheatf_warp,
+	0, cheatf_warp,
 	//{ SCRAMBLE('r'), SCRAMBLE('e'), SCRAMBLE('d'), SCRAMBLE('x'), SCRAMBLE('v'), SCRAMBLE('i'), 0xff }
 	{ SCRAMBLE('b'), SCRAMBLE('a'), SCRAMBLE('n'), SCRAMBLE('a'), SCRAMBLE('n'), SCRAMBLE('a'), 0xff }
 };

 static cheatseq_t cheat_warp_joy = {
-	NULL, cheatf_warp,
+	0, cheatf_warp,
 	/*{ SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_UPARROW),
 	  SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_UPARROW),
 	  SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_UPARROW),
@@ -136,7 +136,7 @@ static cheatseq_t cheat_warp_joy = {

 #ifdef DEVELOP
 static cheatseq_t cheat_devmode = {
-	NULL, cheatf_devmode,
+	0, cheatf_devmode,
 	{ SCRAMBLE('d'), SCRAMBLE('e'), SCRAMBLE('v'), SCRAMBLE('m'), SCRAMBLE('o'), SCRAMBLE('d'), SCRAMBLE('e'), 0xff }
 };
 #endif
@@ -301,7 +301,7 @@ void Command_CheatNoTarget_f(void)
 void Command_Scale_f(void)
 {
 	const double scaled = atof(COM_Argv(1));
-	fixed_t scale = DoubleToFixed(scaled);
+	fixed_t scale = FLOAT_TO_FIXED(scaled);

 	REQUIRE_DEVMODE;
 	REQUIRE_INLEVEL;
@@ -235,7 +235,7 @@ void M_AddRawCondition(UINT8 set, UINT8 id, conditiontype_t c, INT32 r, INT16 x1
 	wnum = conditionSets[set - 1].numconditions;
 	num = ++conditionSets[set - 1].numconditions;

-	conditionSets[set - 1].condition = Z_Realloc(conditionSets[set - 1].condition, sizeof(condition_t)*num, PU_STATIC, NULL);
+	conditionSets[set - 1].condition = Z_Realloc(conditionSets[set - 1].condition, sizeof(condition_t)*num, PU_STATIC, 0);

 	cond = conditionSets[set - 1].condition;

@@ -248,9 +248,12 @@ void M_AddRawCondition(UINT8 set, UINT8 id, conditiontype_t c, INT32 r, INT16 x1

 void M_ClearConditionSet(UINT8 set)
 {
-	Z_Free(conditionSets[set - 1].condition);
-	conditionSets[set - 1].condition = NULL;
-	conditionSets[set - 1].numconditions = 0;
+	if (conditionSets[set - 1].numconditions)
+	{
+		Z_Free(conditionSets[set - 1].condition);
+		conditionSets[set - 1].condition = NULL;
+		conditionSets[set - 1].numconditions = 0;
+	}
 	conditionSets[set - 1].achieved = false;
 }

@@ -12,14 +12,14 @@
 #ifndef __M_EMOTES__
 #define __M_EMOTES__

-#include "doomdef.h"
-#include "m_fixed.h"
-#include "command.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

+#include "doomdef.h"
+#include "m_fixed.h"
+#include "command.h"
+
 extern consvar_t cv_emotes;

 #define MAXEMOTENAME 32
@@ -265,6 +265,35 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedRound(fixed_t x)
 	return INT32_MAX;
 }

+/**	\brief	The xs_CRoundToInt function
+
+	\param	val	double number
+
+	\return Round toward nearest, but ties round toward even
+*/
+#if defined(SRB2_BIG_ENDIAN)
+	#define _xs_iexp_				0
+	#define _xs_iman_				1
+#else
+	#define _xs_iexp_				1       //intel is little endian
+	#define _xs_iman_				0
+#endif //BigEndian_
+
+typedef double real64;
+
+typedef union _xs_doubleints
+{
+	real64 val;
+	unsigned ival[2];
+} _xs_doubleints;
+
+FUNCMATH FUNCINLINE static ATTRINLINE int xs_CRoundToInt(real64 val)
+{
+	_xs_doubleints uval;
+	uval.val = val + 6755399441055744.0;
+	return uval.ival[_xs_iman_];
+}
+
 typedef struct
 {
 	fixed_t x;
@@ -12,8 +12,6 @@
 /// \file  m_menu.c
 /// \brief XMOD's extremely revamped menu system.

-#include "screen.h"
-#include "tables.h"
 #ifdef __GNUC__
 #include <unistd.h>
 #endif
@@ -142,7 +140,7 @@ typedef enum
 } text_enum;

 #ifdef HAVE_THREADS
-I_Mutex m_menu_mutex;
+I_mutex m_menu_mutex;
 #endif

 M_waiting_mode_t m_waiting_mode = M_NOT_WAITING;
@@ -1967,7 +1965,7 @@ void M_Ticker(void)
 	}

 #if defined (MASTERSERVER) && defined (HAVE_THREADS)
-	I_LockMutex(&ms_ServerList_mutex);
+	I_lock_mutex(&ms_ServerList_mutex);
 	{
 		if (ms_ServerList)
 		{
@@ -1976,7 +1974,7 @@ void M_Ticker(void)
 			ms_ServerList = NULL;
 		}
 	}
-	I_UnlockMutex(ms_ServerList_mutex);
+	I_unlock_mutex(ms_ServerList_mutex);
 #endif
 }

@@ -2870,9 +2868,8 @@ static void M_DrawCenteredMenu(void)
 static inline size_t M_StringHeight(const char *string)
 {
 	size_t h = 8, i;
-	const size_t strlength = strlen(string);

-	for (i = 0; i < strlength; i++)
+	for (i = 0; i < strlen(string); i++)
 		if (string[i] == '\n')
 			h += 8;

@@ -4014,14 +4011,14 @@ size_t demolist_all_size = 0;
 boolean replaynamesloaded = false;

 #ifdef HAVE_THREADS
-I_Mutex replayquerymutex;
+I_mutex replayquerymutex;

 // 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_search_state()    if (!g_in_exiting_signal_handler) { I_LockMutex(&replayquerymutex); }
-#  define Unlock_search_state()  if (!g_in_exiting_signal_handler) { I_UnlockMutex(replayquerymutex); }
+#  define Lock_search_state()    if (!g_in_exiting_signal_handler) { I_lock_mutex(&replayquerymutex); }
+#  define Unlock_search_state()  if (!g_in_exiting_signal_handler) { I_unlock_mutex(replayquerymutex); }
 #else/*HAVE_THREADS*/
 #  define Lock_search_state()
 #  define Unlock_search_state()
@@ -4088,10 +4085,7 @@ static void LoadReplayNames(void)
 	Unlock_search_state();

 #ifdef HAVE_THREADS
-	if (!I_SpawnThread("replay-names-load", ReplayNamesLoadThread, replaydirpath))
-	{
-		free(replaydirpath);
-	}
+	I_spawn_thread("replay-names-load", ReplayNamesLoadThread, replaydirpath);
 #else
 	ReplayNamesLoadThread(replaydirpath);
 #endif
@@ -4722,7 +4716,7 @@ static void M_DrawReplayHut(void)
 	if (y > scaledviewheight-80)
 	{
 		V_DrawFill(BASEVIDWIDTH-4, 75, 4, scaledviewheight-80, V_SNAPTOTOP|V_SNAPTORIGHT|239);
-		V_DrawFill(BASEVIDWIDTH-3, 76 + (scaledviewheight-80) * replayhutmenuy / y, 2, max((((scaledviewheight-80) * (scaledviewheight-80))-1) / y - 1, 1), V_SNAPTOTOP|V_SNAPTORIGHT|229);
+		V_DrawFill(BASEVIDWIDTH-3, 76 + (scaledviewheight-80) * replayhutmenuy / y, 2, (((scaledviewheight-80) * (scaledviewheight-80))-1) / y - 1, V_SNAPTOTOP|V_SNAPTORIGHT|229);
 	}

 	// Draw the cursor
@@ -5359,7 +5353,7 @@ void M_PopupMasterServerRules(void)
 		{
 			firstDismissedRulesThisBoot = false;
 			M_StartMessage(va("%s\n(press any key)", rules), NULL, MM_NOTHING);
-			free(rules);
+			Z_Free(rules);
 		}
 	}
 #endif
@@ -5390,7 +5384,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	{
 		CONS_Printf("custom settings menu initiation\n");
 		for (CVARSETUP = 0; CVARSETUP < MAXMENUCCVARS; ++CVARSETUP)
-			OP_CustomCvarMenu[CVARSETUP] = (menuitem_t){IT_DISABLED, NULL, "", NULL, INT16_MAX};
+			OP_CustomCvarMenu[CVARSETUP] = (menuitem_t){IT_DISABLED, NULL, "", 0, INT16_MAX};
 	}

 	if (category && ((ccvarposition == 0 && category[0] != '\0') || !fasticmp(category, OP_CustomCvarMenu[ccvarlaststheader].text)))
@@ -6563,22 +6557,17 @@ static void M_EraseGuest(INT32 choice)

 static void M_OverwriteGuest(const char *which)
 {
-	char *rguest;
+	char *rguest = Z_StrDup(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)));
 	UINT8 *buf;
 	size_t len;
 	len = FIL_ReadFile(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), cv_chooseskin.string, which), &buf);
-
-	if (!len)
+	if (!len) {
 		return;
-
-	rguest = Z_StrDup(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)));
-
-	if (FIL_FileExists(rguest))
-	{
+	}
+	if (FIL_FileExists(rguest)) {
 		M_StopMessage(0);
 		remove(rguest);
 	}
-
 	FIL_WriteFile(rguest, buf, len);
 	Z_Free(rguest);

@@ -6687,11 +6676,11 @@ static void M_EndGame(INT32 choice)
 void M_SetWaitingMode(int mode)
 {
 #ifdef HAVE_THREADS
-	I_LockMutex(&m_menu_mutex);
+	I_lock_mutex(&m_menu_mutex);
 #endif
 	m_waiting_mode = mode;
 #ifdef HAVE_THREADS
-	I_UnlockMutex(m_menu_mutex);
+	I_unlock_mutex(m_menu_mutex);
 #endif
 }

@@ -6700,11 +6689,11 @@ int M_GetWaitingMode(void)
 	int mode;

 #ifdef HAVE_THREADS
-	I_LockMutex(&m_menu_mutex);
+	I_lock_mutex(&m_menu_mutex);
 #endif
 	mode = m_waiting_mode;
 #ifdef HAVE_THREADS
-	I_UnlockMutex(m_menu_mutex);
+	I_unlock_mutex(m_menu_mutex);
 #endif

 	return mode;
@@ -6716,23 +6705,20 @@ static void Spawn_masterserver_thread(const char *name, void (*thread)(int*))
 {
 	int *id = malloc(sizeof *id);

-	I_LockMutex(&ms_QueryId_mutex);
+	I_lock_mutex(&ms_QueryId_mutex);
 	*id = ms_QueryId;
-	I_UnlockMutex(ms_QueryId_mutex);
+	I_unlock_mutex(ms_QueryId_mutex);

-	if (!I_SpawnThread(name, (I_ThreadFn)thread, id))
-	{
-		free(id);
-	}
+	I_spawn_thread(name, (I_thread_fn)thread, id);
 }

 static int Same_instance(int id)
 {
 	int okay;

-	I_LockMutex(&ms_QueryId_mutex);
+	I_lock_mutex(&ms_QueryId_mutex);
 	okay = ( id == ms_QueryId );
-	I_UnlockMutex(ms_QueryId_mutex);
+	I_unlock_mutex(ms_QueryId_mutex);

 	return okay;
 }
@@ -6761,9 +6747,9 @@ static void Fetch_servers_thread(int *id)
 			M_SetWaitingMode(M_NOT_WAITING);

 #ifdef HAVE_THREADS
-			I_LockMutex(&ms_ServerList_mutex);
+			I_lock_mutex(&ms_ServerList_mutex);
 			ms_ServerList = server_list;
-			I_UnlockMutex(ms_ServerList_mutex);
+			I_unlock_mutex(ms_ServerList_mutex);
 #else
 			CL_QueryServerList(server_list);
 			free(server_list);
@@ -6796,7 +6782,7 @@ static void M_SearchServerList(void)
 	serverlistsearchedcount = 0;

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

 	for (UINT32 i = 0; i < serverlistcount; ++i)
@@ -6807,7 +6793,7 @@ static void M_SearchServerList(void)
 	}

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

 	if (menuinput.length > 0)
@@ -7173,11 +7159,11 @@ static void M_CheckMODVersion(int id)
 	{
 		sprintf(updatestring, UPDATE_ALERT_STRING, VERSIONSTRING, updatecheck);
 #ifdef HAVE_THREADS
-		I_LockMutex(&m_menu_mutex);
+		I_lock_mutex(&m_menu_mutex);
 #endif
 		M_StartMessage(updatestring, NULL, MM_NOTHING);
 #ifdef HAVE_THREADS
-		I_UnlockMutex(m_menu_mutex);
+		I_unlock_mutex(m_menu_mutex);
 #endif
 	}
 }
@@ -7223,13 +7209,13 @@ static void M_ConnectMenu(INT32 choice)
 	itemOn = 0;

 #if defined (MASTERSERVER) && defined (HAVE_THREADS)
-	I_LockMutex(&ms_QueryId_mutex);
+	I_lock_mutex(&ms_QueryId_mutex);
 	{
 		ms_QueryId++;
 	}
-	I_UnlockMutex(ms_QueryId_mutex);
+	I_unlock_mutex(ms_QueryId_mutex);

-	I_LockMutex(&ms_ServerList_mutex);
+	I_lock_mutex(&ms_ServerList_mutex);
 	{
 		if (ms_ServerList)
 		{
@@ -7237,7 +7223,7 @@ static void M_ConnectMenu(INT32 choice)
 			ms_ServerList = NULL;
 		}
 	}
-	I_UnlockMutex(ms_ServerList_mutex);
+	I_unlock_mutex(ms_ServerList_mutex);

 #ifdef UPDATE_ALERT
 	Spawn_masterserver_thread("check-new-version", Check_new_version_thread);
@@ -7507,7 +7493,7 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
 		if ((lumpnum = W_CheckNumForName(va("%sE", mapname))) != LUMPERROR)
 			mappingforencore = (patch_t *)W_CachePatchNum(lumpnum, PU_PATCH);*/

-		V_DrawFixedPatch((x+w)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/2, V_FLIP, PictureOfLevel, NULL);
+		V_DrawFixedPatch((x+w)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/2, V_FLIP, PictureOfLevel, 0);

 		{
 			static angle_t rubyfloattime = 0;
@@ -7598,6 +7584,7 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)

 static void M_DrawServerMenu(void)
 {
+
 	M_DrawLevelSelectOnly(false, false);
 #ifdef MASTERSERVER
 	if (currentMenu == &MP_ServerDef && cv_advertise.value) // Remind players where they're hosting.
@@ -7912,7 +7899,7 @@ static void M_HandleConnectIP(INT32 choice)
 	if (exitmenu)
 	{
 		if (currentMenu->prevMenu)
-			M_SetupNextMenu(currentMenu->prevMenu);
+			M_SetupNextMenu (currentMenu->prevMenu);
 		else
 			M_ClearMenus(true);
 	}
@@ -7958,7 +7945,6 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	UINT8 i;
 	UINT8 s, w;
 	const UINT8 *flashcol = V_GetStringColormap(highlightflags);
-	INT32 skinnum = 0;
 	INT32 statx, staty;
 	UINT32 speenframe;
 	INT32 sltw, actw, hetw;
@@ -8172,7 +8158,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			V_DrawFixedPatch(((statx+61+GRIDSTATOFFSET)<<FRACBITS) + (FRACUNIT>>1), (staty+67)<<FRACBITS, FRACUNIT>>1, 0, statlr, flashcol);
 			V_DrawFixedPatch((statx+40+GRIDSTATOFFSET)<<FRACBITS, (staty+80)<<FRACBITS, FRACUNIT>>1, 0, statud, flashcol);
 			// bg
-			V_DrawFixedPatch(((statx+48+GRIDSTATOFFSET)<<FRACBITS)+(FRACUNIT>>1), (staty+73)<<FRACBITS, FRACUNIT>>1, 0, statbg, NULL);
+			V_DrawFixedPatch(((statx+48+GRIDSTATOFFSET)<<FRACBITS)+(FRACUNIT>>1), (staty+73)<<FRACBITS, FRACUNIT>>1, 0, statbg, 0);

 			for (i = 0; i < numskins; i++) // draw the stat dots
 			{
@@ -8231,7 +8217,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			V_DrawFixedPatch((statx+64)<<FRACBITS, staty<<FRACBITS, FRACUNIT, 0, statlr, flashcol);
 			V_DrawFixedPatch((statx+24)<<FRACBITS, (staty+22)<<FRACBITS, FRACUNIT, 0, statud, flashcol);
 			// bg
-			V_DrawFixedPatch((statx+34)<<FRACBITS, (staty+10)<<FRACBITS, FRACUNIT, 0, statbg, NULL);
+			V_DrawFixedPatch((statx+34)<<FRACBITS, (staty+10)<<FRACBITS, FRACUNIT, 0, statbg, 0);

 			for (i = 0; i < numskins; i++) // draw the stat dots
 			{
@@ -8281,9 +8267,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				INT32 curx = (((setupm_skinselect % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH/2)) + SKINXSHIFT) + 20;
 				INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ gridyoffset);

-				UINT8 cursorframe = (I_GetTime() / 4) % 7;
-				cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
-				V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
+					UINT8 cursorframe = (I_GetTime() / 4) % 7;
+
+					cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
+					V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
 			}

 			break;
@@ -8322,12 +8309,14 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				if (setupm_skinselect < numskins)
 				{
 					UINT8 *cmap = R_GetTranslationColormap(setupm_skinselect, setupm_fakecolor, GTC_MENUCACHE);
+
 					cursor = facewantprefix[skinsorted[setupm_skinselect]];
 					V_DrawFixedPatch(((curx-8) << FRACBITS), ((cury-8) << FRACBITS), FRACUNIT, 0, cursor, cmap);
 				}
 				else
 				{
 					UINT8 cursorframe = (I_GetTime() / 4) % 7;
+
 					cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
 					V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
 				}
@@ -8391,6 +8380,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				else
 				{
 					UINT8 cursorframe = (I_GetTime() / 4) % 7;
+
 					cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
 					V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
 				}
@@ -8515,7 +8505,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	switch (cv_skinselectmenu.value)
 	{
 		case SKINMENUTYPE_2D:
-			skintodisplay = (UINT8)setupm_fakeskin;
+			skintodisplay = setupm_fakeskin;
 			if (setupm_skinlockedselect) // show the skin we are trying to select
 				skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][setupm_skinselect];
 			else if (skinstatscount[setupm_skinxpos][setupm_skinypos] && itemOn == 1)
@@ -8523,22 +8513,19 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			break;
 		case SKINMENUTYPE_EXTENDED:
 		case SKINMENUTYPE_GRID:
-			skintodisplay = ((itemOn == 1 && (setupm_skinselect < numskins)) ? skinsorted[setupm_skinselect] : (UINT8)setupm_fakeskin);
+			skintodisplay = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
 			break;
 		default:
-			skintodisplay = (UINT8)setupm_fakeskin;
+			skintodisplay = setupm_fakeskin;
 			break;
 	}

-	if (skintodisplay >= MAXSKINS)
-		skintodisplay = 0;
+	const INT32 skinnum = R_SkinAvailable(skins[skintodisplay].name);

-	skinnum = R_SkinAvailable(skins[skintodisplay].name);
-
-	if (skinnum < 0 || skinnum >= MAXSKINS)
-		skinnum = 0;
-
-	sprdef = &skins[skinnum].spritedef;
+	if (skinnum != -1)
+		sprdef = &skins[skinnum].spritedef;
+	else
+		sprdef = &skins[0].spritedef;

 	if (!sprdef->numframes) // No frames ??
 		return; // Can't render!
@@ -8547,59 +8534,37 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	if (frame >= sprdef->numframes) // Walking animation missing
 		frame = 0; // Try to use standing frame

+	sprframe = &sprdef->spriteframes[frame];
+
+	// minenice's speen css, it's a piece of shit but hey
+	speenframe = (I_GetTime()*cv_skinselectspin.value/TICRATE + 1)%8;
+
+	// this is a very shitty solution for checking if a sprite needs flipping
+	// but it works
+	if ((speenframe > 4) && (sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]))
+		flags = V_FLIP; // This sprite is left/right flipped!
+
+	patch = (patch_t *)W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
+
 	// draw box around guy
 	V_DrawFill(mx + 36 - (charw/2), my+65, charw, 84, 239);
-#undef charw

 	// draw player sprite
 	if (setupm_fakecolor) // inverse should never happen
 	{
 		UINT8 *colormap = R_GetTranslationColormap(skintodisplay, setupm_fakecolor, GTC_MENUCACHE);
-#ifdef HWRENDER
-		md2_t *md2 = &md2_playermodels[skinnum];
-#endif
-		mx += 36;
-		my += 131;
-#ifdef HWRENDER
-		// if we have 3d models enabled and a model exists
-		// try to show it instead of the sprite
-		if (rendermode == render_opengl && cv_glmdls.value
-		&& !md2->error && !md2->notfound)
+
+		if (skins[skintodisplay].flags & SF_HIRES)
 		{
-			const angle_t ROTATE_PER_TIC = (UINT64)ANGLE_45 * cv_skinselectspin.value / TICRATE;
-			angle_t angle = I_GetTime()*ROTATE_PER_TIC + FixedMul(cv_uncappedhud.value ? renderdeltatics : FRACUNIT, ROTATE_PER_TIC);
-			HWR_Draw2DModel(md2, mx, my, skinnum, (skincolors_t)setupm_fakecolor, colormap, 8*FRACUNIT/3, frame, angle);
+			V_DrawFixedPatch((mx+36)<<FRACBITS,
+						(my+131)<<FRACBITS,
+						skins[skintodisplay].highresscale,
+						flags, patch, colormap);
 		}
 		else
-#endif
-		{
-			sprframe = &sprdef->spriteframes[frame];
-
-			// minenice's speen css, it's a piece of shit but hey
-			speenframe = (I_GetTime()*cv_skinselectspin.value/TICRATE + 1)%8;
-
-			// this is a very shitty solution for checking if a sprite needs flipping
-			// but it works
-			if ((speenframe > 4) && (sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]))
-			{
-				flags = V_FLIP; // This sprite is left/right flipped!
-			}
-
-			patch = (patch_t *)W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
-
-			if (skins[skintodisplay].flags & SF_HIRES)
-			{
-				V_DrawFixedPatch(mx<<FRACBITS,
-								 my<<FRACBITS,
-								 skins[skintodisplay].highresscale,
-								 flags, patch, colormap);
-			}
-			else
-			{
-				V_DrawMappedPatch(mx, my, flags, patch, colormap);
-			}
-		}
+			V_DrawMappedPatch(mx+36, my+131, flags, patch, colormap);
 	}
+#undef charw
 }

 // Handle 1P/2P MP Setup
@@ -9393,32 +9358,29 @@ static void M_SetupControlsMenu(UINT8 pnum)
 			break;
 	}

-	OP_AllControlsMenu[4].itemaction = &cv_litesteer[pnum];
-	OP_AllControlsMenu[5].itemaction = &cv_turnsmooth[pnum];
-
 	if (pnum > 0)
 	{
 		// Hide P1-only controls
-		OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // Chat
-		OP_AllControlsMenu[10].status = IT_GRAYEDOUT2; // Rankings
-		OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Pause
-		OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // Screenshot
-		OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // GIF
-		OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // System Menu
-		OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Console
-		OP_AllControlsMenu[41].status = IT_GRAYEDOUT2; // Director
+		OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
+		OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
+		OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Pause
+		OP_AllControlsMenu[18].status = IT_GRAYEDOUT2; // Screenshot
+		OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // GIF
+		OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // System Menu
+		OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Console
+		OP_AllControlsMenu[37].status = IT_GRAYEDOUT2; // Director
 	}
 	else
 	{
 		// Unhide P1-only controls
-		OP_AllControlsMenu[19].status = IT_CONTROL; // Chat
-		OP_AllControlsMenu[10].status = IT_CONTROL; // Rankings
-		OP_AllControlsMenu[21].status = IT_CONTROL; // Pause
-		OP_AllControlsMenu[22].status = IT_CONTROL; // Screenshot
-		OP_AllControlsMenu[23].status = IT_CONTROL; // GIF
-		OP_AllControlsMenu[24].status = IT_CONTROL; // System Menu
-		OP_AllControlsMenu[25].status = IT_CONTROL; // Console
-		OP_AllControlsMenu[41].status = IT_CONTROL; // Director
+		OP_AllControlsMenu[15].status = IT_CONTROL; // Chat
+		OP_AllControlsMenu[16].status = IT_CONTROL; // Rankings
+		OP_AllControlsMenu[17].status = IT_CONTROL; // Pause
+		OP_AllControlsMenu[18].status = IT_CONTROL; // Screenshot
+		OP_AllControlsMenu[19].status = IT_CONTROL; // GIF
+		OP_AllControlsMenu[20].status = IT_CONTROL; // System Menu
+		OP_AllControlsMenu[21].status = IT_CONTROL; // Console
+		OP_AllControlsMenu[37].status = IT_CONTROL; // Director
 	}

 	M_SetupNextMenu(&OP_AllControlsDef);
@@ -9532,36 +9494,12 @@ static void M_DrawControl(void)
 		else if ((currentMenu->menuitems[i].status == IT_HEADER) && (i != max-1))
 			V_DrawString(19, y+6, highlightflags|V_ALLOWLOWERCASE, currentMenu->menuitems[i].text);
 		else if (currentMenu->menuitems[i].status & IT_STRING)
-		{
 			V_DrawString(x, y, ((i == itemOn) ? highlightflags|V_ALLOWLOWERCASE : V_ALLOWLOWERCASE), currentMenu->menuitems[i].text);

-			if (currentMenu->menuitems[i].status & IT_CVAR)
-			{
-				consvar_t *cv = (consvar_t *)currentMenu->menuitems[i].itemaction;
-
-				// IT_HEADER matches IT_CVAR, for some reason...
-				if (cv)
-				{
-					INT32 w = V_StringWidth(cv->string, 0);
-					V_DrawString(BASEVIDWIDTH - x - w, y,
-						((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? warningflags : highlightflags)|MENUCAPS, cv->string);
-					if (i == itemOn)
-					{
-						V_DrawCharacter(BASEVIDWIDTH - x - 10 - w - (skullAnimCounter/5), y,
-								'\x1C' | highlightflags, false); // left arrow
-						V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
-								'\x1D' | highlightflags, false); // right arrow
-					}
-				}
-			}
-		}
-
 		y += SMALLLINEHEIGHT;
 	}

 	V_DrawScaledPatch(currentMenu->x - 20, cursory, 0, (patch_t *)W_CachePatchName("M_CURSOR", PU_PATCH));
-
-	M_DoToolTips(currentMenu);
 }

 #undef controlheight
@@ -9900,7 +9838,7 @@ static void M_DrawLocalSkinMenu(void)
 	spriteframe_t *sprframe;
 	patch_t *patch;
 	UINT8 frame;
-	INT32 skintodisplay = 0;
+	INT16 skintodisplay;
 	UINT32 speenframe;
 	skin_t displayskin;

@@ -9931,12 +9869,12 @@ static void M_DrawLocalSkinMenu(void)
 	// skin 0 is default player sprite
 	skintodisplay = R_AnySkinAvailable(cv_fakelocalskin.string);

-	if (skintodisplay < 0)
+	if (skintodisplay == -1)
 	{
 		// ATTEMPT TO FIND REAL SKIN
 		skintodisplay = R_AnySkinAvailable(cv_skin.string);

-		if (skintodisplay < 0) // STILL NOTHIN? use sonic instead
+		if (skintodisplay == -1) // STILL NOTHIN? use sonic instead
 		{
 			skintodisplay = 0;
 		}
@@ -9953,10 +9891,24 @@ static void M_DrawLocalSkinMenu(void)
 	if (frame >= sprdef->numframes) // Walking animation missing
 		frame = 0; // Try to use standing frame

+	sprframe = &sprdef->spriteframes[frame];
+
+	//minenice's speen css, it's a piece of shit but hey
+	//patch = (patch_t *)W_CachePatchNum(sprframe->lumppat[1], PU_PATCH);
+	speenframe = (I_GetTime()*cv_skinselectspin.value/TICRATE + 1)%8;
+
+	//this is a very shitty solution for checking if a sprite needs flipping
+	//but it works
+	if ((speenframe > 4) && (sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]))
+	{
+		flags = V_FLIP; // This sprite is left/right flipped!
+	}
+	patch = (patch_t *)W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
+
 	// draw box around guy
 	V_DrawFill(mx + 220 - (charw/2), my+54, charw, 84, 239);
-#undef charw

+	// draw player sprite
 	UINT8 *colormap = R_GetLocalTranslationColormap(&skins[displayskin.localnum], (displayskin.localskin ? &localskins[displayskin.localnum] : NULL), cv_playercolor.value, GTC_MENUCACHE, displayskin.localskin);

 	V_DrawMappedPatch(mx, my+50, 0, (patch_t *)W_CachePatchName(displayskin.facewant, PU_PATCH), colormap);
@@ -9969,48 +9921,13 @@ static void M_DrawLocalSkinMenu(void)
 	else
 		V_DrawString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, displayskin.realname);

-	// draw player sprite
-	mx += 220;
-	my += 120;
-
-#ifdef HWRENDER
-	md2_t *md2 = (displayskin.localskin ? &md2_localplayermodels[skintodisplay] : &md2_playermodels[skintodisplay]);
-
-	// if we have 3d models enabled and a model exists
-	// try to show it instead of the sprite
-	if (rendermode == render_opengl && cv_glmdls.value
-	&& !md2->error && !md2->notfound)
+	if (displayskin.flags & SF_HIRES)
 	{
-		const angle_t ROTATE_PER_TIC = (UINT64)ANGLE_45 * cv_skinselectspin.value / TICRATE;
-		angle_t angle = I_GetTime()*ROTATE_PER_TIC + FixedMul(cv_uncappedhud.value ? renderdeltatics : FRACUNIT, ROTATE_PER_TIC);
-		HWR_Draw2DModel(md2, mx, my, skintodisplay, (skincolors_t)cv_playercolor.value, colormap, 8*FRACUNIT/3, frame, angle);
+		V_DrawFixedPatch((mx+220)<<FRACBITS, (my+120)<<FRACBITS, displayskin.highresscale, flags, patch, colormap);
 	}
 	else
-#endif
-	{
-		sprframe = &sprdef->spriteframes[frame];
-
-		// minenice's speen css, it's a piece of shit but hey
-		speenframe = (I_GetTime()*cv_skinselectspin.value/TICRATE + 1)%8;
-
-		// this is a very shitty solution for checking if a sprite needs flipping
-		// but it works
-		if ((speenframe > 4) && (sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]))
-		{
-			flags = V_FLIP; // This sprite is left/right flipped!
-		}
-
-		patch = (patch_t *)W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
-
-		if (displayskin.flags & SF_HIRES)
-		{
-			V_DrawFixedPatch(mx<<FRACBITS, my<<FRACBITS, displayskin.highresscale, flags, patch, colormap);
-		}
-		else
-		{
-			V_DrawMappedPatch(mx, my, flags, patch, colormap);
-		}
-	}
+		V_DrawMappedPatch(mx+220, my+120, flags, patch, colormap);
+#undef charw
 }

 // Draw the video modes list, a-la-Quake
@@ -215,7 +215,7 @@ void M_SetupNextMenu(menu_t *menudef);
 void M_ClearMenus(boolean callexitmenufunc);

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

 extern menu_t *currentMenu;
@@ -398,7 +398,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	NULL\
 }

-#define CONTROLMENUSTYLE(source, prev, tooltip)\
+#define CONTROLMENUSTYLE(source, prev)\
 {\
 	"M_CONTRO",\
 	sizeof (source)/sizeof (menuitem_t),\
@@ -409,7 +409,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	26, 40,\
 	0,\
 	NULL,\
-	tooltip\
+	NULL\
 }

 #define IMAGEDEF(source)\
@@ -648,6 +648,17 @@ static menuitem_t OP_ControlsMenu[] =
 	{IT_SUBMENU | IT_STRING, NULL, "Mouse Options...",  &OP_MouseOptionsDef,    55},

 	{IT_STRING | IT_CVAR, NULL, "Controls per key",     &cv_controlperkey,      75},
+
+	{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P1)",  &cv_turnsmooth[0],         85},
+	{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P2)",  &cv_turnsmooth[1],         95},
+	{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P3)",  &cv_turnsmooth[2],         105},
+	{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P4)",  &cv_turnsmooth[3],         115},
+
+	// i hate our menus sincerly
+	{IT_STRING | IT_CVAR, NULL, "Lite Steer (P1)",      &cv_litesteer[0],       135},
+	{IT_STRING | IT_CVAR, NULL, "Lite Steer (P2)",      &cv_litesteer[1],       145},
+	{IT_STRING | IT_CVAR, NULL, "Lite Steer (P3)",      &cv_litesteer[2],       155},
+	{IT_STRING | IT_CVAR, NULL, "Lite Steer (P4)",      &cv_litesteer[3],       165},
 };

 static const char* OP_ControlsTooltips[] =
@@ -658,6 +669,15 @@ static const char* OP_ControlsTooltips[] =
 	"Setup player 4 controls.",
 	"Options for mouse control.",
 	"Allowed amount of controls per key.",
+	"Turn smoothing for non-analog turning (Player 1).",
+	"Turn smoothing for non-analog turning (Player 2).",
+	"Turn smoothing for non-analog turning (Player 3).",
+	"Turn smoothing for non-analog turning (Player 4).",
+
+	"Hold DOWN on d-pad/keyboard for shallow turns (Player 1).",
+	"Hold DOWN on d-pad/keyboard for shallow turns (Player 2).",
+	"Hold DOWN on d-pad/keyboard for shallow turns (Player 3).",
+	"Hold DOWN on d-pad/keyboard for shallow turns (Player 4).",
 };

 static menuitem_t OP_AllControlsMenu[] =
@@ -665,13 +685,6 @@ static menuitem_t OP_AllControlsMenu[] =
 	{IT_SUBMENU|IT_STRING, NULL, "Gamepad Options...", &OP_Joystick1Def, 0},
 	{IT_CALL|IT_STRING, NULL, "Reset to defaults", M_ResetControls, 8},

-	{IT_HEADER, NULL, "Control Options", NULL, 0},
-	{IT_SPACE, NULL, NULL, NULL, 0},
-
-	// Cvars are set in M_SetupControlsMenu
-	{IT_STRING|IT_CVAR, NULL, "Lite Steer", &cv_litesteer[0], 18},
-	{IT_STRING|IT_CVAR, NULL, "Digital turn easing",  &cv_turnsmooth[0],         26},
-
 	//{IT_SPACE, NULL, NULL, NULL, 0},
 	{IT_HEADER, NULL, "Gameplay Controls", NULL, 0},
 	{IT_SPACE, NULL, NULL, NULL, 0},
@@ -720,17 +733,6 @@ static menuitem_t OP_AllControlsMenu[] =
 	{IT_CONTROL, NULL, "Custom Action 3",       M_ChangeControl, gc_custom3    },
 };

-// Has to be same length as OP_AllControlsMenu, but otherwise its mostly empty
-static const char* OP_AllControlsTooltips[sizeof(OP_AllControlsMenu)/sizeof(OP_AllControlsMenu[0])] = {
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	"Hold DOWN on d-pad/keyboard for shallow turns.",
-	"Turn smoothing for non-analog turning.",
-	// The rest is null, for now
-};
-
 #define OP_JOYMENU(pnum) \
 	{IT_HEADER, NULL, "Gameplay Controls", NULL, 7},                                        \
 	{IT_STRING | IT_CVAR,  NULL, "Aim Forward/Back"           , &cv_aimaxis[pnum]       ,  15}, \
@@ -1205,10 +1207,6 @@ static menuitem_t OP_FocusOptionsMenu[] =
 	{IT_STRING|IT_CVAR,	NULL, "Show \"FOCUS LOST\"",						&cv_showfocuslost,		   100},

 	{IT_STRING|IT_CVAR,	NULL, "Visible Mouse",								&cv_mousevisible,	       120},
-
-	{IT_STRING|IT_CVAR,	NULL, "Gamepad LED Color While Unfocused ",			&cv_gamepadledifunfocused, 	140},
-	{IT_STRING|IT_CVAR,	NULL, "Gamepad Rumble While Unfocused",				&cv_rumbleifunfocused, 	    150},
-
 };

 static const char* OP_FocusOptionsTooltips[] =
@@ -1220,8 +1218,6 @@ static const char* OP_FocusOptionsTooltips[] =
 	"Set manual framerate cap while the game is unfocused.",
 	"Should the FOCUS LOST window appear\n while the game is unfocused?",
 	"Displays the mouse cursor while the game is in focus.",
-	"Should gamepad LED indicator change color when unfocused?",
-	"Should gamepad rumble apply when unfocused?",
 };

 static menuitem_t OP_DataOptionsMenu[] =
@@ -1345,19 +1341,16 @@ static menuitem_t OP_CamOptionsMenu[] =

 	{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT,	NULL,	"Field of View",&cv_fov,				  	 30},

-	{IT_STRING | IT_CVAR,                   NULL,   "Flipcam Mode", &cv_flipcammode,             40},
-
-	{IT_STRING | IT_SUBMENU,	NULL, "Player 1 Camera options...",	&OP_Player1CamOptionsDef,	 60},
-	{IT_STRING | IT_SUBMENU,	NULL, "Player 2 Camera options...",	&OP_Player2CamOptionsDef,	 70},
-	{IT_STRING | IT_SUBMENU,	NULL, "Player 3 Camera options...",	&OP_Player3CamOptionsDef,	 80},
-	{IT_STRING | IT_SUBMENU,	NULL, "Player 4 Camera options...",	&OP_Player4CamOptionsDef,	 90},
+	{IT_STRING | IT_SUBMENU,	NULL, "Player 1 Camera options...",	&OP_Player1CamOptionsDef,	 50},
+	{IT_STRING | IT_SUBMENU,	NULL, "Player 2 Camera options...",	&OP_Player2CamOptionsDef,	 60},
+	{IT_STRING | IT_SUBMENU,	NULL, "Player 3 Camera options...",	&OP_Player3CamOptionsDef,	 70},
+	{IT_STRING | IT_SUBMENU,	NULL, "Player 4 Camera options...",	&OP_Player4CamOptionsDef,	 80},
 };

 static const char* OP_CamOptionsTooltips[] =
 {
 	NULL,
 	"Player field of view.",
-	"Change flipcam mode.\nDisplayplayer - use currently viewed player option.\nLocal - use local flipcam toggle option.",
 	NULL,
 	NULL,
 	NULL,
@@ -1639,34 +1632,26 @@ static menuitem_t OP_AccessibilityMenu[] =
 	{IT_STRING|IT_CVAR|IT_CV_SLIDER,   NULL,   "Saturation",                     &cv_globalsaturation,   25},
 	{IT_SUBMENU|IT_STRING,             NULL,   "Video Color Settings...",        &OP_ColorOptionsDef,    30},

-	{IT_STRING|IT_CVAR,                NULL,   "Reduce Effects",                 &cv_reducevfx,          35},
-	{IT_STRING|IT_CVAR,                NULL,   "Midnight Channel Flicker",       &cv_lessflicker,        40}, // obsolete now? or still better be a seperate toggle?
+	{IT_STRING|IT_CVAR,                NULL,   "Midnight Channel Flicker",       &cv_lessflicker,        35},

-	{IT_STRING|IT_CVAR,                NULL,   "Minimum Sector Brightness",      &cv_secbright,          45},
+	{IT_STRING|IT_CVAR,                NULL,   "Minimum Sector Brightness",      &cv_secbright,          40},

 #ifdef HWRENDER
-	{IT_STRING|IT_CVAR,                NULL,   "Screen Textures",                &cv_glscreentextures,   50},
+	{IT_STRING|IT_CVAR,                NULL,   "Screen Textures",                &cv_glscreentextures,   45},
 #endif

-	{IT_STRING|IT_CVAR,                NULL,   "Water Surface Ripples",          &cv_ripplewater,        55},
+	{IT_STRING|IT_CVAR,                NULL,   "Water Surface Ripples",          &cv_ripplewater,        50},

-	{IT_STRING|IT_CVAR,                NULL,   "Fade Players near Camera",       &cv_playerfade,         60},
+	{IT_STRING|IT_CVAR,                NULL,   "Fade Players near Camera",       &cv_playerfade,         55},

-	{IT_STRING|IT_CVAR,                NULL,   "Quake Screenshakes",             &cv_screenquake,        65},
+	{IT_STRING|IT_CVAR,                NULL,   "Quake Screenshakes",             &cv_screenquake,        60},

-	{IT_CALL|IT_STRING,                NULL,   "Camera Options...",              M_CameraMenu,           70},
+	{IT_CALL|IT_STRING,                NULL,   "Camera Options...",              M_CameraMenu,      65},

-	{IT_HEADER, NULL, "Audio", NULL, 80},
+	{IT_HEADER, NULL, "Audio", NULL, 75},

-	{IT_STRING|IT_CVAR,                NULL,   "Reverse L/R Channels",           &stereoreverse,         90},
-	{IT_STRING|IT_CVAR,                NULL,   "Same Sound Limit",               &cv_samesoundlimit,     95},
-
-	{IT_HEADER, NULL, "Controls", NULL, 105},
-
-	{IT_STRING|IT_CVAR,                NULL,   "Automatic Acceleration (P1)",    &cv_autoaccel[0],       115},
-	{IT_STRING|IT_CVAR,                NULL,   "Automatic Acceleration (P2)",    &cv_autoaccel[1],       120},
-	{IT_STRING|IT_CVAR,                NULL,   "Automatic Acceleration (P3)",    &cv_autoaccel[2],       125},
-	{IT_STRING|IT_CVAR,                NULL,   "Automatic Acceleration (P4)",    &cv_autoaccel[3],       130},
+	{IT_STRING|IT_CVAR,                NULL,   "Reverse L/R Channels",           &stereoreverse,         85},
+	{IT_STRING|IT_CVAR,                NULL,   "Same Sound Limit",               &cv_samesoundlimit,     90},
 };

 static const char* OP_AccessibilityTooltips[] =
@@ -1676,11 +1661,10 @@ static const char* OP_AccessibilityTooltips[] =
 	"Gamma (brightness) of the game.",
 	"Saturation of the game.",
 	"Advanced color settings of the game.",
-	"Reduces or disables certain effects players might be sensitive to\nSuch as flashing, flickering, certain screen effects and more.",
 	"Disables the flicker effect on Midnight Channel.",
 	"Sets minimum sector brightness, useful for dark areas",
 #ifdef HWRENDER
-	"Disabling Screen Textures will disable the Underwater and Heat screen effects.",
+	"Should the game do Screen Textures? Provides a good boost to frames\nat the cost of some visual effects not working when disabled.",
 #endif
 	"Toggles the ripple effect on water surfaces",
 	"Fades other Players that are close to the camera in and out",
@@ -1689,11 +1673,6 @@ static const char* OP_AccessibilityTooltips[] =
 	NULL,
 	"Reverse left and right channels of audio.",
 	"Change how often the same Sound is allowed to play at once.",
-	NULL,
-	"Automatically hold acceleration button (Player 1).",
-	"Automatically hold acceleration button (Player 2).",
-	"Automatically hold acceleration button (Player 3).",
-	"Automatically hold acceleration button (Player 4).",
 };

 static menuitem_t OP_SaturnMenu[] =
@@ -2501,7 +2480,7 @@ menu_t OP_MainDef =
 menu_t OP_ControlsDef     = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 40, 15, OP_ControlsTooltips);
 //WTF
 menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_ControlsDef, 60, 30, OP_MouseTooltips);
-menu_t OP_AllControlsDef  = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef, OP_AllControlsTooltips);
+menu_t OP_AllControlsDef  = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef);
 menu_t OP_Joystick1Def    = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_AllControlsDef, 30, 36, NULL);
 menu_t OP_Joystick2Def    = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_AllControlsDef, 30, 36, NULL);
 menu_t OP_Joystick3Def    = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 30, 36, NULL);
@@ -540,7 +540,7 @@ static boolean M_BackupConfig(const char *filename)
 void M_SaveConfig(const char *filename)
 {
 	FILE *f;
-	CLEANUP(Z_Pfree) char *filepath = NULL;
+	char *filepath;

 	// make sure not to write back the config until it's been correctly loaded
 	if (!loaded_config)
@@ -558,7 +558,7 @@ void M_SaveConfig(const char *filename)
 		// append srb2home to beginning of filename
 		// but check if srb2home isn't already there, first
 		if (!strstr(filename, srb2home))
-			filepath = Z_StrDup(va(pandf, srb2home, filename));
+			filepath = va(pandf,srb2home, filename);
 		else
 			filepath = Z_StrDup(filename);

@@ -1346,15 +1346,14 @@ void M_MinimapGenerate(void)
 	minigen = AM_MinimapGenerate(mul);

 	if (minigen == NULL || minigen->buf == NULL)
-	{
-		CONS_Alert(CONS_ERROR, M_GetText("Couldn't create %s\n"), filepath);
-		return;
-	}
+		goto failure;

 	M_CreateScreenShotPalette();
 	ret = M_SavePNG(filepath, minigen->buf, minigen->w, minigen->h, screenshot_palette);

-	free(minigen->buf);
+failure:
+	if (minigen->buf != NULL)
+		free(minigen->buf);

 	if (ret)
 	{
@@ -1694,23 +1693,22 @@ char *M_GetToken(const char *inputString)
 }


-const char * M_Ftrim(double f)
+const char * M_Ftrim (double f)
 {
 	static char dig[9];/* "0." + 6 digits (6 is printf's default) */
 	int i;
-
 	/* I know I said it's the default, but just in case... */
 	sprintf(dig, "%.6f", fabs(modf(f, &f)));
-
 	/* trim trailing zeroes */
 	for (i = strlen(dig)-1; dig[i] == '0'; --i)
 		;
-
 	if (dig[i] == '.')/* :NOTHING: */
 		return "";
-
-	dig[i + 1] = '\0';
-	return &dig[1];/* skip the 0 */
+	else
+	{
+		dig[i + 1] = '\0';
+		return &dig[1];/* skip the 0 */
+	}
 }

 /** Count bits in a number.
@@ -110,12 +110,12 @@ perfstatrow_t rendertime_rows[] = {

 	{"ui     ", "UI render:     ", &ps_uitime, PS_TIME},
 	{"finupdt", "I_FinishUpdate:", &ps_swaptime, PS_TIME},
-	{}
+	{0}
 };

 perfstatrow_t gamelogicbrief_row[] = {
 	{"logic  ", "Game logic:    ", &ps_tictime, PS_TIME},
-	{}
+	{0}
 };

 perfstatrow_t commoncounter_rows[] = {
@@ -123,20 +123,20 @@ perfstatrow_t commoncounter_rows[] = {
 	{"sprites", "Sprites:     ", &ps_numsprites, 0},
 	{"drwnode", "Drawnodes:   ", &ps_numdrawnodes, 0},
 	{"plyobjs", "Polyobjects: ", &ps_numpolyobjects, 0},
-	{}
+	{0}
 };

 perfstatrow_t interpolation_rows[] = {
 	{"intpfrc", "Interp frac: ", &ps_interp_frac, 0},
 	{"intplag", "Interp lag:  ", &ps_interp_lag, 0},
-	{}
+	{0}
 };

 #ifdef HWRENDER
 perfstatrow_t batchcount_rows[] = {
 	{"polygon", "Polygons:  ", &ps_hw_numpolys, 0},
 	{"vertex ", "Vertices:  ", &ps_hw_numverts, 0},
-	{}
+	{0}
 };

 perfstatrow_t batchcalls_rows[] = {
@@ -145,7 +145,7 @@ perfstatrow_t batchcalls_rows[] = {
 	{"texture", "Textures:  ", &ps_hw_numtextures, 0},
 	{"polyflg", "Polyflags: ", &ps_hw_numpolyflags, 0},
 	{"colors ", "Colors:    ", &ps_hw_numcolors, 0},
-	{}
+	{0}
 };
 #endif

@@ -164,7 +164,7 @@ perfstatrow_t gamelogic_rows[] = {
 	{" lthinkf", " LUAh_ThinkFrame:", &ps_lua_thinkframe_time, PS_TIME|PS_LEVEL},
 	{" lpostthinkf", " LUAh_PostThinkFrame:", &ps_lua_postthinkframe_time, PS_TIME|PS_LEVEL},
 	{" other  ", " Other:          ", &ps_otherlogictime, PS_TIME|PS_LEVEL},
-	{}
+	{0}
 };

 perfstatrow_t thinkercount_rows[] = {
@@ -176,13 +176,13 @@ perfstatrow_t thinkercount_rows[] = {
 	{" precip ", " Precipitation:  ", &ps_precipcount, PS_LEVEL},
 	{" other  ", " Other:          ", &ps_otherthcount, PS_LEVEL},
 	{" remove ", " Pending removal:", &ps_removecount, PS_LEVEL},
-	{}
+	{0}
 };

 perfstatrow_t misc_calls_rows[] = {
 	{"lmhook", "Lua mobj hooks: ", &ps_lua_mobjhooks, PS_LEVEL},
 	{"chkpos", "P_CheckPosition:", &ps_checkposition_calls, PS_LEVEL},
-	{}
+	{0}
 };

 // Sample collection status for averaging.
@@ -41,11 +41,11 @@ static time_t  MSLastPing;
 static char *MSRules;

 #ifdef HAVE_THREADS
-static I_Mutex MSMutex;
-static I_Cond  MSCond;
+static I_mutex MSMutex;
+static I_cond  MSCond;

-#  define Lock_state()   I_LockMutex  (&MSMutex)
-#  define Unlock_state() I_UnlockMutex (MSMutex)
+#  define Lock_state()   I_lock_mutex  (&MSMutex)
+#  define Unlock_state() I_unlock_mutex (MSMutex)
 #else/*HAVE_THREADS*/
 #  define Lock_state()
 #  define Unlock_state()
@@ -90,10 +90,10 @@ consvar_t cv_masterserver_nagattempts = {"masterserver_nagattempts", "5", CV_SAV

 #if defined (MASTERSERVER) && defined (HAVE_THREADS)
 int           ms_QueryId = 0;
-I_Mutex       ms_QueryId_mutex;
+I_mutex       ms_QueryId_mutex;

 msg_server_t *ms_ServerList = NULL;
-I_Mutex       ms_ServerList_mutex;
+I_mutex       ms_ServerList_mutex;
 #endif

 UINT16 current_port = 0;
@@ -129,11 +129,11 @@ void AddMServCommands(void)
 static void WarnGUI (void)
 {
 #ifdef HAVE_THREADS
-	I_LockMutex(&m_menu_mutex);
+	I_lock_mutex(&m_menu_mutex);
 #endif
 	M_PopupMasterServerConnectError();
 #ifdef HAVE_THREADS
-	I_UnlockMutex(m_menu_mutex);
+	I_unlock_mutex(m_menu_mutex);
 #endif
 }

@@ -168,12 +168,12 @@ char *GetMODVersion(int id)
 	c = HMS_compare_mod_version(buffer, 16);

 #ifdef HAVE_THREADS
-	I_LockMutex(&ms_QueryId_mutex);
+	I_lock_mutex(&ms_QueryId_mutex);
 	{
 		if (id != ms_QueryId)
 			c = -1;
 	}
-	I_UnlockMutex(ms_QueryId_mutex);
+	I_unlock_mutex(ms_QueryId_mutex);
 #endif

 	if (c > 0)
@@ -219,9 +219,8 @@ static void Get_masterserver_rules(boolean checkfirst)
 	if (HMS_fetch_rules(rules, sizeof rules))
 	{
 		Lock_state();
-		if (MSRules)
-			free(MSRules);
-		MSRules = strdup(rules);
+		Z_Free(MSRules);
+		MSRules = Z_StrDup(rules);

 		if (MSRegistered == true)
 		{
@@ -341,7 +340,7 @@ Finish_unlist (void)
 		Unlock_state();

 #ifdef HAVE_THREADS
-		I_WakeAllCond(&MSCond);
+		I_wake_all_cond(&MSCond);
 #endif
 	}
 }
@@ -377,7 +376,7 @@ New_server_id (void)
 	Lock_state();
 	{
 		*id = ++MSId;
-		I_WakeAllCond(&MSCond);
+		I_wake_all_cond(&MSCond);
 	}
 	Unlock_state();
 	return id;
@@ -392,7 +391,7 @@ Register_server_thread (int *id)
 	{
 		/* wait for previous unlist to finish */
 		while (*id == MSId && MSRegistered)
-			I_HoldCond(&MSCond, MSMutex);
+			I_hold_cond(&MSCond, MSMutex);

 		same = ( *id == MSId );/* it could have been a while */
 	}
@@ -444,7 +443,7 @@ Change_masterserver_thread (char *api)
 	Lock_state();
 	{
 		while (MSRegistered)
-			I_HoldCond(&MSCond, MSMutex);
+			I_hold_cond(&MSCond, MSMutex);
 	}
 	Unlock_state();

@@ -464,9 +463,9 @@ void RegisterServer(void)
 {
 #ifdef MASTERSERVER
 #ifdef HAVE_THREADS
-	(void)!I_SpawnThread(
+	I_spawn_thread(
 			"register-server",
-			(I_ThreadFn)Register_server_thread,
+			(I_thread_fn)Register_server_thread,
 			New_server_id()
 	);
 #else
@@ -478,9 +477,9 @@ void RegisterServer(void)
 static void UpdateServer(void)
 {
 #ifdef HAVE_THREADS
-	(void)!I_SpawnThread(
+	I_spawn_thread(
 			"update-server",
-			(I_ThreadFn)Update_server_thread,
+			(I_thread_fn)Update_server_thread,
 			Server_id()
 	);
 #else
@@ -492,9 +491,9 @@ void UnregisterServer(void)
 {
 #ifdef MASTERSERVER
 #ifdef HAVE_THREADS
-	(void)!I_SpawnThread(
+	I_spawn_thread(
 			"unlist-server",
-			(I_ThreadFn)Unlist_server_thread,
+			(I_thread_fn)Unlist_server_thread,
 			Server_id()
 	);
 #else
@@ -508,7 +507,7 @@ char *GetMasterServerRules(void)
 	char *rules;

 	Lock_state();
-	rules = MSRules ? strdup(MSRules) : NULL;
+	rules = MSRules ? Z_StrDup(MSRules) : NULL;
 	Unlock_state();

 	return rules;
@@ -557,18 +556,14 @@ void MasterClient_Ticker(void)
 static void
 Set_api (const char *api)
 {
-	char *dapi = strdup(api);
 #ifdef HAVE_THREADS
-	if (!I_SpawnThread(
-		"change-masterserver",
-		(I_ThreadFn)Change_masterserver_thread,
-					   dapi
-	))
-	{
-		free(dapi);
-	}
+	I_spawn_thread(
+			"change-masterserver",
+			(I_thread_fn)Change_masterserver_thread,
+			strdup(api)
+	);
 #else
-	Finish_masterserver_change(dapi);
+	Finish_masterserver_change(strdup(api));
 #endif
 }

@@ -576,9 +571,9 @@ void
 Get_rules (void)
 {
 #ifdef HAVE_THREADS
-	(void)!I_SpawnThread(
-			"get-masterserver-rules",
-			(I_ThreadFn)Get_masterserver_rules_thread,
+	I_spawn_thread(
+		"get-masterserver-rules",
+		(I_thread_fn)Get_masterserver_rules_thread,
 				   NULL
 	);
 #else
@@ -69,10 +69,10 @@ extern consvar_t cv_rendezvousserver;

 #ifdef HAVE_THREADS
 extern int           ms_QueryId;
-extern I_Mutex       ms_QueryId_mutex;
+extern I_mutex       ms_QueryId_mutex;

 extern msg_server_t *ms_ServerList;
-extern I_Mutex       ms_ServerList_mutex;
+extern I_mutex       ms_ServerList_mutex;
 #endif
 #ifdef MASTERSERVER
 void RegisterServer(void);
@@ -5977,7 +5977,7 @@ void A_Boss7Chase(void *thing)
 	if (actor->flags2 & MF2_FRET)
 	{
 		P_SetMobjState(actor, S_BLACKEGG_DESTROYPLAT1);
-		S_StartSound(NULL, sfx_s3k53);
+		S_StartSound(0, sfx_s3k53);
 		actor->flags2 &= ~MF2_FRET;
 		return;
 	}
@@ -6011,7 +6011,7 @@ void A_Boss7Chase(void *thing)
 		{
 			// Punch him!
 			P_SetMobjState(actor, actor->info->meleestate);
-			S_StartSound(NULL, sfx_begrnd); // warning sound
+			S_StartSound(0, sfx_begrnd); // warning sound
 			return;
 		}
 	}
@@ -6057,7 +6057,7 @@ void A_Boss7Chase(void *thing)
 			case 2: // Homing Missile
 				A_FaceTarget(actor);
 				P_SetMobjState(actor, actor->info->missilestate);
-				S_StartSound(NULL, sfx_beflap);
+				S_StartSound(0, sfx_beflap);
 				break;
 		}

@@ -10739,7 +10739,7 @@ void A_BrakChase(void *thing)
 	{
 		actor->reactiontime--;
 		if (actor->reactiontime == 0 && actor->type == MT_CYBRAKDEMON)
-			S_StartSound(NULL, sfx_bewar1 + P_RandomKey(4));
+			S_StartSound(0, sfx_bewar1 + P_RandomKey(4));
 	}

 	// modify target threshold
@@ -14,6 +14,10 @@
 #ifndef __P_LOCAL__
 #define __P_LOCAL__

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "command.h"
 #include "d_player.h"
 #include "d_think.h"
@@ -24,10 +28,6 @@
 #include "p_maputl.h"
 #include "doomstat.h" // MAXSPLITSCREENPLAYERS

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define FLOATSPEED (FRACUNIT*4)

 //#define VIEWHEIGHTS "41"
@@ -272,9 +272,6 @@ extern consvar_t cv_gravity;

 void P_RespawnSpecials(void);

-extern mobjtype_t g_doomednum_to_mobjtype[MAXDOOMEDNUM+1];
-void CalculateDoomednumToMobjtype(void);
-
 mobj_t *P_AllocateMobj(void);
 mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);

@@ -3237,22 +3237,7 @@ void P_DestroyRobots(void)
 // the below is chasecam only, if you're curious. check out P_CalcPostImg in p_user.c for first person
 void P_CalcChasePostImg(player_t *player, camera_t *thiscam)
 {
-	boolean player_flipcam = false;
-
-	if (cv_flipcammode.value == 0)
-		player_flipcam = player->pflags & PF_FLIPCAM;
-	else
-	{
-		INT32 pnum = P_GetLocalPlayerNumForPlayer(player);
-
-		// Shouldn't happen but just in case
-		if (pnum == -1)
-			pnum = 0;
-
-		player_flipcam = cv_flipcam[pnum].value;
-	}
-
-	const boolean flipcam = (player_flipcam && !(player->pflags & PF_NIGHTSMODE) && player->mo->eflags & MFE_VERTICALFLIP);
+	const boolean flipcam = (player->pflags & PF_FLIPCAM && !(player->pflags & PF_NIGHTSMODE) && player->mo->eflags & MFE_VERTICALFLIP);
 	UINT8 postimgtype = 0;

 	if (encoremode)
@@ -3606,10 +3591,10 @@ static void P_CalculatePrecipFloor(precipmobj_t *mobj)
 // Just the identification of a precip thinker. The thinker
 // should never actually be called!
 //
-FUNCNORETURN void P_NullPrecipThinker(precipmobj_t *mobj)
+void P_NullPrecipThinker(precipmobj_t *mobj)
 {
 	(void)mobj;
-	I_Error("P_NullPrecipThinker should not be called");
+	I_Assert("P_NullPrecipThinker should not be called" == 0);
 }

 boolean P_PrecipThinker(precipmobj_t *mobj)
@@ -4012,7 +3997,7 @@ static void P_Boss3Thinker(mobj_t *mobj)
 			if ((UINT32)mobj->extravalue1 + TICRATE*2 < leveltime)
 			{
 				mobj->extravalue1 = (INT32)leveltime;
-				S_StartSound(NULL, sfx_buzz1);
+				S_StartSound(0, sfx_buzz1);
 			}

 			// If in the center, check to make sure
@@ -4631,7 +4616,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
 		if (mobj->health > 0)
 			mobj->health--;

-		S_StartSound(NULL, (mobj->health) ? sfx_behurt : sfx_bedie2);
+		S_StartSound(0, (mobj->health) ? sfx_behurt : sfx_bedie2);

 		mobj->reactiontime /= 3;

@@ -4670,7 +4655,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
 		INT32 i;
 		mobj->state->nextstate = mobj->info->painstate; // Reset

-		S_StartSound(NULL, sfx_bedeen);
+		S_StartSound(0, sfx_bedeen);

 		for (i = 0; i < MAXPLAYERS; i++)
 		{
@@ -4694,7 +4679,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
 				mobj->state->nextstate = mobj->info->spawnstate;

 				// Laugh
-				S_StartSound(NULL, sfx_bewar1 + P_RandomKey(4));
+				S_StartSound(0, sfx_bewar1 + P_RandomKey(4));
 			}
 		}
 	}
@@ -4714,7 +4699,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
 			var2 = 2*TICRATE + (80<<16);

 			A_LobShot(mobj);
-			S_StartSound(NULL, sfx_begoop);
+			S_StartSound(0, sfx_begoop);
 		}
 	}
 	else if (mobj->state == &states[S_BLACKEGG_SHOOT2])
@@ -4738,7 +4723,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
 		S_StopSound(missile);

 		if (leveltime & 1)
-			S_StartSound(NULL, sfx_beshot);
+			S_StartSound(0, sfx_beshot);
 	}
 	else if (mobj->state == &states[S_BLACKEGG_JUMP1] && mobj->tics == 1)
 	{
@@ -4871,7 +4856,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
 		fixed_t x,y,z;
 		mobj_t *mo2;

-		S_StartSound(NULL, sfx_befall);
+		S_StartSound(0, sfx_befall);

 		z = mobj->floorz;
 		for (j = 0; j < 2; j++)
@@ -4910,13 +4895,13 @@ static void P_Boss7Thinker(mobj_t *mobj)
 			P_DamageMobj(players[i].mo, mobj, mobj, 1);

 			// Laugh
-			S_StartSound(NULL, sfx_bewar1 + P_RandomKey(4));
+			S_StartSound(0, sfx_bewar1 + P_RandomKey(4));
 		}

 		P_SetMobjState(mobj, mobj->info->spawnstate);
 	}
 	else if (mobj->state == &states[mobj->info->deathstate] && mobj->tics == mobj->state->tics)
-		S_StartSound(NULL, sfx_bedie1 + (P_RandomFixed() & 1));
+		S_StartSound(0, sfx_bedie1 + (P_RandomFixed() & 1));
 }

 // Metal Sonic battle boss
@@ -10463,24 +10448,6 @@ void P_PrecipitationEffects(void)
 	}
 }

-mobjtype_t g_doomednum_to_mobjtype[MAXDOOMEDNUM+1] = {};
-
-void CalculateDoomednumToMobjtype(void)
-{
-	memset(g_doomednum_to_mobjtype, MT_NULL, sizeof(g_doomednum_to_mobjtype));
-
-	for (size_t i = 0; i < NUMMOBJTYPES; i++)
-	{
-		const INT32 doomednum = mobjinfo[i].doomednum;
-
-		if (doomednum > 0 && doomednum <= MAXDOOMEDNUM)
-		{
-			if (g_doomednum_to_mobjtype[doomednum] == MT_NULL)
-				g_doomednum_to_mobjtype[doomednum] = (mobjtype_t)i;
-		}
-	}
-}
-
 //
 // P_RespawnSpecials
 //
@@ -10554,15 +10521,17 @@ void P_RespawnSpecials(void)

 	if (mthing)
 	{
-		mobjtype_t i = MT_NULL;
+		mobjtype_t i;
 		x = mthing->x << FRACBITS;
 		y = mthing->y << FRACBITS;
 		ss = R_PointInSubsector(x, y);

 		// find which type to spawn
-		i = g_doomednum_to_mobjtype[mthing->type];
+		for (i = 0; i < NUMMOBJTYPES; i++)
+			if (mthing->type == mobjinfo[i].doomednum)
+				break;

-		if (i <= MT_NULL || i >= NUMMOBJTYPES) // prevent creation of objects with this type -- Monster Iestyn 17/12/17
+		if (i == NUMMOBJTYPES) // prevent creation of objects with this type -- Monster Iestyn 17/12/17
 		{
 			// 3D Mode start Thing is unlikely to be added to the que,
 			// so don't bother checking for that specific type
@@ -10711,7 +10680,7 @@ void P_SpawnPlayer(INT32 playernum)
 	// the dead body mobj retains the skin through the 'spritedef' override).
 	mobj->skin = &skins[p->skin];

-	mobj->localskin = (p->localskin ? K_GetPlayerSkin(p) : NULL);
+	mobj->localskin = (p->localskin ? K_GetPlayerSkin(p) : 0);
 	mobj->skinlocal = p->skinlocal;

 	mobj->health = p->health;
@@ -10990,7 +10959,7 @@ INT32 numhuntemeralds = 0;
 //
 void P_SpawnMapThing(mapthing_t *mthing)
 {
-	mobjtype_t i = MT_NULL;
+	mobjtype_t i;
 	mobj_t *mobj;
 	fixed_t x, y, z;
 	subsector_t *ss;
@@ -11003,9 +10972,11 @@ void P_SpawnMapThing(mapthing_t *mthing)
 	if (objectplacing)
 	{
 		// find which type to spawn
-		i = g_doomednum_to_mobjtype[mthing->type];
+		for (i = 0; i < NUMMOBJTYPES; i++)
+			if (mthing->type == mobjinfo[i].doomednum)
+				break;

-		if (i <= MT_NULL || i >= NUMMOBJTYPES)
+		if (i == NUMMOBJTYPES)
 		{
 			if (mthing->type == 3328) // 3D Mode start Thing
 				return;
@@ -11073,9 +11044,13 @@ void P_SpawnMapThing(mapthing_t *mthing)
 	}

 	// find which type to spawn
-	i = g_doomednum_to_mobjtype[mthing->type];
+	for (i = 0; i < NUMMOBJTYPES; i++)
+	{
+		if (mthing->type == mobjinfo[i].doomednum)
+			break;
+	}

-	if (i <= MT_NULL || i >= NUMMOBJTYPES)
+	if (i == NUMMOBJTYPES)
 	{
 		if (mthing->type == 3328) // 3D Mode start Thing
 			return;
@@ -11768,32 +11743,32 @@ ML_NOCLIMB : Direction not controllable
 			if (mobj->flags & MF_MONITOR)
 			{
 				// flag for strong/weak random boxes
-				if (i == MT_SUPERRINGBOX || i == MT_PRUP    ||
-					i == MT_SNEAKERTV    || i == MT_INV     ||
-					i == MT_WHITETV      || i == MT_GREENTV ||
-					i == MT_YELLOWTV     || i == MT_BLUETV  ||
-					i == MT_BLACKTV      || i == MT_PITYTV  ||
-					i == MT_RECYCLETV    || i == MT_MIXUPBOX)
+				if (mthing->type == mobjinfo[MT_SUPERRINGBOX].doomednum || mthing->type == mobjinfo[MT_PRUP].doomednum ||
+					mthing->type == mobjinfo[MT_SNEAKERTV].doomednum || mthing->type == mobjinfo[MT_INV].doomednum ||
+					mthing->type == mobjinfo[MT_WHITETV].doomednum || mthing->type == mobjinfo[MT_GREENTV].doomednum ||
+					mthing->type == mobjinfo[MT_YELLOWTV].doomednum || mthing->type == mobjinfo[MT_BLUETV].doomednum ||
+					mthing->type == mobjinfo[MT_BLACKTV].doomednum || mthing->type == mobjinfo[MT_PITYTV].doomednum ||
+					mthing->type == mobjinfo[MT_RECYCLETV].doomednum || mthing->type == mobjinfo[MT_MIXUPBOX].doomednum)
 						mobj->flags2 |= MF2_AMBUSH;
 			}
-			else if (
-				i != MT_AXIS &&
-				i != MT_AXISTRANSFER &&
-				i != MT_AXISTRANSFERLINE &&
-				i != MT_NIGHTSBUMPER &&
-				i != MT_STARPOST)
+
+			else if (mthing->type != mobjinfo[MT_AXIS].doomednum &&
+				mthing->type != mobjinfo[MT_AXISTRANSFER].doomednum &&
+				mthing->type != mobjinfo[MT_AXISTRANSFERLINE].doomednum &&
+				mthing->type != mobjinfo[MT_NIGHTSBUMPER].doomednum &&
+				mthing->type != mobjinfo[MT_STARPOST].doomednum)
 				mobj->flags2 |= MF2_AMBUSH;
 		}

 		if (mthing->options & MTF_OBJECTSPECIAL)
 		{
 			// flag for strong/weak random boxes
-			if (i == MT_SUPERRINGBOX || i == MT_PRUP    ||
-				i == MT_SNEAKERTV    || i == MT_INV     ||
-				i == MT_WHITETV      || i == MT_GREENTV ||
-				i == MT_YELLOWTV     || i == MT_BLUETV  ||
-				i == MT_BLACKTV      || i == MT_PITYTV  ||
-				i == MT_RECYCLETV    || i == MT_MIXUPBOX)
+			if (mthing->type == mobjinfo[MT_SUPERRINGBOX].doomednum || mthing->type == mobjinfo[MT_PRUP].doomednum ||
+				mthing->type == mobjinfo[MT_SNEAKERTV].doomednum || mthing->type == mobjinfo[MT_INV].doomednum ||
+				mthing->type == mobjinfo[MT_WHITETV].doomednum || mthing->type == mobjinfo[MT_GREENTV].doomednum ||
+				mthing->type == mobjinfo[MT_YELLOWTV].doomednum || mthing->type == mobjinfo[MT_BLUETV].doomednum ||
+				mthing->type == mobjinfo[MT_BLACKTV].doomednum || mthing->type == mobjinfo[MT_PITYTV].doomednum ||
+				mthing->type == mobjinfo[MT_RECYCLETV].doomednum || mthing->type == mobjinfo[MT_MIXUPBOX].doomednum)
 					mobj->flags2 |= MF2_STRONGBOX;

 			// Requires you to be in bonus time to activate
@@ -12354,9 +12329,8 @@ mobj_t *P_SPMAngle(mobj_t *source, mobjtype_t type, angle_t angle, UINT8 allowai
 //
 void P_FlashPal(player_t *pl, UINT16 type, UINT16 duration)
 {
-	if (!pl || cv_reducevfx.value) // no palette flashing with reducevfx
+	if (!pl)
 		return;
-
 	pl->flashcount = duration;
 	pl->flashpal = type;
 }
@@ -1385,7 +1385,8 @@ static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta,

 						if (mo->player)
 						{
-							P_ForceLocalAngle(mo->player, P_GetLocalAngle(mo->player) + delta);
+							angle_t localangle = P_GetLocalAngle(mo->player);
+							P_ForceLocalAngle(mo->player, localangle + delta);
 						}
 					}
 				}
@@ -1965,6 +1965,21 @@ FUNCINLINE static ATTRINLINE player_t *LoadPlayer(UINT32 player)
 // Loads a mobj_t from a save game
 //

+static mobjtype_t g_doomednum_to_mobjtype[UINT16_MAX];
+
+static void CalculateDoomednumToMobjtype(void)
+{
+	memset(g_doomednum_to_mobjtype, MT_NULL, sizeof(g_doomednum_to_mobjtype));
+
+	for (size_t i = MT_NULL+1; i < NUMMOBJTYPES; i++)
+	{
+		if (mobjinfo[i].doomednum > 0 && mobjinfo[i].doomednum <= UINT16_MAX)
+		{
+			g_doomednum_to_mobjtype[ mobjinfo[i].doomednum ] = i;
+		}
+	}
+}
+
 static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	mobj_t *mobj;
@@ -2864,6 +2879,10 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save)
 	if (READUINT32(save->p) != ARCHIVEBLOCK_THINKERS)
 		I_Error("Bad $$$.sav at archive block Thinkers");

+	// Pre-calculate this lookup, because it was wasting
+	// a shit ton of time loading mobj thinkers.
+	CalculateDoomednumToMobjtype();
+
 	// remove all the current thinkers
 	for (currentthinker = thinkercap.next; currentthinker != &thinkercap; currentthinker = next)
 	{
@@ -320,7 +320,9 @@ void P_AddGradesForMare(INT16 i, UINT8 mare, char *gtext)
  */
 void P_DeleteGrades(INT16 i)
 {
-	Z_Free(mapheaderinfo[i]->grades);
+	if (mapheaderinfo[i]->grades)
+		Z_Free(mapheaderinfo[i]->grades);
+
 	mapheaderinfo[i]->grades = NULL;
 	mapheaderinfo[i]->numGradedMares = 0;
 }
@@ -1020,7 +1022,7 @@ void P_WriteThings(lumpnum_t lumpnum)
 	size_t i, length;
 	mapthing_t *mt;
 	UINT8 *data;
-	savebuffer_t save = {};
+	savebuffer_t save = {0};
 	INT16 temp;

 	data = W_CacheLumpNum(lumpnum, PU_LEVEL);
@@ -1164,7 +1166,7 @@ static void P_LoadLineDefs2(void)
 	for (; i--; ld++)
 	{
 		ld->frontsector = sides[ld->sidenum[0]].sector; //e6y: Can't be -1 here
-		ld->backsector  = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : NULL;
+		ld->backsector  = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : 0;

 		// Repeat count for midtexture
 		if ((ld->flags & ML_EFFECT5) && (ld->sidenum[1] != 0xffff))
@@ -2859,10 +2861,6 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)

 	P_ResetDynamicSlopes();

-	// Pre-calculate this lookup, because it was wasting
-	// a shit ton of time loading mobj thinkers.
-	CalculateDoomednumToMobjtype();
-
 	P_SpawnMapThings();

 	P_SpawnEmblems(!fromnetsave);
@@ -4579,8 +4579,8 @@ static inline void P_AddFFloorToList(sector_t *sec, ffloor_t *ffloor)
 	if (!sec->ffloors)
 	{
 		sec->ffloors = ffloor;
-		ffloor->next = NULL;
-		ffloor->prev = NULL;
+		ffloor->next = 0;
+		ffloor->prev = 0;
 		return;
 	}

@@ -4588,7 +4588,7 @@ static inline void P_AddFFloorToList(sector_t *sec, ffloor_t *ffloor)

 	rover->next = ffloor;
 	ffloor->prev = rover;
-	ffloor->next = NULL;
+	ffloor->next = 0;
 }

 /** Adds a 3Dfloor.
@@ -6221,7 +6221,8 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)

 	// Allocate each list
 	for (i = 0; i < numsectors; i++)
-		Z_Free(secthinkers[i].thinkers);
+		if(secthinkers[i].thinkers)
+			Z_Free(secthinkers[i].thinkers);

 	Z_Free(secthinkers);

@@ -20,10 +20,6 @@
 #pragma interface
 #endif

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern tic_t leveltime;

 // Called by G_Ticker. Carries out all thinking of enemies and players.
@@ -42,10 +38,6 @@ mobj_t *P_SetTarget2(mobj_t **mo, mobj_t *target
 #endif
 );

-#ifdef __cplusplus
-}
-#endif
-
 #ifdef PARANOIA
 #define P_SetTarget(...) P_SetTarget2(__VA_ARGS__, __FILE__, __LINE__)
 #else
@@ -1720,7 +1720,8 @@ void R_InitData(void)

 void R_ClearTextureNumCache(boolean btell)
 {
-	Z_Free(tidcache);
+	if (tidcache)
+		Z_Free(tidcache);
 	tidcache = NULL;
 	if (btell)
 		CONS_Debug(DBG_SETUP, "Fun Fact: There are %d textures used in this map.\n", tidcachelen);
@@ -289,14 +289,8 @@ void R_GenerateBlendTables(void)
 	state->LocalPalette = static_cast<RGBA_t *>(memcpy(malloc(palsize), pLocalPalette, palsize));
 	state->gammaCorrectedPalette = static_cast<RGBA_t *>(memcpy(malloc(palsize), pGammaCorrectedPalette, palsize));

-	if (!I_SpawnThread("blend-tables",
-			R_GenerateBlendTables_Thread, state))
-	{
-		free(state->gammaCorrectedPalette);
-		free(state->LocalPalette);
-		free(state);
-		I_Error("R_GenerateBlendTables: Failed to generate BlendTables\n"); // should we just retry on main thread instead?
-	}
+	I_spawn_thread("blend-tables",
+			R_GenerateBlendTables_Thread, state);
 #else
 	struct GenerateBlendTables_State state = {pLocalPalette, pGammaCorrectedPalette};
 	R_GenerateBlendTables_Core(&state);
@@ -15,16 +15,16 @@
 #ifndef __R_FPS_H__
 #define __R_FPS_H__

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "m_fixed.h"
 #include "p_local.h"
 #include "r_state.h"
 #include "r_things.h"
 #include "m_perfstats.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern consvar_t cv_fpscap, cv_fpscapbg;

 extern ps_metric_t ps_interp_frac;
@@ -182,9 +182,6 @@ consvar_t cv_flipcam[MAXSPLITSCREENPLAYERS] = {
 	{"flipcam4", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam4_OnChange, 0, NULL, NULL, 0, 0, NULL}
 };

-static CV_PossibleValue_t flipcammode_cons_t[] = {{0, "Displayplayer"}, {1, "Local"}, {0, NULL}};
-consvar_t cv_flipcammode = {"flipcammode",  "Displayplayer", CV_SAVE, flipcammode_cons_t, NULL,  0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_shadow          = {"shadow", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_shadowoffs      = {"offsetshadows", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_skybox          = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -925,11 +922,11 @@ void R_ExecuteSetViewSize(void)
 	viewheight = vid.height;

 	if (splitscreen)
-	{
 		viewheight >>= 1;

-		if (splitscreen > 1)
-			viewwidth >>= 1;
+	if (splitscreen > 1)
+	{
+		viewwidth >>= 1;
 	}

 	centerx = viewwidth/2;
@@ -956,9 +953,13 @@ void R_ExecuteSetViewSize(void)
 		screenheightarray[i] = (INT16)viewheight;
 	}

-	Z_Free(ds_su);
-	Z_Free(ds_sv);
-	Z_Free(ds_sz);
+	if (ds_su)
+		Z_Free(ds_su);
+	if (ds_sv)
+		Z_Free(ds_sv);
+	if (ds_sz)
+		Z_Free(ds_sz);
+
 	ds_su = ds_sv = ds_sz = NULL;

 	memset(scalelight, 0xFF, sizeof(scalelight));
@@ -1014,8 +1015,8 @@ static void R_InitViewMapping(void)

 		for (INT32 i = 0; i < j; i++)
 		{
-			fixed_t dy = abs(i - viewheight*8) << FRACBITS;
-			dy = FixedMul(dy, fovtan);
+			fixed_t dy = (i - viewheight*8)<<FRACBITS;
+			dy = FixedMul(abs(dy), fovtan);
 			yslopetab[i] = FixedDiv(centerx*FRACUNIT, dy);
 		}
 	}
@@ -1083,7 +1084,7 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
 	ret = &subsectors[nodenum & ~NF_SUBSECTOR];
 	for (i = 0; i < ret->numlines; i++)
 		if (P_PointOnLineSide(x, y, segs[ret->firstline + i].linedef) != segs[ret->firstline + i].side)
-			return NULL;
+			return 0;

 	return ret;
 }
@@ -1545,8 +1546,6 @@ void R_RegisterEngineStuff(void)
 		CV_RegisterVar(&cv_flipcam[i]);
 	}

-	CV_RegisterVar(&cv_flipcammode);
-
 	// Enough for dedicated server
 	if (dedicated)
 		return;
@@ -14,14 +14,14 @@
 #ifndef __R_MAIN__
 #define __R_MAIN__

-#include "d_player.h"
-#include "r_data.h"
-#include "m_perfstats.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

+#include "d_player.h"
+#include "r_data.h"
+#include "m_perfstats.h"
+
 //
 // POV related.
 //
@@ -205,7 +205,6 @@ extern consvar_t cv_showhud, cv_translucenthud, cv_uncappedhud;
 extern consvar_t cv_homremoval;
 extern consvar_t cv_chasecam[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_flipcam[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_flipcammode;
 extern consvar_t cv_shadow, cv_shadowoffs;
 extern consvar_t cv_ffloorclip, cv_spriteclip;
 extern consvar_t cv_softcyancut;
@@ -405,8 +405,10 @@ static void Patch_FreeData(patch_t *patch)
 	}*/
 #endif

-	Z_Free(patch->columnofs);
-	Z_Free(patch->columns);
+	if (patch->columnofs)
+		Z_Free(patch->columnofs);
+	if (patch->columns)
+		Z_Free(patch->columns);
 }

 void Patch_Free(patch_t *patch)
@@ -57,11 +57,8 @@ visffloor_t visffloor[MAXFFLOORS] = {};
 INT32 numffloors = 0;

 //SoM: 3/23/2000: Boom visplane hashing routine.
-constexpr unsigned int visplane_hash(const unsigned int picnum, const unsigned int lightlevel,
-									 const unsigned int height)
-{
-	return ((picnum * 3) + lightlevel + (height * 7)) & VISPLANEHASHMASK;
-}
+#define visplane_hash(picnum,lightlevel,height) \
+  ((unsigned)((picnum)*3+(lightlevel)+(height)*7) & VISPLANEHASHMASK)

 //
 // Clip values are the solid pixel bounding the range.
@@ -139,7 +136,7 @@ void R_AllocPlaneMemory(void)
 	}

 	yslopetab = static_cast<fixed_t*>(Z_Realloc(yslopetab, sizeof(*yslopetab) * (viewheight * 16), PU_STATIC, NULL));
-	spanstart = static_cast<INT32*>(Z_Realloc(spanstart, sizeof(*spanstart) * viewheight, PU_STATIC, NULL));
+	spanstart = static_cast<fixed_t*>(Z_Realloc(spanstart, sizeof(*spanstart) * viewheight, PU_STATIC, NULL));
 }

 //
@@ -454,7 +451,7 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
 			}
 		}

-		hash = visplane_hash(picnum, lightlevel, height >> FRACBITS);
+		hash = visplane_hash(picnum, lightlevel, height);

 		for (check = visplanes[hash]; check; check = check->next)
 		{
@@ -565,7 +562,7 @@ visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop)
 		}
 		else
 		{
-			unsigned hash = visplane_hash(pl->picnum, pl->lightlevel, pl->height >> FRACBITS);
+			unsigned hash = visplane_hash(pl->picnum, pl->lightlevel, pl->height);
 			new_pl = new_visplane(hash);
 		}

@@ -923,12 +920,12 @@ static void R_SetSlopePlane(drawspandata_t* ds, pslope_t *slope, fixed_t xpos, f

 	// m is the v direction vector in view space
 	ang = ANG2RAD(ANGLE_180 - (angle + plangle));
-	m->x = cosf(ang);
-	m->z = sinf(ang);
+	m->x = cos(ang);
+	m->z = sin(ang);

 	// n is the u direction vector in view space
-	n->x = sinf(ang);
-	n->z = -cosf(ang);
+	n->x = sin(ang);
+	n->z = -cos(ang);

 	plangle >>= ANGLETOFINESHIFT;
 	temp = P_GetSlopeZAt(slope, xpos + FINESINE(plangle), ypos + FINECOSINE(plangle));
@@ -246,6 +246,7 @@ static boolean TrimVisplaneBounds(const visplane_t* plane, INT16* start, INT16*
 	if (!(*start < *end))
 		return true;

+
 	/** Trims a visplane's horizontal gap to match its render area.
 	 *
 	 * Visplanes' minx/maxx may sometimes exceed the area they're
@@ -15,8 +15,6 @@
 #include "r_local.h"
 #include "r_sky.h"

-#include <algorithm>
-
 #include "r_portal.h"
 #include "r_splats.h"
 #include "r_fps.h" // newview
@@ -2231,12 +2229,12 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			lowcutslope  = std::max(worldbottomslope, worldlowslope) + viewz;
 			highcutslope = std::min(worldtopslope, worldhighslope) + viewz;

-			auto check_fof_offscreen = [&](ffloor_t* rrover, INT32 bottom, INT32 bottomslope, INT32 top, INT32 topslope)
+			auto check_fof_offscreen = [&](ffloor_t* rover, INT32 bottom, INT32 bottomslope, INT32 top, INT32 topslope)
 			{
-				return ((P_GetFFloorTopZAt    (rrover, segleft .x, segleft .y) <= bottom      + viewz
-					&&   P_GetFFloorTopZAt    (rrover, segright.x, segright.y) <= bottomslope + viewz)
-					|| ( P_GetFFloorBottomZAt (rrover, segleft .x, segleft .y) >= top         + viewz
-					&&   P_GetFFloorBottomZAt (rrover, segright.x, segright.y) >= topslope    + viewz));
+				return ((P_GetFFloorTopZAt    (rover, segleft .x, segleft .y) <= bottom      + viewz
+					&&   P_GetFFloorTopZAt    (rover, segright.x, segright.y) <= bottomslope + viewz)
+					|| ( P_GetFFloorBottomZAt (rover, segleft .x, segleft .y) >= top         + viewz
+					&&   P_GetFFloorBottomZAt (rover, segright.x, segright.y) >= topslope    + viewz));
 			};

 			if (frontsector->ffloors && backsector->ffloors)
@@ -2880,7 +2878,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	if (markceiling)
 	{
 		if (ceilingplane) //SoM: 3/29/2000: Check for null ceiling planes
-			ceilingplane = R_CheckPlane(ceilingplane, rw_x, rw_stopx-1);
+			ceilingplane = R_CheckPlane (ceilingplane, rw_x, rw_stopx-1);
 		else
 			markceiling = false;

@@ -2894,7 +2892,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	if (markfloor)
 	{
 		if (floorplane) //SoM: 3/29/2000: Check for null planes
-			floorplane = R_CheckPlane(floorplane, rw_x, rw_stopx-1);
+			floorplane = R_CheckPlane (floorplane, rw_x, rw_stopx-1);
 		else
 			markfloor = false;

@@ -302,7 +302,7 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)

 		if (player->mo)
 		{
-			player->mo->localskin = NULL;
+			player->mo->localskin = 0;
 			player->mo->skinlocal = false;
 		}
 	}
Author	SHA1	Message	Date
Alug	8cf2395d42	Merge branch 'Saturn-Next' into Saturn	2025-12-06 15:45:51 +01:00
Alug	3abe74de86	release 9.2	2025-12-06 15:33:41 +01:00
Alug	5a61ebf325	Merge branch 'Saturn-Next' into Saturn	2025-12-06 15:33:08 +01:00