Merge branch 'Saturn-Next' into netstuff

lmao oops idk dumb copy paste sry

CMakeLists.txt

@@ -1,14 +1,46 @@
 cmake_minimum_required(VERSION 3.5)
-# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
-# Version change is fine.
-project(SRB2
-	VERSION 1.6
-	LANGUAGES C)
 
 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)
+
+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()
+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/")
 
@@ -73,6 +105,7 @@ 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)
@@ -95,14 +128,12 @@ 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)
@@ -111,25 +142,3 @@ 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)

LUASTUFF.md

@@ -13,10 +13,12 @@ Mainly for use in visual-only addons like secondcolor.
 
 **Not netsafe**. Returns player's current sliptide roll angle, taking sliptideroll cvar value into account.
 
-## hud.setVoteBackground(name)
+## hud.setVoteBackground(name[, time\_per\_frame])
 
 Changes vote background texture prefix (game looks for PREFIX + "W" or "C" (depends on resolution) + FRAME\_NUMBER).
 
+If time\_per\_frame is set, each frame will last this amount of tics, default value is 2
+
 ## hud.add(fn, "vote") and hud.add(fn, "intermission")
 
 Hud hooks for vote screen and intermission screen. They only get drawer (`v`) as argument.
@@ -120,6 +122,11 @@ v.interpLatch(false)
 ```
 When using a custom string drawer, enable this mode to avoid interpolation artifacting when the string changes.
 
+## cameras[] global array
+
+Local player cameras that can be accessed outside of hud hooks.
+`#cameras` will return amount of available cameras. (0 on dedicated server, 1 with 1 player, 4 with 4p splitscreen, etc)
+
 ## mobj.spritexscale, mobj.spriteyscale, mobj.spritexoffset, mobj.spriteyoffset, mobj.rollangle, mobj.sloperoll, mobj.rollmodel fields
 
 Same fields as in SRB2 2.2

README.md

@@ -22,13 +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.
 
-Currently only the Makefile build system with GCC or Clang compiler is supported.
-
+For Windows only the Makefile build system with GCC or Clang compiler is supported.
 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

assets/CMakeLists.txt

@@ -1,5 +1,10 @@
 ## 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 "")

cmake/Modules/FindGME.cmake

@@ -1,6 +1,6 @@
 include(LibFindMacros)
 
-libfind_pkg_check_modules(GME_PKGCONF GME)
+libfind_pkg_check_modules(GME_PKGCONF LIBGME)
 
 find_path(GME_INCLUDE_DIR
 	NAMES gme.h
@@ -8,6 +8,7 @@ find_path(GME_INCLUDE_DIR
 		${GME_PKGCONF_INCLUDE_DIRS}
 		"/usr/include/gme"
 		"/usr/local/include/gme"
+	PATH_SUFFIXES gme
 )
 
 find_library(GME_LIBRARY
@@ -20,4 +21,4 @@ find_library(GME_LIBRARY
 
 set(GME_PROCESS_INCLUDES GME_INCLUDE_DIR)
 set(GME_PROCESS_LIBS GME_LIBRARY)
-libfind_process(GME)
+libfind_process(GME)

cmake/Modules/FindOPENMPT.cmake

@@ -1,6 +1,6 @@
 include(LibFindMacros)
 
-libfind_pkg_check_modules(OPENMPT_PKGCONF OPENMPT)
+libfind_pkg_check_modules(OPENMPT_PKGCONF LIBOPENMPT)
 
 find_path(OPENMPT_INCLUDE_DIR
 	NAMES libopenmpt.h
@@ -8,6 +8,7 @@ find_path(OPENMPT_INCLUDE_DIR
 		${OPENMPT_PKGCONF_INCLUDE_DIRS}
 		"/usr/include/libopenmpt"
 		"/usr/local/include/libopenmpt"
+	PATH_SUFFIXES libopenmpt
 )
 
 find_library(OPENMPT_LIBRARY
@@ -20,4 +21,4 @@ find_library(OPENMPT_LIBRARY
 
 set(OPENMPT_PROCESS_INCLUDES OPENMPT_INCLUDE_DIR)
 set(OPENMPT_PROCESS_LIBS OPENMPT_LIBRARY)
-libfind_process(OPENMPT)
+libfind_process(OPENMPT)

cmake/Modules/Findlibbacktrace.cmake

@@ -0,0 +1,33 @@
+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()

cmake/Modules/LibFindMacros.cmake

@@ -1,4 +1,4 @@
-# Version 2.2
+# Version 2.4
 # 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,6 +52,10 @@ 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.
@@ -125,24 +129,39 @@ function (libfind_process PREFIX)
 
   # Process deps to add to
   foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
-    if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
+    if (DEFINED ${i}_INCLUDE_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 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))
+      if (DEFINED ${i}_LIBRARY)
         # Singular forms can be used
-        if (DEFINED ${i}_INCLUDE_DIR)
-          list(APPEND includeopts ${i}_INCLUDE_DIR)
-        endif()
-        if (DEFINED ${i}_LIBRARY)
-          list(APPEND libraryopts ${i}_LIBRARY)
-        endif()
+        list(APPEND libraryopts ${i}_LIBRARY)
       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!")
+        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!")
+        endif()
       endif()
     endif()
   endforeach()
@@ -209,12 +228,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()
 

src/.gitignore

@@ -1,3 +1,4 @@
 /cscope.out
 *.json
 *.idx
+*.gdb_history

src/CMakeLists.txt

@@ -2,6 +2,8 @@
 
 # Core sources
 set(SRB2_CORE_SOURCES
+	core/memory.cpp
+	core/thread_pool.cpp
 	am_map.c
 	b_bot.c
 	command.c
@@ -18,17 +20,21 @@ 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
@@ -40,19 +46,25 @@ 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.c
+	z_zone.cpp
 )
 
 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
@@ -78,6 +90,7 @@ set(SRB2_CORE_HEADERS
 	fastcmp.h
 	filesrch.h
 	g_game.h
+	g_demo.h
 	g_input.h
 	g_state.h
 	hu_stuff.h
@@ -109,6 +122,7 @@ set(SRB2_CORE_HEADERS
 	md5.h
 	mserv.h
 	qs22j.h
+	r_skins.h
 	s_sound.h
 	screen.h
 	sounds.h
@@ -123,18 +137,18 @@ set(SRB2_CORE_HEADERS
 )
 
 set(SRB2_CORE_RENDER_SOURCES
-	r_bsp.c
+	r_bsp.cpp
 	r_data.c
-	r_draw.c
-	r_fps.c
-	r_main.c
-	r_patch.c
-	r_patchrotation.c
-	r_plane.c
-	r_segs.c
+	r_draw.cpp
+	r_fps.cpp
+	r_main.cpp
+	r_patch.cpp
+	r_patchrotation.cpp
+	r_plane.cpp
+	r_segs.cpp
 	r_sky.c
 	r_splats.c
-	r_things.c
+	r_things.cpp
 	r_portal.c
 
 	r_bsp.h
@@ -162,7 +176,7 @@ set(SRB2_CORE_GAME_SOURCES
 	p_inter.c
 	p_lights.c
 	p_map.c
-	p_maputl.c
+	p_maputl.cpp
 	p_mobj.c
 	p_polyobj.c
 	p_saveg.c
@@ -193,10 +207,6 @@ 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)
@@ -226,10 +236,23 @@ 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)
@@ -469,16 +492,36 @@ 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.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
-		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_portal.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.c
 		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.c
@@ -493,7 +536,6 @@ 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
@@ -512,7 +554,6 @@ 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})
@@ -525,25 +566,40 @@ if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL})
 	endif()
 endif()
 
-if(${SRB2_CONFIG_HWRENDER})
-	if(${SRB2_CONFIG_USE_FBO_OGL})
-		set(SRB2_USE_FBO_OGL ON)
-		add_definitions(-DUSE_FBO_OGL)
-	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)
 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")
-	set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mno-ms-bitfields)
+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)
 endif()
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-	set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value)
+# 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)
 endif()
 
+add_compile_options(-g)
+
 add_definitions(-DCMAKECONFIG)
 
 #add_library(SRB2Core STATIC

src/Makefile

@@ -49,6 +49,7 @@
 #                    Already enabled by default for 32-bit
 #                    Windows.
 # NOCURL=1 - Disable libcurl--HTTP capability.
+# NOHOLEPUNCH=1 - Disable holepunch capability.
 # NOLIBGME=1 - Disable game music emu, retro VGM support.
 # NOOPENMPT=1 - Disable module (tracker) music support.
 # NOMIXER=1 - Disable SDL Mixer (audio playback).
@@ -69,6 +70,7 @@
 # VALGRIND=1 - Enable Valgrind memory debugging support.
 # PROFILEMODE=1 - Enable performance profiling (gprof).
 # USEASAN=1 - Enable building with Address Sanitizer.
+# USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer.
 # NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
 #
 # General flags for building:
@@ -243,10 +245,14 @@ ifdef STATIC
 libs+=-static
 endif
 
+ifneq (,$(filter $(CC) $(CXX),gcc g++))
+ opts+=-mno-ms-bitfields
+endif
+
 # build with profiling information
 ifdef PROFILEMODE
 opts+=-pg
-LDFLAGS+=-pg
+libs+=-pg
 endif
 
 ifdef DEBUGMODE
@@ -256,29 +262,32 @@ debug_opts=-DNDEBUG
 opts+=-O3
 ifdef USELTO
 # compile with LTO
-ifdef MINGW
-opts+=-flto=auto -g
-LDFLAGS+=-flto=auto -g
-else
 opts+=-flto=auto
-LDFLAGS+=-flto=auto
-endif
+libs+=-flto=auto
 endif
 endif
 
 ifdef USEASAN
 # compile with asan
-ifdef MINGW
-opts+=-fsanitize=address -g
-libs+=-fsanitize=address -g
-else
 opts+=-fsanitize=address
 libs+=-fsanitize=address
 endif
+
+ifdef USEUBSAN
+# compile with asan
+opts+=-fsanitize=undefined
+libs+=-fsanitize=undefined
 endif
 
-ifeq ($(CC),clang)
- LDFLAGS+= -fuse-ld=lld
+ifneq (,$(filter $(CC) $(CXX),clang clang++))
+ libs+=-fuse-ld=lld
+endif
+
+ifdef MINGW
+# mingw needs this passed AFTER lto and the likes were passed
+# otherwise libbacktrace may break
+opts+=-g
+libs+=-g
 endif
 
 # debug_opts also get passed to windres

src/Makefile.d/detect.mk

@@ -64,9 +64,9 @@ endif
 
 # This must have high to low order.
 gcc_versions:=\
-	151 150 15\
+	152 151 150 15\
 	142 141 140 14\
-	132 131 130 13\
+	133 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.1.1
+latest_gcc_version:=15.2
 
 # Automatically set version flag, but not if one was
 # manually set. And don't bother if this is a clean only

src/Makefile.d/features.mk

@@ -6,7 +6,8 @@ passthru_opts+=\
 	NOHW NOMD5 NOPOSTPROCESSING\
 	MOBJCONSISTANCY PACKETDROP ZDEBUG\
 	HAVE_MINIUPNPC\
-	HAVE_DISCORDRPC DEVELOP
+	HAVE_DISCORDRPC DEVELOP\
+	NOHOLEPUNCH\
 
 # build with debugging information
 ifdef DEBUGMODE

src/Makefile.d/sdl.mk

@@ -10,7 +10,7 @@
 
 makedir:=$(makedir)/SDL
 
-opts+=-DDIRECTFULLSCREEN -DHAVE_SDL
+opts+=-DHAVE_SDL
 sources+=$(call List,sdl/Sourcefile)
 
 NOUPNP=1
@@ -30,7 +30,7 @@ sources+=sdl/ogl_sdl.c
 endif
 
 ifdef NOMIXER
-sources+=sdl/sdl_sound.c
+sources+=sdl/dummy_sound.c
 else
 opts+=-DHAVE_MIXER
 sources+=sdl/mixer_sound.c

src/Makefile.d/versions.mk

@@ -20,7 +20,10 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\
 CXXFLAGS+= -Wno-aggregate-return
 
 # -W -Wno-unused
-WFLAGS:=-Wall -Wno-trigraphs
+WFLAGS:=-Wall -Wno-trigraphs -Wnull-dereference
+ifdef GCC152
+WFLAGS+=-Wzero-as-null-pointer-constant
+endif
 ifndef GCC295
 #WFLAGS+=-Wno-packed
 endif
@@ -144,8 +147,10 @@ ifdef GCC81
  WFLAGS+=-Wno-error=multistatement-macros
 endif
 
-ifeq ($(CC),clang)
- WFLAGS+= -Wno-unknown-pragmas -Wno-cast-align
+ifneq (,$(filter $(CC) $(CXX),clang clang++))
+ WFLAGS+= -Wno-unknown-pragmas
+ WFLAGS+= -Wno-cast-align
+ WFLAGS+= -Wno-cast-qual # not a fan, but clang really hates our read macros
 endif
 
 ifdef NONX86

src/Makefile.d/win32.mk

@@ -2,6 +2,8 @@
 # Mingw, if you don't know, that's Win32/Win64
 #
 
+sources+=$(call List,win32/Sourcefile)
+
 ifndef MINGW64
 EXENAME?=srb2kart-saturn_32bit.exe
 else
@@ -95,7 +97,7 @@ LIBBACKTRACE_libs:=-L$(lib)/lib/x86_64 -lbacktrace
 $(eval $(call _set,LIBBACKTRACE))
 else
 lib:=../libs/drmingw
-opts+=-I$(lib)/include
+opts+=-I$(lib)/include -DHAVE_DRMINGW
 libs+=-L$(lib)/lib/win32 -lmgwhelp -lexchndl
 endif
 

src/Sourcefile

@@ -1,3 +1,4 @@
+string.c
 am_map.c
 b_bot.c
 command.c
@@ -42,19 +43,18 @@ s_sound.c
 screen.c
 sounds.c
 st_stuff.c
-string.c
 tables.c
 v_video.c
 w_wad.c
 y_inter.c
 z_zone.cpp
-r_bsp.c
+r_bsp.cpp
 r_data.c
-r_draw.c
+r_draw.cpp
 r_fps.cpp
 r_main.cpp
-r_patch.c
-r_patchrotation.c
+r_patch.cpp
+r_patchrotation.cpp
 r_plane.cpp
 r_segs.cpp
 r_skins.c

src/android/i_system.c

@@ -110,7 +110,7 @@ void I_Error(const char *error, ...)
   char logbuf[8192];
 
   va_start(argptr, error);
-  vsprintf(logbuf, error, argptr);
+  vsnprintf(logbuf, 8192, error, argptr);
   va_end(argptr);
 
   LOGE(logbuf);
@@ -166,7 +166,7 @@ void I_OutputMsg(const char *fmt, ...)
   char logbuf[8192];
 
   va_start(argptr, fmt);
-  vsprintf(logbuf, fmt, argptr);
+  vsnprintf(logbuf, 8192, fmt, argptr);
   va_end(argptr);
 
   LOGD(logbuf);
@@ -226,10 +226,6 @@ 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?!");

src/android/i_video.c

@@ -50,25 +50,15 @@ const char *VID_GetModeName(INT32 modenum)
   return "A320x240";
 }
 
-void I_UpdateNoBlit(void){}
-
-void I_FinishUpdate(void) {
+void I_FinishUpdate(void)
+{
   LOGD("FRAME!");
   (*jni_env)->CallVoidMethod(jni_env, androidVideo, videoFrameCB);
 }
 
 void I_UpdateNoVsync(void) {}
 
-void I_WaitVBL(INT32 count)
-{
-  (void)count;
-}
-
 void I_ReadScreen(UINT8 * restrict scr, INT32 scale)
 {
   (void)scr;
 }
-
-void I_BeginRead(void){}
-
-void I_EndRead(void){}

src/b_bot.c

@@ -47,7 +47,7 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
 		if (sonic->player->pflags & (PF_MACESPIN|PF_ITEMHANG))
 		{
 			cmd->forwardmove = sonic->player->cmd.forwardmove;
-			cmd->angleturn = abs((signed)(tails->angle - sonic->angle))>>16;
+			cmd->angleturn = abs((signed)(tails->angle - sonic->angle)) >> TICCMD_REDUCE;
 			if (sonic->angle < tails->angle)
 				cmd->angleturn = -cmd->angleturn;
 		} else if (dist > FixedMul(512*FRACUNIT, tails->scale))
@@ -139,13 +139,13 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward
 			// Don't mess with bot inputs during these unhandled movement conditions.
 			// The normal AI doesn't use abilities, so custom AI should be sending us exactly what it wants anyway.
 			if (forward)
-				cmd->forwardmove += MAXPLMOVE<<FRACBITS>>16;
+				cmd->forwardmove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
 			if (backward)
-				cmd->forwardmove -= MAXPLMOVE<<FRACBITS>>16;
+				cmd->forwardmove -= MAXPLMOVE<<FRACBITS >> TICCMD_REDUCE;
 			if (left || strafeleft)
-				cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16;
+				cmd->sidemove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
 			if (right || straferight)
-				cmd->sidemove += MAXPLMOVE<<FRACBITS>>16;
+				cmd->sidemove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
 		} else {
 			// In standard 2D mode, interpret "forward" as "the way you're facing" and everything else as "the way you're not facing"
 			if (left || right)
@@ -163,23 +163,23 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward
 					right = true;
 			}
 			if (left || strafeleft)
-				cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16;
+				cmd->sidemove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
 			if (right || straferight)
-				cmd->sidemove += MAXPLMOVE<<FRACBITS>>16;
+				cmd->sidemove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
 		}
 	} else {
 		if (forward)
-			cmd->forwardmove += MAXPLMOVE<<FRACBITS>>16;
+			cmd->forwardmove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
 		if (backward)
-			cmd->forwardmove -= MAXPLMOVE<<FRACBITS>>16;
+			cmd->forwardmove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
 		if (left)
 			cmd->angleturn += 1280;
 		if (right)
 			cmd->angleturn -= 1280;
 		if (strafeleft)
-			cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16;
+			cmd->sidemove -= MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
 		if (straferight)
-			cmd->sidemove += MAXPLMOVE<<FRACBITS>>16;
+			cmd->sidemove += MAXPLMOVE << FRACBITS >> TICCMD_REDUCE;
 	}
 	if (jump)
 		cmd->buttons |= BT_DRIFT;

src/blua/lapi.c

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

src/blua/lauxlib.c

@@ -24,6 +24,8 @@
 
 #include "lauxlib.h"
 
+#include "../doomdef.h"
+
 
 #define FREELIST_REF	0	/* free list of references */
 
@@ -40,7 +42,7 @@ LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) {
   if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
     return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
   lua_getinfo(L, "n", &ar);
-  if (strcmp(ar.namewhat, "method") == 0) {
+  if (fastcmp(ar.namewhat, "method")) {
     narg--;  /* do not count `self' */
     if (narg == 0)  /* error is in the self argument itself? */
       return luaL_error(L, "calling " LUA_QS " on bad self (%s)",
@@ -91,13 +93,64 @@ LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
 /* }====================================================== */
 
 
+/*
+** {======================================================
+** 'luaL_resourcetryagain'
+** This function uses 'errno' to check whether the last error was
+** related to lack of resources (e.g., not enough memory or too many
+** open files).  If so, the function performs a full garbage collection
+** to try to release resources, and then it returns 1 to signal to
+** the caller that it is worth trying again the failed operation.
+** Otherwise, it returns 0.  Because error codes are not ANSI C, the
+** code must handle any combination of error codes that are defined.
+** =======================================================
+*/
+
+LUALIB_API int luaL_resourcetryagain (lua_State *L) {
+
+/* these are the resource-related errors in Linux */
+#if defined(EMFILE) || defined(ENFILE) || defined(ENOMEM)
+
+#if !defined(EMFILE)	/* too many open files in the process */
+#define EMFILE		-1	/* if not defined, use an impossible value */
+#endif
+
+#if !defined(ENFILE)	/* too many open files in the system */
+#define ENFILE		-1
+#endif
+
+#if !defined(ENOMEM)	/* not enough memory */
+#define ENOMEM		-1
+#endif
+
+  if (errno == EMFILE || errno == ENFILE || errno == ENOMEM) {
+    CONS_Alert(CONS_WARNING, "%s, force calling lua garbage collector\n", strerror(errno));
+    lua_gc(L, LUA_GCCOLLECT, 0);  /* try to release resources with a full GC */
+    return 1;  /* signal to try again the creation */
+  }
+
+#endif
+
+  return 0;  /* else, asume errors are not due to lack of resources */
+
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Userdata's metatable manipulation
+** =======================================================
+*/
+
 LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def,
                                  const char *const lst[]) {
   const char *name = (def) ? luaL_optstring(L, narg, def) :
                              luaL_checkstring(L, narg);
   int i;
   for (i=0; lst[i]; i++)
-    if (strcmp(lst[i], name) == 0)
+    if (fastcmp(lst[i], name))
       return i;
   return luaL_argerror(L, narg,
                        lua_pushfstring(L, "invalid option " LUA_QS, name));

src/blua/lauxlib.h

@@ -95,6 +95,8 @@ LUALIB_API FUNCREPORT int (luaL_error) (lua_State *L, const char *fmt, ...);
 LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
                                    const char *const lst[]);
 
+LUALIB_API int (luaL_resourcetryagain) (lua_State *L);
+
 LUALIB_API int (luaL_ref) (lua_State *L, int t);
 LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
 

src/blua/liolib.c

@@ -58,12 +58,6 @@ static int pushresult (lua_State *L, int i, const char *filename) {
 }
 
 
-static void fileerror (lua_State *L, int arg, const char *filename) {
-  lua_pushfstring(L, "%s: %s", filename, strerror(errno));
-  luaL_argerror(L, arg, lua_tostring(L, -1));
-}
-
-
 #define tofilep(L)	((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
 
 
@@ -161,12 +155,31 @@ static int io_tostring (lua_State *L) {
 
 static int StartsWith(const char *a, const char *b) // this is wolfs being lazy yet again
 {
-   if(strncmp(a, b, strlen(b)) == 0) return 1;
+   if (strncmp(a, b, strlen(b)) == 0) return 1;
    return 0;
 }
 
+/*
+** Equivalent to 'fopen', but if it fails due to a lack of resources
+** (see 'luaL_resourcetryagain'), do an "emergency" garbage collection to try
+** to close some files and then tries to open the file again.
+*/
+static FILE *trytoopen (lua_State *L, const char *path, const char *mode) {
+  FILE *f = fopen(path, mode);
+  if (f == NULL && luaL_resourcetryagain(L))  /* resource failure? */
+    f = fopen(path, mode);  /* try to open again */
+  return f;
+}
 
-static int io_open (lua_State *L) {
+static void opencheck (lua_State *L, const char *fname, const char *mode) {
+  FILE **p = newfile(L);
+  *p = trytoopen(L, fname, mode);
+  if (l_unlikely(*p == NULL))
+    luaL_error(L, "cannot open file '%s' (%s)", fname, strerror(errno));
+}
+
+static int io_open(lua_State *L)
+{
 	FILE **pf;
 	const char *filename = luaL_checkstring(L, 1);
 	int pass = 0;
@@ -178,12 +191,13 @@ static int io_open (lua_State *L) {
 
 	for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
 	{
-		if (!stricmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
+		if (fasticmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
 		{
 			pass = 1;
 			break;
 		}
 	}
+
 	if (l_unlikely(strstr(filename, "..") || strchr(filename, ':') || StartsWith(filename, "\\")
 		|| StartsWith(filename, "/") || !pass))
 	{
@@ -210,7 +224,7 @@ static int io_open (lua_State *L) {
 	}
 
 	pf = newfile(L);
-	*pf = fopen(destFilename, mode);
+	*pf = trytoopen(L, destFilename, mode);
 	return (*pf == NULL) ? pushresult(L, 0, filename) : 1;
 }
 
@@ -218,6 +232,8 @@ static int io_open (lua_State *L) {
 static int io_tmpfile (lua_State *L) {
   FILE **pf = newfile(L);
   *pf = tmpfile();
+  if (*pf == NULL && luaL_resourcetryagain(L))  /* resource failure? */
+    *pf = tmpfile();  /* try to open again */
   return (*pf == NULL) ? pushresult(L, 0, NULL) : 1;
 }
 
@@ -236,10 +252,7 @@ static int g_iofile (lua_State *L, int f, const char *mode) {
   if (!lua_isnoneornil(L, 1)) {
     const char *filename = lua_tostring(L, 1);
     if (filename) {
-      FILE **pf = newfile(L);
-      *pf = fopen(filename, mode);
-      if (l_unlikely(*pf == NULL))
-        fileerror(L, 1, filename);
+      opencheck(L, filename, mode);
     }
     else {
       tofile(L);  /* check that it's a valid file handle */
@@ -288,10 +301,7 @@ static int io_lines (lua_State *L) {
   }
   else {
     const char *filename = luaL_checkstring(L, 1);
-    FILE **pf = newfile(L);
-    *pf = fopen(filename, "r");
-    if (l_unlikely(*pf == NULL))
-      fileerror(L, 1, filename);
+    opencheck(L, filename, "r");
     aux_lines(L, lua_gettop(L), 1);
     return 1;
   }

src/blua/lstrlib.c

@@ -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, 0) + 2;
+          return push_captures(&ms, NULL, NULL) + 2;
         }
         else
           return push_captures(&ms, s1, res);

src/blua/luaconf.h

@@ -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) != 0), 1))
-#define l_unlikely(x)	(__builtin_expect(((x) != 0), 0))
+#define l_likely(x)		(__builtin_expect(!!(x), 1))
+#define l_unlikely(x)	(__builtin_expect(!!(x), 0))
 #else
-#define l_likely(x)	(x)
+#define l_likely(x)		(x)
 #define l_unlikely(x)	(x)
 #endif
 

src/byteptr.h

@@ -1,7 +1,8 @@
-// SONIC ROBO BLAST 2
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2025 by Sonic Team Junior.
+// Copyright (C) 2025 by Kart Krew.
+// Copyright (C) 2020 by Sonic Team Junior.
+// Copyright (C) 2000 by DooM Legacy Team.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -24,8 +25,9 @@ extern "C" {
 //
 // Little-endian machines
 //
+
 #define WRITEUINT8(p,b)     do {   UINT8 *p_tmp = (  UINT8 *)p; const   UINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
-#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (  SINT8 *)p; const   SINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (  SINT8 *)p; const   SINT8 tv = (  SINT8)(b); memcpy(p, &tv, sizeof(  SINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 #define WRITEINT16(p,b)     do {   INT16 *p_tmp = (  INT16 *)p; const   INT16 tv = (  INT16)(b); memcpy(p, &tv, sizeof(  INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 #define WRITEUINT16(p,b)    do {  UINT16 *p_tmp = ( UINT16 *)p; const  UINT16 tv = ( UINT16)(b); memcpy(p, &tv, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 #define WRITEINT32(p,b)     do {   INT32 *p_tmp = (  INT32 *)p; const   INT32 tv = (  INT32)(b); memcpy(p, &tv, sizeof(  INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
@@ -36,25 +38,25 @@ extern "C" {
 
 // what is this?
 #if defined (__GNUC__)
-#define READUINT8(p)        ({   UINT8 *p_tmp = (UINT8   *)p;   UINT8 b; memcpy(&b, p, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READSINT8(p)        ({   SINT8 *p_tmp = (SINT8   *)p;   SINT8 b; memcpy(&b, p, sizeof(  SINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READINT16(p)        ({   INT16 *p_tmp = (INT16   *)p;   INT16 b; memcpy(&b, p, sizeof(  INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READUINT16(p)       ({  UINT16 *p_tmp = (UINT16  *)p;  UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READINT32(p)        ({   INT32 *p_tmp = (INT32   *)p;   INT32 b; memcpy(&b, p, sizeof(  INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READUINT32(p)       ({  UINT32 *p_tmp = (UINT32  *)p;  UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READCHAR(p)         ({    char *p_tmp = (char    *)p;    char b; memcpy(&b, p, sizeof(   char)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READFIXED(p)        ({ fixed_t *p_tmp = (fixed_t *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
-#define READANGLE(p)        ({ angle_t *p_tmp = (angle_t *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READUINT8(p)        ({   const UINT8 *p_tmp = (const UINT8   *)p;   UINT8 b; memcpy(&b, p, sizeof(  UINT8)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READSINT8(p)        ({   const SINT8 *p_tmp = (const SINT8   *)p;   SINT8 b; memcpy(&b, p, sizeof(  SINT8)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READINT16(p)        ({   const INT16 *p_tmp = (const INT16   *)p;   INT16 b; memcpy(&b, p, sizeof(  INT16)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READUINT16(p)       ({  const UINT16 *p_tmp = (const UINT16  *)p;  UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READINT32(p)        ({   const INT32 *p_tmp = (const INT32   *)p;   INT32 b; memcpy(&b, p, sizeof(  INT32)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READUINT32(p)       ({  const UINT32 *p_tmp = (const UINT32  *)p;  UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READCHAR(p)         ({    const char *p_tmp = (const char    *)p;    char b; memcpy(&b, p, sizeof(   char)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READFIXED(p)        ({ const fixed_t *p_tmp = (const fixed_t *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
+#define READANGLE(p)        ({ const angle_t *p_tmp = (const angle_t *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
 #else
-#define READUINT8(p)        ((UINT8*)(*(void**)(&(p)) = (void*)&((UINT8*)(p))[1]))[-1]
-#define READSINT8(p)        ((SINT8*)(*(void**)(&(p)) = (void*)&((SINT8*)(p))[1]))[-1]
-#define READINT16(p)        ((INT16*)(*(void**)(&(p)) = (void*)&((INT16*)(p))[1]))[-1]
-#define READUINT16(p)       ((UINT16*)(*(void**)(&(p)) = (void*)&((UINT16*)(p))[1]))[-1]
-#define READINT32(p)        ((INT32*)(*(void**)(&(p)) = (void*)&((INT32*)(p))[1]))[-1]
-#define READUINT32(p)       ((UINT32*)(*(void**)(&(p)) = (void*)&((UINT32*)(p))[1]))[-1]
-#define READCHAR(p)         ((char*)(*(void**)(&(p)) = (void*)&((char*)(p))[1]))[-1]
-#define READFIXED(p)        ((fixed_t*)(*(void**)(&(p)) = (void*)&((fixed_t*)(p))[1]))[-1]
-#define READANGLE(p)        ((angle_t*)(*(void**)(&(p)) = (void*)&((angle_t*)(p))[1]))[-1]
+#define READUINT8(p)        ((const UINT8*)  (*(const void**)(&(p)) = (const void*)&((const UINT8*)  (p))[1]))[-1]
+#define READSINT8(p)        ((const SINT8*)  (*(const void**)(&(p)) = (const void*)&((const SINT8*)  (p))[1]))[-1]
+#define READINT16(p)        ((const INT16*)  (*(const void**)(&(p)) = (const void*)&((const INT16*)  (p))[1]))[-1]
+#define READUINT16(p)       ((const UINT16*) (*(const void**)(&(p)) = (const void*)&((const UINT16*) (p))[1]))[-1]
+#define READINT32(p)        ((const INT32*)  (*(const void**)(&(p)) = (const void*)&((const INT32*)  (p))[1]))[-1]
+#define READUINT32(p)       ((const UINT32*) (*(const void**)(&(p)) = (const void*)&((const UINT32*) (p))[1]))[-1]
+#define READCHAR(p)         ((const char*)   (*(const void**)(&(p)) = (const void*)&((const char*)   (p))[1]))[-1]
+#define READFIXED(p)        ((const fixed_t*)(*(const void**)(&(p)) = (const void*)&((const fixed_t*)(p))[1]))[-1]
+#define READANGLE(p)        ((const angle_t*)(*(const void**)(&(p)) = (const void*)&((const angle_t*)(p))[1]))[-1]
 #endif
 
 #else //SRB2_BIG_ENDIAN
@@ -117,15 +119,15 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
 	return (ucp[3] << 24) | (ucp[2] << 16) | (ucp[1] << 8) | ucp[0];
 }
 
-#define READUINT8(p)        ((UINT8*)(p = (void*)&((UINT8*)p)[1]))[-1]
-#define READSINT8(p)        ((SINT8*)(p = (void*)&((SINT8*)p)[1]))[-1]
-#define READINT16(p)        readshort(&((INT16*)(p = (void*)&((INT16*)p)[1]))[-1])
-#define READUINT16(p)       readushort(&((UINT16*)(p = (void*)&((UINT16*)p)[1]))[-1])
-#define READINT32(p)        readlong(&((INT32*)(p = (void*)&((INT32*)p)[1]))[-1])
-#define READUINT32(p)       readulong(&((UINT32*)(p = (void*)&((UINT32*)p)[1]))
-#define READCHAR(p)         ((char*)(p = (void*)&((char*)p)[1]))[-1]
-#define READFIXED(p)        readlong(&((fixed_t*)(p = (void*)&((fixed_t*)p)[1]))[-1])
-#define READANGLE(p)        readulong(&((angle_t*)(p = (void*)&((angle_t*)p)[1]))[-1])
+#define READUINT8(p)        ((const UINT8*)(p = (const void*)&((const UINT8*)p)[1]))[-1]
+#define READSINT8(p)        ((const SINT8*)(p = (const void*)&((const SINT8*)p)[1]))[-1]
+#define READINT16(p)        readshort(&((const INT16*)(p = (const void*)&((const INT16*)p)[1]))[-1])
+#define READUINT16(p)       readushort(&((const UINT16*)(p = (const void*)&((const UINT16*)p)[1]))[-1])
+#define READINT32(p)        readlong(&((const INT32*)(p = (const void*)&((const INT32*)p)[1]))[-1])
+#define READUINT32(p)       readulong(&((const UINT32*)(p = (const void*)&((const UINT32*)p)[1]))[-1])
+#define READCHAR(p)         ((const char*)(p = (const void*)&((const char*)p)[1]))[-1]
+#define READFIXED(p)        readlong(&((const fixed_t*)(p = (const void*)&((const fixed_t*)p)[1]))[-1])
+#define READANGLE(p)        readulong(&((const angle_t*)(p = (const void*)&((const angle_t*)p)[1]))[-1])
 #endif //SRB2_BIG_ENDIAN
 
 #define WRITESTRINGN(p, s, n) do {                          \

src/command.c

@@ -57,7 +57,6 @@ static void CV_EnforceExecVersion(void);
 static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr);
 
 static boolean CV_Command(void);
-consvar_t *CV_FindVar(const char *name);
 static const char *CV_StringValue(const char *var_name);
 static consvar_t *consvar_vars; // list of registered console variables
 
@@ -142,7 +141,7 @@ void COM_BufInsertText(const char *ptext)
 	templen = com_text.cursize;
 	if (templen)
 	{
-		temp = M_Memcpy(ZZ_Alloc(templen), com_text.data, templen);
+		temp = memcpy(ZZ_Alloc(templen), com_text.data, templen);
 		VS_Clear(&com_text);
 	}
 
@@ -199,7 +198,7 @@ void COM_BufExecute(void)
 				break;
 		}
 
-		M_Memcpy(line, ptext, i);
+		memcpy(line, ptext, i);
 		line[i] = 0;
 
 		// flush the command text from the command buffer, _BEFORE_
@@ -238,10 +237,13 @@ void COM_ImmedExecute(const char *ptext)
 	char line[1024] = "";
 	INT32 quotes;
 
-	while (i < strlen(ptext))
+	const size_t txtlength = strlen(ptext);
+
+	while (i < txtlength)
 	{
 		quotes = 0;
-		for (j = 0; i < strlen(ptext); i++,j++)
+
+		for (j = 0; i < txtlength; i++,j++)
 		{
 			if (ptext[i] == '\"' && !quotes && i > 0 && ptext[i-1] != ' ') // Malformed command
 				return;
@@ -277,11 +279,11 @@ static xcommand_t *com_commands = NULL; // current commands
 
 #define MAX_ARGS 80
 static size_t com_argc;
-char *com_argv[MAX_ARGS];
+char *com_argv[MAX_ARGS] = {};
 static const char *com_null_string = "";
 static char *com_args = NULL; // current command args or NULL
 
-static void Got_NetVar(UINT8 **p, INT32 playernum);
+static void Got_NetVar(const UINT8 **p, INT32 playernum);
 
 /** Initializes command buffer and adds basic commands.
   */
@@ -359,7 +361,7 @@ size_t COM_CheckParm(const char *check)
 	size_t i;
 
 	for (i = 1; i < com_argc; i++)
-		if (!strcasecmp(check, com_argv[i]))
+		if (fasticmp(check, com_argv[i]))
 			return i;
 	return 0;
 }
@@ -456,7 +458,7 @@ void COM_AddCommand(const char *name, com_func_t func)
 	// fail if the command already exists
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (fasticmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			// don't I_Error for Lua commands
 			// Lua commands can replace game commands, and they have priority.
@@ -492,7 +494,7 @@ int COM_AddLuaCommand(const char *name)
 	// command already exists
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (fasticmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			// replace the built in command.
 			cmd->function = COM_Lua_f;
@@ -519,7 +521,7 @@ static boolean COM_Exists(const char *com_name)
 	xcommand_t *cmd;
 
 	for (cmd = com_commands; cmd; cmd = cmd->next)
-		if (!stricmp(com_name, cmd->name))
+		if (fasticmp(com_name, cmd->name))
 			return true;
 
 	return false;
@@ -571,7 +573,7 @@ static void COM_ExecuteString(char *ptext)
 	// check functions
 	for (cmd = com_commands; cmd; cmd = cmd->next)
 	{
-		if (!stricmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
+		if (fasticmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase!
 		{
 			cmd->function();
 			return;
@@ -581,7 +583,7 @@ static void COM_ExecuteString(char *ptext)
 	// check aliases
 	for (a = com_alias; a; a = a->next)
 	{
-		if (!stricmp(com_argv[0], a->name))
+		if (fasticmp(com_argv[0], a->name))
 		{
 			if (recursion > MAX_ALIAS_RECURSION)
 				CONS_Alert(CONS_WARNING, M_GetText("Alias recursion cycle detected!\n"));
@@ -653,7 +655,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->next != NULL; head = head->next)
+		for (cmdalias_t *head = com_alias; head != NULL; head = head->next)
 		{
 			if (strncmp(begin, head->name, szBegin) == 0)
 			{
@@ -674,7 +676,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->next != NULL; head = head->next)
+		for (cmdalias_t *head = com_alias; head != NULL; head = head->next)
 		{
 			CONS_Printf(alias_format, head->name, head->value);
 		}
@@ -700,6 +702,7 @@ static void COM_Echo_f(void)
 
 	for (i = 1; i < COM_Argc(); i++)
 		CONS_Printf("%s ", COM_Argv(i));
+
 	CONS_Printf("\n");
 }
 
@@ -708,11 +711,11 @@ static void COM_Echo_f(void)
 static void COM_CEcho_f(void)
 {
 	size_t i;
-	char cechotext[1024] = "";
+	char cechotext[1024] = {0};
 
 	for (i = 1; i < COM_Argc(); i++)
 	{
-		strlcpy(cechotext, COM_Argv(i), sizeof(cechotext)-1);
+		strlcat(cechotext, COM_Argv(i), sizeof(cechotext)-1);
 		strlcat(cechotext, " ", sizeof(cechotext)-1);
 	}
 
@@ -835,7 +838,7 @@ static void COM_Help_f(void)
 			if (cvar->PossibleValue)
 			{
 				{
-					if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX"))
+					if (fasticmp(cvar->PossibleValue[0].strvalue, "MIN") && fasticmp(cvar->PossibleValue[1].strvalue, "MAX"))
 					{
 						if (floatmode)
 						{
@@ -878,7 +881,7 @@ static void COM_Help_f(void)
 		{
 			for (cmd = com_commands; cmd; cmd = cmd->next)
 			{
-				if (strcmp(cmd->name, help))
+				if (!fastcmp(cmd->name, help))
 					continue;
 
 				CONS_Printf("\x82""Command %s:\n", cmd->name);
@@ -938,6 +941,8 @@ static void COM_Find_f(void)
 	}
 
 	help = COM_Argv(1);
+	if (!help)
+		return;
 	helplen = strlen(help);
 	CONS_Printf("\x82""Variables:\n");
 	matchesany = false;
@@ -1126,7 +1131,7 @@ void *VS_GetSpace(vsbuf_t *buf, size_t length)
   */
 void VS_Write(vsbuf_t *buf, const void *data, size_t length)
 {
-	M_Memcpy(VS_GetSpace(buf, length), data, length);
+	memcpy(VS_GetSpace(buf, length), data, length);
 }
 
 /** Prints text in a variable buffer. Like VS_Write() plus a
@@ -1143,9 +1148,9 @@ void VS_Print(vsbuf_t *buf, const char *data)
 	len = strlen(data) + 1;
 
 	if (buf->data[buf->cursize-1])
-		M_Memcpy((UINT8 *)VS_GetSpace(buf, len), data, len); // no trailing 0
+		memcpy((UINT8 *)VS_GetSpace(buf, len), data, len); // no trailing 0
 	else
-		M_Memcpy((UINT8 *)VS_GetSpace(buf, len-1) - 1, data, len); // write over trailing 0
+		memcpy((UINT8 *)VS_GetSpace(buf, len-1) - 1, data, len); // write over trailing 0
 }
 
 // =========================================================================
@@ -1173,7 +1178,7 @@ consvar_t *CV_FindVar(const char *name)
 	consvar_t *cvar;
 
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if (!stricmp(name,cvar->name))
+		if (fasticmp(name, cvar->name))
 			return cvar;
 
 	return NULL;
@@ -1363,7 +1368,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 				v = INT32_MIN; // Invalid integer trigger
 		}
 
-		if (var->PossibleValue[0].strvalue && !stricmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
+		if (var->PossibleValue[0].strvalue && fasticmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
 		{
 #define MINVAL 0
 #define MAXVAL 1
@@ -1376,21 +1381,21 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 
 			// search for other
 			for (i = MAXVAL+1; var->PossibleValue[i].strvalue; i++)
-				if (v == var->PossibleValue[i].value || !stricmp(var->PossibleValue[i].strvalue, valstr))
+				if (v == var->PossibleValue[i].value || fasticmp(var->PossibleValue[i].strvalue, valstr))
 				{
 					var->value = var->PossibleValue[i].value;
 					var->string = var->PossibleValue[i].strvalue;
 					goto finish;
 				}
 
-			if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || !stricmp(valstr, "MIN"))
+			if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || fasticmp(valstr, "MIN"))
 			{
 				v = var->PossibleValue[MINVAL].value;
 				valstr = var->PossibleValue[MINVAL].strvalue;
 				override = true;
 				overrideval = v;
 			}
-			else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || !stricmp(valstr, "MAX"))
+			else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || fasticmp(valstr, "MAX"))
 			{
 				v = var->PossibleValue[MAXVAL].value;
 				valstr = var->PossibleValue[MAXVAL].strvalue;
@@ -1408,7 +1413,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 
 			// check first strings
 			for (i = 0; var->PossibleValue[i].strvalue; i++)
-				if (!stricmp(var->PossibleValue[i].strvalue, valstr))
+				if (fasticmp(var->PossibleValue[i].strvalue, valstr))
 					goto found;
 			if (v != INT32_MIN)
 			{
@@ -1421,9 +1426,9 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 			if (var->PossibleValue == CV_OnOff || var->PossibleValue == CV_YesNo)
 			{
 				overrideval = -1;
-				if (!stricmp(valstr, "on") || !stricmp(valstr, "yes"))
+				if (fasticmp(valstr, "on") || fasticmp(valstr, "yes"))
 					overrideval = 1;
-				else if (!stricmp(valstr, "off") || !stricmp(valstr, "no"))
+				else if (fasticmp(valstr, "off") || fasticmp(valstr, "no"))
 					overrideval = 0;
 
 				if (overrideval != -1)
@@ -1471,7 +1476,7 @@ finish:
 	var->flags |= CV_MODIFIED;
 
 	// raise 'on change' code
-	LUA_CVarChanged(var->name); // let consolelib know what cvar this is.
+	LUA_CVarChanged(var); // let consolelib know what cvar this is.
 
 	if (var->flags & CV_CALL && !stealth)
 		var->func();
@@ -1497,11 +1502,11 @@ badinput:
 
 static boolean serverloading = false;
 
-static void Got_NetVar(UINT8 **p, INT32 playernum)
+static void Got_NetVar(const UINT8 **p, INT32 playernum)
 {
 	consvar_t *cvar;
 	UINT16 netid;
-	char *svalue;
+	const char *svalue;
 	UINT8 stealth = false;
 
 	if (playernum != serverplayer && !IsPlayerAdmin(playernum) && !serverloading)
@@ -1515,9 +1520,10 @@ static void Got_NetVar(UINT8 **p, INT32 playernum)
 		}
 		return;
 	}
+
 	netid = READUINT16(*p);
 	cvar = CV_FindNetVar(netid);
-	svalue = (char *)*p;
+	svalue = (const char *)*p;
 	SKIPSTRING(*p);
 	stealth = READUINT8(*p);
 
@@ -1573,8 +1579,9 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
 	WRITEUINT16(count_p, count);
 }
 
-void CV_LoadNetVars(UINT8 **p)
+size_t CV_LoadNetVars(const UINT8 *bufstart)
 {
+	const UINT8 *p = bufstart;
 	consvar_t *cvar;
 	UINT16 count;
 
@@ -1585,11 +1592,13 @@ void CV_LoadNetVars(UINT8 **p)
 		if (cvar->flags & CV_NETVAR)
 			Setvalue(cvar, cvar->defaultvalue, true);
 
-	count = READUINT16(*p);
+	count = READUINT16(p);
 	while (count--)
-		Got_NetVar(p, 0);
+		Got_NetVar(&p, 0);
 
 	serverloading = false;
+
+	return p - bufstart;
 }
 
 static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth);
@@ -1607,7 +1616,7 @@ void CV_ResetCheatNetVars(void)
 // Returns true if the variable's current value is its default value
 boolean CV_IsSetToDefault(consvar_t *v)
 {
-	return (!(strcmp(v->defaultvalue, v->string)));
+	return (fastcmp(v->defaultvalue, v->string));
 }
 
 // If any cheats CVars are not at their default settings, return true.
@@ -1619,7 +1628,7 @@ UINT8 CV_CheatsEnabled(void)
 	consvar_t *cvar;
 
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if ((cvar->flags & CV_CHEAT) && strcmp(cvar->defaultvalue, cvar->string))
+		if ((cvar->flags & CV_CHEAT) && !fastcmp(cvar->defaultvalue, cvar->string))
 			return 1;
 	return 0;
 }
@@ -1640,7 +1649,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 	if (!var->string)
 		I_Error("CV_Set: %s no string set!\n", var->name);
 #endif
-	if (!var || !var->string || !value || !stricmp(var->string, value))
+	if (!var || !var->string || !value || fasticmp(var->string, value))
 		return; // no changes
 
 	if (var->flags & CV_NETVAR)
@@ -1650,21 +1659,21 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 		UINT8 *p = buf;
 		if (!(server || (IsPlayerAdmin(consoleplayer))))
 		{
-			CONS_Printf(M_GetText("Only the server or admin can change: %s %s\n"), var->name, var->string);
+			CONS_Alert(CONS_NOTICE, "Only the server or admin can change: %s %s\n", var->name, var->string);
 			return;
 		}
 
 		if (var == &cv_kartencore && !M_SecretUnlocked(SECRET_ENCORE))
 		{
-			CONS_Printf(M_GetText("You haven't unlocked Encore Mode yet!\n"));
+			CONS_Alert(CONS_NOTICE, "You haven't unlocked Encore Mode yet!\n");
 			return;
 		}
 
 		if (var == &cv_kartspeed && !M_SecretUnlocked(SECRET_HARDSPEED))
 		{
-			if (!stricmp(value, "Hard") || atoi(value) == 2)
+			if (fasticmp(value, "Hard") || atoi(value) == 2)
 			{
-				CONS_Printf(M_GetText("You haven't unlocked this yet!\n"));
+				CONS_Alert(CONS_NOTICE, "You haven't unlocked this yet!\n");
 				return;
 			}
 		}
@@ -1681,14 +1690,13 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
 		else
 			Setvalue(var, value, stealth);
 	}
+	else if ((var->flags & CV_NOTINNET) && netgame)
+	{
+		CONS_Alert(CONS_NOTICE, "This variable can't be changed while in netgame: %s %s\n", var->name, var->string);
+		return;
+	}
 	else
-		if ((var->flags & CV_NOTINNET) && netgame)
-		{
-			CONS_Printf(M_GetText("This variable can't be changed while in netgame: %s %s\n"), var->name, var->string);
-			return;
-		}
-		else
-			Setvalue(var, value, stealth);
+		Setvalue(var, value, stealth);
 }
 
 /** Sets a value to a variable without calling its callback function.
@@ -1771,7 +1779,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 				newvalue = var->value - 1;
 				do
 				{
-					if(increment > 0) // Going up!
+					if (increment > 0) // Going up!
 					{
 						if (++newvalue == NUMMAPS)
 							newvalue = -1;
@@ -1785,7 +1793,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 					if (newvalue == oldvalue)
 						break; // don't loop forever if there's none of a certain gametype
 
-					if(!mapheaderinfo[newvalue])
+					if (newvalue >= 0 && newvalue < NUMMAPS && !mapheaderinfo[newvalue])
 						continue; // Don't allocate the header.  That just makes memory usage skyrocket.
 
 				} while (!M_CanShowLevelInList(newvalue, gt));
@@ -1797,7 +1805,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 		}
 #define MINVAL 0
 #define MAXVAL 1
-		else if (var->PossibleValue[MINVAL].strvalue && !strcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
+		else if (var->PossibleValue[MINVAL].strvalue && fastcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
 		{ // SRB2Kart
 #ifdef PARANOIA
 			if (!var->PossibleValue[MAXVAL].strvalue)
@@ -1914,13 +1922,14 @@ void CV_AddValue(consvar_t *var, INT32 increment)
 				max = (M_SecretUnlocked(SECRET_HARDSPEED) ? 3 : 2);
 			}
 #ifdef PARANOIA
-			if (currentindice == -1)
-				I_Error("CV_AddValue: current value %d not found in possible value\n",
-					var->value);
+			if (currentindice == -1 || max == 0)
+				I_Error("CV_AddValue: current value %d not found in possible value\n", var->value);
 #endif
-
-			newindice = (currentindice + increment + max) % max;
-			CV_Set(var, var->PossibleValue[newindice].strvalue);
+			if (max > 0)
+			{
+				newindice = (currentindice + increment + max) % max;
+				CV_Set(var, var->PossibleValue[newindice].strvalue);
+			}
 		}
 	}
 	else
@@ -1968,12 +1977,12 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 	{
 		if (joyaxis_default[i])
 		{
-			if (!stricmp(v->name, "joyaxis_fire"))
+			if (fasticmp(v->name, "joyaxis_fire"))
 			{
 				if (joyaxis_count[i] > 7) return false;
 				else if (joyaxis_count[i] == 7) return true;
 
-				if (!stricmp(valstr, "None")) joyaxis_count[i]++;
+				if (fasticmp(valstr, "None")) joyaxis_count[i]++;
 				else joyaxis_default[i] = false;
 			}
 			// reset all axis settings to defaults
@@ -2005,37 +2014,37 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 // Block the Xbox DInput default axes and reset to the current defaults
 static boolean CV_FilterJoyAxisVars2(consvar_t *v, const char *valstr)
 {
-	if (!stricmp(v->name, "joyaxis_turn") && !stricmp(valstr, "X-Axis"))
+	if (fasticmp(v->name, "joyaxis_turn") && fasticmp(valstr, "X-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis2_turn") && !stricmp(valstr, "X-Axis"))
+	if (fasticmp(v->name, "joyaxis2_turn") && fasticmp(valstr, "X-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis3_turn") && !stricmp(valstr, "X-Axis"))
+	if (fasticmp(v->name, "joyaxis3_turn") && fasticmp(valstr, "X-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis4_turn") && !stricmp(valstr, "X-Axis"))
+	if (fasticmp(v->name, "joyaxis4_turn") && fasticmp(valstr, "X-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis_aim") && !stricmp(valstr, "Y-Axis"))
+	if (fasticmp(v->name, "joyaxis_aim") && fasticmp(valstr, "Y-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis2_aim") && !stricmp(valstr, "Y-Axis"))
+	if (fasticmp(v->name, "joyaxis2_aim") && fasticmp(valstr, "Y-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis3_aim") && !stricmp(valstr, "Y-Axis"))
+	if (fasticmp(v->name, "joyaxis3_aim") && fasticmp(valstr, "Y-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis4_aim") && !stricmp(valstr, "Y-Axis"))
+	if (fasticmp(v->name, "joyaxis4_aim") && fasticmp(valstr, "Y-Axis"))
 		return false;
-	if (!stricmp(v->name, "joyaxis_fire") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis_fire") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis2_fire") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis2_fire") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis3_fire") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis3_fire") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis4_fire") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis4_fire") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis_drift") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis_drift") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis2_drift") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis2_drift") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis3_drift") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis3_drift") && fasticmp(valstr, "None"))
 		return false;
-	if (!stricmp(v->name, "joyaxis4_drift") && !stricmp(valstr, "None"))
+	if (fasticmp(v->name, "joyaxis4_drift") && fasticmp(valstr, "None"))
 		return false;
 
 	return true;
@@ -2052,8 +2061,8 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr)
 
 	if (GETMAJOREXECVERSION(cv_execversion.value) < 8) // 8 = 1.4
 	{
-		if (!stricmp(v->name, "masterserver") // Replaces a hack in MasterServer_OnChange for the original SRB2 MS.
-			|| !stricmp(v->name, "gamma")) // Too easy to accidentially change in prior versions.
+		if (fasticmp(v->name, "masterserver") // Replaces a hack in MasterServer_OnChange for the original SRB2 MS.
+			|| fasticmp(v->name, "gamma")) // Too easy to accidentially change in prior versions.
 			return false;
 	}
 
@@ -2136,7 +2145,7 @@ void CV_SaveVariables(FILE *f)
 			char stringtowrite[MAXTEXTCMD+1];
 
 			// Silly hack for Min/Max vars
-			if (!strcmp(cvar->string, "MAX") || !strcmp(cvar->string, "MIN"))
+			if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
 			{
 				if (cvar->flags & CV_FLOAT)
 					sprintf(stringtowrite, "%f", FixedToFloat(cvar->value));

src/command.h

@@ -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
 //===================================
@@ -182,7 +182,7 @@ void CV_SaveVariables(FILE *f);
 
 // load/save gamesate (load and save option and for network join in game)
 void CV_SaveNetVars(UINT8 **p, boolean isdemorecording);
-void CV_LoadNetVars(UINT8 **p);
+size_t CV_LoadNetVars(const UINT8 *p);
 
 // reset cheat netvars after cheats is deactivated
 void CV_ResetCheatNetVars(void);

src/config.h.in

@@ -11,21 +11,6 @@
 
 #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}"
 
@@ -33,30 +18,10 @@
 
 #else
 
-/* 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 SRB2_COMP_REVISION       ""
+#define SRB2_COMP_BRANCH         ""
 
-// 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
+#define CMAKE_ASSETS_DIR         ""
 
 #endif
 #endif

src/console.c

@@ -33,6 +33,8 @@
 #include "d_main.h"
 #include "m_menu.h"
 #include "m_textinput.h"
+#include "m_emotes.h"
+#include "i_time.h"
 #include "filesrch.h"
 
 #ifdef HWRENDER
@@ -44,21 +46,21 @@
 #ifdef HAVE_THREADS
 I_mutex con_mutex;
 
-// g_in_exiting_signal_handler is an evil hack
+// I_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_lock_mutex(&con_mutex); }
-#  define Unlock_state()  if (!g_in_exiting_signal_handler) { I_unlock_mutex(con_mutex); }
-#else/*HAVE_THREADS*/
+#  define Lock_state()    if (!I_In_Exiting_Signal_Handler()) { I_LockMutex(&con_mutex); }
+#  define Unlock_state()  if (!I_In_Exiting_Signal_Handler()) { I_UnlockMutex(con_mutex); }
+#else /*HAVE_THREADS*/
 #  define Lock_state()
 #  define Unlock_state()
-#endif/*HAVE_THREADS*/
+#endif /*HAVE_THREADS*/
 
 static boolean con_started = false; // console has been initialised
        boolean con_startup = false; // true at game startup, screen need refreshing
 static boolean con_forcepic = true; // at startup toggle console translucency when first off
-       boolean con_recalc;          // set true when screen size has changed
+       boolean con_recalc = false;  // set true when screen size has changed
 
 static tic_t con_tick; // console ticker for anim or blinking prompt cursor
                         // con_scrollup should use time (currenttime - lasttime)..
@@ -66,17 +68,12 @@ static tic_t con_tick; // console ticker for anim or blinking prompt cursor
 static boolean consoletoggle; // true when console key pushed, ticker will handle
 static boolean consoleready;  // console prompt is ready
 
-       INT32 con_destlines; // vid lines used by console at final position
-static INT32 con_curlines;  // vid lines currently used by console
-
-       INT32 con_clipviewtop; // (useless)
+       INT32 con_destlines = 0; // vid lines used by console at final position
+static INT32 con_curlines;      // vid lines currently used by console
 
 static UINT8  con_hudlines;             // number of console heads up message lines
 static UINT32 con_hudtime[MAXHUDLINES]; // remaining time of display for hud msg lines
 
-       INT32 con_clearlines;      // top screen lines to refresh when view reduced
-       boolean con_hudupdate;   // when messages scroll, we need a backgrnd refresh
-
 // console text output
 static char *con_line;          // console text output current line
 static size_t con_cx;           // cursor position in current line
@@ -88,7 +85,7 @@ static size_t con_totallines;      // lines of console text into the console buf
 static size_t con_width;           // columns of chars, depend on vid mode width
 
 static size_t con_scrollup;        // how many rows of text to scroll up (pgup/pgdn)
-UINT32 con_scalefactor;            // text size scale factor
+UINT32 con_scalefactor = 0;        // text size scale factor
 
 // hold 32 last lines of input for history
 #define CON_MAXPROMPTCHARS 256
@@ -172,6 +169,8 @@ static CV_PossibleValue_t menuhighlight_cons_t[] =
 };
 consvar_t cons_menuhighlight = {"menuhighlight", "Gametype Default", CV_SAVE, menuhighlight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cons_consoleprintinmenu = {"consoleprintinmenu", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 static void CON_Print(char *msg);
 
 //
@@ -393,9 +392,6 @@ void CON_Init(void)
 
 	Lock_state();
 
-	//note: CON_Ticker should always execute at least once before D_Display()
-	con_clipviewtop = -1; // -1 does not clip
-
 	con_hudlines = atoi(cons_hudlines.defaultvalue);
 
 	Unlock_state();
@@ -432,6 +428,7 @@ void CON_Init(void)
 		CV_RegisterVar(&cons_backpic);
 		CV_RegisterVar(&cons_backcolor);
 		CV_RegisterVar(&cons_menuhighlight);
+		CV_RegisterVar(&cons_consoleprintinmenu);
 		COM_AddCommand("bind", CONS_Bind_f);
 	}
 	else
@@ -529,7 +526,7 @@ static void CON_RecalcSize(void)
 	oldcon_width = con_width;
 	oldnumlines = con_totallines;
 	oldcon_cy = con_cy;
-	M_Memcpy(tmp_buffer, con_buffer, CON_BUFFERSIZE);
+	memcpy(tmp_buffer, con_buffer, CON_BUFFERSIZE);
 
 	if (conw < 1)
 		con_width = (BASEVIDWIDTH>>3) - 2;
@@ -555,7 +552,7 @@ static void CON_RecalcSize(void)
 		{
 			if (tmp_buffer[(i%oldnumlines)*oldcon_width])
 			{
-				M_Memcpy(string, &tmp_buffer[(i%oldnumlines)*oldcon_width], oldcon_width);
+				memcpy(string, &tmp_buffer[(i%oldnumlines)*oldcon_width], oldcon_width);
 				conw = oldcon_width - 1;
 				while (string[conw] == ' ' && conw)
 					conw--;
@@ -592,12 +589,18 @@ static void CON_ChangeHeight(void)
 
 // Handles Console moves in/out of screen (per frame)
 //
-static void CON_MoveConsole(void)
+void CON_MoveConsole(void)
 {
 	static fixed_t fracmovement = 0;
 
 	Lock_state();
 
+	if (con_curlines == con_destlines)
+	{
+		Unlock_state();
+		return;
+	}
+
 	// instant
 	if (!cons_speed.value)
 	{
@@ -727,7 +730,6 @@ void CON_ToggleOff(void)
 	con_curlines = 0;
 	CON_ClearHUD();
 	con_forcepic = 0;
-	con_clipviewtop = -1; // remove console clipping of view
 
 	I_SetTextInput(false);
 
@@ -779,18 +781,6 @@ void CON_Ticker(void)
 		}
 	}
 
-	// clip the view, so that the part under the console is not drawn
-	con_clipviewtop = -1;
-	if (cons_backpic.value) // clip only when using an opaque background
-	{
-		if (con_curlines > 0)
-			con_clipviewtop = con_curlines - viewwindowy - 1 - 10;
-		// NOTE: BIG HACK::SUBTRACT 10, SO THAT WATER DON'T COPY LINES OF THE CONSOLE
-		//       WINDOW!!! (draw some more lines behind the bottom of the console)
-		if (con_clipviewtop < 0)
-			con_clipviewtop = -1; // maybe not necessary, provided it's < 0
-	}
-
 	// check if console ready for prompt
 	if (con_destlines >= minheight)
 	{
@@ -1031,7 +1021,7 @@ boolean CON_Responder(event_t *ev)
 		Lock_state();
 
 		// Only add command to history if it differs from previous one
-		if (strcmp(input.buffer, inputlines[(inputline-1) & 31]))
+		if (!fastcmp(input.buffer, inputlines[(inputline-1) & 31]))
 		{
 			inputline = (inputline+1) & 31;
 			M_TextInputInit(&input, inputlines[inputline], CON_MAXPROMPTCHARS);
@@ -1100,9 +1090,6 @@ static void CON_Linefeed(void)
 
 	con_line = &con_buffer[(con_cy%con_totallines)*con_width];
 	memset(con_line, ' ', con_width);
-
-	// make sure the view borders are refreshed if hud messages scroll
-	con_hudupdate = true; // see HU_Erase()
 }
 
 // Outputs text into the console text buffer
@@ -1282,7 +1269,7 @@ void CONS_Alert(alerttype_t level, const char *fmt, ...)
 		txt = malloc(8192);
 
 	va_start(argptr, fmt);
-	vsprintf(txt, fmt, argptr);
+	vsnprintf(txt, 8192, fmt, argptr);
 	va_end(argptr);
 
 	switch (level)
@@ -1318,7 +1305,7 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...)
 		txt = malloc(8192);
 
 	va_start(argptr, fmt);
-	vsprintf(txt, fmt, argptr);
+	vsnprintf(txt, 8192, fmt, argptr);
 	va_end(argptr);
 
 	// Again I am lazy, oh well
@@ -1477,7 +1464,18 @@ static void CON_DrawHudlines(void)
 			}
 			if (c >= con_width)
 				break;
-			if (*p < HU_FONTSTART)
+
+			int emotelen;
+			emote_t *emote;
+
+			if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
+			{
+				M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
+				p += emotelen-1;
+				c += emotelen-1;
+				continue;
+			}
+			else if (*p < HU_FONTSTART)
 				;//charwidth = 4 * con_scalefactor;
 			else
 			{
@@ -1489,9 +1487,6 @@ static void CON_DrawHudlines(void)
 		//V_DrawCharacter(x, y, (p[c]&0xff) | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 		y += charheight;
 	}
-
-	// top screen lines that might need clearing when view is reduced
-	con_clearlines = y; // this is handled by HU_Erase();
 }
 
 // draw the console background, text, and prompt if enough place
@@ -1509,14 +1504,10 @@ static void CON_DrawConsole(void)
 	if (con_curlines <= 0)
 		return;
 
-	//FIXME: refresh borders only when console bg is translucent
-	con_clearlines = con_curlines; // clear console draw from view borders
-	con_hudupdate = true; // always refresh while console is on
-
 	// draw console background
 	if (cons_backpic.value || con_forcepic)
 	{
-		patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY);
+		patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_PATCH);
 
 		// Jimita: CON_DrawBackpic just called V_DrawScaledPatch
 		V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, con_backpic, NULL);
@@ -1558,8 +1549,20 @@ static void CON_DrawConsole(void)
 				p++;
 				c++;
 			}
+
 			if (c >= con_width)
 				break;
+
+			int emotelen;
+			emote_t *emote;
+
+			if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
+			{
+				M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
+				p += emotelen-1;
+				c += emotelen-1;
+				continue;
+			}
 			V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 		}
 	}
@@ -1590,13 +1593,12 @@ void CON_Drawer(void)
 	}
 
 	// console movement
-	if (con_curlines != con_destlines)
-		CON_MoveConsole();
+	CON_MoveConsole();
 
 	if (con_curlines > 0)
 		CON_DrawConsole();
 	else if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_CREDITS
-		|| gamestate == GS_VOTING || gamestate == GS_EVALUATION || gamestate == GS_WAITINGPLAYERS)
+		|| gamestate == GS_VOTING || gamestate == GS_EVALUATION || gamestate == GS_WAITINGPLAYERS || (cons_consoleprintinmenu.value && gamestate == GS_TITLESCREEN))
 		CON_DrawHudlines();
 
 	Unlock_state();

src/console.h

@@ -30,17 +30,13 @@ extern boolean con_recalc;
 
 extern boolean con_startup;
 
-// top clip value for view render: do not draw part of view hidden by console
-extern INT32 con_clipviewtop;
-
 // 0 means console if off, or moving out
 extern INT32 con_destlines;
 
-extern INT32 con_clearlines; // lines of top of screen to refresh
-extern boolean con_hudupdate; // hud messages have changed, need refresh
 extern UINT32 con_scalefactor; // console text scale factor
 
 extern consvar_t cons_backcolor, cons_menuhighlight;
+extern consvar_t cons_consoleprintinmenu;
 
 extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\
  *skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap;
@@ -56,6 +52,7 @@ void CON_ClearHUD(void); // clear heads up messages
 
 void CON_Ticker(void);
 void CON_Drawer(void);
+void CON_MoveConsole(void);
 void CONS_Error(const char *msg); // print out error msg, and wait a key
 
 // force console to move out

src/cxxutil.hpp

@@ -147,6 +147,51 @@ public:
 template <class T>
 NotNull(T) -> NotNull<T>;
 
+// does a super safe cast from floating point to interger types
+// this prob could be better since i suck at ceepeepee
+// but atleast we can just template shit to our desired types
+template <typename FloatT, typename IntT>
+static inline IntT floattoint(FloatT val)
+{
+	// :chaosleep:
+	static_assert(std::is_floating_point_v<FloatT>, "Input must be a floating-point type");
+	static_assert(std::is_integral_v<IntT>, "Output must be a integer type");
+
+	if (std::fpclassify(val) == FP_NAN)
+		return 0; // if stuffs not a number we sure screwed up lmao
+
+	// treat inifinity as "int min/max"
+	if (std::fpclassify(val) == FP_INFINITE)
+	{
+		// yes infinity can be signed kek
+		if (std::signbit(val))
+			return std::numeric_limits<IntT>::min(); // negative infinity, so return min
+		else
+			return std::numeric_limits<IntT>::max();
+	}
+
+	// make sure we fit into our targettype uwu
+	if (val > static_cast<FloatT>(std::numeric_limits<IntT>::max()))
+		return std::numeric_limits<IntT>::max();
+	else if (val < static_cast<FloatT>(std::numeric_limits<IntT>::min()))
+		return std::numeric_limits<IntT>::min();
+
+	return static_cast<IntT>(val);
+}
+
+// safe float to fixed
+// which handles nan and inf
+// pretty much the same stuff as the above, but uh, idk how id use the above with this
+template <typename FloatT> // can use both float and doubles yay
+static inline int32_t floattofixed(FloatT val)
+{
+	// :chaosleep:
+	static_assert(std::is_floating_point_v<FloatT>, "Input must be a floating-point type");
+
+	// fixed_t is just an int32_t, i dont wanna include doomtype here if it can be avoided
+	return floattoint<FloatT, int32_t>(val * 65535.);
+}
+
 } // namespace srb2
 
 #endif // __SRB2_CXXUTIL_HPP__

src/d_clisrv.h

@@ -516,7 +516,6 @@ typedef struct
 
 extern serverelem_t serverlist[MAXSERVERLIST];
 extern UINT32 serverlistcount;
-extern UINT32 serverlistultimatecount;
 extern INT32 mapchangepending;
 
 // Points inside doomcom
@@ -582,6 +581,8 @@ extern tic_t simulated_lag;
 extern tic_t lowest_lag;
 extern consvar_t cv_mindelay, cv_gentlemens;
 
+extern consvar_t cv_usefakeseed, cv_fakeseedname;
+
 extern consvar_t
 	cv_netticbuffer, cv_allownewplayer,
 #ifdef SATURNJOIN
@@ -604,7 +605,7 @@ extern consvar_t cv_serverinfoscreen;
 void D_ClientServerInit(void);
 
 // Initialise the other field
-void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum));
+void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(const UINT8 **p, INT32 playernum));
 void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_t nparam);
 #define SendNetXCmd(id, param, nparam) SendNetXCmdForPlayer(0, id, param, nparam) // Shortcut for P1
 void SendKick(UINT8 playernum, UINT8 msg);
@@ -625,7 +626,6 @@ void CL_ClearPlayer(INT32 playernum);
 void CL_RemovePlayer(INT32 playernum, INT32 reason);
 void CL_QueryServerList(msg_server_t *list);
 void CL_UpdateServerList(void);
-void CL_TimeoutServerList(void);
 
 void CL_AbortConnection(void);
 
@@ -660,9 +660,11 @@ extern UINT8 hu_redownloadinggamestate;
 #endif
 extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
 
+#define SAVEGAMESIZE (768*1024)
+
 typedef struct rewind_s
 {
-	UINT8 savebuffer[(768*1024)];
+	UINT8 savebuffer[SAVEGAMESIZE];
 	tic_t leveltime;
 	size_t demopos;
 

src/d_main.h

@@ -61,9 +61,6 @@ extern boolean minilighticon;     // mkwii-style minimap headlight
 //
 
 // autoload stuff
-extern boolean autoloading;
-extern boolean autoloaded;
-extern boolean postautoloaded;
 void D_AddPostloadFiles(void);
 
 // the infinite loop of D_SRB2Loop() called from win_main for windows version
@@ -83,8 +80,6 @@ void D_ProcessEvents(void);
 
 const char *D_Home(void);
 
-void D_ResetDeviceLED(void);
-
 //
 // BASE LEVEL
 //

src/d_net.c

@@ -59,7 +59,7 @@ static INT16 reboundsize[MAXREBOUND];
 static INT32 rebound_head, rebound_tail;
 
 /// \brief max length per packet
-INT16 hardware_MAXPACKETLENGTH;
+INT16 hardware_MAXPACKETLENGTH = 0;
 
 boolean (*I_NetGet)(void) = NULL;
 void (*I_NetSend)(void) = NULL;
@@ -95,9 +95,9 @@ static INT32 sendackpacket = 0, getackpacket = 0;
 INT32 ticruned = 0, ticmiss = 0;
 
 // globals
-INT32 getbps, sendbps;
-float lostpercent, duppercent, gamelostpercent;
-INT32 packetheaderlength;
+INT32 getbps = 0, sendbps = 0;
+float lostpercent = 0.0f, duppercent = 0.0f, gamelostpercent = 0.0f;
+INT32 packetheaderlength = 0;
 
 boolean Net_GetNetStat(void)
 {
@@ -243,7 +243,7 @@ static boolean GetFreeAcknum(UINT8 *freeack)
 			ackpak[i].length = doomcom->datalength;
 			ackpak[i].senttime = I_GetTime();
 			ackpak[i].resentnum = 0;
-			M_Memcpy(ackpak[i].pak.raw, netbuffer, ackpak[i].length);
+			memcpy(ackpak[i].pak.raw, netbuffer, ackpak[i].length);
 
 			*freeack = ackpak[i].acknum;
 
@@ -412,7 +412,7 @@ void Net_SendAcks(INT32 node)
 {
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_NOTHING;
-	M_Memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
+	memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
 	HSendPacket(node, false, 0, MAXACKTOSEND);
 }
 
@@ -492,9 +492,10 @@ void Net_AckTicker(void)
 				ackpak[i].acknum = 0;
 				continue;
 			}
+
 			DEBFILE(va("Resend ack %d, %u<%d at %u\n", ackpak[i].acknum, ackpak[i].senttime,
 				NODETIMEOUT, I_GetTime()));
-			M_Memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
+			memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
 			ackpak[i].senttime = I_GetTime();
 			ackpak[i].resentnum++;
 			ackpak[i].nextacknum = node->nextacknum;
@@ -611,12 +612,8 @@ void Net_WaitAllAckReceived(UINT32 timeout)
 
 static void InitNode(node_t *node)
 {
-	node->acktosend_head = node->acktosend_tail = 0;
-	memset(node->acktosend, 0, sizeof(node->acktosend));
-	node->firstacktosend = 0;
+	memset(node, 0, sizeof(node_t));
 	node->nextacknum = 1;
-	node->remotefirstack = 0;
-	node->flags = 0;
 }
 
 static void InitAck(void)
@@ -805,16 +802,16 @@ const char *packettypename[NUMPACKETTYPE] =
 	"TELLFILESNEEDED",
 	"MOREFILESNEEDED",
 
-	"PING"
+	"PING",
 #ifdef SATURNPAK
-	,
-
 	"WILLRESENDGAMESTATE",
 	"CANRECEIVEGAMESTATE",
 	"RECEIVEDGAMESTATE",
 
-	"ISSATURN" // special packet to identify saturn clients
+	"ISSATURN", // special packet to identify saturn clients
 #endif
+	"MAPICON",            // Send map image icon (gamespy).
+	"NEEDMAPICON"   // Request missed map icon (gamespy).
 };
 
 const char *Net_GetPacketName(UINT8 packettype)
@@ -1021,7 +1018,7 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 			return false;
 		}
 		netbuffer->ack = netbuffer->ackreturn = 0; // don't hold over values from last packet sent/received
-		M_Memcpy(&reboundstore[rebound_head], netbuffer,
+		memcpy(&reboundstore[rebound_head], netbuffer,
 			doomcom->datalength);
 		reboundsize[rebound_head] = doomcom->datalength;
 		rebound_head = (rebound_head+1) % MAXREBOUND;
@@ -1107,7 +1104,7 @@ boolean HGetPacket(void)
 	// Get a packet from self
 	if (rebound_tail != rebound_head)
 	{
-		M_Memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
+		memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
 		doomcom->datalength = reboundsize[rebound_tail];
 		if (netbuffer->packettype == PT_NODETIMEOUT)
 			doomcom->remotenode = netbuffer->u.textcmd[0];
@@ -1127,9 +1124,7 @@ boolean HGetPacket(void)
 
 	while (true)
 	{
-		I_NetGet();
-
-		if (doomcom->remotenode == -1) // No packet received
+		if (!I_NetGet()) // No packets received
 			return false;
 
 		getbytes += packetheaderlength + doomcom->datalength; // For stat
@@ -1165,6 +1160,7 @@ boolean HGetPacket(void)
 			GotAcks();
 			continue;
 		}
+
 		doomcom->datalength -= BASEPACKETSIZE;
 		break;
 	}
@@ -1225,7 +1221,7 @@ void D_SetDoomcom(void)
 	if (doomcom)
 		return;
 
-	doomcom = Z_Calloc(sizeof (doomcom_t), PU_STATIC, NULL);
+	doomcom = Z_Calloc(sizeof(doomcom_t), PU_STATIC, NULL);
 	doomcom->id = DOOMCOM_ID;
 	doomcom->numslots = doomcom->numnodes = 1;
 }
@@ -1267,6 +1263,7 @@ boolean D_CheckNetGame(void)
 		ret = true;
 	if (client && netgame)
 		netgame = false;
+
 	server = true; // WTF? server always true???
 		// no! The deault mode is server. Client is set elsewhere
 		// when the client executes connect command.
@@ -1302,6 +1299,7 @@ boolean D_CheckNetGame(void)
 
 	if (doomcom->id != DOOMCOM_ID)
 		I_Error("Doomcom buffer invalid!");
+
 	if (doomcom->numnodes > MAXNETNODES)
 		I_Error("Too many nodes (%d), max:%d", doomcom->numnodes, MAXNETNODES);
 
@@ -1310,14 +1308,17 @@ boolean D_CheckNetGame(void)
 	{
 		char filename[21];
 		INT32 k = doomcom->consoleplayer - 1;
+
 		if (M_IsNextParm())
 			k = atoi(M_GetNextParm()) - 1;
+
 		while (!debugfile && k < MAXPLAYERS)
 		{
 			k++;
 			sprintf(filename, "debug%d.txt", k);
 			debugfile = fopen(va("%s" PATHSEP "%s", srb2home, filename), "w");
 		}
+
 		if (debugfile)
 			CONS_Printf(M_GetText("debug output to: %s\n"), va("%s" PATHSEP "%s", srb2home, filename));
 		else

src/d_netcmd.h

@@ -21,10 +21,7 @@ extern "C" {
 
 #include "command.h"
 
-void SendWeaponPref(void);
-void SendWeaponPref2(void);
-void SendWeaponPref3(void);
-void SendWeaponPref4(void);
+void SendWeaponPref(UINT8 splitplayer);
 
 // console vars
 extern consvar_t cv_playername;
@@ -209,6 +206,8 @@ extern consvar_t cv_betainterscreen;
 
 extern consvar_t cv_laglesscam;
 
+extern consvar_t cv_demoangturn;
+
 typedef enum
 {
 	SKINMENUTYPE_SCROLL = 0,
@@ -293,7 +292,7 @@ typedef union {
 // add game commands, needs cleanup
 void D_RegisterServerCommands(void);
 void D_RegisterClientCommands(void);
-void D_SendPlayerConfig(void);
+void D_SendPlayerConfig(UINT8 splitplayer);
 void Command_ExitGame_f(void);
 void Command_Retry_f(void);
 void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore

src/d_netfil.c

@@ -64,7 +64,6 @@
 static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid);
 
 #ifdef HAVE_CURL
-size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream);
 #if (LIBCURL_VERSION_MAJOR <= 7) && (LIBCURL_VERSION_MINOR < 35)
 static int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
 #else
@@ -110,14 +109,14 @@ static fileused_t transferFiles[UINT8_MAX + 1];
 // Write time of file: utime
 
 // Receiver structure
-INT32 fileneedednum; // Number of files needed to join the server
-fileneeded_t fileneeded[MAX_WADFILES]; // List of needed files
+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;
 #endif
 char downloaddir[512] = "DOWNLOAD";
 
-file_download_t filedownload;
+file_download_t filedownload = {};
 
 #ifdef HAVE_CURL
 static CURL *http_handle;
@@ -131,7 +130,9 @@ static UINT32 curl_origfilesize;
 static UINT32 curl_origtotalfilesize;
 static char *curl_realname = NULL;
 fileneeded_t *curl_curfile = NULL;
-HTTP_login *curl_logins;
+HTTP_login *curl_logins = NULL;
+
+static void CURLGetFile(void);
 #endif
 
 /** Fills a serverinfo packet with information about wad files loaded.
@@ -550,7 +551,8 @@ INT32 CL_CheckFiles(void)
 		for (j = mainwads+1; j < numwadfiles; j++)
 		{
 			nameonly(strcpy(wadfilename, wadfiles[j]->filename));
-			if (!stricmp(wadfilename, fileneeded[i].filename) &&
+
+			if (fasticmp(wadfilename, fileneeded[i].filename) &&
 				!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
 			{
 				CONS_Debug(DBG_NETPLAY, "already loaded\n");
@@ -665,7 +667,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 		strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
 		nameonly(wadfilename);
 
-		if (!stricmp(wadfilename, p->id.filename))
+		if (fasticmp(wadfilename, p->id.filename))
 		{
 			// Copy file name with full path
 			strlcpy(p->id.filename, wadfiles[wadnum]->filename, MAX_WADPATH);
@@ -901,7 +903,7 @@ void SV_FileSendTicker(void)
 
 		if (ram)
 		{
-			M_Memcpy(p->data, &f->id.ram[transfer[i].position], size);
+			memcpy(p->data, &f->id.ram[transfer[i].position], size);
 		}
 		else if (fread(p->data, 1, size, transferFiles[f->fileid].file) != size)
 		{
@@ -946,19 +948,19 @@ void Got_Filetxpak(void)
 	char *filename = file->filename;
 	static INT32 filetime = 0;
 
-	if (!(strcmp(filename, "srb2.srb")
-		//&& strcmp(filename, "srb2.wad")
-		//&& strcmp(filename, "patch.dta")
-		//&& strcmp(filename, "music.dta")
-		&& strcmp(filename, "gfx.kart")
-		&& strcmp(filename, "textures.kart")
-		&& strcmp(filename, "chars.kart")
-		&& strcmp(filename, "maps.kart")
-		&& strcmp(filename, "sounds.kart")
-		&& strcmp(filename, "music.kart")
-		&& strcmp(filename, "patch.kart")
+	if ((fastcmp(filename, "srb2.srb")
+		//|| fastcmp(filename, "srb2.wad")
+		//|| fastcmp(filename, "patch.dta")
+		//|| fastcmp(filename, "music.dta")
+		|| fastcmp(filename, "gfx.kart")
+		|| fastcmp(filename, "textures.kart")
+		|| fastcmp(filename, "chars.kart")
+		|| fastcmp(filename, "maps.kart")
+		|| fastcmp(filename, "sounds.kart")
+		|| fastcmp(filename, "music.kart")
+		|| fastcmp(filename, "patch.kart")
 		))
-		I_Error("Tried to download \"%s\"", filename);
+		I_Error("Tried to download base-game file: \"%s\"", filename);
 
 	if (filenum >= fileneedednum)
 	{
@@ -1017,21 +1019,21 @@ void Got_Filetxpak(void)
 
 		switch(file->status)
 		{
-		case FS_NOTFOUND:
-			s = "FS_NOTFOUND";
-			break;
-		case FS_FOUND:
-			s = "FS_FOUND";
-			break;
-		case FS_OPEN:
-			s = "FS_OPEN";
-			break;
-		case FS_MD5SUMBAD:
-			s = "FS_MD5SUMBAD";
-			break;
-		default:
-			s = "unknown";
-			break;
+			case FS_NOTFOUND:
+				s = "FS_NOTFOUND";
+				break;
+			case FS_FOUND:
+				s = "FS_FOUND";
+				break;
+			case FS_OPEN:
+				s = "FS_OPEN";
+				break;
+			case FS_MD5SUMBAD:
+				s = "FS_MD5SUMBAD";
+				break;
+			default:
+				s = "unknown";
+				break;
 		}
 
 		I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
@@ -1079,12 +1081,14 @@ 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);
@@ -1098,17 +1102,16 @@ 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);
-#if 0
-				M_Memcpy(s, ns, len+1);
-#else
-				memmove(s, ns, len+1);
-#endif
+			memmove(s, ns, len+1);
+
 			return;
 		}
+	}
 }
 
 // Returns the length in characters of the last element of a path.
@@ -1162,8 +1165,12 @@ 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)
 
-	// skip for startup, our mainwads wont be in there
-	if (loaded_config)
+	// 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
 	{
 		if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
 		{
@@ -1197,7 +1204,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}
 
 	// next, check SRB2's "home" directory (if non-'.')
-	if (strcmp(srb2home, "."))
+	if (!fastcmp(srb2home, "."))
 	{
 		homecheck = filesearch(filename, srb2home, wantedmd5sum, completepath, 10);
 
@@ -1209,7 +1216,7 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	}
 
 	// next, check SRB2's "path" directory (also if non-'.')
-	if (strcmp(srb2path, "."))
+	if (!fastcmp(srb2path, "."))
 	{
 		homecheck = filesearch(filename, srb2path, wantedmd5sum, completepath, 10);
 
@@ -1300,6 +1307,7 @@ 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);
@@ -1308,6 +1316,7 @@ void CURLPrepareFile(const char* url, int dfilenum)
 		{
 			multi_handle = curl_multi_init();
 		}
+
 		if (!multi_handle)
 		{
 			I_OutputMsg("libcurl: curl_multi_init() failed\n");
@@ -1436,7 +1445,7 @@ void CURLAbortFile(void)
 #endif
 }
 
-void CURLGetFile(void)
+static void CURLGetFile(void)
 {
 #ifdef HAVE_THREADS
 	I_lock_mutex(&downloadmutex);
@@ -1478,7 +1487,8 @@ void CURLGetFile(void)
 				e = m->easy_handle;
 				easyres = m->data.result;
 
-				char *filename = Z_StrDup(curl_realname);
+				char *filename = malloc(strlen(curl_realname)+1);
+				strcpy(filename, curl_realname);
 				nameonly(filename);
 
 				if (easyres != CURLE_OK)
@@ -1516,7 +1526,7 @@ void CURLGetFile(void)
 					}
 				}
 
-				Z_Free(filename);
+				free(filename);
 				curl_curfile->file = NULL;
 				filedownload.remaining--;
 				mc = curl_multi_remove_handle(multi_handle, e);
@@ -1554,7 +1564,7 @@ CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
 			( login = (*prev_next));
 			prev_next = &login->next
 	){
-		if (strcmp(login->url, url) == 0)
+		if (fastcmp(login->url, url) != 0)
 		{
 			if (return_prev_next)
 				(*return_prev_next) = prev_next;

src/d_netfil.h

@@ -119,7 +119,6 @@ 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

src/d_protocol.c

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

src/d_ticcmd.h

@@ -46,15 +46,20 @@ typedef enum
 // Mainly movements/button commands per game tick,
 // plus a checksum for internal state consistency.
 
+// ticcmd turning bits
+#define TICCMD_REDUCE 16
+
+// ticcmd latency mask
+#define TICCMD_LATENCYMASK 0xFF
+
 // bits in angleturn
-#define TICCMD_RECEIVED 1
-#define TICCMD_XY 2
+#define TICCMD_RECEIVED (0x01) /* Actual tic recieved from client */
 
 typedef struct
 {
 	SINT8 forwardmove; // -MAXPLMOVE to MAXPLMOVE (50)
 	SINT8 sidemove; // -MAXPLMOVE to MAXPLMOVE (50)
-	INT16 angleturn; // <<16 for angle delta - saved as 1 byte into demos
+	INT16 angleturn; // << TICCMD_REDUCE for angle delta - saved as 1 byte into demos
 	INT16 aiming; // vertical aiming, see G_BuildTicCmd
 	UINT16 buttons;
 	INT16 driftturn; // SRB2Kart: Used for getting drift turn speed

src/dedicated/CMakeLists.txt

@@ -1,21 +1,75 @@
 # Declare dedicated interface sources
 
-target_sourcefile(c)
+set(SRB2_DEDICATED_SOURCES
+	i_system.c
+	i_main.c
+	i_video.c
+	i_sound.c
+	i_threads.c
+	dosstr.c
+	endtxt.c
+)
 
-target_sources(SRB2SDL2 PRIVATE)
+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})
 
 if(${CMAKE_SYSTEM} MATCHES Windows)
-	target_sources(SRB2SDL2 PRIVATE
-		../win32/win_dbg.c
-		../win32/Srb2win.rc)
+	set(SRB2_DEDICATED_TOTAL_SOURCES ${SRB2_DEDICATED_TOTAL_SOURCES}
+		${CMAKE_SOURCE_DIR}/src/win32/win_dbg.c
+		${CMAKE_SOURCE_DIR}/src/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 srb2legacy)
+	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2kartd)
 elseif(${CMAKE_SYSTEM} MATCHES Linux)
-	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2dlegacy)
+	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2kartd)
 else()
-	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy)
+	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"
+	)
 endif()
 
 if(${CMAKE_SYSTEM} MATCHES Darwin)
@@ -24,25 +78,27 @@ 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()
 
-#target_link_libraries(SRB2SDL2 PRIVATE SRB2Core)
-
-set_target_properties(SRB2SDL2 PROPERTIES VERSION ${SRB2_VERSION})
+if(${SRB2_HAVE_LIBBACKTRACE})
+	target_link_libraries(SRB2SDL2 PRIVATE ${LIBBACKTRACE_LIBRARIES})
+endif()
 
 if(${CMAKE_SYSTEM} MATCHES Windows)
 	target_link_libraries(SRB2SDL2 PRIVATE
@@ -60,20 +116,35 @@ target_include_directories(SRB2SDL2 PRIVATE
 
 target_compile_definitions(SRB2SDL2 PRIVATE
 	-DDEDICATED
+	-DHAVE_THREADS
 )
 
-## 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()
+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()
+
 #### Installation ####
 if(${CMAKE_SYSTEM} MATCHES Darwin)
 	install(TARGETS SRB2SDL2

src/dedicated/i_system.c

@@ -127,16 +127,32 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 
 #include <time.h>
 
-// Locations for searching the srb2.srb
+/// Locations to directly check for srb2.srb in
+const char *wadDefaultPaths[] = {
 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
-#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
-#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
-#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart"
-#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart"
-#define DEFAULTSEARCHPATH1 "/usr/local/games"
-#define DEFAULTSEARCHPATH2 "/usr/games"
-#define DEFAULTSEARCHPATH3 "/usr/local"
+	"/usr/local/share/games/SRB2Kart",
+	"/usr/local/games/SRB2Kart",
+	"/usr/share/games/SRB2Kart",
+	"/usr/games/SRB2Kart",
+#elif defined (_WIN32)
+	"c:\\games\\srb2kart",
+	"\\games\\srb2kart",
 #endif
+	NULL
+};
+
+// Folders to recurse through looking for srb2.srb
+const char *wadSearchPaths[] = {
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+	"/usr/local/games",
+	"/usr/games",
+	"/usr/local",
+#elif defined (_WIN32)
+	"c:\\games",
+	"\\games",
+#endif
+	NULL
+};
 
 /**	\brief WAD file to look for
 */
@@ -151,6 +167,8 @@ 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"
@@ -162,10 +180,6 @@ 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)
@@ -180,8 +194,6 @@ UINT8 keyboard_started = false;
 
 #ifdef HAVE_TERMIOS
 // TERMIOS console code from Quake3: thank you!
-boolean stdin_active = true;
-
 typedef struct
 {
 	size_t cursor;
@@ -683,11 +695,7 @@ void I_JoyScale4(void)
 
 
 */
-void I_ShutdownJoystick(void)
-{
-}
-
-void I_GetJoystickEvents(UINT8 index)
+void I_ShutdownJoystick(UINT8 index)
 {
 	(void)index;
 }
@@ -808,20 +816,23 @@ static void I_SetupMumble(void)
 void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 {
 #ifdef HAVE_MUMBLE
-	double angle;
+	float angle;
 	fixed_t anglef;
 
 	if (!mumble)
 		return;
 
-	if (mumble->uiVersion != 2) {
-		wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRINGW, 256);
+	if (mumble->uiVersion != 2)
+	{
+		wcsncpy(mumble->name, L"SRB2Kart " VERSIONSTRINGW, 256);
 		wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048);
 		mumble->uiVersion = 2;
 	}
 	mumble->uiTick++;
 
-	if (!netgame || gamestate != GS_LEVEL) { // Zero out, but never delink.
+	// Zero out, but never delink.
+	if (!netgame || gamestate != GS_LEVEL)
+	{
 		mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
 		mumble->fAvatarFront[0] = 1.0f;
 		mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
@@ -838,31 +849,34 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 		mumble->context_len = (UINT32)(p - mumble->context);
 	}
 
-	if (mobj) {
-		mumble->fAvatarPosition[0] = FIXED_TO_FLOAT(mobj->x) / MUMBLEUNIT;
-		mumble->fAvatarPosition[1] = FIXED_TO_FLOAT(mobj->z) / MUMBLEUNIT;
-		mumble->fAvatarPosition[2] = FIXED_TO_FLOAT(mobj->y) / MUMBLEUNIT;
+	if (mobj)
+	{
+		mumble->fAvatarPosition[0] = FixedToFloat(mobj->x) / MUMBLEUNIT;
+		mumble->fAvatarPosition[1] = FixedToFloat(mobj->z) / MUMBLEUNIT;
+		mumble->fAvatarPosition[2] = FixedToFloat(mobj->y) / MUMBLEUNIT;
 
 		anglef = AngleFixed(mobj->angle);
-		angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
-		mumble->fAvatarFront[0] = (float)cos(angle);
+		angle = (float)(FixedToFloat(anglef) * DEG2RAD);
+		mumble->fAvatarFront[0] = cosf(angle);
 		mumble->fAvatarFront[1] = 0.0f;
-		mumble->fAvatarFront[2] = (float)sin(angle);
-	} else {
+		mumble->fAvatarFront[2] = sinf(angle);
+	}
+	else
+	{
 		mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
 		mumble->fAvatarFront[0] = 1.0f;
 		mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
 	}
 
-	mumble->fCameraPosition[0] = FIXED_TO_FLOAT(listener.x) / MUMBLEUNIT;
-	mumble->fCameraPosition[1] = FIXED_TO_FLOAT(listener.z) / MUMBLEUNIT;
-	mumble->fCameraPosition[2] = FIXED_TO_FLOAT(listener.y) / MUMBLEUNIT;
+	mumble->fCameraPosition[0] = FixedToFloat(listener.x) / MUMBLEUNIT;
+	mumble->fCameraPosition[1] = FixedToFloat(listener.z) / MUMBLEUNIT;
+	mumble->fCameraPosition[2] = FixedToFloat(listener.y) / MUMBLEUNIT;
 
 	anglef = AngleFixed(listener.angle);
-	angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
-	mumble->fCameraFront[0] = (float)cos(angle);
+	angle = (float)(FixedToFloat(anglef) * DEG2RAD);
+	mumble->fCameraFront[0] = cosf(angle);
 	mumble->fCameraFront[1] = 0.0f;
-	mumble->fCameraFront[2] = (float)sin(angle);
+	mumble->fCameraFront[2] = sinf(angle);
 #else
 	(void)mobj;
 	(void)listener;
@@ -970,7 +984,7 @@ void I_SleepDuration(precise_t duration)
 #endif
 }
 
-boolean g_in_exiting_signal_handler = false;
+static volatile sig_atomic_t g_in_exiting_signal_handler = false;
 
 static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg)
 {
@@ -1034,6 +1048,11 @@ static void I_ReportSignal(int num, int coredumped)
 	I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
 }
 
+boolean I_In_Exiting_Signal_Handler(void)
+{
+	return g_in_exiting_signal_handler;
+}
+
 #ifndef NEWSIGNALHANDLER
 FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
 {
@@ -1053,11 +1072,17 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
 }
 #endif
 
-FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
+static volatile sig_atomic_t interrupted = 0;
+
+boolean I_Interrupted(void)
 {
-	signal(num, SIG_DFL); //default signal action
-	raise(num);
-	I_Quit();
+	return interrupted;
+}
+
+static void quit_handler(int num)
+{
+	(void)num;
+	interrupted = 1;
 }
 
 #ifdef HAVE_LIBBACKTRACE
@@ -1417,20 +1442,6 @@ death:
 	exit(0);
 }
 
-void I_WaitVBL(INT32 count)
-{
-	count = 1;
-	I_Sleep(count);
-}
-
-void I_BeginRead(void)
-{
-}
-
-void I_EndRead(void)
-{
-}
-
 //
 // I_Error
 //
@@ -1442,7 +1453,7 @@ static INT32 errorcount = 0;
 */
 static boolean shutdowning = false;
 
-void I_Error(const char *error, ...)
+FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
 {
 	va_list argptr;
 	char buffer[8192];
@@ -1468,7 +1479,7 @@ void I_Error(const char *error, ...)
 		if (errorcount > 20)
 		{
 			va_start(argptr, error);
-			vsprintf(buffer, error, argptr);
+			vsnprintf(buffer, 8192, error, argptr);
 			va_end(argptr);
 
 			I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
@@ -1482,7 +1493,7 @@ void I_Error(const char *error, ...)
 
 	// Display error message in the console before we start shutting it down
 	va_start(argptr, error);
-	vsprintf(buffer, error, argptr);
+	vsnprintf(buffer, 8192, error, argptr);
 	va_end(argptr);
 	I_OutputMsg("\nI_Error(): %s\n", buffer);
 
@@ -1709,9 +1720,9 @@ char *I_GetUserName(void)
 		strncpy(username, p, MAXPLAYERNAME);
 	}
 
-
-	if (strcmp(username, "") != 0)
+	if (!fastcmp(username, ""))
 		return username;
+
 	return NULL; // dummy for platform independent version
 }
 
@@ -1821,16 +1832,23 @@ static const char *searchWad(const char *searchDir)
 		return tempsw;
 	}
 
-	strcpy(tempsw, WADKEYWORD2);
-	fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
-	if (fstemp == FS_FOUND)
-	{
-		pathonly(tempsw);
-		return tempsw;
-	}
 	return NULL;
 }
 
+#define CHECKWADPATH(ret) \
+do { \
+	I_OutputMsg(",%s", ret); \
+	if (isWadPathOk(ret)) \
+		return ret; \
+} while (0)
+
+#define SEARCHWAD(str) \
+do { \
+	WadPath = searchWad(str); \
+	if (WadPath) \
+		return WadPath; \
+} while (0)
+
 /**	\brief go through all possible paths and look for srb2.srb
 
   \return path to srb2.srb if any
@@ -1839,6 +1857,7 @@ static const char *locateWad(void)
 {
 	const char *envstr;
 	const char *WadPath;
+	int i;
 
 	I_OutputMsg("SRB2WADDIR");
 	// does SRB2WADDIR exist?
@@ -1846,132 +1865,51 @@ static const char *locateWad(void)
 		return envstr;
 
 #ifndef NOCWD
-	I_OutputMsg(",.");
 	// examine current dir
 	strcpy(returnWadPath, ".");
+	I_OutputMsg(",%s", returnWadPath);
 	if (isWadPathOk(returnWadPath))
 		return NULL;
 #endif
 
-
+#ifndef NOHOME
 #ifdef DEFAULTDIR
 	I_OutputMsg(",HOME/" DEFAULTDIR);
 	// examine user jart directory
 	if ((envstr = I_GetEnv("HOME")) != NULL)
 	{
 		sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
-		if (isWadPathOk(returnWadPath))
-			return returnWadPath;
-	}
-#endif
-
-
-#ifdef CMAKECONFIG
-#ifndef NDEBUG
-	I_OutputMsg(","CMAKE_ASSETS_DIR);
-	strcpy(returnWadPath, CMAKE_ASSETS_DIR);
-	if (isWadPathOk(returnWadPath))
-	{
-		return returnWadPath;
+		CHECKWADPATH(returnWadPath);
 	}
 #endif
 #endif
 
 #ifdef __APPLE__
 	OSX_GetResourcesPath(returnWadPath);
-	I_OutputMsg(",%s", returnWadPath);
-	if (isWadPathOk(returnWadPath))
-	{
-		return returnWadPath;
-	}
+	CHECKWADPATH(returnWadPath);
 #endif
 
 	// examine default dirs
-#ifdef DEFAULTWADLOCATION1
-	I_OutputMsg(","DEFAULTWADLOCATION1);
-	strcpy(returnWadPath, DEFAULTWADLOCATION1);
-	if (isWadPathOk(returnWadPath))
-		return returnWadPath;
-#endif
-#ifdef DEFAULTWADLOCATION2
-	I_OutputMsg(","DEFAULTWADLOCATION2);
-	strcpy(returnWadPath, DEFAULTWADLOCATION2);
-	if (isWadPathOk(returnWadPath))
-		return returnWadPath;
-#endif
-#ifdef DEFAULTWADLOCATION3
-	I_OutputMsg(","DEFAULTWADLOCATION3);
-	strcpy(returnWadPath, DEFAULTWADLOCATION3);
-	if (isWadPathOk(returnWadPath))
-		return returnWadPath;
-#endif
-#ifdef DEFAULTWADLOCATION4
-	I_OutputMsg(","DEFAULTWADLOCATION4);
-	strcpy(returnWadPath, DEFAULTWADLOCATION4);
-	if (isWadPathOk(returnWadPath))
-		return returnWadPath;
-#endif
-#ifdef DEFAULTWADLOCATION5
-	I_OutputMsg(","DEFAULTWADLOCATION5);
-	strcpy(returnWadPath, DEFAULTWADLOCATION5);
-	if (isWadPathOk(returnWadPath))
-		return returnWadPath;
-#endif
-#ifdef DEFAULTWADLOCATION6
-	I_OutputMsg(","DEFAULTWADLOCATION6);
-	strcpy(returnWadPath, DEFAULTWADLOCATION6);
-	if (isWadPathOk(returnWadPath))
-		return returnWadPath;
-#endif
-#ifdef DEFAULTWADLOCATION7
-	I_OutputMsg(","DEFAULTWADLOCATION7);
-	strcpy(returnWadPath, DEFAULTWADLOCATION7);
-	if (isWadPathOk(returnWadPath))
-		return returnWadPath;
-#endif
-#ifndef NOHOME
-	// find in $HOME
-	I_OutputMsg(",HOME/" DEFAULTDIR);
-	if ((envstr = I_GetEnv("HOME")) != NULL)
+	for (i = 0; wadDefaultPaths[i]; i++)
 	{
-		char *tmp = malloc(strlen(envstr) + sizeof(PATHSEP) + sizeof(DEFAULTDIR));
-		strcpy(tmp, envstr);
-		strcat(tmp, PATHSEP);
-		strcat(tmp, DEFAULTDIR);
-		WadPath = searchWad(tmp);
-		free(tmp);
-		if (WadPath)
-			return WadPath;
+		strcpy(returnWadPath, wadDefaultPaths[i]);
+		CHECKWADPATH(returnWadPath);
 	}
-#endif
-#ifdef DEFAULTSEARCHPATH1
-	// find in /usr/local
-	I_OutputMsg(", in:"DEFAULTSEARCHPATH1);
-	WadPath = searchWad(DEFAULTSEARCHPATH1);
-	if (WadPath)
-		return WadPath;
-#endif
-#ifdef DEFAULTSEARCHPATH2
-	// find in /usr/games
-	I_OutputMsg(", in:"DEFAULTSEARCHPATH2);
-	WadPath = searchWad(DEFAULTSEARCHPATH2);
-	if (WadPath)
-		return WadPath;
-#endif
-#ifdef DEFAULTSEARCHPATH3
-	// find in ???
-	I_OutputMsg(", in:"DEFAULTSEARCHPATH3);
-	WadPath = searchWad(DEFAULTSEARCHPATH3);
-	if (WadPath)
-		return WadPath;
-#endif
+
+	// search paths
+	for (i = 0; wadSearchPaths[i]; i++)
+	{
+		I_OutputMsg(", in:%s", wadSearchPaths[i]);
+		SEARCHWAD(wadSearchPaths[i]);
+	}
+
 	// if nothing was found
 	return NULL;
 }
 
 const char *I_LocateWad(void)
 {
-	const char *waddir;
+	const char *waddir = NULL;
 
 	I_OutputMsg("Looking for WADs in: ");
 	waddir = locateWad();
@@ -1981,12 +1919,15 @@ const char *I_LocateWad(void)
 	{
 		// change to the directory where we found srb2.srb
 #if defined (_WIN32)
+		waddir = _fullpath(NULL, waddir, MAX_PATH);
 		SetCurrentDirectoryA(waddir);
 #else
+		waddir = realpath(waddir, NULL);
 		if (waddir == NULL || chdir(waddir) == -1)
 			I_OutputMsg("Couldn't change working directory\n");
 #endif
 	}
+
 	return waddir;
 }
 

src/dedicated/i_video.c

@@ -65,13 +65,6 @@ void I_OsPolling(void)
 		I_GetConsoleEvents();
 }
 
-//
-// I_UpdateNoBlit
-//
-void I_UpdateNoBlit(void)
-{
-}
-
 //
 // I_FinishUpdate
 //
@@ -155,7 +148,10 @@ boolean I_UseNativeKeyboard(void)
 	return false;
 }
 
+void I_HandleControllerHatRepeat(void)
+{
+}
+
 void I_SetBorderlessWindow(void)
 {
-
 }

src/dehacked.c

@@ -47,9 +47,9 @@
 
 // Free slot names
 // The crazy word-reading stuff uses these.
-char *FREE_STATES[NUMSTATEFREESLOTS];
-char *FREE_MOBJS[NUMMOBJFREESLOTS];
-UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
+char *FREE_STATES[NUMSTATEFREESLOTS] = {};
+char *FREE_MOBJS[NUMMOBJFREESLOTS] = {};
+UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1] = {}; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
 
 #define initfreeslots() {\
 	memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
@@ -173,7 +173,7 @@ FUNCPRINTF static void deh_warning(const char *first, ...)
 	vsnprintf(buf, 1000, first, argptr); // sizeof only returned 4 here. it didn't like that pointer.
 	va_end(argptr);
 
-	if(dbg_line == -1) // Not in a SOC, line number unknown.
+	if (dbg_line == -1) // Not in a SOC, line number unknown.
 		CONS_Alert(CONS_WARNING, "%s\n", buf);
 	else
 		CONS_Alert(CONS_WARNING, "Line %u: %s\n", dbg_line, buf);
@@ -8545,7 +8545,7 @@ static inline int lib_action(lua_State *L)
 
 // Hardcoded A_Action name to call for super() or NULL if super() would be invalid.
 // Set in lua_infolib.
-const char *superactions[MAXRECURSION];
+const char *superactions[MAXRECURSION] = {};
 UINT8 superstack = 0;
 
 static int lib_dummysuper(lua_State *L)

src/discord.c

@@ -49,6 +49,27 @@ discordRequest_t *discordRequestList = NULL;
 
 static char self_ip[IP_SIZE+1];
 
+/*--------------------------------------------------
+ *	const char *DRPC_HideUsername(const char *input)
+ *
+ *		See header file for description.
+ * --------------------------------------------------*/
+const char *DRPC_HideUsername(const char *input)
+{
+	static char buffer[5];
+	int i;
+
+	buffer[0] = input[0];
+
+	for (i = 1; i < 4; ++i)
+	{
+		buffer[i] = '.';
+	}
+
+	buffer[4] = '\0';
+	return buffer;
+}
+
 boolean drpc_init = false;
 
 /*--------------------------------------------------
@@ -105,7 +126,7 @@ static void DRPC_HandleReady(const DiscordUser *user)
 	}
 	else
 	{
-		CONS_Printf("Discord: connected to %s#%s (%s)\n", user->username, user->discriminator, user->userId);
+		CONS_Printf("Discord: connected to %s (%s)\n", user->username, user->userId);
 	}
 }
 
@@ -241,8 +262,10 @@ static void DRPC_HandleJoinRequest(const DiscordUser *requestUser)
 	newRequest->username = Z_Calloc(344, PU_STATIC, NULL);
 	snprintf(newRequest->username, 344, "%s", requestUser->username);
 
+#if 0
 	newRequest->discriminator = Z_Calloc(8, PU_STATIC, NULL);
 	snprintf(newRequest->discriminator, 8, "%s", requestUser->discriminator);
+#endif
 
 	newRequest->userID = Z_Calloc(32, PU_STATIC, NULL);
 	snprintf(newRequest->userID, 32, "%s", requestUser->userId);
@@ -254,7 +277,7 @@ static void DRPC_HandleJoinRequest(const DiscordUser *requestUser)
 		while (append != NULL)
 		{
 			// CHECK FOR DUPES!! Ignore any that already exist from the same user.
-			if (!strcmp(newRequest->userID, append->userID))
+			if (fastcmp(newRequest->userID, append->userID))
 			{
 				Discord_Respond(newRequest->userID, DISCORD_REPLY_IGNORE);
 				DRPC_RemoveRequest(newRequest);
@@ -308,6 +331,9 @@ void DRPC_RemoveRequest(discordRequest_t *removeRequest)
 	}
 
 	Z_Free(removeRequest->username);
+#if 0
+	Z_Free(removeRequest->discriminator);
+#endif
 	Z_Free(removeRequest->userID);
 	Z_Free(removeRequest);
 }
@@ -393,7 +419,7 @@ static const char *DRPC_GetServerIP(void)
 	// If you're connected
 	if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL)
 	{
-		if (strcmp(address, "self"))
+		if (!fastcmp(address, "self"))
 		{
 			// We're not the server, so we could successfully get the IP!
 			// No need to do anything else :)
@@ -658,7 +684,7 @@ void DRPC_UpdatePresence(void)
 		// Character image
 		while (supportedSkins[checkSkin] != NULL)
 		{
-			if (!strcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
+			if (fastcmp(skins[players[consoleplayer].skin].name, supportedSkins[checkSkin]))
 			{
 				snprintf(charimg, 21, "char%s", supportedSkins[checkSkin]);
 				discordPresence.smallImageKey = charimg;

src/discord.h

@@ -29,7 +29,9 @@ extern struct discordInfo_s {
 
 typedef struct discordRequest_s {
 	char *username; // Discord user name.
+#if 0 // Good night, sweet prince...
 	char *discriminator; // Discord discriminator (The little hashtag thing after the username). Separated for a "hide discriminators" cvar.
+#endif
 	char *userID; // The ID of the Discord user, gets used with Discord_Respond()
 
 	// HAHAHA, no.
@@ -44,6 +46,15 @@ typedef struct discordRequest_s {
 
 extern discordRequest_t *discordRequestList;
 
+/*--------------------------------------------------
+ *	const char *DRPC_HideUsername(const char *input);
+ *
+ *		Handle usernames while cv_discordstreamer is activated.
+ *		(The loss of discriminators is still a dumbass regression
+ *		that I will never forgive the Discord developers for.)
+ * --------------------------------------------------*/
+
+const char *DRPC_HideUsername(const char *input);
 
 /*--------------------------------------------------
 	void DRPC_RemoveRequest(void);

src/doomdef.h

@@ -19,25 +19,18 @@
 // This should actually be in the makefile,
 // but I can't stand that gibberish. D:
 #define SOUND_DUMMY   0
-#define SOUND_SDL     1
-#define SOUND_MIXER   2
+#define SOUND_MIXER   1
 
 #ifndef SOUND
 #ifdef HAVE_SDL
-
 // Use Mixer interface?
 #ifdef HAVE_MIXER
     #define SOUND SOUND_MIXER
+#else
+	#define SOUND SOUND_DUMMY
 #endif
-
-// Use generic SDL interface.
-#ifndef SOUND
-#define SOUND SOUND_SDL
-#endif
-
-#else // No SDL.
-// No more interfaces. :(
-#define SOUND SOUND_DUMMY
+#else
+	#define SOUND SOUND_DUMMY
 #endif
 #endif
 
@@ -47,28 +40,53 @@
 #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>
 
-#define _USE_MATH_DEFINES // fixes M_PI errors in r_plane.c for Visual Studio
-#ifdef __cplusplus
-#include <cmath>
-#else
-#include <math.h>
+#include <limits.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
+#include "fastcmp.h"
+
 #ifdef _WIN32
 #include <io.h>
 #endif
@@ -90,12 +108,6 @@ extern FILE *logstream;
 extern char  logfilename[1024];
 #endif
 
-// not sure if this belongs here lul
-// TODO: figure out whats preventing 32bit windows from working with libbacktrace
-#if defined(_WIN32) && !defined(__MINGW64__)
-#define HAVE_DRMINGW
-#endif
-
 #if defined (HAVE_LIBBACKTRACE)
 #define CRASH_LOGFILE_NAME "srb2kart-crash-log.txt"
 #elif defined (HAVE_DRMINGW)
@@ -118,8 +130,8 @@ extern char  logfilename[1024];
 #else
 #define VERSION    1 // Game version
 #define SUBVERSION 6 // more precise version number
-#define VERSIONSTRING "Saturn v9"
-#define VERSIONSTRINGW L"Saturn v9"
+#define VERSIONSTRING "Saturn v9.2"
+#define VERSIONSTRINGW L"Saturn v9.2"
 
 #define SATURN_TESTING // comment out for saturn release builds!
 
@@ -457,11 +469,6 @@ extern char savegamename[256];
 //TODO: delet this
 #define M_GetText(x) (x)
 
-FUNCINLINE static ATTRINLINE void *M_Memcpy(void *dest, const void *src, size_t n)
-{
-	return memcpy(dest, src, n);
-}
-
 char *va(const char *format, ...) FUNCPRINTF;
 char *M_GetToken(const char *inputString);
 char *sizeu1(size_t num);
@@ -493,7 +500,7 @@ extern INT32 cv_debug;
 // Misc stuff for later...
 // =======================
 
-#define ANG2RAD(angle) ((float)((angle)*M_PI)/ANGLE_180)
+#define ANG2RAD(angle) ((float)((angle)*M_PIf) / (float)ANGLE_180)
 
 // Modifier key variables, accessible anywhere
 extern UINT8 shiftdown, ctrldown, altdown;
@@ -542,6 +549,10 @@ UINT32 quickncasehash (const char *p, size_t n)
 #define M_PIl 3.1415926535897932384626433832795029L
 #endif
 
+#ifndef M_PIf
+#define M_PIf 3.14159265f
+#endif
+
 // Floating point comparison epsilons from float.h
 #ifndef FLT_EPSILON
 #define FLT_EPSILON 1.1920928955078125e-7f
@@ -657,7 +668,9 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 
 #if defined (HAVE_CURL)
 #define MASTERSERVER
+#ifndef NOHOLEPUNCH
 #define HOLEPUNCH
+#endif
 #else
 #undef UPDATE_ALERT
 #endif

src/doomstat.h

@@ -116,7 +116,10 @@ extern UINT8 window_notinfocus; // are we in focus? (backend independant -- hand
 extern boolean nodrawers;
 extern boolean noblit;
 extern boolean lastdraw;
+
+#ifdef MOTIONBLUR
 extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
+#endif
 
 extern INT32 viewwindowx, viewwindowy;
 extern INT32 viewwidth;
@@ -539,7 +542,7 @@ extern mapthing_t *redctfstarts[MAXPLAYERS]; // CTF
 #else
 #define DEBUGFILE
 #ifdef DEBUGFILE
-#define DEBFILE(msg) { if (debugfile) { fputs(msg, debugfile); fflush(debugfile); } }
+#define DEBFILE(msg) { if (UNLIKELY(debugfile)) { fputs(msg, debugfile); fflush(debugfile); } }
 #else
 #define DEBFILE(msg) {}
 #endif

src/doomtype.h

@@ -43,7 +43,6 @@ extern "C" {
 #define UINT64 uint64_t
 
 #ifdef __APPLE_CC__
-#define DIRECTFULLSCREEN 1
 #define DEBUG_LOG
 #define NOIPX
 #endif
@@ -69,11 +68,13 @@ extern "C" {
 	#define strnicmp(x,y,n) strncasecmp(x,y,n)
 #endif
 
-#ifndef __cplusplus
-char *strcasestr(const char *in, const char *what);
-#define stristr strcasestr
+char *nongnu_strcasestr(const char *in, const char *what);
+#ifndef _GNU_SOURCE
+#define strcasestr nongnu_strcasestr
 #endif
 
+#define stristr strcasestr
+
 #if defined (macintosh) //|| defined (__APPLE__) //skip all boolean/Boolean crap
 	#define true 1
 	#define false 0
@@ -294,7 +295,7 @@ typedef struct
 	UINT8 green;
 	UINT8 blue;
 	UINT8 alpha;
-} byteColor_t;
+} ATTRPACK byteColor_t;
 
 union FColorRGBA
 {

src/f_finale.c

@@ -166,8 +166,8 @@ static void F_SkyScroll(INT32 scrollspeed)
 	patch_t *pat, *pat2;
 	INT32 anim2 = 0;
 
-	pat = W_CachePatchName("TITLEBG1", PU_PATCH_LOWPRIORITY);
-	pat2 = W_CachePatchName("TITLEBG2", PU_PATCH_LOWPRIORITY);
+	pat = W_CachePatchName("TITLEBG1", PU_PATCH);
+	pat2 = W_CachePatchName("TITLEBG2", PU_PATCH);
 
 	w = (vid.scaledwidth << FRACBITS);
 
@@ -208,16 +208,13 @@ static void F_SkyScroll(INT32 scrollspeed)
 INT32 intro_scenenum = 0;
 INT32 intro_curtime = 0;
 
-const char *introtext[NUMINTROSCENES];
+const char *introtext[NUMINTROSCENES] = {};
 
 static tic_t introscenetime[NUMINTROSCENES] =
 {
 	 4*TICRATE,	// KART KR(eW
 };
 
-// custom intros
-void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer);
-
 void F_StartIntro(void)
 {
 	if (gamestate)
@@ -257,26 +254,21 @@ void F_StartIntro(void)
 //
 void F_IntroDrawer(void)
 {
-	boolean highres = false;
 	INT32 cx = 8, cy = 128;
 	patch_t *background = NULL;
 	INT32 bgxoffs = 0;
 
+	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120);
+
 	// DRAW A FULL PIC INSTEAD OF FLAT!
 	if (intro_scenenum == 0)
 	{
-		background = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY);
-		highres = true;
-	}
+		background = W_CachePatchName("KARTKREW", PU_PATCH);
 
-	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120);
-
-	if (background)
-	{
-		if (highres)
+		if (background)
+		{
 			V_DrawSmallScaledPatch(bgxoffs, 0, 0, background);
-		else
-			V_DrawScaledPatch(bgxoffs, 0, 0, background);
+		}
 	}
 
 	W_UnlockCachedPatch(background);
@@ -324,6 +316,7 @@ void F_IntroTicker(void)
 			D_StartTitle();
 			return;
 		}
+
 		if (finalecount == 8)
 			S_StartSound(NULL, sfx_vroom);
 		else if (finalecount == 47)
@@ -626,7 +619,6 @@ void F_StartCredits(void)
 	timetonext = 2*TICRATE;
 }
 
-
 void F_CreditDrawer(void)
 {
 	UINT16 i;
@@ -661,22 +653,23 @@ void F_CreditDrawer(void)
 	// Draw credits text on top
 	for (i = 0; credits[i]; i++)
 	{
-		switch(credits[i][0])
+		switch (credits[i][0])
 		{
-		case 0:
-			y += 80<<FRACBITS;
-			break;
-		case 1:
-			if (y>>FRACBITS > -20)
-				V_DrawCreditString((160 - (V_CreditStringWidth(&credits[i][1])>>1))<<FRACBITS, y, 0, &credits[i][1]);
-			y += 30<<FRACBITS;
-			break;
-		default:
-			if (y>>FRACBITS > -10)
-				V_DrawStringAtFixed(32<<FRACBITS, y, V_ALLOWLOWERCASE, credits[i]);
-			y += 12<<FRACBITS;
-			break;
+			case 0:
+				y += 80<<FRACBITS;
+				break;
+			case 1:
+				if (y>>FRACBITS > -20)
+					V_DrawCreditString((160 - (V_CreditStringWidth(&credits[i][1])>>1))<<FRACBITS, y, 0, &credits[i][1]);
+				y += 30<<FRACBITS;
+				break;
+			default:
+				if (y>>FRACBITS > -10)
+					V_DrawStringAtFixed(32<<FRACBITS, y, V_ALLOWLOWERCASE, credits[i]);
+				y += 12<<FRACBITS;
+				break;
 		}
+
 		if (((y>>FRACBITS) * vid.dup) > vid.height)
 			break;
 	}
@@ -701,7 +694,7 @@ void F_CreditTicker(void)
 	// Draw credits text on top
 	for (i = 0; credits[i]; i++)
 	{
-		switch(credits[i][0])
+		switch (credits[i][0])
 		{
 			case 0: y += 80<<FRACBITS; break;
 			case 1: y += 30<<FRACBITS; break;
@@ -963,6 +956,7 @@ void F_StartTitleScreen(void)
 		finalecount = 0;
 	else
 		wipegamestate = GS_TITLESCREEN;
+
 	G_SetGamestate(GS_TITLESCREEN);
 	CON_ClearHUD();
 
@@ -978,10 +972,10 @@ void F_StartTitleScreen(void)
 	demoDelayLeft = demoDelayTime;
 	demoIdleLeft = demoIdleTime;
 
-	ttbanner = W_CachePatchName("TTKBANNR", PU_PATCH_LOWPRIORITY);
-	ttkart = W_CachePatchName("TTKART", PU_PATCH_LOWPRIORITY);
-	ttcheckers = W_CachePatchName("TTCHECK", PU_PATCH_LOWPRIORITY);
-	ttkflash = W_CachePatchName("TTKFLASH", PU_PATCH_LOWPRIORITY);
+	ttbanner = W_CachePatchName("TTKBANNR", PU_PATCH);
+	ttkart = W_CachePatchName("TTKART", PU_PATCH);
+	ttcheckers = W_CachePatchName("TTCHECK", PU_PATCH);
+	ttkflash = W_CachePatchName("TTKFLASH", PU_PATCH);
 }
 
 // (no longer) De-Demo'd Title Screen
@@ -1178,9 +1172,7 @@ void F_StartWaitingPlayers(void)
 	randskin = M_RandomKey(numskins);
 	boolean waithires = skins[randskin].flags && SF_HIRES;
 
-	if (waitcolormap)
-		Z_Free(waitcolormap);
-
+	Z_Free(waitcolormap);
 	waitcolormap = R_GetTranslationColormap(randskin, skins[randskin].prefcolor, 0);
 
 	if (waithires)
@@ -1324,7 +1316,7 @@ boolean F_ContinueResponder(event_t *event)
 	keypressed = true;
 	imcontinuing = true;
 	continuetime = TICRATE;
-	S_StartSound(0, sfx_itemup);
+	S_StartSound(NULL, sfx_itemup);
 	return true;
 }
 
@@ -1418,6 +1410,7 @@ void F_EndCutScene(void)
 	}
 }
 
+// custom intros
 void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer)
 {
 	if (!cutscenes[cutscenenum])

src/f_wipe.c

@@ -98,7 +98,8 @@ static fixed_t paldiv;
   * \param	lump	Lump name to get data from
   * \return	fademask_t for lump
   */
-static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
+static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum)
+{
 	static char lumpname[9] = "FADEmmss";
 	static fademask_t fm = {NULL,0,0,0,0,0};
 	lumpnum_t lumpnum;
@@ -148,6 +149,7 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
 		case 0: // end marker (not bad!, but still need clearing)
 			goto freemask;
 	}
+
 	if (lsize != fm.size)
 		fm.mask = Z_Realloc(fm.mask, lsize, PU_STATIC, NULL);
 	fm.size = lsize;
@@ -257,7 +259,7 @@ static void F_DoWipe(fademask_t *fademask)
 				// shortcut - memcpy source to work
 				while (draw_linestogo--)
 				{
-					M_Memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
+					memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
 					relativepos += vid.width;
 				}
 			}
@@ -266,7 +268,7 @@ static void F_DoWipe(fademask_t *fademask)
 				// shortcut - memcpy target to work
 				while (draw_linestogo--)
 				{
-					M_Memcpy(w_base+relativepos, e_base+relativepos, draw_rowend-draw_rowstart);
+					memcpy(w_base+relativepos, e_base+relativepos, draw_rowend-draw_rowstart);
 					relativepos += vid.width;
 				}
 			}
@@ -361,6 +363,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 	{
 		// get fademask first so we can tell if it exists or not
 		fmask = F_GetFadeMask(wipetype, wipeframe++);
+
 		if (!fmask)
 			break;
 
@@ -377,11 +380,10 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 			HWR_DoWipe(wipetype, wipeframe-1); // send in the wipe type and wipeframe because we need to cache the graphic
 		else
 #endif
-		if (rendermode != render_none) //this allows F_RunWipe to be called in dedicated servers
+		if (rendermode != render_none) // this allows F_RunWipe to be called in dedicated servers
 			F_DoWipe(fmask);
 
 		I_OsPolling();
-		I_UpdateNoBlit();
 
 		if (rendermode != render_none && drawMenu)
 		{
@@ -401,6 +403,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 
 		NetKeepAlive(); // Update the network so we don't cause timeouts
 	}
+
 	WipeInAction = false;
 #endif
 }

src/fastcmp.h

@@ -10,7 +10,7 @@ FUNCINLINE static ATTRINLINE boolean fasticmp(const char *s, const char *c)
 }
 
 // case-sensitive of the above
-FUNCINLINE static ATTRINLINE boolean fastcmp(const char *s, const char *c)
+FUNCINLINE static ATTRINLINE PUREFUNC 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 boolean fastcmp(const char *s, const char *c)
 
 // length-limited of the above
 // only true if both strings are at least l characters long AND match, case-sensitively!
-FUNCINLINE static ATTRINLINE boolean fastncmp(const char *s, const char *c, UINT16 l)
+FUNCINLINE static ATTRINLINE PUREFUNC 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

src/filesrch.c

@@ -44,16 +44,16 @@ consvar_t cv_addons_search_case = {"addons_search_case", "No", CV_SAVE, CV_YesNo
 static CV_PossibleValue_t addons_search_type_cons_t[] = {{0, "Start"}, {1, "Anywhere"}, {0, NULL}};
 consvar_t cv_addons_search_type = {"addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-char menupath[1024];
-size_t menupathindex[menudepth];
+char menupath[MAXFILEPATH] = {};
+size_t menupathindex[menudepth] = {};
 size_t menudepthleft = menudepth;
 
 char menusearchbuf[MAXSTRINGLENGTH+1];
-textinput_t menusearch;
+textinput_t menusearch = {};
 
-char **dirmenu, **coredirmenu; // core only local for this file
-size_t sizedirmenu, sizecoredirmenu; // ditto
-size_t dir_on[menudepth];
+char **dirmenu = NULL, **coredirmenu = NULL; // core only local for this file
+size_t sizedirmenu = 0, sizecoredirmenu = 0; // ditto
+size_t dir_on[menudepth] = {};
 UINT8 refreshdirmenu = 0;
 char *refreshdirname = NULL;
 
@@ -92,7 +92,6 @@ INT32 pathisdirectory(const char *path)
 // skip those folders, they will not have any addons
 static const char *exclude_paths[] = {
 	"logs",
-	"luafiles",
 	"replay",
 	"mdls",
 	"gifs",
@@ -111,7 +110,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 	int found = 0;
 	char *searchname;
 	int depthleft = maxsearchdepth;
-	char searchpath[1024];
+	char searchpath[MAXFILEPATH];
 	size_t *searchpathindex;
 
 	dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
@@ -198,7 +197,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 
 				for (; *path != NULL; path++)
 				{
-					if (strcasecmp(*path, dent->d_name) == 0)
+					if (fasticmp(*path, dent->d_name))
 					{
 						skipfolder = true;
 						break;
@@ -212,7 +211,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 				}
 			}
 
-			if (strcasecmp(".git", dent->d_name) // sanity if you're weird like me
+			if (!fasticmp(".git", dent->d_name) // sanity if you're weird like me
 				&& (dirhandle[depthleft-1] = opendir(searchpath)) != NULL)
 			{
 				// Got read permissions!
@@ -227,7 +226,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 
 		// I am a file!
 
-		if (strcasecmp(searchname, dent->d_name))
+		if (!fasticmp(searchname, dent->d_name))
 			continue; // Not what we're looking for!
 
 		switch (checkfilemd5(searchpath, wantedmd5sum))
@@ -272,10 +271,13 @@ 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) != 0);
+		return (strstr(localhaystack, needle) != NULL);
+
 	return (!strncmp(localhaystack, needle, menusearch.length));
 }
 
@@ -315,8 +317,7 @@ void closefilemenu(boolean validsize)
 		coredirmenu = NULL;
 	}
 
-	if (refreshdirname)
-		Z_Free(refreshdirname);
+	Z_Free(refreshdirname);
 	refreshdirname = NULL;
 }
 
@@ -344,8 +345,7 @@ void searchfilemenu(char *tempname)
 
 	if (!menusearch.length)
 	{
-		if (dirmenu)
-			Z_Free(dirmenu);
+		Z_Free(dirmenu);
 		dirmenu = coredirmenu;
 		sizedirmenu = sizecoredirmenu;
 
@@ -353,7 +353,7 @@ void searchfilemenu(char *tempname)
 		{
 			for (i = first; i < sizedirmenu; i++)
 			{
-				if (!strcmp(dirmenu[i]+DIR_STRING, tempname))
+				if (fastcmp(dirmenu[i]+DIR_STRING, tempname))
 				{
 					dir_on[menudepthleft] = i;
 					break;
@@ -387,8 +387,8 @@ void searchfilemenu(char *tempname)
 				I_Error("searchfilemenu(): could not create \"No results...\".");
 		sizedirmenu = 1;
 		dir_on[menudepthleft] = 0;
-		if (tempname)
-			Z_Free(tempname);
+		Z_Free(tempname);
+
 		return;
 	}
 
@@ -400,7 +400,7 @@ void searchfilemenu(char *tempname)
 	{
 		if (filemenucmp(coredirmenu[i]+DIR_STRING, localmenusearch))
 		{
-			if (tempname && !strcmp(coredirmenu[i]+DIR_STRING, tempname))
+			if (tempname && fastcmp(coredirmenu[i]+DIR_STRING, tempname))
 			{
 				dir_on[menudepthleft] = sizedirmenu;
 				Z_Free(tempname);
@@ -478,14 +478,14 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 
 				if (replayhut)
 				{
-					if (strcasecmp(".lmp", dent->d_name+len-5))
+					if (!fasticmp(".lmp", dent->d_name+len-5))
 						continue; // Not a replay
 				}
 				else if (!cv_addons_showall.value)
 				{
 					UINT8 ext;
 					for (ext = 0; ext < NUM_EXT_TABLE; ext++)
-						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (fasticmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
 							break; // extension comparison
 
 					if (ext == NUM_EXT_TABLE)
@@ -503,8 +503,8 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 	{
 		closedir(dirhandle);
 		closefilemenu(false);
-		if (tempname)
-			Z_Free(tempname);
+		Z_Free(tempname);
+
 		return false;
 	}
 
@@ -559,7 +559,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 
 				if (replayhut)
 				{
-					if (strcasecmp(".lmp", dent->d_name+len-5))
+					if (!fasticmp(".lmp", dent->d_name+len-5))
 						continue; // Not a replay
 
 					ext = EXT_TXT; // This isn't used anywhere but better safe than sorry for messing with this...
@@ -567,7 +567,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 				else
 				{
 					for (; ext < NUM_EXT_TABLE; ext++)
-						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+						if (fasticmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
 							break; // extension comparison
 
 					if (ext == NUM_EXT_TABLE && !cv_addons_showall.value)
@@ -587,7 +587,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 								nameonly(filenamebuf[i]);
 							}
 
-							if (strcmp(dent->d_name, filenamebuf[i]))
+							if (!fastcmp(dent->d_name, filenamebuf[i]))
 								continue;
 
 							if (cv_addons_md5.value && !checkfilemd5(menupath, wadfiles[i]->md5sum))
@@ -598,11 +598,11 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 					}
 					else if (ext == EXT_TXT)
 					{
-						if (!strncmp(dent->d_name, "log-", 4) || !strcmp(dent->d_name, "errorlog.txt"))
+						if (!strncmp(dent->d_name, "log-", 4) || fastcmp(dent->d_name, "errorlog.txt"))
 							ext |= EXT_LOADED;
 					}
 
-					if (!strcmp(dent->d_name, configfile))
+					if (fastcmp(dent->d_name, configfile))
 						ext |= EXT_LOADED;
 				}
 

src/filesrch.h

@@ -34,7 +34,8 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 
 #define menudepth 20
 
-extern char menupath[1024];
+#define MAXFILEPATH 1024
+extern char menupath[MAXFILEPATH];
 extern size_t menupathindex[menudepth];
 extern size_t menudepthleft;
 

src/g_demo.h

@@ -67,7 +67,7 @@ typedef enum {
 } menudemotype_e;
 
 typedef struct menudemo_s {
-	char filepath[256];
+	char filepath[1023 + 256]; // see M_PrepReplayList and sizeof menupath
 	menudemotype_e type;
 
 	char title[65]; // Null-terminated for string prints
@@ -149,6 +149,7 @@ typedef struct demoghost {
 	UINT8 checksum[16];
 	UINT8 *buffer, *p, color;
 	UINT16 version;
+	boolean done;
 	mobj_t oldmo, *mo;
 	struct demoghost *next;
 } demoghost;

src/g_game.h

@@ -50,7 +50,7 @@ extern INT16 rw_maximums[NUM_WEAPONS];
 
 // used in game menu
 extern consvar_t cv_chatwidth, cv_chatnotifications, cv_chatheight, cv_chattime, cv_consolechat, cv_chatbacktint, cv_chatspamprotection, cv_chatcentertext/*, cv_compactscoreboard*/;
-extern consvar_t cv_songcredits;
+extern consvar_t cv_songcredits, cv_pausesongcredits;
 extern consvar_t cv_showfreeplay;
 extern consvar_t cv_growmusic, cv_supermusic;
 extern consvar_t cv_pauseifunfocused;
@@ -72,6 +72,10 @@ extern consvar_t cv_custom3axis[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_xdeadzone[MAXSPLITSCREENPLAYERS];
 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
@@ -126,6 +130,7 @@ 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;
 
@@ -153,13 +158,12 @@ typedef enum
 // mouseaiming (looking up/down with the mouse or keyboard)
 #define KB_LOOKSPEED (1<<25)
 #define MAXPLMOVE (50)
-#define SLOWTURNTICS (cv_turnsmooth.value * 3)
 
 // build an internal map name MAPxx from map number
 const char *G_BuildMapName(INT32 map);
 void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer);
 
-// copy ticcmd_t to and fro the normal way
+// copy ticcmd_t to and from the normal way
 ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
 // copy ticcmd_t to and fro network packets
 ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
@@ -261,9 +265,10 @@ boolean G_CanView(INT32 playernum, UINT8 viewnum, boolean onlyactive);
 INT32 G_FindView(INT32 startview, UINT8 viewnum, boolean onlyactive, boolean reverse);
 INT32 G_CountPlayersPotentiallyViewable(boolean active);
 
-void G_ResetViews(void);
+void G_ResetViews(boolean resetfreecam);
 void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive);
-void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive);
+void G_AdjustViewEx(UINT8 viewnum, INT32 offset, boolean onlyactive, boolean resetfreecam);
+#define G_AdjustView(v,o,oa) G_AdjustViewEx(v,o,oa, true)
 
 void G_AddPlayer(INT32 playernum);
 

src/g_input.c

@@ -34,10 +34,16 @@ static CV_PossibleValue_t onecontrolperkey_cons_t[] = {{1, "One"}, {2, "Several"
 static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "Off"}, {0, NULL}};
 
 // mouse values are used once
-consvar_t cv_mousesens = {"mousesens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mousexsens = {"mousexsens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_turnsmooth = {"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS] = {
+	{"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"turnsmoothing2", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"turnsmoothing3", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"turnsmoothing4", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
 
 static void G_ResetPlayerDeviceRumble(INT32 player);
 static void rumble_off_handle(void);
@@ -52,12 +58,21 @@ static void led_off_handle3(void);
 static void led_off_handle4(void);
 
 consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = {
-	{"rumble", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle, 0, NULL, NULL, 0, 0, NULL},
+	{"rumble",  "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle, 0, NULL, NULL, 0, 0, NULL},
 	{"rumble2", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle2, 0, NULL, NULL, 0, 0, NULL},
 	{"rumble3", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle3, 0, NULL, NULL, 0, 0, NULL},
 	{"rumble4", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle4, 0, NULL, NULL, 0, 0, NULL}
 };
 
+static CV_PossibleValue_t rumblestrength_cons_t[] = {{FRACUNIT/4, "MIN"}, {FRACUNIT*4, "MAX"}, {0, NULL}};
+
+consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS] = {
+	{"rumblestrength",  "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"rumblestrength2", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"rumblestrength3", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"rumblestrength4", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
 static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
 consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
 	{"gamepadled",  "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
@@ -66,6 +81,9 @@ 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)
@@ -110,17 +128,17 @@ static void led_off_handle4(void)
 	G_ResetPlayerGamepadIndicatorColor(3);
 }
 
-INT32 mousex, mousey;
-INT32 mlooky; // like mousey but with a custom sensitivity for mlook
+INT32 mousex = 0, mousey = 0;
 
 // joystick values are repeated
-INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
+INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET] = {};
+INT32 joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET] = {};
 
 // current state of the keys: true if pushed
-UINT8 gamekeydown[NUMINPUTS];
+UINT8 gamekeydown[NUMINPUTS] = {};
 
 // two key codes (or virtual key) per game control
-INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2];
+INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2] = {};
 
 typedef struct
 {
@@ -177,9 +195,8 @@ void G_MapEventsToControls(event_t *ev)
 		case ev_mouse: // buttons are virtual keys
 			if (menuactive || CON_Ready() || chat_on)
 				break;
-			mousex = (INT32)(ev->data2*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f));
-			mousey = (INT32)(ev->data3*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f));
-			mlooky = (INT32)(ev->data3*((cv_mouseysens.value*cv_mousesens.value)/110.0f + 0.1f));
+			mousex = (INT32)(ev->data2*((cv_mousexsens.value*cv_mousexsens.value)/110.0f + 0.1f));
+			mousey = (INT32)(ev->data3*((cv_mouseysens.value*cv_mouseysens.value)/110.0f + 0.1f));
 			break;
 
 		case ev_joystick: // buttons are virtual keys
@@ -200,7 +217,7 @@ void G_MapEventsToControls(event_t *ev)
 
 		case ev_joystick3:
 			i = ev->data1;
-			if (i >= JOYAXISSET)
+			if (i >= JOYAXISSET || menuactive)
 				break;
 			if (ev->data2 != INT32_MAX) joyxmove[2][i] = ev->data2;
 			if (ev->data3 != INT32_MAX) joyymove[2][i] = ev->data3;
@@ -208,7 +225,7 @@ void G_MapEventsToControls(event_t *ev)
 
 		case ev_joystick4:
 			i = ev->data1;
-			if (i >= JOYAXISSET)
+			if (i >= JOYAXISSET || menuactive)
 				break;
 			if (ev->data2 != INT32_MAX) joyxmove[3][i] = ev->data2;
 			if (ev->data3 != INT32_MAX) joyymove[3][i] = ev->data3;
@@ -256,9 +273,6 @@ void G_ResetControls(void)
 
 	memset(joyxmove, 0, sizeof(joyxmove));
 	memset(joyymove, 0, sizeof(joyymove));
-
-	// reset those just in case the game missed the keyup event
-	memset(dpadscrollstate, false, sizeof(dpadscrollstate));
 }
 
 //
@@ -872,11 +886,13 @@ static const char *gamecontrolname[num_gamecontrols] =
 
 #include "k_kart.h"
 
-UINT16 G_GetSkinColor(INT32 playernum)
+UINT8 G_GetSkinColorForGamepad(INT32 playernum)
 {
+	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
+
 	if (gamestate == GS_LEVEL)
 	{
-		player_t *player = &players[displayplayers[playernum]];
+		const player_t *player = &players[displayplayers[playernum]];
 
 		if (player)
 		{
@@ -894,13 +910,13 @@ UINT16 G_GetSkinColor(INT32 playernum)
 	switch (playernum)
 	{
 		case 0:
-			return cv_playercolor.value;
+			return (UINT8)cv_playercolor.value;
 		case 1:
-			return cv_playercolor2.value;
+			return (UINT8)cv_playercolor2.value;
 		case 2:
-			return cv_playercolor3.value;
+			return (UINT8)cv_playercolor3.value;
 		case 3:
-			return cv_playercolor4.value;
+			return (UINT8)cv_playercolor4.value;
 		default:
 			return 0;
 	}
@@ -908,19 +924,23 @@ UINT16 G_GetSkinColor(INT32 playernum)
 	return 0;
 }
 
-void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT16 color)
+// Sets the Indicator LED on supported gamepads to a desired skincolor
+// pass SKINCOLOR_NONE/0 to set the players skin color
+void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)
 {
-	UINT16 skincolor;
+	UINT8 skincolor;
 	byteColor_t byte_color;
 
 	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
 
-	if (cv_gamepadled[playernum].value == 0)
+	if (cv_gamepadled[playernum].value == 0 || (window_notinfocus && cv_gamepadledifunfocused.value == 0)
+	 || color >= MAXTRANSLATIONS)
 	{
 		return;
 	}
 
-	skincolor = color ? color : G_GetSkinColor(playernum);
+	// so we can override this
+	skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
 	byte_color = V_GetColor(colortranslations[skincolor][8]).s;
 
 	I_SetGamepadIndicatorColor(playernum, byte_color.red, byte_color.green, byte_color.blue);
@@ -928,16 +948,53 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT16 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);
 	}
 	else
+	{
 		G_SetPlayerGamepadIndicatorColor(playernum, 0);
+	}
+}
+
+static UINT8 curcolor[MAXSPLITSCREENPLAYERS] = {};
+
+void G_DeviceLEDTick(void)
+{
+	UINT8 i, newcolor;
+
+	if (numcontrollers == 0)
+	{
+		return;
+	}
+
+	for (i = 0; i <= splitscreen; i++)
+	{
+		if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
+			continue;
+
+		newcolor = G_GetSkinColorForGamepad(i);
+
+		if (curcolor[i] == newcolor) // dont update if same colour
+			continue;
+
+		G_SetPlayerGamepadIndicatorColor(i, newcolor);
+		curcolor[i] = newcolor;
+	}
+}
+
+// ensures next call to G_DeviceLEDTick will refresh the gamepad led
+void G_ResetDeviceLED(void)
+{
+	memset(curcolor, 0, sizeof(curcolor));
 }
 
 static void G_ResetPlayerDeviceRumble(INT32 playernum)
 {
+	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
 	I_GamepadRumble(playernum, 0, 0, 0);
 }
 
@@ -955,14 +1012,140 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
 {
 	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
 
-	if (cv_rumble[playernum].value == 0)
+	if (cv_rumble[playernum].value == 0 || (window_notinfocus && cv_rumbleifunfocused.value == 0))
 	{
 		return;
 	}
 
+	// doesent need to be super precise
+	// but ensure this is within range (0-65535)
+	// placed here so it applies to lua aswell
+	low_strength = (UINT16)min(FixedMul(low_strength, cv_rumblestrength[playernum].value), UINT16_MAX);
+	high_strength = (UINT16)min(FixedMul(high_strength, cv_rumblestrength[playernum].value), UINT16_MAX);
+
 	I_GamepadRumble(playernum, low_strength, high_strength, duration);
 }
 
+// rumble strengths
+enum
+{
+	RUMBLE_VERYSTRONG = FRACUNIT / 4,   // 16384
+	RUMBLE_STRONG     = FRACUNIT / 8,   // 8192
+	RUMBLE_MODERATE   = FRACUNIT / 64,  // 1024
+	RUMBLE_WEAK       = FRACUNIT / 128, // 512
+	RUMBLE_VERYWEAK   = FRACUNIT / 256, // 256
+};
+
+// Controller rumble!
+// this keeps track of a bunch of things
+// and makes your controller rumble accordingly
+void G_DeviceRumbleTick(void)
+{
+	UINT8 i;
+
+	if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL)
+	{
+		return;
+	}
+
+	for (i = 0; i <= splitscreen; i++)
+	{
+		if (!cv_usejoystick[i].value || !cv_rumble[i].value)
+		{
+			continue;
+		}
+
+		if (camera[i].freecam)
+		{
+			continue;
+		}
+
+		// SDL rumble strength goes from a range or 0-65535 respectively
+		// the higher, the stronger it is
+		UINT16 low = 0, high = 0;
+		// for how long the action should rumble, in ms
+		UINT16 lenght = 57; // 57ms is a short pulse, matches super well with this updating once per tic
+
+		const player_t *player = P_GetLocalPlayerForNum(i);
+
+		// allow lua to do some crap for spectators
+		if (player->spectator || !player->mo)
+		{
+			continue;
+		}
+
+		// reset the rumble if you exit or are ded lel
+		if (player->exiting ||
+			player->playerstate == PST_DEAD ||
+			player->kartstuff[k_respawn] > 1)
+		{
+			G_PlayerDeviceRumble(i, low, high, 0);
+			continue;
+		}
+
+		if (player->kartstuff[k_spinouttimer])
+		{
+			//low = high = FRACUNIT / 6;
+			low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
+		}
+		else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2)))
+		{
+			low = high = RUMBLE_STRONG;
+		}
+		else if ((player->kartstuff[k_offroad])
+			&& player->speed != 0
+			&& P_IsObjectOnGround(player->mo))
+		{
+			// weaken this depending on if you got hyu or invinc
+			if (player->kartstuff[k_hyudorotimer])
+			{
+				high = RUMBLE_WEAK;
+			}
+			else if (player->kartstuff[k_invincibilitytimer])
+			{
+				high = RUMBLE_MODERATE;
+			}
+			else
+			{
+				low = high = RUMBLE_MODERATE;
+			}
+		}
+		else if ((player->kartstuff[k_bananadrag] > TICRATE)
+			&& player->speed != 0
+			&& P_IsObjectOnGround(player->mo))
+		{
+			if (leveltime & 1) // this is actually funny lel
+				high = RUMBLE_MODERATE;
+		}
+
+		if (player->kartstuff[k_brakedrift])
+		{
+			high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
+		}
+
+		// pulse when gettin new driftlevel
+		// let this come last
+		if (player->kartstuff[k_driftcharge]
+			&& player->driftlevel)
+		{
+			high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
+
+			if (player->driftlevel == 2)
+				lenght = 114;
+			else if (player->driftlevel == 3)
+				lenght = 174;
+		}
+
+		// hack alert! i just dont want this thing constantly resetting the rumble lol
+		if (low == 0 && high == 0)
+		{
+			continue;
+		}
+
+		G_PlayerDeviceRumble(i, low, high, lenght);
+	}
+}
+
 //
 // Detach any keys associated to the given game control
 // - pass the pointer to the gamecontrol table for the player being edited
@@ -1027,7 +1210,7 @@ INT32 G_KeyStringtoNum(const char *keystr)
 		return atoi(&keystr[3]);
 
 	for (j = 0; j < NUMKEYNAMES; j++)
-		if (!stricmp(keynames[j].name, keystr))
+		if (fasticmp(keynames[j].name, keystr))
 			return keynames[j].keynum;
 
 	return 0;
@@ -1327,14 +1510,15 @@ static void setcontrol(INT32 (*gc)[2])
 		player = 0;
 
 	namectrl = COM_Argv(1);
-	for (numctrl = 0; numctrl < num_gamecontrols && stricmp(namectrl, gamecontrolname[numctrl]);
-		numctrl++)
+	for (numctrl = 0; numctrl < num_gamecontrols && !fasticmp(namectrl, gamecontrolname[numctrl]); numctrl++)
 		;
+
 	if (numctrl == num_gamecontrols)
 	{
 		CONS_Printf(M_GetText("Control '%s' unknown\n"), namectrl);
 		return;
 	}
+
 	keynum1 = G_KeyStringtoNum(COM_Argv(2));
 	keynum2 = G_KeyStringtoNum(COM_Argv(3));
 	keynum = G_FilterKeyByVersion(numctrl, 0, player, &keynum1, &keynum2, &nestedoverride);

src/g_input.h

@@ -37,7 +37,7 @@ typedef enum
 	KEY_JOY1 = KEY_MOUSE1 + MOUSEBUTTONS,
 	KEY_HAT1 = KEY_JOY1 + JOYBUTTONS,
 
-	KEY_DBLMOUSE1 =KEY_HAT1 + JOYHATS*4, // double clicks
+	KEY_DBLMOUSE1 = KEY_HAT1 + JOYHATS*4, // double clicks
 	KEY_DBLJOY1 = KEY_DBLMOUSE1 + MOUSEBUTTONS,
 	KEY_DBLHAT1 = KEY_DBLJOY1 + JOYBUTTONS,
 
@@ -109,13 +109,17 @@ typedef enum
 } gamecontrols_e;
 
 // mouse values are used once
-extern consvar_t cv_mousesens, cv_mouseysens;
-extern consvar_t cv_controlperkey, cv_turnsmooth;
+extern consvar_t cv_mousexsens, cv_mouseysens;
+extern consvar_t cv_controlperkey;
+extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
 
+extern consvar_t cv_gamepadledifunfocused;
+extern consvar_t cv_rumbleifunfocused;
+
 extern INT32 mousex, mousey;
-extern INT32 mlooky; //mousey with mlookSensitivity
 
 extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
 
@@ -130,13 +134,17 @@ extern INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2];
 #define PLAYER3INPUTDOWN(gc) (gamekeydown[gamecontrol[2][gc][0]] || gamekeydown[gamecontrol[2][gc][1]])
 #define PLAYER4INPUTDOWN(gc) (gamekeydown[gamecontrol[3][gc][0]] || gamekeydown[gamecontrol[3][gc][1]])
 
-// peace to my little coder fingers!
-// check a gamecontrol being active or not
+UINT8 G_GetSkinColorForGamepad(INT32 playernum);
+void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color);
+void G_DeviceLEDTick(void);
+void G_ResetDeviceLED(void);
 
-UINT16 G_GetSkinColor(INT32 playernum);
-void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT16 color);
 void G_ResetAllDeviceRumbles(void);
 void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
+void G_DeviceRumbleTick(void);
+
+// peace to my little coder fingers!
+// check a gamecontrol being active or not
 
 // remaps the input event to a game control.
 void G_MapEventsToControls(event_t *ev);

src/hardware/hw_batching.c

@@ -21,28 +21,28 @@
 
 // The texture for the next polygon given to HWR_ProcessPolygon.
 // Set with HWR_SetCurrentTexture.
-GLMipmap_t *current_texture = NULL;
+static GLMipmap_t *current_texture = NULL;
 
-boolean currently_batching = false;
+static boolean currently_batching = false;
 
-FOutVector* finalVertexArray  = NULL;// contains subset of sorted vertices and texture coordinates to be sent to gpu
-UINT32* finalVertexIndexArray = NULL;// contains indexes for glDrawElements, taking into account fan->triangles conversion
+static FOutVector* finalVertexArray  = NULL;// contains subset of sorted vertices and texture coordinates to be sent to gpu
+static UINT32* finalVertexIndexArray = NULL;// contains indexes for glDrawElements, taking into account fan->triangles conversion
 //     NOTE have this alloced as 3x finalVertexArray size
-int finalVertexArrayAllocSize = 65536;
+static int finalVertexArrayAllocSize = 65536;
 
 //GLubyte* colorArray = NULL;// contains color data to be sent to gpu, if needed
 //int colorArrayAllocSize = 65536;
 // not gonna use this for now, just sort by color and change state when it changes
 // later maybe when using vertex attributes if it's needed
 
-PolygonArrayEntry* polygonArray        = NULL ;// contains the polygon data from DrawPolygon, waiting to be processed
-PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray
-int polygonArraySize      = 0;
-int polygonArrayAllocSize = 65536;
+static PolygonArrayEntry* polygonArray        = NULL ;// contains the polygon data from DrawPolygon, waiting to be processed
+static PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray
+static int polygonArraySize      = 0;
+static int polygonArrayAllocSize = 65536;
 
-FOutVector* unsortedVertexArray  = NULL; // contains unsorted vertices and texture coordinates from DrawPolygon
-int unsortedVertexArraySize      = 0;
-int unsortedVertexArrayAllocSize = 65536;
+static FOutVector* unsortedVertexArray  = NULL; // contains unsorted vertices and texture coordinates from DrawPolygon
+static int unsortedVertexArraySize      = 0;
+static int unsortedVertexArrayAllocSize = 65536;
 
 // Enables batching mode. HWR_ProcessPolygon will collect polygons instead of passing them directly to the rendering backend.
 // Call HWR_RenderBatches to render all the collected geometry.
@@ -126,8 +126,9 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt
 		if (!(PolyFlags & PF_NoTexture) && !horizonSpecial)
 		{
 			// use FNV-1a to hash polygons for later sorting.
-			INT32 hash = 0x811c9dc5;
-#define DIGEST(h, x) h ^= (x); h *= 0x01000193
+			UINT32 hash = 0x811c9dc5;
+			UINT32 prime = 0x1000193;
+#define DIGEST(h, x) h ^= ((UINT32)(x)); h *= prime
 			if (current_texture)
 			{
 				DIGEST(hash, current_texture->downloaded);
@@ -148,7 +149,7 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt
 			}
 #undef DIGEST
 			// remove the sign bit to ensure that skybox and horizon line comes first.
-			polygonArray[polygonArraySize-1].hash = (hash & INT32_MAX);
+			polygonArray[polygonArraySize-1].hash = (INT32)(hash & INT32_MAX);
 		}
 
 		memcpy(&unsortedVertexArray[unsortedVertexArraySize], pOutVerts, iNumPts * sizeof(FOutVector));
@@ -168,8 +169,10 @@ static int comparePolygons(const void *p1, const void *p2)
 	const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
 	const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
 
-	const int shader1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? -1 : poly1->shader;
-	const int shader2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? -1 : poly2->shader;
+	// special case with signedness to prevent overflowing
+	// FIXME: check for prediction slowdowns!
+	const int shader1 = poly1->hash & 0x80000000 ? -1 : poly1->shader;
+	const int shader2 = poly2->hash & 0x80000000 ? -1 : poly2->shader;
 
 	// skywalls and horizon lines must retain their order for horizon lines to work
 	if (shader1 == -1 && shader2 == -1)
@@ -210,8 +213,8 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
 	const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
 	const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
 
-	const GLMipmap_t *texture1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? NULL : poly1->texture;
-	const GLMipmap_t *texture2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? NULL : poly2->texture;
+	const GLMipmap_t *texture1 = poly1->hash & 0x80000000 ? NULL : poly1->texture;
+	const GLMipmap_t *texture2 = poly2->hash & 0x80000000 ? NULL : poly2->texture;
 
 	// skywalls and horizon lines must retain their order for horizon lines to work
 	if (!texture1 && !texture2)
@@ -219,6 +222,7 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
 
 	UINT32 downloaded1 = texture1 ? texture1->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
 	UINT32 downloaded2 = texture2 ? texture2->downloaded : 0;
+
 	diff64 = downloaded1 - downloaded2;
 	if (diff64 != 0) return diff64;
 
@@ -260,7 +264,7 @@ void HWR_RenderBatches(void)
 	nextSurfaceInfo.LightInfo.light_level = 0;
 	nextSurfaceInfo.LightInfo.directional = false;
 
-	currently_batching = false;// no longer collecting batches
+	currently_batching = false; // no longer collecting batches
 
 	if (!polygonArraySize)
 	{
@@ -270,6 +274,8 @@ void HWR_RenderBatches(void)
 		return;// nothing to draw
 	}
 
+	const boolean useshader = HWR_UseShader();
+
 	// init stats vars
 	ps_hw_numpolys.value.i = polygonArraySize;
 	ps_hw_numcalls.value.i = ps_hw_numverts.value.i = 0;
@@ -284,7 +290,7 @@ void HWR_RenderBatches(void)
 
 	// sort polygons
 	PS_START_TIMING(ps_hw_batchsorttime);
-	qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), (HWR_UseShader() ? comparePolygons : comparePolygonsNoShaders));
+	qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), (useshader ? comparePolygons : comparePolygonsNoShaders));
 	PS_STOP_TIMING(ps_hw_batchsorttime);
 
 	// sort order
@@ -305,7 +311,7 @@ void HWR_RenderBatches(void)
 
 	// set state for first batch
 
-	if (HWR_UseShader())
+	if (useshader)
 	{
 		GL_SetShader(currentShader);
 	}
@@ -385,9 +391,9 @@ void HWR_RenderBatches(void)
 				nextSurfaceInfo = nextEntry->surf;
 
 				if (nextPolyFlags & PF_NoTexture)
-					nextTexture = 0;
+					nextTexture = NULL;
 
-				if (currentShader != nextShader && HWR_UseShader())
+				if (useshader && currentShader != nextShader)
 				{
 					changeState = true;
 					changeShader = true;
@@ -405,7 +411,7 @@ void HWR_RenderBatches(void)
 					changePolyFlags = true;
 				}
 
-				if (HWR_UseShader())
+				if (useshader)
 				{
 					if (currentSurfaceInfo.PolyColor.rgba != nextSurfaceInfo.PolyColor.rgba ||
 						currentSurfaceInfo.TintColor.rgba != nextSurfaceInfo.TintColor.rgba ||

src/hardware/hw_bsp.c

@@ -80,14 +80,6 @@ static poly_t *HWR_AllocPoly(INT32 numpts)
 	return p;
 }
 
-static polyvertex_t *HWR_AllocVertex(void)
-{
-	polyvertex_t *p;
-	size_t size = sizeof(polyvertex_t);
-	p = Z_Malloc(size, PU_HWRPLANE, NULL);
-	return p;
-}
-
 /// \todo polygons should be freed in reverse order for efficiency,
 /// for now don't free because it doesn't free in reverse order
 static void HWR_FreePoly(poly_t *poly)
@@ -546,7 +538,7 @@ static void loading_status(void)
 	x = BASEVIDWIDTH/2;
 	y = BASEVIDHEIGHT/2;
 	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // Black background to match fade in effect
-	//V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_PATCH)); // SRB2 background, ehhh too bright.
+	//V_DrawPatchFill(srb2back); // SRB2 background, ehhh too bright.
 	M_DrawTextBox(x-58, y-8, 13, 1);
 	V_DrawString(x-50, y, V_YELLOWMAP, "Loading...");
 	V_DrawRightAlignedString(x+50, y, V_YELLOWMAP, s);
@@ -637,7 +629,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 		WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
 
 		// copy child bbox
-		M_Memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
+		memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
 	}
 	else
 		I_Error("WalkBSPNode: no front poly?");
@@ -855,100 +847,6 @@ static INT32 SolveTProblem(void)
 	return numsplitpoly;
 }
 
-#define NEARDIST (0.75f)
-#define MYMAX    (10000000000000.0f)
-
-/* Adjust true segs (from the segs lump) to be exactely the same as
- * plane polygone segs
- * This also convert fixed_t point of segs in float (in moste case
- * it share the same vertice
- */
-static void AdjustSegs(void)
-{
-	size_t i, count;
-	INT32 j;
-	seg_t *lseg;
-	poly_t *p;
-	INT32 v1found = 0, v2found = 0;
-	float nearv1, nearv2;
-
-	for (i = 0; i < numsubsectors; i++)
-	{
-		count = subsectors[i].numlines;
-		lseg = &segs[subsectors[i].firstline];
-		p = extrasubsectors[i].planepoly;
-
-		if (!p)
-			continue;
-
-		for (; count--; lseg++)
-		{
-			float distv1,distv2,tmp;
-			nearv1 = nearv2 = MYMAX;
-
-			// Don't touch polyobject segs. We'll compensate
-			// for this when we go about drawing them.
-			if (lseg->polyseg)
-				continue;
-
-			for (j = 0; j < p->numpts; j++)
-			{
-				distv1 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v1->x);
-				tmp    = p->pts[j].y - FIXED_TO_FLOAT(lseg->v1->y);
-				distv1 = distv1*distv1+tmp*tmp;
-
-				if (distv1 <= nearv1)
-				{
-					v1found = j;
-					nearv1 = distv1;
-				}
-
-				// the same with v2
-				distv2 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v2->x);
-				tmp    = p->pts[j].y - FIXED_TO_FLOAT(lseg->v2->y);
-				distv2 = distv2*distv2+tmp*tmp;
-
-				if (distv2 <= nearv2)
-				{
-					v2found = j;
-					nearv2 = distv2;
-				}
-			}
-
-			if (nearv1 <= NEARDIST*NEARDIST)
-				// share vertice with segs
-				lseg->pv1 = &(p->pts[v1found]);
-			else
-			{
-				// BP: here we can do better, using PointInSeg and compute
-				// the right point position also split a polygone side to
-				// solve a T-intersection, but too mush work
-
-				// convert fixed vertex to float vertex
-				polyvertex_t *pv = HWR_AllocVertex();
-				pv->x = FIXED_TO_FLOAT(lseg->v1->x);
-				pv->y = FIXED_TO_FLOAT(lseg->v1->y);
-				lseg->pv1 = pv;
-			}
-
-			if (nearv2 <= NEARDIST*NEARDIST)
-				lseg->pv2 = &(p->pts[v2found]);
-			else
-			{
-				polyvertex_t *pv = HWR_AllocVertex();
-				pv->x = FIXED_TO_FLOAT(lseg->v2->x);
-				pv->y = FIXED_TO_FLOAT(lseg->v2->y);
-				lseg->pv2 = pv;
-			}
-
-			lseg->pv1->x2 = FloatToFixed(lseg->pv1->x);
-			lseg->pv1->y2 = FloatToFixed(lseg->pv1->y);
-			lseg->pv2->x2 = FloatToFixed(lseg->pv2->x);
-			lseg->pv2->y2 = FloatToFixed(lseg->pv2->y);
-		}
-	}
-}
-
 
 // call this routine after the BSP of a Doom wad file is loaded,
 // and it will generate all the convex polys for the hardware renderer
@@ -1017,7 +915,6 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 #else
 	SolveTProblem();
 #endif
-	AdjustSegs();
 
 #ifdef DEBUG_HWBSP
 	//debug debug..

src/hardware/hw_cache.cpp

@@ -15,6 +15,8 @@
 
 #ifdef HWRENDER
 
+#include <unordered_set>
+
 #include "hw_main.h"
 #include "hw_glob.h"
 #include "hw_gl.h"
@@ -36,7 +38,7 @@
 INT32 patchformat = GL_TEXFMT_AP_88; // use alpha for holes
 INT32 textureformat = GL_TEXFMT_P_8; // use chromakey for hole
 
-RGBA_t mapPalette[256] = {0}; // the palette for the currently loaded level or menu etc.
+RGBA_t mapPalette[256] = {}; // the palette for the currently loaded level or menu etc.
 
 static void HWR_FreeTextureColormaps(patch_t *patch);
 
@@ -98,7 +100,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
 			position = 0;
 		}
 
-		position = max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
+		position = std::max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
 
 		if (position + count >= pblockheight)
 			count = pblockheight - position;
@@ -162,7 +164,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
 	fixed_t xfrac, xfracstep;
 	fixed_t yfracstep, scale_y;
 	const column_t *patchcol;
-	UINT8 *block = mipmap->data;
+	UINT8 *block = static_cast<UINT8 *>(mipmap->data);
 	INT32 bpp;
 	INT32 blockmodulo;
 	RGBA_t *palette;
@@ -212,7 +214,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
 	fixed_t xfrac, xfracstep;
 	fixed_t yfracstep, scale_y;
 	const column_t *patchcol;
-	UINT8 *block = mipmap->data;
+	UINT8 *block = static_cast<UINT8 *>(mipmap->data);
 	INT32 bpp;
 	INT32 blockmodulo;
 	INT32 width, height;
@@ -287,8 +289,8 @@ static UINT8 *MakeBlock(GLMipmap_t *glMipmap)
 	UINT16 bu16 = ((0x00 <<8) | HWR_PATCHES_CHROMAKEY_COLORINDEX);
 	INT32 blocksize = (glMipmap->width * glMipmap->height);
 
-	bpp =  format2bpp(glMipmap->format);
-	block = Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data));
+	bpp = format2bpp(glMipmap->format);
+	block = static_cast<UINT8 *>(Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data)));
 
 	switch (bpp)
 	{
@@ -325,7 +327,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
 	texture = textures[texnum];
 
 	gltex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
-	gltex->mipmap.format = textureformat;
+	gltex->mipmap.format = static_cast<GLTextureFormat_t>(textureformat);
 
 	// hack the Legacy skies..
 	if (UNLIKELY(memcmp(texture->name, "SKY", 3) == 0 &&
@@ -344,9 +346,9 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
 		colormap += COLORMAP_REMAPOFFSET;
 #endif
 
-	gltex->mipmap.colormap = Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL);
+	gltex->mipmap.colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL));
 	gltex->mipmap.colormap->source = colormap;
-	M_Memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
+	memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
 
 	blockwidth = texture->width;
 	blockheight = texture->height;
@@ -377,7 +379,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
 	// Composite the columns together.
 	for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
 	{
-		pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
+		pdata = static_cast<UINT8 *>(W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL));
 		realpatch = (softwarepatch_t *)pdata;
 
 		HWR_DrawTexturePatchInCache(&gltex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
@@ -413,7 +415,7 @@ void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipma
 		glMipmap->flags = 0;
 
 		// setup the texture info
-		glMipmap->format = patchformat;
+		glMipmap->format = static_cast<GLTextureFormat_t>(patchformat);
 
 		glPatch->max_s = (float)patch->width / (float)glMipmap->width;
 		glPatch->max_t = (float)patch->height / (float)glMipmap->height;
@@ -437,8 +439,16 @@ void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipma
 //             CACHING HANDLING
 // =================================================
 
+typedef struct
+{
+	GLMapTexture_t normal;
+#ifdef GLENCORE
+	GLMapTexture_t encore;
+#endif
+} GLMapTextureSet_t; // idk i suck at naming things
+
 static size_t gl_numtextures = 0; // Texture count
-static GLMapTexture_t *gl_textures; // For all textures
+static GLMapTextureSet_t *gl_textures; // For all textures
 
 static void HWR_FreeTextureData(patch_t *patch)
 {
@@ -447,12 +457,13 @@ static void HWR_FreeTextureData(patch_t *patch)
 	if (!patch || !patch->hardware)
 		return;
 
-	glPatch = patch->hardware;
+	glPatch = static_cast<GLPatch_t *>(patch->hardware);
 
 	if (vid.glstate == VID_GL_LIBRARY_LOADED)
 		GL_DeleteTexture(glPatch->mipmap);
 
 	Z_Free(glPatch->mipmap->data);
+	glPatch->mipmap->data = NULL;
 }
 
 void HWR_FreeTexture(patch_t *patch)
@@ -462,7 +473,7 @@ void HWR_FreeTexture(patch_t *patch)
 
 	if (patch->hardware)
 	{
-		GLPatch_t *glPatch = patch->hardware;
+		GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
 
 		HWR_FreeTextureColormaps(patch);
 
@@ -470,6 +481,7 @@ void HWR_FreeTexture(patch_t *patch)
 		{
 			HWR_FreeTextureData(patch);
 			Z_Free(glPatch->mipmap);
+			glPatch->mipmap = NULL;
 		}
 
 		Z_Free(patch->hardware);
@@ -487,7 +499,7 @@ static void HWR_FreeTextureColormaps(patch_t *patch)
 	if (!patch)
 		return;
 
-	pat = patch->hardware;
+	pat = static_cast<GLPatch_t *>(patch->hardware);
 	if (!pat)
 		return;
 
@@ -569,6 +581,9 @@ void HWR_InitMapTextures(void)
 
 static void FreeMapTexture(GLMapTexture_t *tex)
 {
+	if (!tex)
+		return;
+
 	GL_DeleteTexture(&tex->mipmap);
 	Z_Free(tex->mipmap.data);
 	tex->mipmap.data = NULL;
@@ -578,32 +593,48 @@ void HWR_FreeMapTextures(void)
 {
 	size_t i;
 
-#ifdef GLENCORE
-	for (i = 0; i < gl_numtextures*2; i++)
-#else
-	for (i = 0; i < gl_numtextures; i++)
-#endif
+	if (!gl_textures)
 	{
-		FreeMapTexture(&gl_textures[i]);
+		gl_numtextures = 0;
+		return;
+	}
+
+	for (i = 0; i < gl_numtextures; i++)
+	{
+		FreeMapTexture(&gl_textures[i].normal);
+#ifdef GLENCORE
+		FreeMapTexture(&gl_textures[i].encore);
+#endif
 	}
 
 	// now the heap don't have any 'user' pointing to our
 	// texturecache info, we can free it
-	if (gl_textures)
-		free(gl_textures);
+	free(gl_textures);
 	gl_textures = NULL;
 	gl_numtextures = 0;
 }
 
 static void HWR_PrecacheLevelFlats(void)
 {
-	lumpnum_t lump;
+	// 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;
 	size_t i, j;
 	INT32 k;
 
+	auto load_flat = [&](lumpnum_t lump, boolean noencoremap)
+	{
+		// flat already loaded?
+		if (flatpresent.count(lump) == 0)
+		{
+			HWR_GetFlat(lump, noencoremap);
+			flatpresent.insert(lump);
+		}
+	};
+
 	// special case for encore
 #ifdef GLENCORE
-	if (encoremode)
+	if (encoremap)
 	{
 		// go through all sectors to determine if it should be remapped for encore
 		for (i = 0; i < numsectors; i++)
@@ -618,15 +649,14 @@ static void HWR_PrecacheLevelFlats(void)
 
 				const levelflat_t *levelflat = &levelflats[pic];
 
-				lump = levelflat->lumpnum;
-				HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
+				load_flat(levelflat->lumpnum, R_NoEncore(sec, ceiling));
 
-				if (levelflat->speed) // it is an animated flat
+				if (levelflat->speed) // is it an animated flat ?
 				{
-					for (k = 1; k < levelflat->numpics; k++)
+					// start from 0, occasionally basenumlump != flat->lumpnum
+					for (k = 0; k < levelflat->numpics; k++)
 					{
-						lump = levelflat->baselumpnum + k;
-						HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
+						load_flat(levelflat->baselumpnum + k, R_NoEncore(sec, ceiling));
 					}
 				}
 			}
@@ -640,17 +670,16 @@ static void HWR_PrecacheLevelFlats(void)
 		for (i = 0; i < numlevelflats; i++)
 		{
 			const levelflat_t *levelflat = &levelflats[i];
-			lump = levelflat->lumpnum;
 
-			HWR_GetFlat(lump, false);
+			load_flat(levelflat->lumpnum, false);
 
-			if (!levelflat->speed) // is it an animated flat ?
-				continue;
-
-			for (k = 1; k < levelflat->numpics; k++)
+			if (levelflat->speed) // is it an animated flat ?
 			{
-				lump = levelflat->baselumpnum + k;
-				HWR_GetFlat(lump, false);
+				// start from 0, occasionally basenumlump != flat->lumpnum
+				for (k = 0; k < levelflat->numpics; k++)
+				{
+					load_flat(levelflat->baselumpnum + k, false);
+				}
 			}
 		}
 	}
@@ -663,7 +692,7 @@ static void HWR_PrecacheLevelTextures(void)
 	size_t i, j, f;
 	INT32 h;
 
-	texturepresent = calloc(numtextures, sizeof (*texturepresent));
+	texturepresent = static_cast<char *>(calloc(gl_numtextures, sizeof(*texturepresent)));
 	if (texturepresent == NULL)
 		I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
 
@@ -678,8 +707,6 @@ static void HWR_PrecacheLevelTextures(void)
 		const line_t *line = &lines[i];
 #ifdef GLENCORE
 		const int noencoremap = ((encoremap && (line->flags & ML_TFERLINE)) ? 2 : 1);
-#else
-		const int noencoremap = 1;
 #endif
 		// two sides
 		for (j = 0; j < 2; j++)
@@ -695,11 +722,17 @@ static void HWR_PrecacheLevelTextures(void)
 			for (f = 0; f < 3; f++)
 			{
 				const INT32 texnum = sidetex[f];
-				if (texnum < 0 || texnum >= numtextures || texturepresent[texnum])
+
+				if (texnum < 0 || texnum >= (signed)gl_numtextures)
 					continue;
 
+				if (texturepresent[texnum])
+					continue;
+#ifdef GLENCORE
 				texturepresent[texnum] = 1|noencoremap;
-
+#else
+				texturepresent[texnum] = 1;
+#endif
 				HWR_GetTexture(texnum, false);
 #ifdef GLENCORE
 				if (noencoremap & 2)
@@ -721,14 +754,16 @@ static void HWR_PrecacheLevelTextures(void)
 
 		for (h = 1; h < anim->numpics; h++)
 		{
+			const INT32 animtexnum = anim->basepic+h;
+
 			if (texpresent & 1)
 			{
-				HWR_GetTexture(anim->basepic+h, false);
+				HWR_GetTexture(animtexnum, false);
 			}
 #ifdef GLENCORE
 			if (texpresent & 2)
 			{
-				HWR_GetTexture(anim->basepic+h, true);
+				HWR_GetTexture(animtexnum, true);
 			}
 #endif
 		}
@@ -737,7 +772,7 @@ static void HWR_PrecacheLevelTextures(void)
 	free(texturepresent);
 }
 
-static void HWR_PrecacheLevelSprites(void)
+/*static void HWR_PrecacheLevelSprites(void)
 {
 	patch_t *spritepatch;
 	char *spritepresent;
@@ -800,21 +835,30 @@ static void HWR_PrecacheLevelSprites(void)
 		}
 	}
 	free(spritepresent);
-}
+}*/
 
 void HWR_PrecacheLevel(void)
 {
-	if (rendermode != render_opengl)
+	if (gamestate != GS_LEVEL || !cv_precachetextures.value)
 		return;
 
 	// Precache flats.
 	HWR_PrecacheLevelFlats();
 
+	// prevent timeouts
+	NetKeepAlive();
+
 	// Precache textures.
 	HWR_PrecacheLevelTextures();
 
+	// prevent timeouts
+	NetKeepAlive();
+
 	// Precache sprites.
-	HWR_PrecacheLevelSprites();
+	//HWR_PrecacheLevelSprites();
+
+	// prevent timeouts
+	//NetKeepAlive();
 }
 
 void HWR_LoadMapTextures(size_t pnumtextures)
@@ -823,11 +867,8 @@ void HWR_LoadMapTextures(size_t pnumtextures)
 	HWR_FreeMapTextures();
 
 	gl_numtextures = pnumtextures;
-#ifdef GLENCORE
-	gl_textures = calloc(gl_numtextures, sizeof (*gl_textures)*2); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore)
-#else
-	gl_textures = calloc(gl_numtextures, sizeof (*gl_textures));
-#endif
+	gl_textures = static_cast<GLMapTextureSet_t *>(calloc(gl_numtextures, sizeof(*gl_textures))); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
+
 	if (gl_textures == NULL)
 		I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
 }
@@ -838,6 +879,7 @@ void HWR_LoadMapTextures(size_t pnumtextures)
 GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
 {
 	GLMapTexture_t *gltex;
+	GLMipmap_t *glMipmap;
 
 	if (tex < 0 || tex >= (signed)gl_numtextures)
 	{
@@ -851,24 +893,27 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
 	// Every texture in memory, stored in the
 	// hardware renderer's bit depth format. Wow!
 #ifdef GLENCORE
-	gltex = &gl_textures[tex*2 + (encoremap && !noencore ? 0 : 1)];
+	gltex = (encoremap && !noencore) ? &gl_textures[tex].encore : &gl_textures[tex].normal;
 #else
 	gltex = &gl_textures[tex];
 #endif
 
+	glMipmap = &gltex->mipmap;
+
 	// Generate texture if missing from the cache
-	if (!gltex->mipmap.downloaded)
+	if (!glMipmap->downloaded)
 	{
 		if (!gltex->mipmap.data)
 			HWR_GenerateTexture(tex, gltex, noencore);
 
 		// If hardware does not have the texture, then call GL_SetTexture to upload it
-		GL_SetTexture(&gltex->mipmap);
+		GL_SetTexture(glMipmap);
 	}
-	HWR_SetCurrentTexture(&gltex->mipmap);
+
+	HWR_SetCurrentTexture(glMipmap);
 
 	// The system-memory data can be purged now.
-	Z_ChangeTag(gltex->mipmap.data, PU_HWRCACHE_UNLOCKED);
+	Z_ChangeTag(glMipmap->data, PU_HWRCACHE_UNLOCKED);
 
 	return gltex;
 }
@@ -919,7 +964,7 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
 	W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &glMipmap->data));
 
 #ifdef GLENCORE
-	flat = glMipmap->data;
+	flat = static_cast<UINT8 *>(glMipmap->data);
 	for (steppy = 0; steppy < size; steppy++)
 	{
 		if (flat[steppy] == HWR_PATCHES_CHROMAKEY_COLORINDEX)
@@ -963,9 +1008,9 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
 		if (!noencoremap && encoremap)
 			colormap += COLORMAP_REMAPOFFSET;
 #endif
-		glMipmap->colormap = Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
+		glMipmap->colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
 		glMipmap->colormap->source = colormap;
-		M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+		memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 	}
 
 	if (!glMipmap->downloaded)
@@ -987,7 +1032,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
 // --------------------+
 static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
 {
-	GLPatch_t *glPatch = patch->hardware;
+	GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
 
 	if (!glMipmap->downloaded)
 	{
@@ -1008,8 +1053,8 @@ static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
 // ----------------------+
 static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
 {
-	GLPatch_t *grPatch = patch->hardware;
-	HWR_MakePatch(patch, grPatch, glMipmap, true);
+	GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
+	HWR_MakePatch(patch, glPatch, glMipmap, true);
 
 	// If hardware does not have the texture, then call GL_SetTexture to upload it
 	// If it does have the texture, then call GL_UpdateTexture to update it
@@ -1017,6 +1062,7 @@ static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
 		GL_SetTexture(glMipmap);
 	else
 		GL_UpdateTexture(glMipmap);
+
 	HWR_SetCurrentTexture(glMipmap);
 
 	// The system-memory data can be purged now.
@@ -1043,7 +1089,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 
 	if (!patch->hardware)
 		Patch_CreateGL(patch);
-	glPatch = patch->hardware;
+	glPatch = static_cast<GLPatch_t *>(patch->hardware);
 
 	// Blatant hack for encore colormapping aside...
 	if (colormap == colormaps || colormap == NULL || colormap == (const UINT8*)(COLORMAP_REMAPOFFSET))
@@ -1063,7 +1109,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 		{
 			if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
 			{
-				M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+				memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 				HWR_UpdatePatchMipmap(patch, glMipmap);
 			}
 			else
@@ -1079,14 +1125,14 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 	//              (it have a liste of mipmap)
 	//    this malloc is cleared in HWR_FreeColormapCache
 	//    (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
-	newMipmap = calloc(1, sizeof (*newMipmap));
+	newMipmap = static_cast<GLMipmap_t *>(calloc(1, sizeof (*newMipmap)));
 	if (newMipmap == NULL)
 		I_Error("%s: Out of memory", "HWR_GetMappedPatch");
 	glMipmap->nextcolormap = newMipmap;
 
-	newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
+	newMipmap->colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
 	newMipmap->colormap->source = colormap;
-	M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+	memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 
 	HWR_LoadPatchMipmap(patch, newMipmap);
 }
@@ -1107,7 +1153,7 @@ patch_t *HWR_GetCachedGLPatchPwad(UINT16 wadnum, UINT16 lumpnum)
 	{
 		void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
 		Patch_Create(NULL, 0, ptr);
-		Patch_AllocateHardwarePatch(ptr);
+		Patch_AllocateHardwarePatch(static_cast<patch_t *>(ptr));
 	}
 
 	return (patch_t *)(lumpcache[lumpnum]);
@@ -1124,7 +1170,7 @@ static void HWR_DrawFadeMaskInCache(GLMipmap_t *mipmap, INT32 pblockwidth, INT32
 {
 	INT32 i,j;
 	fixed_t posx, posy, stepx, stepy;
-	UINT8 *block = mipmap->data; // places the data directly into here
+	UINT8 *block = static_cast<UINT8 *>(mipmap->data); // places the data directly into here
 	UINT8 *flat;
 	UINT8 *dest, *src, texel;
 	RGBA_t col;
@@ -1280,9 +1326,9 @@ void HWR_SetPalette(RGBA_t *palette)
 static void HWR_SetPaletteLookup(RGBA_t *palette)
 {
 	int r, g, b;
-	UINT8 *lut = Z_Malloc(
+	UINT8 *lut = static_cast<UINT8 *>(Z_Malloc(
 		HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*sizeof(UINT8),
-		PU_STATIC, NULL);
+		PU_STATIC, NULL));
 #define STEP_SIZE (256/HWR_PALETTE_LUT_SIZE)
 	for (b = 0; b < HWR_PALETTE_LUT_SIZE; b++)
 	{
@@ -1325,7 +1371,7 @@ void HWR_SetMapPalette(void)
 		if (palsize < 768) // 256 * 3
 			I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
 
-		RGB_data = W_CacheLumpNum(lumpnum, PU_CACHE);
+		RGB_data = static_cast<UINT8 *>(W_CacheLumpNum(lumpnum, PU_CACHE));
 		// we got the RGB palette now, but we need it in RGBA format.
 		for (i = 0; i < 256; i++)
 		{
@@ -1360,7 +1406,7 @@ static UINT32 HWR_CreateLightTable(UINT8 *lighttable)
 {
 	UINT32 i, id;
 	RGBA_t *palette = HWR_GetTexturePalette();
-	RGBA_t *hw_lighttable = Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL);
+	RGBA_t *hw_lighttable = static_cast<RGBA_t *>(Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL));
 
 	// To make the palette index -> RGBA mapping easier for the shader,
 	// the hardware lighttable is composed of RGBA colors instead of palette indices.

src/hardware/hw_clip.c

@@ -80,14 +80,13 @@
 
 
 typedef struct clipnode_s
-	{
-		struct clipnode_s *prev, *next;
-		angle_t start, end;
-	} clipnode_t;
+{
+	struct clipnode_s *prev, *next;
+	angle_t start, end;
+} clipnode_t;
 
-clipnode_t *freelist;
-clipnode_t *clipnodes;
-clipnode_t *cliphead;
+static clipnode_t *freelist;
+static clipnode_t *cliphead;
 
 static clipnode_t * gld_clipnode_GetNew(void);
 static clipnode_t * gld_clipnode_NewRange(angle_t start, angle_t end);
@@ -167,6 +166,7 @@ static void gld_clipper_RemoveRange(clipnode_t *range)
 		{
 			range->prev->next = range->next;
 		}
+
 		if (range->next)
 		{
 			range->next->prev = range->prev;
@@ -178,7 +178,7 @@ static void gld_clipper_RemoveRange(clipnode_t *range)
 
 void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle)
 {
-	if(startangle > endangle)
+	if (startangle > endangle)
 	{
 		// The range has to added in two parts.
 		gld_clipper_AddClipRange(startangle, ANGLE_MAX);
@@ -320,7 +320,7 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
 	double floatangle;
 	angle_t a1;
 
-	float tilt = (float)fabs(((double)(int)tiltangle) / ANG1);
+	float tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
 
 	if (tilt > 90.0f)
 		tilt = 90.0f;
@@ -331,11 +331,11 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
 
 	// ok, this is a gross hack that barely works...
 	// but at least it doesn't overestimate too much...
-	clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PIl;
+	clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI;
 	floatangle = 2.0 + (45.0 + ((double)tilt / 1.9)) * clipfov / 90.0;
 	if (floatangle >= 180.0)
 		return 0xffffffff;
-	a1 = (angle_t)xs_CRoundToInt(ANG1 * floatangle);
+	a1 = (angle_t)lrint(ANG1 * floatangle);
 	return a1;
 }
 
@@ -349,33 +349,32 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
 // gld_FrustumSetup
 //
 
-static GLdouble viewMatrix[16];
-static GLdouble projMatrix[16];
-float frustum[6][4];
+static float frustum[6][4];
 
 #define CALCMATRIX(a, b, c, d, e, f, g, h)\
-(float)(viewMatrix[a] * projMatrix[b] + \
-viewMatrix[c] * projMatrix[d] + \
-viewMatrix[e] * projMatrix[f] + \
-viewMatrix[g] * projMatrix[h])
+	(modelMatrix[a] * projMatrix[b] + \
+	modelMatrix[c] * projMatrix[d] + \
+	modelMatrix[e] * projMatrix[f] + \
+	modelMatrix[g] * projMatrix[h])
 
 #define NORMALIZE_PLANE(i)\
-t = (float)sqrt(\
-frustum[i][0] * frustum[i][0] + \
-frustum[i][1] * frustum[i][1] + \
-frustum[i][2] * frustum[i][2]); \
-frustum[i][0] /= t; \
-frustum[i][1] /= t; \
-frustum[i][2] /= t; \
-frustum[i][3] /= t
+	t = sqrtf(\
+		frustum[i][0] * frustum[i][0] + \
+		frustum[i][1] * frustum[i][1] + \
+		frustum[i][2] * frustum[i][2]); \
+	frustum[i][0] /= t; \
+	frustum[i][1] /= t; \
+	frustum[i][2] /= t; \
+	frustum[i][3] /= t
 
 void gld_FrustumSetup(void)
 {
 	float t;
 	float clip[16];
 
-	pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix);
-	pglGetFloatv(GL_MODELVIEW_MATRIX, viewMatrix);
+	// HWR_SetTransform will take care of this!
+	//pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix);
+	//pglGetFloatv(GL_MODELVIEW_MATRIX, modelMatrix);
 
 	clip[0]  = CALCMATRIX(0, 0, 1, 4, 2, 8, 3, 12);
 	clip[1]  = CALCMATRIX(0, 1, 1, 5, 2, 9, 3, 13);

src/hardware/hw_clip.h

@@ -16,7 +16,7 @@ extern "C" {
 #include "../tables.h"
 #include "../doomtype.h"
 
-//#define HAVE_SPHEREFRUSTRUM // enable if you want gld_SphereInFrustum and related code
+#define HAVE_SPHEREFRUSTRUM // enable if you want gld_SphereInFrustum and related code
 
 boolean gld_clipper_SafeCheckRange(angle_t startAngle, angle_t endAngle);
 void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle);

src/hardware/hw_data.h

@@ -65,7 +65,7 @@ typedef struct GLMipmap_s GLMipmap_t;
 struct GLMapTexture_s
 {
 	GLMipmap_t		mipmap;
-	float			scaleX; //used for scaling textures on walls
+	float			scaleX; // used for scaling textures on walls
 	float			scaleY;
 };
 typedef struct GLMapTexture_s GLMapTexture_t;
@@ -74,7 +74,7 @@ typedef struct GLMapTexture_s GLMapTexture_t;
 struct GLPatch_s
 {
 	GLMipmap_t			*mipmap;
-	float				max_s,max_t;
+	float				max_s, max_t;
 };
 typedef struct GLPatch_s GLPatch_t;
 

src/hardware/hw_defs.h

@@ -79,7 +79,7 @@ typedef struct FColorARGB FColorARGB;
 // Simple 2D coordinate
 typedef struct
 {
-	FLOAT x,y;
+	FLOAT x, y;
 } F2DCoord, v2d_t;
 
 // ======================
@@ -117,7 +117,7 @@ typedef struct
 
 typedef struct
 {
-	FLOAT       x,y,z;           // position
+	FLOAT       x, y, z;           // position
 	FLOAT       anglex, angley, anglez;   // aimingangle / viewangle
 	FLOAT       scalex, scaley, scalez;
 	FLOAT       fovangle;
@@ -142,8 +142,8 @@ enum
 // Transformed vector, as passed to HWR API
 typedef struct
 {
-	FLOAT       x,y,z;
-	FLOAT       s,t;
+	FLOAT       x, y, z;
+	FLOAT       s, t;
 } FOutVector;
 
 typedef struct vbo_vertex_s
@@ -173,7 +173,7 @@ typedef struct
 	int rows, columns;
 	int loopcount;
 
-	int detail, vertex_count;
+	int vertex_count;
 	int texture, width, height;
 	boolean rebuild; // VBO needs to be rebuilt
 

src/hardware/hw_dll.h

@@ -1,67 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2005 by SRB2 Jr. Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//-----------------------------------------------------------------------------
-/// \file
-/// \brief Win32 DLL and Shared Objects API definitions
-
-#ifndef __HWR_DLL_H__
-#define __HWR_DLL_H__
-
-// Function declaration for exports from the DLL :
-// EXPORT <return-type> HWRAPI(<function-name>) (<arguments>);
-// If _CREATE_DLL_ is defined the above declaration translates to :
-// __declspec(dllexport) <return-type> WINAPI <function-name> (<arguments>);
-// If _CREATE_DLL_ is NOT DEFINED the above declaration translates to :
-// __declspec(dllexport) <return->type> (WINAPI *<function-name>) (<arguments>);
-
-#ifdef _CREATE_DLL_
- #ifdef __cplusplus
-  #define EXPORT  extern "C"
- #else
-  #define EXPORT
- #endif
- #ifdef _WIN32
-  #define HWRAPI(fn)  WINAPI fn
- #else
-  #define HWRAPI(fn)  fn
- #endif
-#else // _CREATE_DLL_
- #define EXPORT      typedef
- #ifdef _WIN32
-  #define HWRAPI(fn)  (WINAPI *fn)
- #else
-  #define HWRAPI(fn)  (*fn)
- #endif
-#endif
-
-// ==========================================================================
-//                                                                      MATHS
-// ==========================================================================
-
-// Constants
-#define DEGREE (0.017453292519943295769236907684883l) // 2*PI/360
-
-void GL_DBG_Printf(const char *format, ...) /*FUNCPRINTF*/;
-#define DBG_Printf GL_DBG_Printf
-
-#if defined (__CYGWIN__)
-void _init() __attribute__((constructor));
-void _fini() __attribute__((destructor));
-#else
-void _init();
-void _fini();
-#endif
-
-#endif

src/hardware/hw_draw.c

@@ -31,11 +31,6 @@
 #include "../st_stuff.h"
 
 #include <fcntl.h>
-#include "../i_video.h"  // for rendermode != render_glide
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
 
 typedef struct
 {
@@ -51,75 +46,13 @@ typedef struct
 	UINT8 image_descriptor; //18
 } ATTRPACK TGAHeader; // sizeof is 18
 
-static UINT8 softwaretranstogl[11]    = {  0, 25, 51, 76,102,127,153,178,204,229,255};
-static UINT8 softwaretranstogl_hi[11] = {  0, 51,102,153,204,255,255,255,255,255,255};
-static UINT8 softwaretranstogl_lo[11] = {  0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
+static const UINT8 softwaretranstogl[11]    = {  0, 25, 51, 76,102,127,153,178,204,229,255};
+static const UINT8 softwaretranstogl_hi[11] = {  0, 51,102,153,204,255,255,255,255,255,255};
+static const UINT8 softwaretranstogl_lo[11] = {  0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
 
 static const float FLOATBASEVIDWIDTH  = (float)BASEVIDWIDTH;
 static const float FLOATBASEVIDHEIGHT = (float)BASEVIDHEIGHT;
 
-//
-// -----------------+
-// HWR_DrawPatch    : Draw a 'tile' graphic
-// Notes            : x,y : positions relative to the original Doom resolution
-//                  : textes(console+score) + menus + status bar
-// -----------------+
-void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option)
-{
-	FOutVector v[4];
-	FBITFIELD flags;
-	GLPatch_t *hwrPatch;
-
-//  3--2
-//  | /|
-//  |/ |
-//  0--1
-	float sdup = FIXED_TO_FLOAT(vid.fdup)*2.0f;
-	float pdup = FIXED_TO_FLOAT(vid.fdup)*2.0f;
-
-	// make patch ready in hardware cache
-	HWR_GetPatch(gpatch);
-	hwrPatch = ((GLPatch_t *)gpatch->hardware);
-
-	switch (option & V_SCALEPATCHMASK)
-	{
-	case V_NOSCALEPATCH:
-		pdup = 2.0f;
-		break;
-	case V_SMALLSCALEPATCH:
-		pdup = 2.0f * FIXED_TO_FLOAT(vid.smalldup*FRACUNIT);
-		break;
-	case V_MEDSCALEPATCH:
-		pdup = 2.0f * FIXED_TO_FLOAT(vid.meddup*FRACUNIT);
-		break;
-	}
-
-	if (option & V_NOSCALESTART)
-		sdup = 2.0f;
-
-	v[0].x = v[3].x = (x*sdup-gpatch->leftoffset*pdup)/vid.width - 1;
-	v[2].x = v[1].x = (x*sdup+(gpatch->width - gpatch->leftoffset)*pdup)/vid.width - 1;
-	v[0].y = v[1].y = 1-(y*sdup-gpatch->topoffset*pdup)/vid.height;
-	v[2].y = v[3].y = 1-(y*sdup+(gpatch->height - gpatch->topoffset)*pdup)/vid.height;
-
-	v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
-
-	v[0].s = v[3].s = 0.0f;
-	v[2].s = v[1].s = hwrPatch->max_s;
-	v[0].t = v[1].t = 0.0f;
-	v[2].t = v[3].t = hwrPatch->max_t;
-
-	flags = PF_Translucent|PF_NoDepthTest;
-
-	if (option & V_WRAPX)
-		flags |= PF_ForceWrapX;
-	if (option & V_WRAPY)
-		flags |= PF_ForceWrapY;
-
-	// clip it since it is used for bunny scroll in doom I
-	GL_DrawPolygon(NULL, v, 4, flags);
-}
-
 void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, INT32 bflags)
 {
 	FOutVector v[4];
@@ -154,15 +87,15 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
 
 	switch (option & V_SCALEPATCHMASK)
 	{
-	case V_NOSCALEPATCH:
-		dup = 1.0f;
-		break;
-	case V_SMALLSCALEPATCH:
-		dup = (float)vid.smalldup;
-		break;
-	case V_MEDSCALEPATCH:
-		dup = (float)vid.meddup;
-		break;
+		case V_NOSCALEPATCH:
+			dup = 1.0f;
+			break;
+		case V_SMALLSCALEPATCH:
+			dup = (float)vid.smalldup;
+			break;
+		case V_MEDSCALEPATCH:
+			dup = (float)vid.meddup;
+			break;
 	}
 
 	fscalew = fscaleh = FIXED_TO_FLOAT(pscale);
@@ -336,15 +269,15 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
 
 	switch (option & V_SCALEPATCHMASK)
 	{
-	case V_NOSCALEPATCH:
-		dup = 1.0f;
-		break;
-	case V_SMALLSCALEPATCH:
-		dup = (float)vid.smalldup;
-		break;
-	case V_MEDSCALEPATCH:
-		dup = (float)vid.meddup;
-		break;
+		case V_NOSCALEPATCH:
+			dup = 1.0f;
+			break;
+		case V_SMALLSCALEPATCH:
+			dup = (float)vid.smalldup;
+			break;
+		case V_MEDSCALEPATCH:
+			dup = (float)vid.meddup;
+			break;
 	}
 
 	fscale = FIXED_TO_FLOAT(pscale);
@@ -573,7 +506,7 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 
 	if (color & 0xFF00) // Do COLORMAP fade.
 	{
-		if (HWR_ShouldUsePaletteRendering() && cv_glscreentextures.value)
+		if (cv_glscreentextures.value && HWR_ShouldUsePaletteRendering())
 		{
 			const hwdscreentexture_t scr_tex = HWD_SCREENTEXTURE_GENERIC2;
 
@@ -585,12 +518,10 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 			GL_UnSetShader();
 			return;
 		}
-		else
-		{
-			Surf.PolyColor.rgba = UINT2RGBA(0x01010160);
-			Surf.PolyColor.s.alpha = (strength*8);
-			poly_flags |= PF_Translucent;
-		}
+
+		Surf.PolyColor.rgba = UINT2RGBA(0x01010160);
+		Surf.PolyColor.s.alpha = (strength*8);
+		poly_flags |= PF_Translucent;
 	}
 	else // Do TRANSMAP** fade.
 	{
@@ -636,133 +567,6 @@ void HWR_DrawConsoleBack(UINT32 color, INT32 height)
 }
 
 
-// ==========================================================================
-//                                                             R_DRAW.C STUFF
-// ==========================================================================
-
-// ------------------
-// HWR_DrawViewBorder
-// Fill the space around the view window with a Doom flat texture, draw the
-// beveled edges.
-// 'clearlines' is useful to clear the heads up messages, when the view
-// window is reduced, it doesn't refresh all the view borders.
-// ------------------
-void HWR_DrawViewBorder(INT32 clearlines)
-{
-	INT32 x, y;
-	INT32 top, side;
-	INT32 baseviewwidth, baseviewheight;
-	INT32 basewindowx, basewindowy;
-	patch_t *patch;
-
-	if (!clearlines)
-		clearlines = BASEVIDHEIGHT; // refresh all
-
-	// calc view size based on original game resolution
-	baseviewwidth =  FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwidth), vid.fdup)); //(cv_viewsize.value * BASEVIDWIDTH/10)&~7;
-	baseviewheight = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewheight), vid.fdup));
-	top = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowy), vid.fdup));
-	side = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowx), vid.fdup));
-
-	// top
-	HWR_DrawFlatFill(0, 0,
-		BASEVIDWIDTH, (top < clearlines ? top : clearlines),
-		st_borderpatchnum);
-
-	// left
-	if (top < clearlines)
-		HWR_DrawFlatFill(0, top, side,
-			(clearlines-top < baseviewheight ? clearlines-top : baseviewheight),
-			st_borderpatchnum);
-
-	// right
-	if (top < clearlines)
-		HWR_DrawFlatFill(side + baseviewwidth, top, side,
-			(clearlines-top < baseviewheight ? clearlines-top : baseviewheight),
-			st_borderpatchnum);
-
-	// bottom
-	if (top + baseviewheight < clearlines)
-		HWR_DrawFlatFill(0, top + baseviewheight,
-			BASEVIDWIDTH, BASEVIDHEIGHT, st_borderpatchnum);
-
-	//
-	// draw the view borders
-	//
-
-	basewindowx = (BASEVIDWIDTH - baseviewwidth)>>1;
-	if (baseviewwidth == BASEVIDWIDTH)
-		basewindowy = 0;
-	else
-		basewindowy = top;
-
-	// top edge
-	if (clearlines > basewindowy - 8)
-	{
-		patch = W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH);
-		for (x = 0; x < baseviewwidth; x += 8)
-			HWR_DrawPatch(patch, basewindowx + x, basewindowy - 8,
-				0);
-	}
-
-	// bottom edge
-	if (clearlines > basewindowy + baseviewheight)
-	{
-		patch = W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH);
-		for (x = 0; x < baseviewwidth; x += 8)
-			HWR_DrawPatch(patch, basewindowx + x,
-				basewindowy + baseviewheight, 0);
-	}
-
-	// left edge
-	if (clearlines > basewindowy)
-	{
-		patch = W_CachePatchNum(viewborderlump[BRDR_L], PU_PATCH);
-		for (y = 0; y < baseviewheight && basewindowy + y < clearlines;
-			y += 8)
-		{
-			HWR_DrawPatch(patch, basewindowx - 8, basewindowy + y,
-				0);
-		}
-	}
-
-	// right edge
-	if (clearlines > basewindowy)
-	{
-		patch = W_CachePatchNum(viewborderlump[BRDR_R], PU_PATCH);
-		for (y = 0; y < baseviewheight && basewindowy+y < clearlines;
-			y += 8)
-		{
-			HWR_DrawPatch(patch, basewindowx + baseviewwidth,
-				basewindowy + y, 0);
-		}
-	}
-
-	// Draw beveled corners.
-	if (clearlines > basewindowy - 8)
-		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_TL],
-				PU_PATCH),
-			basewindowx - 8, basewindowy - 8, 0);
-
-	if (clearlines > basewindowy - 8)
-		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_TR],
-				PU_PATCH),
-			basewindowx + baseviewwidth, basewindowy - 8, 0);
-
-	if (clearlines > basewindowy+baseviewheight)
-		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_BL],
-				PU_PATCH),
-			basewindowx - 8, basewindowy + baseviewheight, 0);
-
-	if (clearlines > basewindowy + baseviewheight)
-		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_BR],
-				PU_PATCH),
-			basewindowx + baseviewwidth,
-			basewindowy + baseviewheight, 0);
-}
-
-
-
 // ==========================================================================
 //                                                     AM_MAP.C DRAWING STUFF
 // ==========================================================================
@@ -1084,11 +888,13 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 
 	if (fx >= vid.width || fy >= vid.height)
 		return;
+
 	if (fx < 0)
 	{
 		fw += fx;
 		fx = 0;
 	}
+
 	if (fy < 0)
 	{
 		fh += fy;
@@ -1100,6 +906,7 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 
 	if (fx + fw > vid.width)
 		fw = fvw - fx;
+
 	if (fy + fh > vid.height)
 		fh = fvh - fy;
 
@@ -1168,7 +975,7 @@ static inline boolean saveTGA(const char *file_name, void *buffer,
 	INT32 i;
 	UINT8 *buf8 = buffer;
 
-	fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
+	fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666);
 	if (fd < 0)
 		return false;
 

src/hardware/hw_gl.h

@@ -80,6 +80,9 @@ 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

src/hardware/hw_main.h

@@ -42,10 +42,6 @@ extern "C" {
 void HWR_Startup(void);
 void HWR_Shutdown(void);
 
-extern float gl_viewwidth, gl_viewheight, gl_baseviewwindowx, gl_baseviewwindowy;
-
-extern float gl_basewindowcenterx, gl_basewindowcentery;
-
 extern unsigned msaa;
 extern boolean a2c;
 
@@ -89,7 +85,6 @@ extern ps_metric_t ps_hw_batchdrawtime;
 extern boolean gl_shadersavailable;
 
 // hw_draw.c
-void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option);
 void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, INT32 bflags);
 void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
 void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color);
@@ -98,7 +93,6 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color);
 void HWR_drawAMline(const fline_t *fl, INT32 color);
 void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength);
 void HWR_DrawConsoleBack(UINT32 color, INT32 height);
-void HWR_DrawViewBorder(INT32 clearlines);
 void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum);
 
 UINT8 *HWR_GetScreenshot(INT32 scale);
@@ -108,8 +102,7 @@ void HWR_SetViewSize(void);
 void HWR_AddCommands(void);
 
 void HWR_RenderPlayerView(void);
-void HWR_RenderViewpoint(gl_portal_t *rootportal, player_t *player, int stencil_level, boolean allow_portals);
-void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, player_t *player, int stencil_level, boolean allow_portals);
+void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level, boolean allow_portals);
 
 void HWR_ClearSkyDome(void);
 void HWR_BuildSkyDome(void);

src/hardware/hw_md2.c

@@ -72,10 +72,9 @@
 #include <errno.h>
 #endif
 
-md2_t md2_models[NUMSPRITES];
-md2_t md2_playermodels[MAXSKINS];
-md2_t md2_localplayermodels[MAXLOCALSKINS];
-
+md2_t md2_models[NUMSPRITES] = {};
+md2_t md2_playermodels[MAXSKINS] = {};
+md2_t md2_localplayermodels[MAXLOCALSKINS] = {};
 
 /*
  * free model
@@ -417,7 +416,7 @@ static void md2_loadTexture(md2_t *model)
 			size = w*h;
 			while (size--)
 			{
-				V_CubeApply(&image->s.red, &image->s.green, &image->s.blue);
+				V_CubeApply(image);
 				image++;
 			}
 		}
@@ -549,7 +548,7 @@ void HWR_InitMD2(void)
 	{
 		for (i = 0; i < NUMSPRITES; i++)
 		{
-			if (stricmp(name, sprnames[i]) == 0)
+			if (fasticmp(name, sprnames[i]))
 			{
 				md2_models[i].scale = scale;
 				md2_models[i].offset = offset;
@@ -561,7 +560,7 @@ void HWR_InitMD2(void)
 
 		for (s = 0; s < MAXSKINS; s++)
 		{
-			if (stricmp(name, skins[s].name) == 0)
+			if (fasticmp(name, skins[s].name))
 			{
 				md2_playermodels[s].skin = s;
 				md2_playermodels[s].scale = scale;
@@ -580,7 +579,7 @@ md2found:
 	fclose(f);
 }
 
-void HWR_AddPlayerMD2(int skin, boolean local) // For MD2's that were added after startup
+void HWR_AddPlayerMD2(INT32 skin, boolean local) // For MD2's that were added after startup
 {
 	FILE *f;
 	char name[20], filename[32];
@@ -607,11 +606,12 @@ void HWR_AddPlayerMD2(int skin, boolean local) // For MD2's that were added afte
 		}
 	}
 
-	md2s = ( (local) ? md2_localplayermodels : md2_playermodels );
+	md2s = (local ? md2_localplayermodels : md2_playermodels);
+
 	// Check for any MD2s that match the names of player skins!
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
-		if (stricmp(name, K_GetSkinArray(local)[skin].name) == 0)
+		if (fasticmp(name, K_GetSkinArray(local)[skin].name))
 		{
 			md2s[skin].skin = skin;
 			md2s[skin].scale = scale;
@@ -650,6 +650,7 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
 	if (!f)
 	{
 		f = fopen(va("%s"PATHSEP"%s", srb2path, "mdls.dat"), "rt");
+
 		if (!f)
 		{
 			CONS_Printf("%s %s\n", M_GetText("Error while loading mdls.dat:"), strerror(errno));
@@ -661,7 +662,7 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
 	// Check for any MD2s that match the names of sprite names!
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
-		if (stricmp(name, sprnames[spritenum]) == 0)
+		if (fasticmp(name, sprnames[spritenum]))
 		{
 			md2_models[spritenum].scale = scale;
 			md2_models[spritenum].offset = offset;
@@ -692,17 +693,15 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
 	GLPatch_t *hwrBlendPatch = blendgpatch->hardware;
 	UINT16 w = gpatch->width, h = gpatch->height;
 	UINT32 size = w*h;
-	RGBA_t *image, *blendimage, *cur, blendcolor;
+	RGBA_t *image, *blendimage, *cur;
+	RGBA_t blendcolor = {};
 	RGBA_t *palette = HWR_GetTexturePalette();
-	UINT8 translation[17]; // First the color index
-	UINT8 cutoff[17]; // Brightness cutoff before using the next color
+	UINT8 translation[17] = {}; // First the color index
+	UINT8 cutoff[17] = {}; // Brightness cutoff before using the next color
 	UINT8 translen = 0;
 	UINT8 i;
-	UINT8 colorbrightnesses[17];
-	UINT8 color_match_lookup[256]; // optimization attempt
-
-	memset(translation, 0, sizeof(translation));
-	memset(cutoff, 0, sizeof(cutoff));
+	UINT8 colorbrightnesses[17] = {};
+	UINT8 color_match_lookup[256] = {}; // optimization attempt
 
 	if (glMipmap->width == 0)
 	{
@@ -715,14 +714,10 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
 		glMipmap->format = GL_TEXFMT_RGBA;
 	}
 
-	if (glMipmap->data)
-	{
-		Z_Free(glMipmap->data);
-		glMipmap->data = NULL;
-	}
+	Z_Free(glMipmap->data);
+	glMipmap->data = NULL;
 
-	cur = Z_Malloc(size*4, PU_HWRMODELTEXTURE, &glMipmap->data);
-	memset(cur, 0x00, size*4);
+	cur = Z_Calloc(size*4, PU_HWRMODELTEXTURE, &glMipmap->data);
 
 	image = hwrPatch->mipmap->data;
 	blendimage = hwrBlendPatch->mipmap->data;
@@ -1036,7 +1031,6 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
 	GLPatch_t *glPatch = patch->hardware;
 	GLMipmap_t *glMipmap, *newMipmap;
 
-
 	if (blendgpatch == NULL || colormap == colormaps || colormap == NULL)
 	{
 		// Don't do any blending
@@ -1056,7 +1050,7 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
 			{
 				if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
 				{
-					M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+					memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 					HWR_CreateBlendedTexture(patch, blendgpatch, glMipmap, skinnum, color);
 					GL_UpdateTexture(glMipmap);
 				}
@@ -1083,7 +1077,7 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
 
 	newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
 	newMipmap->colormap->source = colormap;
-	M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+	memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 
 	HWR_CreateBlendedTexture(patch, blendgpatch, newMipmap, skinnum, color);
 
@@ -1197,8 +1191,15 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 			Surf.PolyFlags = HWR_GetBlendModeFlag(blendmode);
 		}
 
-		if (cv_playerfade.value && spr->mobj->player)
-			Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha);
+		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);
+		}
 
 		// dont forget to enabled the depth test because we can't do this like
 		// before: polygons models are not sorted
@@ -1467,4 +1468,116 @@ 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

src/hardware/hw_md2.h

@@ -45,6 +45,9 @@ 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"

src/hardware/hw_md2load.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, 0);
+	retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL);
 
 	//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, 0);
+		texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, NULL);
 		strcpy(texturefilename, texPos);
 	}
 	else
 	{
 		namelen = strlen(fileName) + 1;
-		texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, 0);
+		texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, NULL);
 		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, 0);
+	retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * retModel->numMeshes, ztag, NULL);
 	retModel->meshes[0].numFrames = header->numFrames;
 	// const float WUNITS = 1.0f;
 	// float dataScale = WUNITS;
@@ -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, 0);
+	retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, NULL);
 
 	// 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, 0);
+		retModel->meshes[0].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*header->numFrames, ztag, NULL);
 		retModel->meshes[0].numVertices = header->numXYZ;
-		retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, 0);
+		retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, NULL);
 
 		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, 0);
-			retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, 0);
+			retModel->meshes[0].tinyframes[i].vertices = (short*)Z_Malloc(sizeof(short) * 3 * header->numXYZ, ztag, NULL);
+			retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, NULL);
 
 			//			if (retModel->materials[0].lightmap)
 			//				retModel->meshes[0].tinyframes[i].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*header->numVerts, ztag);
-			retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, 0);
+			retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, NULL);
 
 			vertptr = retModel->meshes[0].tinyframes[i].vertices;
 			normptr = retModel->meshes[0].tinyframes[i].normals;
@@ -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, 0);
-		retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, 0);
+		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);
 
 		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, 0);
-			retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, 0);
+			retModel->meshes[0].frames[i].normals = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
+			retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
 			//			if (retModel->materials[0].lightmap)
 			//				retModel->meshes[0].frames[i].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*header->numTris*3, ztag);
 			//float *vertptr, *normptr;

src/hardware/hw_md3load.c

@@ -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, 0);
+	retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL);
 
 	// 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, 0);
+	retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, NULL);
 
 	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, 0);
+	retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t)*retModel->numMeshes, ztag, NULL);
 
 	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, 0);
+			retModel->meshes[i].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*mdS->numFrames, ztag, NULL);
 			retModel->meshes[i].numVertices = mdS->numVerts;
-			retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numVerts, ztag, 0);
+			retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numVerts, ztag, NULL);
 			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, 0);
-				retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, 0);
+				retModel->meshes[i].tinyframes[j].vertices = (short*)Z_Malloc(sizeof(short)*3*mdS->numVerts, ztag, NULL);
+				retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, NULL);
 
 //				if (retModel->materials[0].lightmap)
 //					retModel->meshes[i].tinyframes[j].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag);
-				retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, 0);
+				retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, NULL);
 				vertptr = retModel->meshes[i].tinyframes[j].vertices;
 				normptr = retModel->meshes[i].tinyframes[j].normals;
 
@@ -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, 0);
-			retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numTriangles*3, ztag, 0);
+			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);
 
 			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, 0);
-				retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, 0);
+				retModel->meshes[i].frames[j].vertices = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
+				retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
 //				if (retModel->materials[i].lightmap)
 //					retModel->meshes[i].frames[j].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag);
 				vertptr = retModel->meshes[i].frames[j].vertices;

src/hardware/hw_model.c

@@ -114,7 +114,6 @@ void UnloadModel(model_t *model)
 	if (model->materials)
 		Z_Free(model->materials);
 
-	DeleteVBOs(model);
 	Z_Free(model);
 }
 
@@ -127,7 +126,7 @@ tag_t *GetTagByName(model_t *model, char *name, int frame)
 		int i;
 		for (i = 0; i < model->numTags; i++)
 		{
-			if (!stricmp(iterator[i].name, name))
+			if (fasticmp(iterator[i].name, name))
 				return &iterator[i];
 		}
 	}
@@ -164,22 +163,22 @@ model_t *LoadModel(const char *filename, int ztag)
 		return NULL;
 	}
 
-	if (!strcmp(extension, ".md3"))
+	if (fastcmp(extension, ".md3"))
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (!strcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
+	else if (fastcmp(extension, ".md3s")) // MD3 that will be converted in memory to use full floats
 	{
 		if (!(model = MD3_LoadModel(filename, ztag, true)))
 			return NULL;
 	}
-	else if (!strcmp(extension, ".md2"))
+	else if (fastcmp(extension, ".md2"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, false)))
 			return NULL;
 	}
-	else if (!strcmp(extension, ".md2s"))
+	else if (fastcmp(extension, ".md2s"))
 	{
 		if (!(model = MD2_LoadModel(filename, ztag, true)))
 			return NULL;
@@ -190,11 +189,10 @@ model_t *LoadModel(const char *filename, int ztag)
 		return NULL;
 	}
 
-	model->mdlFilename = (char*)Z_Malloc(strlen(filename)+1, ztag, 0);
+	model->mdlFilename = (char*)Z_Malloc(strlen(filename)+1, ztag, NULL);
 	strcpy(model->mdlFilename, filename);
 
 	Optimize(model);
-	GeneratePolygonNormals(model, ztag);
 
 	// Default material properties
 	for (i = 0 ; i < model->numMaterials; i++)
@@ -239,19 +237,12 @@ 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, 0);
+			float *newNormals = (float*)Z_Malloc(sizeof(float)*3*mesh->numTriangles*3, memTag, NULL);
 			int k;
 			float *vertPtr = frame->vertices;
 			float *oldNormals;
 
-			M_Memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);
-
-/*			if (!systemSucks)
-			{
-				memTag = Z_GetTag(frame->tangents);
-				float *newTangents = (float*)Z_Malloc(sizeof(float)*3*mesh->numTriangles*3, memTag);
-				M_Memcpy(newTangents, frame->tangents, sizeof(float)*3*mesh->numTriangles*3);
-			}*/
+			memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);
 
 			for (k = 0; k < mesh->numVertices; k++)
 			{
@@ -288,32 +279,15 @@ void GenerateVertexNormals(model_t *model)
 
 				if (vCount > 1)
 				{
-//					Vector::Normalize(&normal);
 					newNormals[3 * k + 0] = (float)normal.x;
 					newNormals[3 * k + 1] = (float)normal.y;
 					newNormals[3 * k + 2] = (float)normal.z;
-
-/*					if (!systemSucks)
-					{
-						Vector::vector_t tangent;
-						Vector::Tangent(&normal, &tangent);
-						newTangents[3 * k + 0] = tangent.x;
-						newTangents[3 * k + 1] = tangent.y;
-						newTangents[3 * k + 2] = tangent.z;
-					}*/
 				}
 			}
 
 			oldNormals = frame->normals;
 			frame->normals = newNormals;
 			Z_Free(oldNormals);
-
-/*			if (!systemSucks)
-			{
-				float *oldTangents = frame->tangents;
-				frame->tangents = newTangents;
-				Z_Free(oldTangents);
-			}*/
 		}
 	}
 }
@@ -335,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, 0);
+	newMatNode = (materiallist_t*)Z_Malloc(sizeof(materiallist_t), PU_CACHE, NULL);
 	newMatNode->material = material;
 	ListAdd(newMatNode, (listitem_t**)head);
 	return true;
@@ -377,7 +351,7 @@ void Optimize(model_t *model)
 	}
 
 	memTag = PU_STATIC;
-	newMeshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * numMeshes, memTag, 0);
+	newMeshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * numMeshes, memTag, NULL);
 
 	i = 0;
 	for (node = matListHead; node; node = node->next)
@@ -403,18 +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, 0);
-//		if (node->material->lightmap)
-//			newMesh->lightuvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, 0);
-		newMesh->frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t), memTag, 0);
+		newMesh->uvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, NULL);
+		newMesh->frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t), memTag, NULL);
 		curFrame = &newMesh->frames[0];
 
 		curFrame->material = curMat;
-		curFrame->normals = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
-//		if (!systemSucks)
-//			curFrame->tangents = (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);
+		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);
 
 		// Now traverse the meshes of the model, adding in
 		// vertices/normals/uvs that match the current material
@@ -432,39 +402,24 @@ void Optimize(model_t *model)
 				char *destByte;
 				char *srcByte;
 
-				M_Memcpy(&newMesh->uvs[uvCount],
+				memcpy(&newMesh->uvs[uvCount],
 					curMesh->uvs,
 					sizeof(float)*2*curMesh->numTriangles*3);
 
-/*				if (node->material->lightmap)
-				{
-					M_Memcpy(&newMesh->lightuvs[uvCount],
-						curMesh->lightuvs,
-						sizeof(float)*2*curMesh->numTriangles*3);
-				}*/
 				uvCount += 2*curMesh->numTriangles*3;
 
 				dest = (float*)newMesh->frames[0].vertices;
 				src = (float*)curMesh->frames[0].vertices;
-				M_Memcpy(&dest[vertCount],
+				memcpy(&dest[vertCount],
 					src,
 					sizeof(float)*3*curMesh->numTriangles*3);
 
 				dest = (float*)newMesh->frames[0].normals;
 				src = (float*)curMesh->frames[0].normals;
-				M_Memcpy(&dest[vertCount],
+				memcpy(&dest[vertCount],
 					src,
 					sizeof(float)*3*curMesh->numTriangles*3);
 
-/*				if (!systemSucks)
-				{
-					dest = (float*)newMesh->frames[0].tangents;
-					src = (float*)curMesh->frames[0].tangents;
-					M_Memcpy(&dest[vertCount],
-						src,
-						sizeof(float)*3*curMesh->numTriangles*3);
-				}*/
-
 				vertCount += 3 * curMesh->numTriangles * 3;
 
 				destByte = (char*)newMesh->frames[0].colors;
@@ -472,7 +427,7 @@ void Optimize(model_t *model)
 
 				if (srcByte)
 				{
-					M_Memcpy(&destByte[colorCount],
+					memcpy(&destByte[colorCount],
 						srcByte,
 						sizeof(char)*4*curMesh->numTriangles*3);
 				}
@@ -494,103 +449,3 @@ void Optimize(model_t *model)
 	model->meshes = newMeshes;
 	model->numMeshes = numMeshes;
 }
-
-void GeneratePolygonNormals(model_t *model, int ztag)
-{
-	int i;
-	for (i = 0; i < model->numMeshes; i++)
-	{
-		int j;
-		mesh_t *mesh = &model->meshes[i];
-
-		if (!mesh->frames)
-			continue;
-
-		for (j = 0; j < mesh->numFrames; j++)
-		{
-			int k;
-			mdlframe_t *frame = &mesh->frames[j];
-			const float *vertices = frame->vertices;
-			vector_t *polyNormals;
-
-			frame->polyNormals = (vector_t*)Z_Malloc(sizeof(vector_t) * mesh->numTriangles, ztag, 0);
-
-			polyNormals = frame->polyNormals;
-
-			for (k = 0; k < mesh->numTriangles; k++)
-			{
-				/// TODO: normalize vectors
-				(void)vertices;
-				(void)polyNormals;
-//				Vector::Normal(vertices, polyNormals);
-				vertices += 3 * 3;
-				polyNormals++;
-			}
-		}
-	}
-}
-
-//
-// Reload
-//
-// Reload VBOs
-//
-#if 0
-static void Reload(void)
-{
-/*	model_t *node;
-	for (node = modelHead; node; node = node->next)
-	{
-		int i;
-		for (i = 0; i < node->numMeshes; i++)
-		{
-			mesh_t *mesh = &node->meshes[i];
-
-			if (mesh->frames)
-			{
-				int j;
-				for (j = 0; j < mesh->numFrames; j++)
-					CreateVBO(mesh, &mesh->frames[j]);
-			}
-			else if (mesh->tinyframes)
-			{
-				int j;
-				for (j = 0; j < mesh->numFrames; j++)
-					CreateVBO(mesh, &mesh->tinyframes[j]);
-			}
-		}
-	}*/
-}
-#endif
-
-void DeleteVBOs(model_t *model)
-{
-	(void)model;
-/*	for (int i = 0; i < model->numMeshes; i++)
-	{
-		mesh_t *mesh = &model->meshes[i];
-
-		if (mesh->frames)
-		{
-			for (int j = 0; j < mesh->numFrames; j++)
-			{
-				mdlframe_t *frame = &mesh->frames[j];
-				if (!frame->vboID)
-					continue;
-				bglDeleteBuffers(1, &frame->vboID);
-				frame->vboID = 0;
-			}
-		}
-		else if (mesh->tinyframes)
-		{
-			for (int j = 0; j < mesh->numFrames; j++)
-			{
-				tinyframe_t *frame = &mesh->tinyframes[j];
-				if (!frame->vboID)
-					continue;
-				bglDeleteBuffers(1, &frame->vboID);
-				frame->vboID = 0;
-			}
-		}
-	}*/
-}

src/hardware/hw_model.h

@@ -28,8 +28,6 @@ typedef struct
 	float ambient[4], diffuse[4], specular[4], emissive[4];
 	float shininess;
 	boolean spheremap;
-//	Texture::texture_t *texture;
-//	Texture::texture_t *lightmap;
 } material_t;
 
 typedef struct
@@ -40,7 +38,6 @@ typedef struct
 	float *tangents;
 	char *colors;
 	unsigned int vboID;
-	vector_t *polyNormals;
 } mdlframe_t;
 
 typedef struct
@@ -70,7 +67,6 @@ typedef struct mesh_s
 typedef struct tag_s
 {
 	char name[64];
-//	matrix_t transform;
 } tag_t;
 
 typedef struct model_s
@@ -96,9 +92,7 @@ model_t *LoadModel(const char *filename, int ztag);
 void UnloadModel(model_t *model);
 void Optimize(model_t *model);
 void GenerateVertexNormals(model_t *model);
-void GeneratePolygonNormals(model_t *model, int ztag);
 void CreateVBOTiny(mesh_t *mesh, tinyframe_t *frame);
 void CreateVBO(mesh_t *mesh, mdlframe_t *frame);
-void DeleteVBOs(model_t *model);
 
 #endif

src/hardware/hw_portal.c

@@ -30,7 +30,7 @@
 
 SINT8 gl_portal_state = GLPORTAL_OFF;
 
-gl_portallist_t *currentportallist;
+gl_portallist_t *currentportallist = NULL;
 
 // clip the area outside the portal destination window
 void HWR_PortalClipping(gl_portal_t *portal)
@@ -38,7 +38,7 @@ void HWR_PortalClipping(gl_portal_t *portal)
 	gld_clipper_SafeAddClipRange(portal->angle1, portal->angle2);
 }
 
-static gl_portal_t* HWR_Portal_Add (seg_t *seg)
+static gl_portal_t* HWR_Portal_Add(seg_t *seg)
 {
 	gl_portal_t *portal = Z_Malloc(sizeof(gl_portal_t), PU_STATIC, NULL);
 
@@ -120,8 +120,8 @@ void HWR_PortalFrame(gl_portal_t* portal)
 	viewz = portal->viewz;
 
 	viewangle = portal->viewangle;
-	//viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
-	//viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
+	viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
+	viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
 
 	if (portal->clipline != -1)
 	{
@@ -157,7 +157,7 @@ static void HWR_RenderPortalSeg(gl_portal_t* portal, SINT8 state)
 }
 
 // Renders a single portal from the current viewpoint.
-void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float fpov, player_t *player, int stencil_level)
+void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float fpov, int stencil_level)
 {
 	// draw portal seg to stencil buffer with increment
 	HWR_SetTransform(fpov);
@@ -168,8 +168,10 @@ void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float
 
 	// go to portal frame lmao
 	HWR_PortalFrame(portal);
+
 	// call HWR_RenderViewpoint
-	HWR_RenderPortalViewpoint(portal, player, stencil_level + 1, true);
+	HWR_RenderPortalViewpoint(portal, stencil_level + 1, true);
+
 	// return to current frame
 	if (rootportal)
 		HWR_PortalFrame(rootportal);

src/hardware/hw_portal.h

@@ -65,7 +65,7 @@ extern SINT8 gl_portal_state;
 // new thing
 extern gl_portallist_t *currentportallist;
 
-static inline void HWR_SetPortalState (SINT8 state)
+static inline void HWR_SetPortalState(SINT8 state)
 {
 	gl_portal_state = state;
 }
@@ -75,7 +75,7 @@ void HWR_PortalClipping(gl_portal_t *portal);
 
 void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg);
 void HWR_PortalFrame(gl_portal_t* portal);
-void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float fpov, player_t *player, int stencil_level);
+void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float fpov, int stencil_level);
 void HWR_FreePortalList(gl_portallist_t portallist);
 
 boolean HWR_PortalCheckPointSide(fixed_t x, fixed_t y);

src/hardware/hw_shaders.c

@@ -201,7 +201,7 @@ static char *HWR_PreprocessShader(char *original)
 				CONS_Alert(CONS_ERROR, "HWR_PreprocessShader: Syntax error in #version. Expected version with 3 digits, but got %d digits.\n", version_number_len);
 				return NULL;
 			}
-			M_Memcpy(shader_glsl_version, read_pos, 3);
+			memcpy(shader_glsl_version, read_pos, 3);
 			ADVANCE(version_number_len)
 			version_len = (read_pos - original) - version_pos;
 			whitespace_len = strspn(read_pos, WHITESPACE_CHARS);
@@ -304,7 +304,7 @@ static char *HWR_PreprocessShader(char *original)
 	{
 		strcpy(write_pos, VERSION_PART);
 		write_pos += sizeof(VERSION_PART) - 1;
-		M_Memcpy(write_pos, shader_glsl_version, 3);
+		memcpy(write_pos, shader_glsl_version, 3);
 		write_pos += 3;
 		strcpy(write_pos, line_ending);
 		write_pos += line_ending_len;
@@ -344,7 +344,7 @@ static char *HWR_PreprocessShader(char *original)
 	}
 
 	// Copy the original shader.
-	M_Memcpy(write_pos, read_pos, original_len);
+	memcpy(write_pos, read_pos, original_len);
 
 	// Erase the original #version directive, if it exists and was copied.
 	if (new_len != original_len && version_pos != -1)
@@ -573,7 +573,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 	size = W_LumpLengthPwad(wadnum, lump);
 
 	line = Z_Malloc(size+1, PU_STATIC, NULL);
-	M_Memcpy(line, shaderdef, size);
+	memcpy(line, shaderdef, size);
 	line[size] = '\0';
 
 	stoken = strtok(line, "\r\n ");
@@ -586,7 +586,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 			goto skip_field;
 		}
 
-		if (!stricmp(stoken, "GLSL"))
+		if (fasticmp(stoken, "GLSL"))
 		{
 			value = strtok(NULL, "\r\n ");
 			if (!value)
@@ -596,9 +596,9 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 				goto skip_lump;
 			}
 
-			if (!stricmp(value, "VERTEX"))
+			if (fasticmp(value, "VERTEX"))
 				shadertype = 1;
-			else if (!stricmp(value, "FRAGMENT"))
+			else if (fasticmp(value, "FRAGMENT"))
 				shadertype = 2;
 
 skip_lump:
@@ -624,7 +624,7 @@ skip_lump:
 
 			for (i = 0; shaderxlat[i].type; i++)
 			{
-				if (!stricmp(shaderxlat[i].type, stoken))
+				if (fasticmp(shaderxlat[i].type, stoken))
 				{
 					size_t shader_string_length;
 					char *shader_source;

src/hardware/r_opengl/r_opengl.c

@@ -25,7 +25,7 @@
 
 // Eeeeh not sure is this right way, but it works < sry :c < sry again it had to go :c
 
-#if defined (HWRENDER) && !defined (NOROPENGL)
+#if defined (HWRENDER)
 
 #include "../../r_fps.h" // For R_GetTimeFrac, used for the leveltime shader uniform
 
@@ -98,10 +98,10 @@ static size_t textureBufferSize = 0;
 static LTListItem *LightTablesTail = NULL;
 static LTListItem *LightTablesHead = NULL;
 
-static RGBA_t screenPalette[256] = {0}; // the palette for the postprocessing step in palette rendering
+static RGBA_t screenPalette[256] = {}; // 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] = {}; // the palette for converting textures to RGBA
 
 static GLint gltexformat = GL_RGB5_A1;
 GLint   screen_width     = 0;               // used by Draw2DLine()
@@ -110,6 +110,7 @@ GLint   screen_texsizew  = 512; // Power-of-two screen texture render resolution
 GLint   screen_texsizeh  = 512; // Power-of-two screen texture render resolution
 GLbyte  screen_depth     = 0;
 GLint maximumAnisotropy  = 0;
+boolean supportNPO2tex   = false;
 static GLboolean MipMap  = GL_FALSE;
 static GLint min_filter  = GL_LINEAR;
 static GLint mag_filter  = GL_LINEAR;
@@ -126,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;-)
-static GLfloat modelMatrix[16];
-GLfloat projMatrix[16];
-static GLint   viewport[4];
+GLfloat modelMatrix[16] = {};
+GLfloat projMatrix[16] = {};
+static GLint viewport[4];
 
 #ifdef USE_FBO_OGL
 enum
@@ -170,43 +171,9 @@ 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] = {0};
+static GLuint screenTextures[NUMSCREENTEXTURES] = {};
 
-// shortcut for ((float)1/i)
-static const GLfloat byte2float[256] = {
-	0.000000f, 0.003922f, 0.007843f, 0.011765f, 0.015686f, 0.019608f, 0.023529f, 0.027451f,
-	0.031373f, 0.035294f, 0.039216f, 0.043137f, 0.047059f, 0.050980f, 0.054902f, 0.058824f,
-	0.062745f, 0.066667f, 0.070588f, 0.074510f, 0.078431f, 0.082353f, 0.086275f, 0.090196f,
-	0.094118f, 0.098039f, 0.101961f, 0.105882f, 0.109804f, 0.113725f, 0.117647f, 0.121569f,
-	0.125490f, 0.129412f, 0.133333f, 0.137255f, 0.141176f, 0.145098f, 0.149020f, 0.152941f,
-	0.156863f, 0.160784f, 0.164706f, 0.168627f, 0.172549f, 0.176471f, 0.180392f, 0.184314f,
-	0.188235f, 0.192157f, 0.196078f, 0.200000f, 0.203922f, 0.207843f, 0.211765f, 0.215686f,
-	0.219608f, 0.223529f, 0.227451f, 0.231373f, 0.235294f, 0.239216f, 0.243137f, 0.247059f,
-	0.250980f, 0.254902f, 0.258824f, 0.262745f, 0.266667f, 0.270588f, 0.274510f, 0.278431f,
-	0.282353f, 0.286275f, 0.290196f, 0.294118f, 0.298039f, 0.301961f, 0.305882f, 0.309804f,
-	0.313726f, 0.317647f, 0.321569f, 0.325490f, 0.329412f, 0.333333f, 0.337255f, 0.341176f,
-	0.345098f, 0.349020f, 0.352941f, 0.356863f, 0.360784f, 0.364706f, 0.368627f, 0.372549f,
-	0.376471f, 0.380392f, 0.384314f, 0.388235f, 0.392157f, 0.396078f, 0.400000f, 0.403922f,
-	0.407843f, 0.411765f, 0.415686f, 0.419608f, 0.423529f, 0.427451f, 0.431373f, 0.435294f,
-	0.439216f, 0.443137f, 0.447059f, 0.450980f, 0.454902f, 0.458824f, 0.462745f, 0.466667f,
-	0.470588f, 0.474510f, 0.478431f, 0.482353f, 0.486275f, 0.490196f, 0.494118f, 0.498039f,
-	0.501961f, 0.505882f, 0.509804f, 0.513726f, 0.517647f, 0.521569f, 0.525490f, 0.529412f,
-	0.533333f, 0.537255f, 0.541177f, 0.545098f, 0.549020f, 0.552941f, 0.556863f, 0.560784f,
-	0.564706f, 0.568627f, 0.572549f, 0.576471f, 0.580392f, 0.584314f, 0.588235f, 0.592157f,
-	0.596078f, 0.600000f, 0.603922f, 0.607843f, 0.611765f, 0.615686f, 0.619608f, 0.623529f,
-	0.627451f, 0.631373f, 0.635294f, 0.639216f, 0.643137f, 0.647059f, 0.650980f, 0.654902f,
-	0.658824f, 0.662745f, 0.666667f, 0.670588f, 0.674510f, 0.678431f, 0.682353f, 0.686275f,
-	0.690196f, 0.694118f, 0.698039f, 0.701961f, 0.705882f, 0.709804f, 0.713726f, 0.717647f,
-	0.721569f, 0.725490f, 0.729412f, 0.733333f, 0.737255f, 0.741177f, 0.745098f, 0.749020f,
-	0.752941f, 0.756863f, 0.760784f, 0.764706f, 0.768627f, 0.772549f, 0.776471f, 0.780392f,
-	0.784314f, 0.788235f, 0.792157f, 0.796078f, 0.800000f, 0.803922f, 0.807843f, 0.811765f,
-	0.815686f, 0.819608f, 0.823529f, 0.827451f, 0.831373f, 0.835294f, 0.839216f, 0.843137f,
-	0.847059f, 0.850980f, 0.854902f, 0.858824f, 0.862745f, 0.866667f, 0.870588f, 0.874510f,
-	0.878431f, 0.882353f, 0.886275f, 0.890196f, 0.894118f, 0.898039f, 0.901961f, 0.905882f,
-	0.909804f, 0.913726f, 0.917647f, 0.921569f, 0.925490f, 0.929412f, 0.933333f, 0.937255f,
-	0.941177f, 0.945098f, 0.949020f, 0.952941f, 0.956863f, 0.960784f, 0.964706f, 0.968628f,
-	0.972549f, 0.976471f, 0.980392f, 0.984314f, 0.988235f, 0.992157f, 0.996078f, 1.000000f
-};
+#define byte2float(byte) (GLfloat)(byte / 255.0f)
 
 // -----------------+
 // GL_DBG_Printf    : Output debug messages to debug log if DEBUG_TO_FILE is defined,
@@ -215,7 +182,7 @@ static const GLfloat byte2float[256] = {
 // -----------------+
 
 #ifdef DEBUG_TO_FILE
-FILE *gllogstream;
+FILE *gllogstream = NULL;
 #endif
 
 FUNCPRINTF void GL_DBG_Printf(const char *format, ...)
@@ -437,6 +404,14 @@ 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;
@@ -778,7 +753,7 @@ typedef struct gl_shaderstate_s
 static gl_shaderstate_t gl_shaderstate;
 
 // Shader info
-static float shader_leveltime = 0;
+static float shader_leveltime = 0.0f;
 static float shader_light_x = 0.0f;
 static float shader_light_y = 0.0f;
 static float shader_light_z = 0.0f;
@@ -891,6 +866,8 @@ void SetupGLFunc4(void)
 	GetGLfunc(glUniform3fv);
 	GetGLfunc(glGetUniformLocation);
 
+	GetGLfunc(glOrtho);
+
 #ifdef GLDEBUGMESSAGE
 	GetGLfunc(glDebugMessageCallback);
 #endif
@@ -1022,11 +999,9 @@ boolean GL_CompileShader(int slot)
 	{
 		return true;
 	}
-	else
-	{
-		gl_shaders[slot].program = 0;
-		return false;
-	}
+
+	gl_shaders[slot].program = 0;
+	return false;
 }
 
 //
@@ -1068,6 +1043,7 @@ void GL_SetShader(int slot)
 		GL_UnSetShader();
 		return;
 	}
+
 	if (gl_allowshaders)
 	{
 		gl_shader_t *next_shader = &gl_shaders[slot]; // the gl_shader_t we are going to switch to
@@ -1129,7 +1105,7 @@ static void GL_SetNoTexture(void)
 // -----------------+
 static void GL_Perspective(GLfloat fovy, GLfloat aspect)
 {
-	GLfloat m[4][4] =
+	static GLfloat m[4][4] =
 	{
 		{ 1.0f, 0.0f, 0.0f, 0.0f},
 		{ 0.0f, 1.0f, 0.0f, 0.0f},
@@ -1137,7 +1113,6 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect)
 		{ 0.0f, 0.0f, 0.0f, 0.0f},
 	};
 
-	const GLfloat focallength = (GLfloat)(1.0f / (GLfloat)tan(fovy * (GLfloat)M_PIl / 360.0f));
 	const GLfloat deltaZ = FAR_CLIPPING_PLANE - NEAR_CLIPPING_PLANE;
 
 	if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
@@ -1145,6 +1120,8 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect)
 		return;
 	}
 
+	const GLfloat focallength = (1.0f / tanf(fovy * M_PIf / 360.0f));
+
 	m[0][0] = focallength / aspect;
 	m[1][1] = focallength;
 	m[2][2] = -(FAR_CLIPPING_PLANE + NEAR_CLIPPING_PLANE) / deltaZ;
@@ -1158,7 +1135,7 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect)
 // -----------------+
 void GL_SetModelView(GLint w, GLint h)
 {
-	GLint maxtexsize = 0;
+	static GLint maxtexsize = 0;
 	//GL_DBG_Printf("SetModelView(): %dx%d\n", (int)w, (int)h);
 
 	// The screen textures need to be flushed if the width or height change so that they be remade for the correct size
@@ -1176,14 +1153,24 @@ void GL_SetModelView(GLint w, GLint h)
 
 	screen_texsizew = screen_texsizeh = 512;
 
-	// look for power of two that is large enough for the screen
-	while (screen_texsizew < w)
-		screen_texsizew <<= 1;
+	if (supportNPO2tex)
+	{
+		screen_texsizew = screen_width;
+		screen_texsizeh = screen_height;
+	}
+	else
+	{
+		// look for power of two that is large enough for the screen
+		while (screen_texsizew < w)
+			screen_texsizew <<= 1;
 
-	while (screen_texsizeh < h)
-		screen_texsizeh <<= 1;
+		while (screen_texsizeh < h)
+			screen_texsizeh <<= 1;
+	}
+
+	if (!maxtexsize)
+		pglGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsize); // Get the maximum supported texture size
 
-	pglGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsize); // Get the maximum supported texture size
 	if ((screen_texsizew > maxtexsize || screen_texsizeh > maxtexsize) && maxtexsize > 0)
 	{
 		// The desired screen texture resolution is too big for the player's GPU!
@@ -1329,7 +1316,8 @@ void GL_DeleteTexture(GLMipmap_t *pTexInfo)
 
 	if (!pTexInfo)
 		return;
-	else if (pTexInfo->downloaded)
+
+	if (pTexInfo->downloaded)
 		pglDeleteTextures(1, (GLuint *)&pTexInfo->downloaded);
 
 	while (head)
@@ -1383,7 +1371,8 @@ void GL_Flush(void)
 	TexCacheTail = TexCacheHead = NULL; //Hurdler: well, TexCacheHead is already NULL
 	tex_downloaded = 0;
 
-	free(textureBuffer);
+	if (textureBuffer)
+		free(textureBuffer);
 	textureBuffer = NULL;
 	textureBufferSize = 0;
 }
@@ -1489,14 +1478,14 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
 // -----------------+
 void GL_SetPalette(RGBA_t *palette)
 {
-	INT32 i;
+	const size_t palsize = (sizeof(RGBA_t) * 256);
 
-	for (i = 0; i < 256; i++)
+	// on a palette change, you have to reload all of the textures
+	if (memcmp(myPaletteData, palette, palsize))
 	{
-		myPaletteData[i].s = palette[i].s;
+		memcpy(myPaletteData, palette, palsize);
+		GL_Flush();
 	}
-
-	GL_Flush();
 }
 
 // -----------------+
@@ -1537,6 +1526,7 @@ void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask
 
 		ClearMask |= GL_COLOR_BUFFER_BIT;
 	}
+
 	if (DepthMask)
 	{
 		pglClearDepth(1.0f);     //Hurdler: all that are permanen states
@@ -1548,7 +1538,7 @@ void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask
 	GL_SetBlend(DepthMask ? PF_Occlude | CurrentPolyFlags : CurrentPolyFlags&~PF_Occlude);
 
 	if (StencilMask)
-		ClearMask |= GL_STENCIL_BUFFER_BIT;// looks like sometimes stencil buffer needs clearing? had a problem with random black screens
+		ClearMask |= GL_STENCIL_BUFFER_BIT; // looks like sometimes stencil buffer needs clearing? had a problem with random black screens
 
 	pglClear(ClearMask);
 	pglEnableClientState(GL_VERTEX_ARRAY); // We always use this one
@@ -1573,11 +1563,11 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color)
 
 	// This is the preferred, 'modern' way of rendering lines -- creating a polygon.
 	if (fabsf(v2->x - v1->x) > FLT_EPSILON)
-		angle = (float)atan((v2->y-v1->y)/(v2->x-v1->x));
+		angle = atanf((v2->y-v1->y)/(v2->x-v1->x));
 	else
 		angle = (float)N_PI_DEMI;
-	dx = (float)sin(angle) / (float)screen_width;
-	dy = (float)cos(angle) / (float)screen_height;
+	dx = sinf(angle) / (float)screen_width;
+	dy = cosf(angle) / (float)screen_height;
 
 	p[0] = v1->x - dx;  p[1] = -(v1->y + dy); p[2] = 1;
 	p[3] = v2->x - dx;  p[4] = -(v2->y + dy); p[5] = 1;
@@ -1592,18 +1582,21 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color)
 	pglEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	pglEnable(GL_TEXTURE_2D);
 }
+
+static inline void Clamp2D(GLenum pname)
+{
+#ifdef GL_CLAMP_TO_EDGE
+	pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP_TO_EDGE);
+#else
+	pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP); // fallback clamp
+#endif
+}
+
 // -----------------+
 // SetBlend         : Set render mode
 // -----------------+
 // PF_Masked - we could use an ALPHA_TEST of GL_EQUAL, and alpha ref of 0,
 //             is it faster when pixels are discarded ?
-static void Clamp2D(GLenum pname)
-{
-	pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP); // fallback clamp
-#ifdef GL_CLAMP_TO_EDGE
-	pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP_TO_EDGE);
-#endif
-}
 
 static void GL_SetBlendEquation(GLenum mode)
 {
@@ -1752,14 +1745,6 @@ void GL_SetBlend(FBITFIELD PolyFlags)
 
 		if (Xor & PF_Modulated)
 		{
-#if defined (__unix__) || defined (UNIXCOMMON)
-			if (oglflags & GLF_NOTEXENV)
-			{
-				if (!(PolyFlags & PF_Modulated))
-					pglColor4ubv(white);
-			}
-			else
-#endif
 			if (PolyFlags & PF_Modulated)
 			{   // mix texture colour with Surface->PolyColor
 				pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -1814,47 +1799,72 @@ static void GL_AllocTextureBuffer(GLMipmap_t *pTexInfo)
 	}
 }
 
-#define PADDING_CHECK(offset, alphaCheck) { from = to + (offset); if ((alphaCheck)) from = NULL; else goto foundFrom; }
-
-static void PadRGBABitmap(RGBA_t *tex, UINT16 w, UINT16 h)
+static void PadRGBABitmap(RGBA_t *tex, UINT16 w, UINT16 h, UINT32 flags)
 {
-	INT32 i;
-	boolean notLeft, notRight, notTop, notBottom;
-	RGBA_t *to = tex - 1, *from;
+	INT32 i, c1, c2, idxAdd;
+	UINT16 c1size, c2size;
+	RGBA_t *current, *prev, *next, *first;
+	boolean ignorePrev, wrap;
 
-	for (i = 0; i < w * h; i++)
+	for (i = 0; i < 2; i++)
 	{
-		to++;
-		if (to->rgba != 0)
-			continue;
-		from = NULL;
+		c1size = i ? h : w;
+		c2size = i ? w : h;
+		idxAdd = i ? 1 : w;
+		wrap = i ? flags & TF_WRAPX : flags & TF_WRAPY;
 
-		notLeft = i % w != 0;
-		notRight = i % w != w - 1;
-		notTop = i / w != 0;
-		notBottom = i / w != h - 1;
-
-		if (notRight) PADDING_CHECK(1, from->s.alpha == 0) // Check +X
-		if (notBottom) PADDING_CHECK(w, from->s.alpha == 0) // Check +Y
-		if (notLeft) PADDING_CHECK(-1, from->s.alpha == 0) // Check -X
-		if (notTop) PADDING_CHECK(-w, from->s.alpha == 0) // Check -Y
-		if (notRight && notBottom) PADDING_CHECK(1 + w, from->s.alpha == 0) // Check +X+Y
-		if (notLeft && notBottom) PADDING_CHECK(-1 + w, from->s.alpha == 0) // Check -X+Y
-		if (notLeft && notTop) PADDING_CHECK(-1 - w, from->s.alpha == 0) // Check -X-Y
-		if (notRight && notTop) PADDING_CHECK(1 - w, from->s.alpha == 0) // Check +X-Y
-
-foundFrom:
-		if (from != NULL)
+		for (c1 = 0; c1 < c1size; c1++)
 		{
-			*to = *from;
-			to->s.alpha = 0;
+			if (i)
+			{
+				first = current = tex + (c1 * w);
+				prev = wrap ? tex + (w - 1 + c1 * w) : current;
+				next = tex + (1 + c1 * w);
+			}
+			else
+			{
+				first = current = tex + c1;
+				prev = wrap ? tex + (c1 + (h - 1) * w) : current;
+				next = tex + (c1 + w);
+			}
+
+			ignorePrev = false;
+
+			for (c2 = 0; c2 < c2size; c2++)
+			{
+				if (c2 == c2size - 1)
+					next = wrap ? first : current;
+
+				if (current->rgba)
+				{
+					ignorePrev = false;
+				}
+				else if (prev->rgba && !ignorePrev)
+				{
+					*current = *prev;
+					current->s.alpha = 0;
+					ignorePrev = true;
+				}
+				else if (next->rgba)
+				{
+					*current = *next;
+					current->s.alpha = 0;
+					ignorePrev = false;
+				}
+				else
+				{
+					ignorePrev = false;
+				}
+
+				prev = current;
+				current = next;
+				next += idxAdd;
+			}
 		}
 	}
 }
 
-#undef PADDING_CHECK
-
-static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD)
+static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD, UINT32 flags)
 {
 	if (tex == NULL)
 	{
@@ -1916,7 +1926,7 @@ static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD)
 		h /= 2;
 
 		if (padTexture)
-			PadRGBABitmap(tex, w, h);
+			PadRGBABitmap(tex, w, h, flags);
 
 		pglTexSubImage2D(GL_TEXTURE_2D, m + 1, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, tex);
 	}
@@ -1970,7 +1980,7 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 				{
 					if (chromakeyed && (*pImgData == HWR_PATCHES_CHROMAKEY_COLORINDEX))
 					{
-						tex[idx].s = (byteColor_t){0, 0, 0, 0};
+						memset(&tex[idx].s, 0, sizeof(byteColor_t));
 						pTexInfo->flags |= TF_TRANSPARENT; // there is a hole in it
 					}
 					else
@@ -1982,16 +1992,15 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 
 					if (texinfoformat != GL_TEXFMT_AP_88)
 						continue;
-					if (chromakeyed)
-						continue;
 
-					tex[idx].s.alpha = *pImgData;
+					if (!chromakeyed)
+						tex[idx].s.alpha = *pImgData;
 					pImgData++;
 				}
 			}
 
 			if (applyPadding)
-				PadRGBABitmap(tex, w, h);
+				PadRGBABitmap(tex, w, h, pTexInfo->flags);
 
 			break;
 		case GL_TEXFMT_RGBA:
@@ -2007,7 +2016,7 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 				ptex = tex;
 
 				if (applyPadding)
-					PadRGBABitmap(tex, w, h);
+					PadRGBABitmap(tex, w, h, pTexInfo->flags);
 			}
 
 			break;
@@ -2020,9 +2029,9 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 			{
 				for (i = 0; i < w; i++, idx++)
 				{
-					tex[idx].s.red   = *pImgData;
-					tex[idx].s.green = *pImgData;
-					tex[idx].s.blue  = *pImgData;
+					tex[idx].s.red =
+					tex[idx].s.green =
+					tex[idx].s.blue = *pImgData;
 					pImgData++;
 					tex[idx].s.alpha = *pImgData;
 					pImgData++;
@@ -2052,21 +2061,10 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 	pglBindTexture(GL_TEXTURE_2D, num);
 	tex_downloaded = num;
 
-	const int transparent = (pTexInfo->flags & TF_TRANSPARENT);
+	pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
+	pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
 
-	// disable texture filtering on any texture that has holes so there's no dumb borders or blending issues
-	if (transparent)
-	{
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	}
-	else
-	{
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
-	}
-
-	if (MipMap && !transparent) // No mipmaps on transparent stuff
+	if (MipMap)
 	{
 		pglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
 
@@ -2077,8 +2075,16 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 
 		// Control the mipmap level of detail
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0);
-		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 5);
-		GenerateMipmaps(w, h, tex, 5);
+
+		if (pTexInfo->flags & TF_TRANSPARENT)
+		{
+			pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 0); // No mipmaps on transparent stuff
+		}
+		else
+		{
+			pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4);
+			GenerateMipmaps(w, h, tex, 4, pTexInfo->flags);
+		}
 	}
 	else
 	{
@@ -2112,7 +2118,8 @@ void GL_SetTexture(GLMipmap_t *pTexInfo)
 		GL_SetNoTexture();
 		return;
 	}
-	else if (pTexInfo->downloaded)
+
+	if (pTexInfo->downloaded)
 	{
 		if (pTexInfo->downloaded != tex_downloaded)
 		{
@@ -2212,16 +2219,10 @@ static void GL_Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRG
 			UNIFORM_1(shader->uniforms[gluniform_light_contrast], shader_light_contrast, pglUniform1f);
 			UNIFORM_1(shader->uniforms[gluniform_light_backlight], shader_light_backlight, pglUniform1f);
 		}
-		else
-		{
-			UNIFORM_3(shader->uniforms[gluniform_light_dir], 0, 0, 0, pglUniform3f);
-			UNIFORM_1(shader->uniforms[gluniform_light_contrast], 0, pglUniform1f);
-			UNIFORM_1(shader->uniforms[gluniform_light_backlight], 0, pglUniform1f);
-		}
 
 		UNIFORM_1(shader->uniforms[gluniform_leveltime], shader_leveltime, pglUniform1f);
 
-		UNIFORM_2(shader->uniforms[gluniform_scr_resolution], vid.width, vid.height, pglUniform2f);
+		UNIFORM_2(shader->uniforms[gluniform_scr_resolution], (GLfloat)vid.width, (GLfloat)vid.height, pglUniform2f);
 
 		#undef UNIFORM_1
 		#undef UNIFORM_2
@@ -2388,38 +2389,38 @@ static void GL_PreparePolygon(FSurfaceInfo *pSurf, FBITFIELD PolyFlags)
 
 	if (pSurf)
 	{
-		// If modulated, mix the surface colour to the texture
-		if (CurrentPolyFlags & PF_Modulated)
-			pglColor4ubv((GLubyte*)&pSurf->PolyColor.s);
-
 		// If the surface is either modulated or colormapped, or both
 		if (CurrentPolyFlags & (PF_Modulated | PF_ColorMapped))
 		{
-			poly.red   = byte2float[pSurf->PolyColor.s.red];
-			poly.green = byte2float[pSurf->PolyColor.s.green];
-			poly.blue  = byte2float[pSurf->PolyColor.s.blue];
-			poly.alpha = byte2float[pSurf->PolyColor.s.alpha];
-		}
+			// If modulated, mix the surface colour to the texture
+			if (CurrentPolyFlags & PF_Modulated)
+				pglColor4ubv((GLubyte*)&pSurf->PolyColor.s);
 
-		// Only if the surface is colormapped
-		if (CurrentPolyFlags & PF_ColorMapped)
-		{
-			tint.red   = byte2float[pSurf->TintColor.s.red];
-			tint.green = byte2float[pSurf->TintColor.s.green];
-			tint.blue  = byte2float[pSurf->TintColor.s.blue];
-			tint.alpha = byte2float[pSurf->TintColor.s.alpha];
+			poly.red   = byte2float(pSurf->PolyColor.s.red);
+			poly.green = byte2float(pSurf->PolyColor.s.green);
+			poly.blue  = byte2float(pSurf->PolyColor.s.blue);
+			poly.alpha = byte2float(pSurf->PolyColor.s.alpha);
 
-			fade.red   = byte2float[pSurf->FadeColor.s.red];
-			fade.green = byte2float[pSurf->FadeColor.s.green];
-			fade.blue  = byte2float[pSurf->FadeColor.s.blue];
-			fade.alpha = byte2float[pSurf->FadeColor.s.alpha];
-
-			if (pSurf->LightTableId && pSurf->LightTableId != lt_downloaded)
+			// Only if the surface is colormapped
+			if (CurrentPolyFlags & PF_ColorMapped)
 			{
-				pglActiveTexture(GL_TEXTURE2);
-				pglBindTexture(GL_TEXTURE_2D, pSurf->LightTableId);
-				pglActiveTexture(GL_TEXTURE0);
-				lt_downloaded = pSurf->LightTableId;
+				tint.red   = byte2float(pSurf->TintColor.s.red);
+				tint.green = byte2float(pSurf->TintColor.s.green);
+				tint.blue  = byte2float(pSurf->TintColor.s.blue);
+				tint.alpha = byte2float(pSurf->TintColor.s.alpha);
+
+				fade.red   = byte2float(pSurf->FadeColor.s.red);
+				fade.green = byte2float(pSurf->FadeColor.s.green);
+				fade.blue  = byte2float(pSurf->FadeColor.s.blue);
+				fade.alpha = byte2float(pSurf->FadeColor.s.alpha);
+
+				if (pSurf->LightTableId && pSurf->LightTableId != lt_downloaded)
+				{
+					pglActiveTexture(GL_TEXTURE2);
+					pglBindTexture(GL_TEXTURE_2D, pSurf->LightTableId);
+					pglActiveTexture(GL_TEXTURE0);
+					lt_downloaded = pSurf->LightTableId;
+				}
 			}
 		}
 	}
@@ -2459,12 +2460,10 @@ void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT i
 	// the DrawPolygon variant of this has some code about polyflags and wrapping here but havent noticed any problems from omitting it?
 }
 
-static const boolean gl_ext_arb_vertex_buffer_object = true;
-
-#define NULL_VBO_VERTEX ((gl_skyvertex_t*)NULL)
-#define sky_vbo_x (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->x : &sky->data[0].x)
-#define sky_vbo_u (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->u : &sky->data[0].u)
-#define sky_vbo_r (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->r : &sky->data[0].r)
+//#define NULL_VBO_VERTEX ((gl_skyvertex_t*)NULL)
+#define sky_vbo_x ((void*)offsetof(gl_skyvertex_t, x))
+#define sky_vbo_u ((void*)offsetof(gl_skyvertex_t, u))
+#define sky_vbo_r ((void*)offsetof(gl_skyvertex_t, r))
 
 void GL_RenderSkyDome(gl_sky_t *sky)
 {
@@ -2476,30 +2475,23 @@ void GL_RenderSkyDome(gl_sky_t *sky)
 	if (sky->rebuild)
 	{
 		// delete VBO when already exists
-		if (gl_ext_arb_vertex_buffer_object)
-		{
-			if (sky->vbo)
-				pglDeleteBuffers(1, &sky->vbo);
-		}
+		if (sky->vbo)
+			pglDeleteBuffers(1, &sky->vbo);
 
-		if (gl_ext_arb_vertex_buffer_object)
-		{
-			// generate a new VBO and get the associated ID
-			pglGenBuffers(1, &sky->vbo);
+		// generate a new VBO and get the associated ID
+		pglGenBuffers(1, &sky->vbo);
 
-			// bind VBO in order to use
-			pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
+		// bind VBO in order to use
+		pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
 
-			// upload data to VBO
-			pglBufferData(GL_ARRAY_BUFFER, sky->vertex_count * sizeof(sky->data[0]), sky->data, GL_STATIC_DRAW);
-		}
+		// upload data to VBO
+		pglBufferData(GL_ARRAY_BUFFER, sky->vertex_count * sizeof(sky->data[0]), sky->data, GL_STATIC_DRAW);
 
 		sky->rebuild = false;
 	}
 
 	// bind VBO in order to use
-	if (gl_ext_arb_vertex_buffer_object)
-		pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
+	pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
 
 	// activate and specify pointers to arrays
 	pglVertexPointer(3, GL_FLOAT, sizeof(sky->data[0]), sky_vbo_x);
@@ -2543,8 +2535,7 @@ void GL_RenderSkyDome(gl_sky_t *sky)
 	pglColor4ubv(white);
 
 	// bind with 0, so, switch back to normal pointer operation
-	if (gl_ext_arb_vertex_buffer_object)
-		pglBindBuffer(GL_ARRAY_BUFFER, 0);
+	pglBindBuffer(GL_ARRAY_BUFFER, 0);
 
 	// deactivate color array
 	pglDisableClientState(GL_COLOR_ARRAY);
@@ -2941,24 +2932,24 @@ void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics
 			pol = 0.0f;
 	}
 
-	poly.red    = byte2float[Surface->PolyColor.s.red];
-	poly.green  = byte2float[Surface->PolyColor.s.green];
-	poly.blue   = byte2float[Surface->PolyColor.s.blue];
-	poly.alpha  = byte2float[Surface->PolyColor.s.alpha];
+	poly.red    = byte2float(Surface->PolyColor.s.red);
+	poly.green  = byte2float(Surface->PolyColor.s.green);
+	poly.blue   = byte2float(Surface->PolyColor.s.blue);
+	poly.alpha  = byte2float(Surface->PolyColor.s.alpha);
 
 	pglColor4ubv((GLubyte*)&Surface->PolyColor.s);
 
 	GL_SetBlend(((poly.alpha < 1) ? Surface->PolyFlags : (PF_Masked|PF_Occlude))|PF_Modulated);
 
-	tint.red    = byte2float[Surface->TintColor.s.red];
-	tint.green  = byte2float[Surface->TintColor.s.green];
-	tint.blue   = byte2float[Surface->TintColor.s.blue];
-	tint.alpha  = byte2float[Surface->TintColor.s.alpha];
+	tint.red    = byte2float(Surface->TintColor.s.red);
+	tint.green  = byte2float(Surface->TintColor.s.green);
+	tint.blue   = byte2float(Surface->TintColor.s.blue);
+	tint.alpha  = byte2float(Surface->TintColor.s.alpha);
 
-	fade.red   = byte2float[Surface->FadeColor.s.red];
-	fade.green = byte2float[Surface->FadeColor.s.green];
-	fade.blue  = byte2float[Surface->FadeColor.s.blue];
-	fade.alpha = byte2float[Surface->FadeColor.s.alpha];
+	fade.red   = byte2float(Surface->FadeColor.s.red);
+	fade.green = byte2float(Surface->FadeColor.s.green);
+	fade.blue  = byte2float(Surface->FadeColor.s.blue);
+	fade.alpha = byte2float(Surface->FadeColor.s.alpha);
 
 	if (Surface->LightTableId && Surface->LightTableId != lt_downloaded)
 	{
@@ -3109,14 +3100,47 @@ 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     :
 // -----------------+
 void GL_SetTransform(FTransform *stransform)
 {
 	static boolean special_splitscreen;
-	GLdouble used_fov;
 	boolean shearing = false;
+	float used_fov;
 
 	pglLoadIdentity();
 
@@ -3166,7 +3190,8 @@ void GL_SetTransform(FTransform *stransform)
 	{
 		float dy = stransform->viewaiming * 2;
 
-		if (stransform->fliptype == TRANSFORM_FLIP || stransform->fliptype == TRANSFORM_MIRRORFLIP)
+		if (stransform->fliptype == TRANSFORM_FLIP
+			|| stransform->fliptype == TRANSFORM_MIRRORFLIP)
 			dy *= -1.0f;
 
 		pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f);
@@ -3174,11 +3199,13 @@ void GL_SetTransform(FTransform *stransform)
 
 	if (special_splitscreen)
 	{
-		used_fov = (float)(atan(tan(used_fov * M_PIl / 360) * 0.8) * 360 / M_PIl);
-		GL_Perspective((GLfloat)used_fov, 2*ASPECT_RATIO);
+		used_fov = (atanf(tanf(used_fov * M_PIf / 360.0f) * 0.8f) * 360.0f / M_PIf);
+		GL_Perspective(used_fov, 2*ASPECT_RATIO);
 	}
 	else
-		GL_Perspective((GLfloat)used_fov, ASPECT_RATIO);
+	{
+		GL_Perspective(used_fov, ASPECT_RATIO);
+	}
 
 	pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix); // added for new coronas' code (without depth buffer)
 	pglMatrixMode(GL_MODELVIEW);
@@ -3312,8 +3339,8 @@ void GL_Framebuffer_Disable(void)
 	// delet our fbo
 	if (framebufferobject.fboobj)
 		pglDeleteFramebuffers(1, &framebufferobject.fboobj);
-
 	framebufferobject.fboobj = 0;
+
 	GL_Framebuffer_DeleteAttachments();
 }
 #endif
@@ -3443,7 +3470,7 @@ void GL_FlushScreenTextures(void)
 
 void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags)
 {
-	float fix[8];
+	static float fix[8];
 	float xfix, yfix;
 
 	if (gl_enable_screen_textures != 2)
@@ -3452,14 +3479,8 @@ void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags)
 	xfix = 1/((float)screen_texsizew/(float)screen_width);
 	yfix = 1/((float)screen_texsizeh/(float)screen_height);
 
-	fix[0] = 0.0f;
-	fix[1] = 0.0f;
-	fix[2] = 0.0f;
-	fix[3] = yfix;
-	fix[4] = xfix;
-	fix[5] = yfix;
-	fix[6] = xfix;
-	fix[7] = 0.0f;
+	fix[3] = fix[5] = yfix;
+	fix[4] = fix[6] = xfix;
 
 	pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 
@@ -3570,22 +3591,30 @@ 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]);
 
-	const float stride = 2.f/scrwh;
+	uint32_t r = rand();
 
-	for (i = 0; i < 1; i += stride)
+	const float ystep = 2.f/scrwh * (float)vid.udup/4.f;
+
+	for (i = 0; i < 1; i += ystep)
 	{
-		fix[2] = (float)(rand() % 128) / -22000.f * xfix;
+		// avoid calling rand thousands of times
+		r ^= r >> 13;
+		r ^= r >> 11;
+		r ^= r << 21;
+
+		fix[2] = (float)(r & 127) / -22000.f * xfix;
 		fix[0] = fix[2];
 		fix[6] = fix[0] + xfix;
 		fix[4] = fix[2] + xfix;
@@ -3603,8 +3632,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;
@@ -3627,13 +3656,14 @@ 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;
@@ -3652,6 +3682,7 @@ 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);
@@ -3691,10 +3722,15 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 {
 	float xfix, yfix;
 	float origaspect, newaspect;
-	float xoff = 1, yoff = 1; // xoffset and yoffset for the polygon to have black bars around the screen
-	FRGBAFloat clearColour;
+	float xoff = 1.0f, yoff = 1.0f; // xoffset and yoffset for the polygon to have black bars around the screen
+
+	static float off[12] =
+	{
+		1.0f, 1.0f, 1.0f, 1.0f,
+		1.0f, 1.0f, 1.0f, 1.0f,
+		1.0f, 1.0f, 1.0f, 1.0f
+	};
 
-	static float off[12];
 	static float fix[8];
 
 	if (gl_enable_screen_textures != 2)
@@ -3709,42 +3745,27 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
 	if (origaspect < newaspect)
 	{
 		xoff = origaspect / newaspect;
-		yoff = 1;
+		yoff = 1.0f;
 	}
 	else if (origaspect > newaspect)
 	{
-		xoff = 1;
+		xoff = 1.0f;
 		yoff = newaspect / origaspect;
 	}
 
 	// float off[12];
-	off[0] = -xoff;
-	off[1] = -yoff;
-	off[2] = 1.0f;
-	off[3] = -xoff;
-	off[4] = yoff;
-	off[5] = 1.0f;
-	off[6] = xoff;
-	off[7] = yoff;
-	off[8] = 1.0f;
-	off[9] = xoff;
-	off[10] = -yoff;
-	off[11] = 1.0f;
+	off[0] = off[3]  = -xoff;
+	off[1] = off[10] = -yoff;
+	off[4] = off[7]  =  yoff;
+	off[6] = off[9]  =  xoff;
 
 	// float fix[8];
-	fix[0] = 0.0f;
-	fix[1] = 0.0f;
-	fix[2] = 0.0f;
-	fix[3] = yfix;
-	fix[4] = xfix;
-	fix[5] = yfix;
-	fix[6] = xfix;
-	fix[7] = 0.0f;
+	fix[3] = fix[5] = yfix;
+	fix[4] = fix[6] = xfix;
 
 	pglViewport(0, 0, width, height);
 
-	clearColour.red = clearColour.green = clearColour.blue = 0;
-	clearColour.alpha = 1;
+	FRGBAFloat clearColour = {0, 0, 0, 1};
 	GL_ClearBuffer(true, false, false, &clearColour);
 	GL_SetBlend(PF_NoDepthTest);
 

src/hardware/r_opengl/r_opengl.h

@@ -38,8 +38,6 @@ extern "C" {
 #endif
 #endif
 
-#define  _CREATE_DLL_  // necessary for Unix AND Windows
-
 #include "../../doomdef.h"
 #include "../hw_gl.h"
 #include "../../z_zone.h"
@@ -69,7 +67,6 @@ extern boolean supportstencil;
 void *GetGLFunc(const char *proc);
 boolean SetupGLfunc(void);
 void SetupGLFunc4(void);
-void GL_Flush(void);
 INT32 GL_isExtAvailable(const char *extension, const GLubyte *start);
 void GL_SetModelView(GLint w, GLint h);
 void GL_SetStates(void);
@@ -124,20 +121,12 @@ extern GLint			screen_width;
 extern GLint			screen_height;
 extern GLbyte			screen_depth;
 extern GLint			maximumAnisotropy;
+extern boolean			supportNPO2tex;
 extern boolean 			supportMipMap;
 
-/**	\brief OpenGL flags for video driver
-*/
-extern INT32            oglflags;
-
+extern GLfloat modelMatrix[16];
 extern GLfloat projMatrix[16];
 
-typedef enum
-{
-	GLF_NOZBUFREAD = 0x01,
-	GLF_NOTEXENV   = 0x02,
-} oglflags_t;
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

src/http-mserv.c

@@ -189,7 +189,7 @@ HMS_connect (const char *format, ...)
 	seek = strlen(hms_api) + 1;/* + '/' */
 
 	va_start (ap, format);
-	url = malloc(seek + vsnprintf(0, 0, format, ap) + sizeof HMS_QUERY_VERSION - 1 + token_length + 1);
+	url = malloc(seek + vsnprintf(NULL, 0, format, ap) + sizeof HMS_QUERY_VERSION - 1 + token_length + 1);
 	va_end (ap);
 
 	sprintf(url, "%s/", hms_api);
@@ -225,9 +225,10 @@ HMS_connect (const char *format, ...)
 	{
 		cc = curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
-
+#ifdef LOGMESSAGES
 		cc = curl_easy_setopt(curl, CURLOPT_STDERR, logstream);
 		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
+#endif
 	}
 
 	if (M_CheckParm("-bindaddr") && M_IsNextParm())
@@ -253,6 +254,9 @@ HMS_connect (const char *format, ...)
 	cc = curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)cv_masterserver_timeout.value);
 	if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
 
+	cc = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 30L);
+	if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
+
 	cc = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read);
 	if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
 
@@ -314,6 +318,7 @@ static void
 HMS_end (struct HMS_buffer *buffer)
 {
 	curl_easy_cleanup(buffer->curl);
+	free(buffer->errbuf);
 	free(buffer->buffer);
 	free(buffer);
 }
@@ -468,8 +473,8 @@ HMS_fetch_servers (msg_server_t *list, int query_id)
 			*end = '\0';
 
 			address = strtok(p, " ");
-			port    = strtok(0, " ");
-			contact = strtok(0, "");
+			port    = strtok(NULL, " ");
+			contact = strtok(NULL, "");
 
 			if (address && port)
 			{
@@ -536,7 +541,7 @@ HMS_compare_mod_version (char *buffer, size_t buffer_size)
 	if (HMS_do(hms))
 	{
 		version      = strtok(hms->buffer, " ");
-		version_name = strtok(0, "\n");
+		version_name = strtok(NULL, "\n");
 
 		if (version && version_name)
 		{

src/hu_stuff.c

@@ -68,47 +68,48 @@
 //-------------------------------------------
 //              heads up font
 //-------------------------------------------
-patch_t *hu_font[HU_FONTSIZE];
-patch_t *kart_font[KART_FONTSIZE];	// SRB2kart
-patch_t *tny_font[HU_FONTSIZE];
-patch_t *tallnum[10]; // 0-9
+patch_t *hu_font[HU_FONTSIZE] = {};
+patch_t *kart_font[KART_FONTSIZE] = {};	// SRB2kart
+patch_t *tny_font[HU_FONTSIZE] = {};
+patch_t *tallnum[10] = {}; // 0-9
 
 // Level title and credits fonts
-patch_t *lt_font[LT_FONTSIZE];
-patch_t *cred_font[CRED_FONTSIZE];
+patch_t *lt_font[LT_FONTSIZE] = {};
+patch_t *cred_font[CRED_FONTSIZE] = {};
 
 // ping font
 // Note: I'd like to adress that at this point we might *REALLY* want to work towards a common drawString function that can take any font we want because this is really turning into a MESS. :V -Lat'
-patch_t *pingnum[10];
-patch_t *pinggfx[5];	// small ping graphic
-patch_t *pingmeasure[2]; // ping measurement graphic
+patch_t *pingnum[10] = {};
+patch_t *pinggfx[5] = {};	// small ping graphic
+patch_t *pingmeasure[2] = {}; // ping measurement graphic
 
-patch_t *ranknum[10]; // rank numbers
+patch_t *ranknum[10] = {}; // rank numbers
 
-patch_t *framecounter;
-patch_t *frameslash;	// framerate stuff. Used in screen.c
+patch_t *framecounter = NULL;
+patch_t *frameslash = NULL;	// framerate stuff. Used in screen.c
 
-static player_t *plr;
-boolean chat_on; // entering a chat message?
+patch_t *srb2back = NULL;
+
+static player_t *plr = NULL;
+boolean chat_on = false; // entering a chat message?
 static char w_chat_buf[HU_MAXMSGLEN + 1];
 static textinput_t w_chat;
 static boolean headsupactive = false;
-boolean hu_showscores; // draw rankings
+boolean hu_showscores = false; // draw rankings
 static char hu_tick;
 static tic_t hu_emoteanim = 0;
-#define MAXEMOTESUGGESTIONS 8
-static emote_t *emote_suggestions[MAXEMOTESUGGESTIONS] = {0};
+emote_autocomplete_t emote_autocomplete = {0};
 
-static huddrawlist_h luahuddrawlist_scores;
+static huddrawlist_h luahuddrawlist_scores = NULL;
 
-patch_t *rflagico;
-patch_t *bflagico;
-patch_t *rmatcico;
-patch_t *bmatcico;
-patch_t *tallminus;
+patch_t *rflagico = NULL;
+patch_t *bflagico = NULL;
+patch_t *rmatcico = NULL;
+patch_t *bmatcico = NULL;
+patch_t *tallminus = NULL;
 
 // song credits
-static patch_t *songcreditbg;
+static patch_t *songcreditbg = NULL;
 
 // -------
 // protos.
@@ -122,7 +123,7 @@ consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0,
 //                 KEYBOARD LAYOUTS FOR ENTERING TEXT
 //======================================================================
 
-char *shiftxform;
+char *shiftxform = NULL;
 
 char english_shiftxform[] =
 {
@@ -280,7 +281,7 @@ static void Command_Say_f(void);
 static void Command_Sayto_f(void);
 static void Command_Sayteam_f(void);
 static void Command_CSay_f(void);
-static void Got_Saycmd(UINT8 **p, INT32 playernum);
+static void Got_Saycmd(const UINT8 **p, INT32 playernum);
 
 void HU_LoadGraphics(void)
 {
@@ -291,6 +292,7 @@ void HU_LoadGraphics(void)
 		return;
 
 	j = HU_FONTSTART;
+
 	for (i = 0; i < HU_FONTSIZE; i++, j++)
 	{
 		// cache the heads-up font for entire game execution
@@ -361,21 +363,21 @@ void HU_LoadGraphics(void)
 			cred_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	//cache numbers too!
+	// cache numbers too!
 	for (i = 0; i < 10; i++)
 	{
 		sprintf(buffer, "STTNUM%d", i);
 		tallnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 		sprintf(buffer, "PINGN%d", i);
-		pingnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		pingnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 		sprintf(buffer, "OPPRNK0%d", i);
-		ranknum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		ranknum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
 	// minus for negative tallnums
 	tallminus = (patch_t *)W_CachePatchName("STTMINUS", PU_HUDGFX);
 
-	songcreditbg = W_CachePatchName("K_SONGCR", PU_HUDGFX);
+	songcreditbg = (patch_t *)W_CachePatchName("K_SONGCR", PU_HUDGFX);
 
 	// cache ping gfx:
 	for (i = 0; i < 5; i++)
@@ -384,12 +386,15 @@ void HU_LoadGraphics(void)
 		pinggfx[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	pingmeasure[0] = W_CachePatchName("PINGD", PU_HUDGFX);
-	pingmeasure[1] = W_CachePatchName("PINGMS", PU_HUDGFX);
+	pingmeasure[0] = (patch_t *)W_CachePatchName("PINGD", PU_HUDGFX);
+	pingmeasure[1] = (patch_t *)W_CachePatchName("PINGMS", PU_HUDGFX);
 
 	// fps stuff
-	framecounter = W_CachePatchName("FRAMER", PU_HUDGFX);
-	frameslash  = W_CachePatchName("FRAMESL", PU_HUDGFX);;
+	framecounter = (patch_t *)W_CachePatchName("FRAMER", PU_HUDGFX);
+	frameslash  = (patch_t *)W_CachePatchName("FRAMESL", PU_HUDGFX);
+
+	// idk where else to put this lul
+	srb2back = (patch_t *)W_CachePatchName("SRB2BACK", PU_HUDGFX);
 }
 
 // Initialise Heads up
@@ -406,8 +411,10 @@ void HU_Init(void)
 	// set shift translation table
 	shiftxform = english_shiftxform;
 
-	luahuddrawlist_scores = LUA_HUD_CreateDrawList();
+	if (dedicated || rendermode == render_none)
+		return;
 
+	luahuddrawlist_scores = LUA_HUD_CreateDrawList();
 	HU_LoadGraphics();
 }
 
@@ -431,7 +438,7 @@ void HU_Start(void)
 
 void HU_Shiftform(void)
 {
-	shiftxform = cv_keyboardlayout.value == 3 ? french_shiftxform : english_shiftxform;
+	shiftxform = (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
 }
 
 //======================================================================
@@ -465,8 +472,8 @@ static INT16 addy = 0; // use this to make the messages scroll smoothly when one
 static void HU_removeChatText_Mini(void)
 {
 	// MPC: Don't create new arrays, just iterate through an existing one
-	size_t i;
-	for(i=0;i<chat_nummsg_min-1;i++) {
+	for (size_t i = 0; i < chat_nummsg_min - 1; i++)
+	{
 		strcpy(chat_mini[i], chat_mini[i+1]);
 		chat_timers[i] = chat_timers[i+1];
 	}
@@ -485,12 +492,14 @@ static void HU_removeChatText_Log(void)
 		return;
 
 	free(chat_log[0]);
-	size_t i;
-	for(i=0;i<chat_nummsg_log-1;i++)
+
+	for (size_t i = 0; i < chat_nummsg_log - 1;i++)
 	{
 		chat_log[i] = chat_log[i+1];
 	}
+
 	chat_nummsg_log--; // lost 1 msg.
+	chat_log[chat_nummsg_log] = NULL;
 }
 
 static void Chatlogsize_OnChange(void)
@@ -509,6 +518,7 @@ static void Chatlogsize_OnChange(void)
 	if (new_chat_log == NULL)
 	{
         free(chat_log);
+		chat_log = NULL;
 		return;
 	}
 	chat_log = new_chat_log;
@@ -589,12 +599,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;
@@ -608,17 +618,20 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
 		strlcat(msg, COM_Argv(ix + usedargs), msgspace);
 	}
 
-	if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
+	const size_t msglength = strlen(msg);
+
+	if (msglength > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
 	{
 		// what we're gonna do now is check if the node exists
 		// with that logic, characters 4 and 5 are our numbers:
 		const char *newmsg;
 		INT32 spc = 1; // used if nodenum[1] is a space.
-		char *nodenum = (char*) malloc(3);
+		CLEANUP(pfree) 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] == ' ')
@@ -627,23 +640,21 @@ 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!
@@ -654,12 +665,13 @@ 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, strlen(msg) + 1 + msg-buf);
+	SendNetXCmd(XD_SAY, buf, msglength + 1 + msg-buf);
 }
 
 /** Send a message to everyone.
@@ -879,11 +891,12 @@ const char *HU_SkinColorToConsoleColor(skincolors_t color)
   * \sa DoSayCommand
   * \author Graue <graue@oceanbase.org>
   */
-static void Got_Saycmd(UINT8 **p, INT32 playernum)
+static void Got_Saycmd(const UINT8 **p, INT32 playernum)
 {
 	SINT8 target;
 	UINT8 flags;
 	const char *dispname;
+	char buf[HU_MAXMSGLEN + 1];
 	char *msg;
 	boolean action = false;
 	char *ptr;
@@ -893,8 +906,8 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 
 	target = READSINT8(*p);
 	flags = READUINT8(*p);
-	msg = (char *)*p;
-	SKIPSTRINGL(*p, HU_MAXMSGLEN + 1);
+	msg = buf;
+	READSTRINGL(*p, msg, HU_MAXMSGLEN + 1);
 
 	if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
 	{
@@ -909,10 +922,12 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 		return;
 	}
 
+	const size_t msglength = strlen(msg);
+
 	//check for invalid characters (0x80 or above)
 	{
 		size_t i;
-		const size_t j = strlen(msg);
+		const size_t j = msglength;
 		for (i = 0; i < j; i++)
 		{
 			if (msg[i] & 0x80)
@@ -959,7 +974,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 	}
 
 	// Handle "/me" actions, but only in messages to everyone.
-	if (target == 0 && strlen(msg) > 4 && strnicmp(msg, "/me ", 4) == 0)
+	if (target == 0 && msglength > 4 && strnicmp(msg, "/me ", 4) == 0)
 	{
 		msg += 4;
 		action = true;
@@ -1060,8 +1075,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 
 		HU_AddChatText(va(fmt2, prefix, cstart, dispname, textcolor, msg), cv_chatnotifications.value); // add to chat
 
-		if (tempchar)
-			Z_Free(tempchar);
+		Z_Free(tempchar);
 	}
 #ifdef _DEBUG
 	// I just want to point out while I'm here that because the data is still
@@ -1101,14 +1115,14 @@ void HU_Ticker(void)
 		size_t i = 0;
 
 		// handle spam while we're at it:
-		for(; (i<MAXPLAYERS); i++)
+		for(; (i < MAXPLAYERS); i++)
 		{
 			if (stop_spamming[i] > 0)
 				stop_spamming[i]--;
 		}
 
 		// handle chat timers
-		for (i=0; (i<chat_nummsg_min); i++)
+		for (i = 0; (i < chat_nummsg_min); i++)
 		{
 			if (chat_timers[i] > 0)
 				chat_timers[i]--;
@@ -1141,10 +1155,12 @@ 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 < strlen(w_chat_buf); i++) // iterate through message and eradicate all spaces that don't belong.
+	for (; i < chatlength; 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.
 
@@ -1153,6 +1169,7 @@ static boolean HU_clearChatSpaces(void)
 			nothingbutspaces = false;
 		}
 	}
+
 	return nothingbutspaces;
 }
 
@@ -1199,11 +1216,11 @@ static void HU_SendChatMessage(void)
 		return;
 	}
 
-	size_t len = strlen(msg);
+	const size_t msglength = strlen(msg);
 
-	if (len >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute
+	if (msglength >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute
 	{
-		if (len > 6)
+		if (msglength > 6)
 			DoMute(msg+6);
 		else
 			HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false);
@@ -1211,7 +1228,7 @@ static void HU_SendChatMessage(void)
 		return;
 	}
 
-	if (len > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
+	if (msglength > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
 	{
 		INT32 spc = 1; // used if nodenum[1] is a space.
 		const char *newmsg;
@@ -1231,7 +1248,7 @@ static void HU_SendChatMessage(void)
 		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] == ' ')
@@ -1333,6 +1350,7 @@ boolean HU_Responder(event_t *ev)
 			chat_on = true;
 			w_chat_buf[0] = 0;
 			M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf);
+			memset(&emote_autocomplete, 0, sizeof(emote_autocomplete));
 			teamtalk = false;
 			chat_scrollmedown = true;
 			typelines = 1;
@@ -1345,6 +1363,7 @@ boolean HU_Responder(event_t *ev)
 			chat_on = true;
 			w_chat_buf[0] = 0;
 			M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf);
+			memset(&emote_autocomplete, 0, sizeof(emote_autocomplete));
 			teamtalk = G_GametypeHasTeams();	// Don't teamtalk if we don't have teams.
 			chat_scrollmedown = true;
 			typelines = 1;
@@ -1370,9 +1389,9 @@ boolean HU_Responder(event_t *ev)
 		&& ev->data1 != gamecontrol[0][gc_talkkey][1]))
 			return false;
 
-		M_TextInputHandleEmotes(&w_chat, c, emote_suggestions, MAXEMOTESUGGESTIONS);
-
-		if (c == KEY_ENTER)
+		if (M_TextInputHandleEmotes(&w_chat, c, &emote_autocomplete))
+			; // Do nothing
+		else if (c == KEY_ENTER)
 		{
 			chat_on = false;
 			chat_scrollmedown = true; // you hit enter, so you might wanna autoscroll to see what you just sent. :)
@@ -1409,8 +1428,6 @@ boolean HU_Responder(event_t *ev)
 //                         HEADS UP DRAWING
 //======================================================================
 
-#define HU_DrawEmote(x, y, emote, flags) M_DrawEmote((x), (y), (emote), hu_emoteanim, (flags))
-
 // Precompile a wordwrapped string to any given width.
 // This is a muuuch better method than V_WORDWRAP.
 // again stolen and modified a bit from video.c, don't mind me, will need to rearrange this one day.
@@ -1469,6 +1486,7 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 			x = 0;
 		}
 	}
+
 	return newstring;
 }
 
@@ -1499,7 +1517,7 @@ static void HU_drawMiniChat(void)
 	if (splitscreen > 1)
 		boxw = max(64, boxw/2);
 
-	for (; i>0; i--)
+	for (; i > 0; i--)
 	{
 		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i-1]);
 		size_t j = 0;
@@ -1507,7 +1525,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
 			{
@@ -1539,19 +1557,21 @@ 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;
-		if (msg)
-			Z_Free(msg);
+		Z_Free(msg);
 	}
 
 	y = chaty - charheight*(msglines+1);
@@ -1572,7 +1592,7 @@ static void HU_drawMiniChat(void)
 	i = 0;
 	prev_linereturn = false;
 
-	for (; i<=(chat_nummsg_min-1); i++) // iterate through our hot messages
+	for (; i <= (chat_nummsg_min-1); i++) // iterate through our hot messages
 	{
 		INT32 clrflag = 0;
 		INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below...
@@ -1583,7 +1603,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
 			{
@@ -1613,7 +1633,7 @@ static void HU_drawMiniChat(void)
 				if (cv_chatbacktint.value) // on request of wolfy
 					V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 
-				HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
+				M_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
 				dx += EMOTEWIDTH - charwidth;
 
 				j += emotelen;
@@ -1628,16 +1648,17 @@ static void HU_drawMiniChat(void)
 
 			dx += charwidth;
 			prev_linereturn = false;
+
 			if (dx >= boxw)
 			{
 				dx = 0;
 				dy += charheight;
 			}
 		}
+
 		dy += charheight;
 		dx = 0;
-		if (msg)
-			Z_Free(msg);
+		Z_Free(msg);
 	}
 
 	// decrement addy and make that shit smooth:
@@ -1689,7 +1710,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;
@@ -1698,7 +1719,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
 			{
@@ -1723,7 +1744,7 @@ static void HU_drawChatLog(INT32 offset)
 			{
 				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
 				{
-					HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+					M_DrawEmote(x+dx+2, y+dy+1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 					dx += EMOTEWIDTH - charwidth;
 				}
 				j += emotelen;
@@ -1743,13 +1764,12 @@ static void HU_drawChatLog(INT32 offset)
 				dy += charheight;
 			}
 		}
+
 		dy += charheight;
 		dx = 0;
-		if (msg)
-			Z_Free(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.
 	{
 		atbottom = true; // we should scroll
@@ -1864,7 +1884,7 @@ static void HU_DrawChat(void)
 
 		if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
 		{
-			HU_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
+			M_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
 			c += EMOTEWIDTH - charwidth;
 			i += emotelen-1;
 			drawwidth = EMOTEWIDTH;
@@ -1901,17 +1921,37 @@ static void HU_DrawChat(void)
 		}
 	}
 
-	if (emote_suggestions[0])
+	if (emote_autocomplete.emotestart != -1 && (emote_autocomplete.complete[0] || (w_chat.cursor - emote_autocomplete.emotestart) > 1))
 	{
+		emote_t *suggest;
+		int skip = 0;
+
+		const char *complete;
+		int complete_len;
+
+		if (emote_autocomplete.complete[0])
+		{
+			complete = emote_autocomplete.complete;
+			complete_len = strlen(complete);
+		}
+		else
+		{
+			complete = &w_chat_buf[emote_autocomplete.emotestart];
+			complete_len = w_chat.cursor - emote_autocomplete.emotestart;
+		}
+
 		// A bit of copy-paste from /pm code :p
 		INT32 suggesty = chaty - charheight - 1;
 		size_t longest_suggestion_length = 0;
 
-		for (i = 0; i < MAXEMOTESUGGESTIONS && emote_suggestions[i]; ++i)
+		while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
 		{
-			longest_suggestion_length = max(longest_suggestion_length, strlen(emote_suggestions[i]->name));
+			longest_suggestion_length = max(longest_suggestion_length, strlen(suggest->name));
+			++skip;
 		}
 
+		skip = 0;
+
 #ifdef NETSPLITSCREEN
 		if (splitscreen)
 		{
@@ -1923,11 +1963,19 @@ static void HU_DrawChat(void)
 #endif
 			suggesty -= (cv_kartspeedometer.value ? 16 : 0);
 
-		for (i = 0; i < MAXEMOTESUGGESTIONS && emote_suggestions[i]; ++i)
+		while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
 		{
-			V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*i), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
-			V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*i), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", emote_suggestions[i]->name));
-			HU_DrawEmote(chatx + boxw + 2, suggesty - i*7, emote_suggestions[i], V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+			V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*skip), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+
+			// Highlight currently suggested emote
+			int hlflag = 0;
+			if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
+				hlflag = V_YELLOWMAP;
+
+			V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
+			M_DrawEmote(chatx + boxw + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+
+			++skip;
 		}
 	}
 
@@ -1956,7 +2004,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;
@@ -2062,15 +2110,15 @@ static void HU_DrawChat_Old(void)
 	i = 0;
 	while (w_chat_buf[i])
 	{
-		if (w_chat.cursor == (i+1) && hu_tick < 4)
-		{
-			INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down.
-			INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight);
-			V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
-		}
+		int emotelen;
+		emote_t *emote;
 
-		//Hurdler: isn't it better like that?
-		if (w_chat_buf[i] >= HU_FONTSTART)
+		if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
+		{
+			M_DrawScaledEmote((HU_INPUTX + c)<<FRACBITS, (y+con_scalefactor*2)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART | V_NOSCALEPATCH | t);
+			i += emotelen-1;
+		}
+		else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
 		{
 			//charwidth = hu_font[w_chat[i]-HU_FONTSTART]->width * con_scalefactor;
 			V_DrawCharacter(HU_INPUTX + c, y, w_chat_buf[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
@@ -2082,6 +2130,13 @@ static void HU_DrawChat_Old(void)
 
 		++i;
 
+		if (w_chat.cursor == i && hu_tick < 4)
+		{
+			INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down.
+			INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight);
+			V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
+		}
+
 		c += charwidth;
 		if (c >= vid.width)
 		{
@@ -2284,6 +2339,7 @@ static void HU_DrawSongCreditsBox(void)
 		V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, 28|flags|(bgt<<V_ALPHASHIFT));
 		V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, 30|flags|(bgt<<V_ALPHASHIFT));
 	}
+
 	if (cursongcredit.trans < NUMTRANSMAPS)
 	{
 		V_DrawSmallString(x+2*dup, y+2*dup, V_ALLOWLOWERCASE|flags|(cursongcredit.trans<<V_ALPHASHIFT), str);
@@ -2391,76 +2447,6 @@ void HU_Drawer(void)
 	}
 }
 
-//======================================================================
-//                 HUD MESSAGES CLEARING FROM SCREEN
-//======================================================================
-
-// Clear old messages from the borders around the view window
-// (only for reduced view, refresh the borders when needed)
-//
-// startline: y coord to start clear,
-// clearlines: how many lines to clear.
-//
-static INT32 oldclearlines;
-
-void HU_Erase(void)
-{
-	INT32 topline, bottomline;
-	INT32 y, yoffset;
-
-#ifdef HWRENDER
-	// clear hud msgs on double buffer (OpenGL mode)
-	boolean secondframe;
-	static INT32 secondframelines;
-#endif
-
-	if (con_clearlines == oldclearlines && !con_hudupdate && !chat_on)
-		return;
-
-#ifdef HWRENDER
-	// clear the other frame in double-buffer modes
-	secondframe = (con_clearlines != oldclearlines);
-	if (secondframe)
-		secondframelines = oldclearlines;
-#endif
-
-	// clear the message lines that go away, so use _oldclearlines_
-	bottomline = oldclearlines;
-	oldclearlines = con_clearlines;
-	if (chat_on && OLDCHAT)
-		if (bottomline < 8)
-			bottomline = 8; // only do it for consolechat. consolechat is gay.
-
-	if (automapactive || viewwindowx == 0) // hud msgs don't need to be cleared
-		return;
-
-	// software mode copies view border pattern & beveled edges from the backbuffer
-	if (rendermode == render_soft)
-	{
-		topline = 0;
-		for (y = topline, yoffset = y*vid.width; y < bottomline; y++, yoffset += vid.width)
-		{
-			if (y < viewwindowy || y >= viewwindowy + viewheight)
-				R_VideoErase(yoffset, vid.width); // erase entire line
-			else
-			{
-				R_VideoErase(yoffset, viewwindowx); // erase left border
-				// erase right border
-				R_VideoErase(yoffset + viewwindowx + viewwidth, viewwindowx);
-			}
-		}
-		con_hudupdate = false; // if it was set..
-	}
-#ifdef HWRENDER
-	else if (rendermode != render_none)
-	{
-		// refresh just what is needed from the view borders
-		HWR_DrawViewBorder(secondframelines);
-		con_hudupdate = secondframe;
-	}
-#endif
-}
-
 //======================================================================
 //                   IN-LEVEL MULTIPLAYER RANKINGS
 //======================================================================
@@ -2540,17 +2526,91 @@ Ping_conversion (UINT32 lag)
 // HU_drawPing
 //
 
+static void HU_drawOldPing(INT32 x, INT32 y, UINT32 lag, INT32 flags, boolean gentleman)
+{
+	const INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
+
+	if (vid.width >= 640)	// how sad, we're using a shit resolution.
+	{
+		if (measureid == 1)
+		{
+			V_DrawRightAlignedSmallString(x+12, y+13, V_ALLOWLOWERCASE|flags, va("%dms", Ping_conversion(lag)));
+		}
+		else if (measureid == 0)
+		{
+			V_DrawRightAlignedSmallString(x+12, y+13, flags, va("d%d", Ping_conversion(lag)));
+		}
+	}
+
+	if (cv_pingicon.value)
+	{
+		UINT8 numbars = 0; // how many ping bars do we draw?
+		UINT8 barcolor = 31; // color we use for the bars (green, yellow, red or black)
+		SINT8 i = 0;
+		SINT8 yoffset = 6;
+
+		switch (lag)
+		{
+			case 0 ... 1:
+				numbars = 3;
+				barcolor = 215; // Blue
+				break;
+			case 2 ... 3:
+				numbars = 3;
+				barcolor = 184; // Green
+				break;
+			case 4 ... 6:
+				numbars = 2;    // Apparently ternaries w/ multiple statements don't look good in C so I decided against it.
+				barcolor = 103; // Yellow
+				break;
+			case 7 ... 9:
+				numbars = 1;
+				barcolor = 155; // Red
+				break;
+			default:            // Brazil
+				numbars = 0;
+				barcolor = 31;  // black
+				break;
+		}
+
+		if (gentleman)
+		{
+			barcolor = 194; // make it purplish
+			// bars get indirectly set earlier
+		}
+
+		for (i = 0; (i < 3); i++) // Draw the ping bar
+		{
+			V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-4, 2, 8-yoffset, 31|flags);
+			if (i < numbars)
+				V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-3, 1, 8-yoffset-1, barcolor|flags);
+
+			yoffset -= 2;
+		}
+	}
+}
+
+static void HU_drawKartPing(INT32 x, INT32 y, UINT32 lag, INT32 flags, boolean gentleman)
+{
+	const INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
+
+	if (measureid == 1)
+		V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
+
+	if (cv_pingicon.value)
+	{
+		INT32 gfxnum = Ping_gfx_num(lag); // gfx to draw
+		V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]);
+	}
+
+	x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, Ping_conversion(lag), Ping_gfx_colormap(lag, gentleman));
+
+	if (measureid == 0)
+		V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
+}
+
 void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
 {
-	INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
-	INT32 gfxnum; // gfx to draw
-
-	//SRB2/Kart v1.0 style
-	UINT8 numbars = 0; // how many ping bars do we draw?
-	UINT8 barcolor = 31; // color we use for the bars (green, yellow, red or black)
-	SINT8 i = 0;
-	SINT8 yoffset = 6;
-
 	UINT32 lag = playerpingtable[pnum];
 	const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag));
 
@@ -2561,74 +2621,11 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
 
 	if (cv_pingstyle.value == 0) // kart
 	{
-		gfxnum = Ping_gfx_num(lag);
-
-		if (measureid == 1)
-			V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
-
-		if (cv_pingicon.value)
-			V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]);
-
-		x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, Ping_conversion(lag), Ping_gfx_colormap(lag, gentleman));
-
-		if (measureid == 0)
-			V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
+		HU_drawKartPing(x, y, lag, flags, gentleman);
 	}
 	else if (cv_pingstyle.value == 1) // old style ping
 	{
-		if (vid.width >= 640)	// how sad, we're using a shit resolution.
-		{
-			if (measureid == 1)
-			{
-				V_DrawRightAlignedSmallString(x+12, y+13, V_ALLOWLOWERCASE|flags, va("%dms", Ping_conversion(lag)));
-			}
-			else if (measureid == 0)
-			{
-				V_DrawRightAlignedSmallString(x+12, y+13, flags, va("d%d", Ping_conversion(lag)));
-			}
-		}
-
-		if (cv_pingicon.value)
-		{
-			switch (lag)
-			{
-				case 0 ... 1:
-					numbars = 3;
-					barcolor = 215; // Blue
-					break;
-				case 2 ... 3:
-					numbars = 3;
-					barcolor = 184; // Green
-					break;
-				case 4 ... 6:
-					numbars = 2;    // Apparently ternaries w/ multiple statements don't look good in C so I decided against it.
-					barcolor = 103; // Yellow
-					break;
-				case 7 ... 9:
-					numbars = 1;
-					barcolor = 155; // Red
-					break;
-				default:            // Brazil
-					numbars = 0;
-					barcolor = 31;  // black
-					break;
-			}
-
-			if (gentleman)
-			{
-				barcolor = 194; // make it purplish
-				// bars get indirectly set earlier
-			}
-
-			for (i = 0; (i < 3); i++) // Draw the ping bar
-			{
-				V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-4, 2, 8-yoffset, 31|flags);
-				if (i < numbars)
-					V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-3, 1, 8-yoffset-1, barcolor|flags);
-
-				yoffset -= 2;
-			}
-		}
+		HU_drawOldPing(x, y, lag, flags, gentleman);
 	}
 }
 
@@ -2904,12 +2901,8 @@ void HU_SetCEchoFlags(INT32 flags)
 
 void HU_DoCEcho(const char *msg)
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstringop-truncation" // This is fine, we set null byte later
-	strncpy(cechotext, msg, sizeof(cechotext));
-#pragma GCC diagnostic pop
-	strncat(cechotext, "\\", sizeof(cechotext) - strlen(cechotext) - 1);
-	cechotext[sizeof(cechotext) - 1] = '\0';
+	strlcpy(cechotext, msg, sizeof(cechotext));
+	strlcat(cechotext, "\\", sizeof(cechotext));
 
 	// just print it to console
 	if (cv_cechotoggle.value == 2)
@@ -2918,8 +2911,20 @@ void HU_DoCEcho(const char *msg)
 		strncpy(temp, cechotext, sizeof(temp));
 
 		for (char *p = temp; *p != '\0'; ++p)
+		{
 			if (*p == '\\')
+			{
 				*p = '\n';
+				++p;
+				char *skip_p = p; // Point at which we will move part of string after all \'s
+
+				while (*p == '\\')
+					++p;
+
+				memmove(skip_p, p, strlen(p)+1); // move the rest of string with null byte
+				p = skip_p; // Restore p
+			}
+		}
 
 		CONS_Printf("%s\n", temp);
 

src/hu_stuff.h

@@ -90,6 +90,7 @@ extern patch_t *pinggfx[5];
 extern patch_t *ranknum[10];
 extern patch_t *framecounter;
 extern patch_t *frameslash;
+extern patch_t *srb2back;
 extern patch_t *lt_font[LT_FONTSIZE];
 extern patch_t *cred_font[CRED_FONTSIZE];
 extern patch_t *rflagico;
@@ -117,7 +118,6 @@ void HU_TickSongCredits(void);
 void HU_DrawSongCredits(void);
 void HU_Drawer(void);
 char HU_dequeueChatChar(void);
-void HU_Erase(void);
 void HU_clearChatChars(void);
 void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags);	// Lat': Ping drawer for scoreboard.
 //void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer);

src/i_addrinfo.c

@@ -1,680 +0,0 @@
-// SONIC ROBO BLAST 2
-//-----------------------------------------------------------------------------
-// Copyright (C) 2011-2018 by Sonic Team Junior.
-//
-// This program is free software distributed under the
-// terms of the GNU General Public License, version 2.
-// See the 'LICENSE' file for more details.
-//-----------------------------------------------------------------------------
-/// \file  i_addrinfo.c
-/// \brief getaddr stubs, for lesser OSes
-///
-///        Some systems/SDKs, like PSL1GHT v2 does not have addrinfo functions
-///        So a stub is needed
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#ifdef _WIN32
-#ifdef USE_WINSOCK2
-#include <ws2tcpip.h>
-#else
-#include <winsock.h>
-#endif
-#else
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#endif
-
-#include "i_addrinfo.h"
-
-/*
- * This addrinfo stub have a testcases:
- * To test the stub, use this command to compile the stub testcase:
- * gcc -g -DTESTCASE -Dtest_stub -Wall -W i_addrinfo.c -o stub
- * To test the real getaddrinfo API, use this command to get real one:
- * gcc -g -DTESTCASE -Utest_stub -Wall -W i_addrinfo.c -o real
- * For Win32,you need the WinSock library, version 1.1 or 2.2
- * for 1.1, add -lwsock32
- * i686-w64-mingw32-gcc -g -DTESTCASE -Dtest_stub -UUSE_WINSOCK2 -Wall -W i_addrinfo.c -o stub.exe -lwsock32
- * for 2.2, add -DUSE_WINSOCK2 -lws2_32
- * i686-w64-mingw32-gcc -g -DTESTCASE -Utest_stub -DUSE_WINSOCK2 -Wall -W i_addrinfo.c -o real.exe -lws2_32
- */
-
-#ifndef I_getaddrinfo
-
-#include <stdbool.h>
-
-#ifdef _WIN32
-// it seems windows doesn't define that... maybe some other OS? OS/2
-static int inet_aton(const char *cp, struct in_addr *addr)
-{
-	if( cp == NULL || addr == NULL )
-	{
-		return(0);
-	}
-	if (strcmp(cp, "255.255.255.225") == 0)
-	{
-		addr->s_addr = htonl(INADDR_BROADCAST);
-		return 0;
-	}
-	return (addr->s_addr = inet_addr(cp)) != htonl(INADDR_NONE);
-}
-#endif
-
-#ifdef USE_WINSOCK2
-static HMODULE ipv6dll = NULL;
-typedef int (WSAAPI *p_getaddrinfo) (const char *, const char *,
-                                     const struct my_addrinfo *,
-                                     struct my_addrinfo **);
-typedef void (WSAAPI *p_freeaddrinfo) (struct my_addrinfo *);
-
-static p_getaddrinfo WS_getaddrinfo = NULL;
-static p_freeaddrinfo WS_freeaddrinfo = NULL;
-
-static HMODULE WS_getfunctions(HMODULE tmp)
-{
-	if (tmp != NULL)
-	{
-		WS_getaddrinfo = (p_getaddrinfo)(LPVOID)GetProcAddress(tmp, "getaddrinfo");
-		if (WS_getaddrinfo == NULL)
-			return NULL;
-		WS_freeaddrinfo = (p_freeaddrinfo)(LPVOID)GetProcAddress(tmp, "freeaddrinfo");
-		if (WS_freeaddrinfo == NULL)
-		{
-			WS_getaddrinfo = NULL;
-			return NULL;
-		}
-	}
-	return tmp;
-}
-
-static void WS_addrinfosetup(void)
-{
-	if (WS_getaddrinfo && WS_freeaddrinfo)
-		return; // already have the functions
-	// why not hold it into ipv6dll? becase we already link with ws2_32, silly!
-	if (WS_getfunctions(GetModuleHandleA("ws2_32.dll")) == NULL)
-		ipv6dll = WS_getfunctions(LoadLibraryA("wship6.dll"));
-}
-
-void WS_addrinfocleanup(void)
-{
-	if (ipv6dll)
-		FreeLibrary(ipv6dll);
-	ipv6dll = NULL;
-	WS_getaddrinfo = NULL;
-	WS_freeaddrinfo = NULL;
-}
-#else
-void WS_addrinfocleanup(void) {}
-#endif
-
-int I_getaddrinfo(const char *node, const char *service,
-                  const struct my_addrinfo *hints,
-                  struct my_addrinfo **res)
-{
-	struct hostent *nodename = NULL;
-	bool hostlookup = true, passivemode = false;
-	int flags = 0;
-	int socktype = 0;
-	int sockport = 0;
-	struct my_addrinfo *ai;
-	struct sockaddr_in *addr;
-	struct in_addr ipv4;
-	size_t addrlen = 1;
-	size_t ailen = 1, i = 0, j;
-	size_t famsize = sizeof(struct sockaddr_in);
-#ifdef USE_WINSOCK2
-	WS_addrinfosetup();
-	if (WS_getaddrinfo)
-		return WS_getaddrinfo(node, service, hints, res);
-#endif
-
-	// param check
-	if (node == NULL && service == NULL)
-		return EAI_NONAME;
-	//note: testcase show NULL as res crashes libc
-	if (res == NULL)
-		return -1;
-
-	// check hints
-	if (hints)
-	{
-		// no support for IPv6
-		if (hints->ai_family != AF_INET && hints->ai_family != AF_UNSPEC)
-			return -1; //EAI_FAMILY
-#ifdef AI_NUMERICHOST
-		// do not look up hostnames
-		if ((hints->ai_flags & AI_NUMERICHOST) == AI_NUMERICHOST)
-		{
-			hostlookup = false;
-			flags |= AI_NUMERICHOST;
-		}
-#endif
-#ifdef AI_PASSIVE
-		// return loopback or any address?
-		if ((hints->ai_flags & AI_PASSIVE) == AI_PASSIVE)
-		{
-			passivemode = true;
-			flags |= AI_PASSIVE;
-		}
-#endif
-		// why no support for canon names? lazy
-		//AI_CANONNAME
-		// what kind of socket?
-		socktype = hints->ai_socktype;
-	}
-	else
-	{
-#ifdef AI_V4MAPPED
-		flags |= AI_V4MAPPED;
-#endif
-#ifdef AI_ADDRCONFIG
-		flags |= AI_ADDRCONFIG;
-#endif
-	}
-
-	// we need gethostbyname to convert numeric strings
-	if (node && hostlookup)
-	{
-		if (node == NULL)
-			return -1;
-		nodename = gethostbyname(node);
-		if (nodename == NULL)
-		{
-			if (inet_aton(node, &ipv4) != 0)
-				addrlen = 1;
-			else
-				return -1;
-		}
-		else while (nodename->h_addr_list[addrlen] != NULL)
-			addrlen++;
-	}
-	else if (node)
-	{
-		if (inet_aton(node, &ipv4) != 0)
-			addrlen = 1;
-		else if (!hostlookup)
-			return EAI_NONAME;
-	}
-	else
-		addrlen = 1;
-
-	if (service) //AI_NUMERICSERV
-		sockport = atoi(service);
-
-	if (socktype == 0)
-		ailen = addrlen*3;
-	else
-		ailen = addrlen;
-
-	ai = calloc(ailen, sizeof(struct my_addrinfo));
-	if  (ai == NULL)
-		return -1;
-	else
-		*res = ai;
-
-	addr = calloc(ailen*2, famsize);
-	if (addr == NULL)
-	{
-		free(ai);
-		return -1;
-	}
-	else
-		ai->ai_addr = memset(addr, 0x00, ailen*ai->ai_addrlen);
-
-	for (i = 0; i < ailen; i++)
-	{
-		ai = *res+i;
-		ai->ai_flags = flags;
-		ai->ai_family = AF_INET;
-		ai->ai_socktype = socktype;
-		switch (ai->ai_socktype)
-		{
-			case SOCK_STREAM:
-				ai->ai_protocol = IPPROTO_TCP;
-				break;
-			case SOCK_DGRAM:
-				ai->ai_protocol = IPPROTO_UDP;
-				break;
-			default:
-				ai->ai_protocol = 0;
-		}
-		ai->ai_addrlen = famsize;
-		ai->ai_addr = (struct sockaddr *)&addr[i];
-		//ai_cannonname
-		ai->ai_next = ai+1;
-	}
-	ai->ai_next = NULL;
-	ai = *res;
-
-	for (i = 0, j = 0; i < ailen; i++, j++)
-	{
-		ai = *res+i;
-		addr[i].sin_port = htons((UINT16)sockport);
-		if (nodename)
-		{
-			memcpy(&addr[i].sin_addr, nodename->h_addr_list[j], ai->ai_addrlen);
-			addr[i].sin_family = nodename->h_addrtype;
-		}
-		else if (node)
-		{
-			memcpy(&addr[i].sin_addr, &ipv4, ai->ai_addrlen);
-			addr[i].sin_family = AF_INET;
-		}
-		else
-		{
-			if (passivemode)
-				addr[i].sin_addr.s_addr = htonl(INADDR_ANY);
-			else
-				addr[i].sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-			addr[i].sin_family = AF_INET;
-		}
-		if (socktype == 0)
-		{
-			ai->ai_socktype = SOCK_STREAM;
-			ai->ai_protocol = IPPROTO_TCP;
-			memcpy(&addr[i+1], &addr[i], ai->ai_addrlen);
-			i++; ai++;
-			ai->ai_socktype = SOCK_DGRAM;
-			ai->ai_protocol = IPPROTO_UDP;
-			memcpy(&addr[i+1], &addr[i], ai->ai_addrlen);
-			i++; ai++;
-			ai->ai_socktype = SOCK_RAW;
-			ai->ai_protocol = IPPROTO_IP;
-		}
-	}
-	return 0;
-}
-#endif
-
-#ifndef I_freeaddrinfo
-void I_freeaddrinfo(struct my_addrinfo *res)
-{
-#ifdef USE_WINSOCK2
-	if (WS_freeaddrinfo)
-	{
-		WS_freeaddrinfo(res);
-		return;
-	}
-#endif
-	if (!res)
-		return;
-	free(res->ai_addr);
-	free(res);
-}
-#endif
-
-#ifdef TESTCASE
-#include <stdio.h>
-
-#ifdef USE_WINSOCK2
-#define inet_ntop inet_ntopA
-#define HAVE_NTOP
-static const char* inet_ntopA(int af, const void *cp, char *buf, socklen_t len)
-{
-	DWORD Dlen = len, AFlen = 0;
-	SOCKADDR_STORAGE any;
-	LPSOCKADDR anyp = (LPSOCKADDR)&any;
-	LPSOCKADDR_IN any4 = (LPSOCKADDR_IN)&any;
-	LPSOCKADDR_IN6 any6 = (LPSOCKADDR_IN6)&any;
-
-	if (!buf)
-	{
-		WSASetLastError(STATUS_INVALID_PARAMETER);
-		return NULL;
-	}
-
-	if (af != AF_INET && af != AF_INET6)
-	{
-		WSASetLastError(WSAEAFNOSUPPORT);
-		return NULL;
-	}
-
-	ZeroMemory(&any, sizeof(SOCKADDR_STORAGE));
-	any.ss_family = af;
-
-	switch (af)
-	{
-		case AF_INET:
-		{
-			CopyMemory(&any4->sin_addr, cp, sizeof(IN_ADDR));
-			AFlen = sizeof(SOCKADDR_IN);
-			break;
-		}
-		case AF_INET6:
-		{
-			CopyMemory(&any6->sin6_addr, cp, sizeof(IN6_ADDR));
-			AFlen = sizeof(SOCKADDR_IN6);
-			break;
-		}
-	}
-
-	if (WSAAddressToStringA(anyp, AFlen, NULL, buf, &Dlen) == SOCKET_ERROR)
-		return NULL;
-	return buf;
-}
-#elif defined (_WIN32)
-// w32api, ws2tcpip.h, r1.12
-static inline char* gai_strerror(int ecode)
-{
-        static char message[1024+1];
-        DWORD dwFlags = FORMAT_MESSAGE_FROM_SYSTEM
-                      | FORMAT_MESSAGE_IGNORE_INSERTS
-                      | FORMAT_MESSAGE_MAX_WIDTH_MASK;
-        DWORD dwLanguageId = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT);
-        FormatMessageA(dwFlags, NULL, ecode, dwLanguageId, message, 1024, NULL);
-        return message;
-}
-#else
-#define HAVE_NTOP
-#endif
-
-#ifndef INET_ADDRSTRLEN
-#define INET_ADDRSTRLEN 16
-#endif
-
-static inline void printflags(int ai_flags)
-{
-	printf("flags: %x(", ai_flags);
-	if (ai_flags == 0)
-		printf("NONE|");
-#ifdef AI_PASSIVE
-	if ((ai_flags & AI_PASSIVE) == AI_PASSIVE)
-		printf("AI_PASSIVE|");
-	ai_flags &= ~AI_PASSIVE;
-#endif
-#ifdef AI_CANONNAME
-	if ((ai_flags & AI_CANONNAME) == AI_CANONNAME)
-		printf("AI_CANONNAME|");
-	ai_flags &= ~AI_CANONNAME;
-#endif
-#ifdef AI_NUMERICHOST
-	if ((ai_flags & AI_NUMERICHOST) == AI_NUMERICHOST)
-		printf("AI_NUMERICHOST|");
-	ai_flags &= ~AI_NUMERICHOST;
-#endif
-#ifdef AI_V4MAPPED
-	if ((ai_flags & AI_V4MAPPED) == AI_V4MAPPED)
-		printf("AI_V4MAPPED|");
-	ai_flags &= ~AI_V4MAPPED;
-#endif
-#ifdef AI_ALL
-	if ((ai_flags & AI_ALL) == AI_ALL)
-		printf("AI_ALL|");
-	ai_flags &= ~AI_ALL;
-#endif
-#ifdef AI_ADDRCONFIG
-	if ((ai_flags & AI_ADDRCONFIG) == AI_ADDRCONFIG)
-		printf("AI_ADDRCONFIG|");
-	ai_flags &= ~AI_ADDRCONFIG;
-#endif
-#ifdef AI_IDN
-	if ((ai_flags & AI_IDN) == AI_IDN)
-		printf("AI_IDN|");
-	ai_flags &= ~AI_IDN;
-#endif
-#ifdef AI_CANONIDN
-	if ((ai_flags & AI_CANONIDN) == AI_CANONIDN)
-		printf("AI_CANONIDN|");
-	ai_flags &= ~AI_CANONIDN;
-#endif
-#ifdef AI_IDN_ALLOW_UNASSIGNED
-	if ((ai_flags & AI_IDN_ALLOW_UNASSIGNED) == AI_IDN_ALLOW_UNASSIGNED)
-		printf("AI_IDN_ALLOW_UNASSIGNED|");
-	ai_flags &= ~AI_IDN_ALLOW_UNASSIGNED;
-#endif
-#ifdef AI_IDN_USE_STD3_ASCII_RULES
-	if ((ai_flags & AI_IDN_USE_STD3_ASCII_RULES) == AI_IDN_USE_STD3_ASCII_RULES)
-		printf("AI_IDN_USE_STD3_ASCII_RULES|");
-	ai_flags &= ~AI_PASSIVE;
-#endif
-#ifdef AI_NUMERICSERV
-	if ((ai_flags & AI_NUMERICSERV) == AI_NUMERICSERV)
-		printf("AI_NUMERICSERV|");
-	ai_flags &= ~AI_NUMERICSERV;
-#endif
-	printf("%x", ai_flags);
-	printf(")\n");
-}
-
-static inline void printsocktype(int ai_socktype)
-{
-	printf("socktype: %d(", ai_socktype);
-	switch (ai_socktype)
-	{
-		case 0:
-			printf("SOCK_ Woe32");
-			break;
-		case SOCK_STREAM:
-			printf("SOCK_STREAM");
-			break;
-		case SOCK_DGRAM:
-			printf("SOCK_DGRAM");
-			break;
-		case SOCK_RAW:
-			printf("SOCK_RAW");
-			break;
-		default:
-			printf("SOCK_ERROR\n");
-			exit(-1);
-	}
-	printf(")\n");
-}
-
-static inline void printprotocol(int ai_protocol)
-{
-	printf("protocol: %d(", ai_protocol);
-	switch (ai_protocol)
-	{
-		case IPPROTO_IP:
-			printf("IPPROTO_IP");
-			break;
-		case IPPROTO_TCP:
-			printf("IPPROTO_TCP");
-			break;
-		case IPPROTO_UDP:
-			printf("IPPROTO_UDP");
-			break;
-		default:
-			printf("IPPROTO_ERROR\n");
-			exit(-1);
-	}
-	printf(")\n");
-}
-
-static inline void printaddr(int ai_family, const struct sockaddr *ai_addr)
-{
-	char str[INET_ADDRSTRLEN+1] = "FAKE";
-	printf("family: %d(", ai_family);
-	switch (ai_family)
-	{
-		case AF_UNSPEC:
-			printf("AF_UNSPEC");
-			break;
-		case AF_INET:
-			printf("AF_INET");
-			break;
-#ifdef AF_INET6
-		case AF_INET6:
-			printf("AF_INET6");
-			break;
-#endif
-		default:
-			printf("AF_ERROR\n");
-			exit(-1);
-	}
-	printf(")\n");
-	if (ai_family == AF_INET && ai_addr)
-	{
-		const struct sockaddr_in *ip4 = (void *)ai_addr;
-#ifdef HAVE_NTOP
-		inet_ntop(ai_family, &ip4->sin_addr, str, INET_ADDRSTRLEN);
-#else
-		strncpy(str, inet_ntoa(ip4->sin_addr), INET_ADDRSTRLEN);
-#endif
-		printf("port: %d\n", ntohs(ip4->sin_port));
-	}
-	printf("addr: %s\n", str);
-}
-
-void printaddrinfo(const struct my_addrinfo *data)
-{
-	if(data == NULL)
-	{
-		printf("no data\n");
-		return;
-	}
-	else
-		printf("starting addrinfo dump\n");
-	while (data != NULL)
-	{
-		printflags(data->ai_flags);
-		printsocktype(data->ai_socktype);
-		printaddr(data->ai_family, data->ai_addr);
-		printprotocol(data->ai_protocol);
-		//addrlen
-		data = data->ai_next;
-	}
-}
-
-int main(int argc, char **argv)
-{
-	struct my_addrinfo *res = NULL, hints;
-	int gaie;
-
-	(void)argc;
-	(void)argv;
-	memset(&hints, 0x00, sizeof(struct my_addrinfo));
-	hints.ai_family = AF_INET;
-
-#ifdef _WIN32
-	{
-#ifdef USE_WINSOCK2
-		const WORD VerNeed = MAKEWORD(2,2);
-#else
-		const WORD VerNeed = MAKEWORD(1,1);
-#endif
-		WSADATA WSAData;
-		WSAStartup(VerNeed, &WSAData);
-	}
-#endif
-	printf("-----------------------------------------------------------\n");
-#ifndef _WIN32 //NULL as res crashes Win32
-	gaie = I_getaddrinfo(NULL, NULL, &hints, NULL);
-	if (gaie != EAI_NONAME)
-		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	I_freeaddrinfo(res);
-#endif
-#if 0 //NULL as res crashes
-	gaie = I_getaddrinfo("localhost", "5029", NULL, NULL);
-    if (gaie == 0)
-		printf("NULL crashes: %s(%d)\n", gai_strerror(gaie), gaie);
-	I_freeaddrinfo(res);
-#endif
-	gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
-    //if (gaie != 0)
-		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	printf("-----------------------------------------------------------\n");
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_protocol = IPPROTO_TCP;
-	gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
-    //if (gaie != 0)
-		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	printf("-----------------------------------------------------------\n");
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_protocol = IPPROTO_UDP;
-	gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
-    //if (gaie != 0)
-		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	printf("-----------------------------------------------------------\n");
-	hints.ai_flags = AI_NUMERICHOST;
-	gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
-    //if (gaie != 0)
-		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	printf("-----------------------------------------------------------\n");
-	gaie = I_getaddrinfo("127.0.0.1", NULL, &hints, &res);
-    //if (gaie != 0)
-		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo("127.0.0.1", "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	printf("-----------------------------------------------------------\n");
-	gaie = I_getaddrinfo("255.255.255.255", NULL, &hints, &res);
-    //if (gaie != 0)
-		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo("255.255.255.255", "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	printf("-----------------------------------------------------------\n");
-	hints.ai_flags = AI_PASSIVE;
-	gaie = I_getaddrinfo("0.0.0.0", NULL, &hints, &res);
-    //if (gaie != 0)
-		printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-	gaie = I_getaddrinfo("0.0.0.0", "5029", &hints, &res);
-    //if (gaie != 0)
-		printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
-	printaddrinfo(res);
-	I_freeaddrinfo(res); res = NULL;
-    return 0;
-}
-#endif

src/i_addrinfo.h

@@ -1,71 +0,0 @@
-// SONIC ROBO BLAST 2
-//-----------------------------------------------------------------------------
-// Copyright (C) 2011-2018 by Sonic Team Junior.
-//
-// This program is free software distributed under the
-// terms of the GNU General Public License, version 2.
-// See the 'LICENSE' file for more details.
-//-----------------------------------------------------------------------------
-/// \file  i_addrinfo.h
-/// \brief getaddrinfo stub
-
-#ifndef __I_ADDRINFO__
-#define __I_ADDRINFO__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#ifndef AI_PASSIVE
-#define AI_PASSIVE     0x01
-#endif
-#ifndef AI_NUMERICHOST
-#define AI_NUMERICHOST 0x04
-#endif
-#ifndef AI_V4MAPPED
-#define AI_V4MAPPED    0x08
-#endif
-#ifndef AI_ADDRCONFIG
-#define AI_ADDRCONFIG  0x20
-#endif
-
-#ifdef _WIN32
-#ifndef EAI_NONAME
-#define EAI_NONAME WSAHOST_NOT_FOUND
-#endif
-#endif
-
-#ifndef EAI_NONAME
-#define EAI_NONAME -2
-#endif
-
-#ifdef _WIN32 // already use the stub for Win32
-// w32api, ws2tcpip.h, r1.12
-struct my_addrinfo {
-        int     ai_flags;
-        int     ai_family;
-        int     ai_socktype;
-        int     ai_protocol;
-        size_t  ai_addrlen;
-        char   *ai_canonname;
-        struct sockaddr  *ai_addr;
-        struct my_addrinfo  *ai_next;
-};
-#else
-#define my_addrinfo addrinfo
-#endif
-
-void WS_addrinfocleanup(void);
-
-#ifndef my_addrinfo
-void I_freeaddrinfo(struct my_addrinfo *res);
-int I_getaddrinfo(const char *node, const char *service,
-                         const struct my_addrinfo *hints,
-                         struct my_addrinfo **res);
-#elif !defined (test_stub)
-#define I_getaddrinfo getaddrinfo
-#define I_freeaddrinfo freeaddrinfo
-#endif
-
-
-#endif

src/i_net.h

@@ -80,6 +80,8 @@ typedef struct
 
 #define DOOMCOM_DATA(d) (doomdata_t *)&(d)->data
 
+extern doomcom_t *doomcom;
+
 #ifdef HOLEPUNCH
 typedef struct
 {
@@ -91,8 +93,6 @@ typedef struct
 #define HOLEPUNCH_DATA(d) (holepunch_t *)&(d)->data
 #endif
 
-extern doomcom_t *doomcom;
-
 /**	\brief return packet in doomcom struct
 */
 extern boolean (*I_NetGet)(void);

src/i_sound.h

@@ -41,11 +41,6 @@ typedef enum {
 */
 extern UINT8 sound_started;
 
-/**	\brief info of samplerate
-*/
-#if defined(HAVE_SDL) && SOUND==SOUND_SDL
-extern consvar_t cv_samplerate;
-#endif
 
 /**	\brief	The I_GetSfx function
 

src/i_system.h

@@ -29,6 +29,10 @@ extern "C" {
 */
 #define MAX_QUIT_FUNCS     16
 
+void I_GetConsoleEvents(void);
+
+extern boolean consolevent;
+extern boolean framebuffer;
 
 /**	\brief Graphic system had started up
 */
@@ -39,7 +43,7 @@ extern UINT8 graphics_started;
 extern UINT8 keyboard_started;
 
 /** \brief Set to true when inside a signal handler that will exit the program. */
-extern boolean g_in_exiting_signal_handler;
+boolean I_In_Exiting_Signal_Handler(void);
 
 /**	\brief	The I_GetFreeMem function
 
@@ -61,10 +65,6 @@ precise_t I_GetPreciseTime(void);
   */
 UINT64 I_GetPrecisePrecision(void);
 
-/** \brief  Get the current time in rendering tics, including fractions.
-*/
-double I_GetFrameTime(void);
-
 /**	\brief	Sleeps for the given duration in milliseconds. Depending on the
             operating system's scheduler, the calling thread may give up its
 			time slice for a longer duration. The implementation should give a
@@ -195,6 +195,10 @@ INT32 I_StartupSystem(void);
 */
 void I_ShutdownSystem(void);
 
+/**	\brief To check if a Interrupt or Terminate Signal was fired
+ */
+boolean I_Interrupted(void);
+
 /**	\brief	The I_GetDiskFreeSpace function
 
 	\param	freespace	a INT64 pointer to hold the free space amount
@@ -221,10 +225,6 @@ INT32 I_mkdir(const char *dirname, INT32 unixright);
 */
 const char *I_LocateWad(void);
 
-/**	\brief Joystick events
-*/
-void I_GetJoystickEvents(UINT8 index);
-
 char *I_GetEnv(const char *name);
 
 INT32 I_PutEnv(char *variable);

src/i_tcp.c

@@ -28,43 +28,37 @@
 #endif
 
 #ifdef _WIN32
-#define USE_WINSOCK
-#if defined (_WIN64) || defined (HAVE_IPV6)
-#define USE_WINSOCK2
-#else //_WIN64/HAVE_IPV6
-#define USE_WINSOCK1
-#endif
+	#define USE_WINSOCK
 #endif //WIN32 OS
 
-#ifdef USE_WINSOCK2
-#include <ws2tcpip.h>
+#ifdef USE_WINSOCK
+	#include <ws2tcpip.h>
+	#define addrinfo_t ADDRINFOA
+#else
+	#define addrinfo_t struct addrinfo
 #endif
 
 #include "doomdef.h"
 
+#ifndef USE_WINSOCK
+	#include <arpa/inet.h>
+	#ifdef __APPLE_CC__
+		#ifndef _BSD_SOCKLEN_T_
+			#define _BSD_SOCKLEN_T_
+		#endif //_BSD_SOCKLEN_T_
+	#endif //__APPLE_CC__
+	#include <sys/socket.h>
+	#include <netinet/in.h>
+	#include <netdb.h>
+	#include <sys/ioctl.h>
+#endif //normal BSD API
+
+#include <errno.h>
 #include <time.h>
-#ifdef USE_WINSOCK1
-	#include <winsock.h>
-#else
-	#ifndef USE_WINSOCK
-		#include <arpa/inet.h>
-		#ifdef __APPLE_CC__
-			#ifndef _BSD_SOCKLEN_T_
-				#define _BSD_SOCKLEN_T_
-			#endif //_BSD_SOCKLEN_T_
-		#endif //__APPLE_CC__
-		#include <sys/socket.h>
-		#include <netinet/in.h>
-		#include <netdb.h>
-		#include <sys/ioctl.h>
-	#endif //normal BSD API
 
-	#include <errno.h>
-
-	#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
-		#include <sys/time.h>
-	#endif // UNIXCOMMON
-#endif
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
+	#include <sys/time.h>
+#endif // UNIXCOMMON
 
 #ifdef USE_WINSOCK
 	// some undefined under win32
@@ -152,27 +146,22 @@ static UINT8 UPNP_support = TRUE;
 	#define close closesocket
 #endif
 
-#include "i_addrinfo.h"
 #define DEFAULTPORT "5029"
 
-#if defined (USE_WINSOCK)
-typedef SOCKET SOCKET_TYPE;
-#define ERRSOCKET (SOCKET_ERROR)
+#ifdef USE_WINSOCK
+	typedef SOCKET SOCKET_TYPE;
+	#define ERRSOCKET (SOCKET_ERROR)
 #else
-#if defined (__unix__) || defined (__APPLE__) || defined (__HAIKU__)
-typedef int SOCKET_TYPE;
-#else
-typedef unsigned long SOCKET_TYPE;
-#endif
-#define ERRSOCKET (-1)
+	#if defined (__unix__) || defined (__APPLE__) || defined (__HAIKU__)
+		typedef int SOCKET_TYPE;
+	#else
+		typedef unsigned long SOCKET_TYPE;
+	#endif
+	#define ERRSOCKET (-1)
 #endif
 
 #define IPV6_MULTICAST_ADDRESS "ff15::57e1:1a12"
 
-#ifdef USE_WINSOCK1
-typedef int socklen_t;
-#endif
-
 typedef struct
 {
 	mysockaddr_t address;
@@ -232,9 +221,8 @@ static char *get_WSAErrorStr(int e)
 #define strerror get_WSAErrorStr
 #endif
 
-#ifdef USE_WINSOCK2
+#ifdef USE_WINSOCK
 #define inet_ntop inet_ntopA
-#define HAVE_NTOP
 static const char* inet_ntopA(short af, const void *cp, char *buf, socklen_t len)
 {
 	DWORD Dlen = len, AFlen = 0;
@@ -278,8 +266,6 @@ static const char* inet_ntopA(short af, const void *cp, char *buf, socklen_t len
 		return NULL;
 	return buf;
 }
-#elif !defined (USE_WINSOCK1)
-#define HAVE_NTOP
 #endif
 
 #ifdef HAVE_MINIUPNPC // based on old XChat patch
@@ -359,18 +345,15 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 {
 	static char s[64]; // 255.255.255.255:65535 or
 	// [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535
-
-#ifdef HAVE_NTOP
 #ifdef HAVE_IPV6
 	int v6 = (sk->any.sa_family == AF_INET6);
 #else
 	int v6 = 0;
 #endif
-
 	void *addr;
 	int e = 0; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once
 
-	if(sk->any.sa_family == AF_INET)
+	if (sk->any.sa_family == AF_INET)
 		addr = &sk->ip4.sin_addr;
 #ifdef HAVE_IPV6
 	else if(sk->any.sa_family == AF_INET6)
@@ -379,9 +362,11 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 	else
 		addr = NULL;
 
-	if(addr == NULL)
+	if (addr == NULL)
+	{
 		sprintf(s, "No address");
-	else if(inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
+	}
+	else if (inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
 	{
 		e = errno;
 		sprintf(s, "Unknown family type, error #%u: %s", e, strerror(e));
@@ -396,17 +381,9 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 			strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
 	}
 #endif
-	else if(sk->any.sa_family == AF_INET  && sk->ip4.sin_port  != 0)
+	else if (sk->any.sa_family == AF_INET  && sk->ip4.sin_port != 0)
 		strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
-#else
-	if (sk->any.sa_family == AF_INET)
-	{
-		strcpy(s, inet_ntoa(sk->ip4.sin_addr));
-		if (sk->ip4.sin_port != 0) strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
-	}
-	else
-		sprintf(s, "Unknown type");
-#endif
+
 	return s;
 }
 
@@ -504,7 +481,6 @@ static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
 		return false;
 }
 
-
 // This is a hack. For some reason, nodes aren't being freed properly.
 // This goes through and cleans up what nodes were supposed to be freed.
 /** \warning This function causes the file downloading to stop if someone joins.
@@ -520,8 +496,10 @@ static void cleanupnodes(void)
 
 	// Why can't I start at zero?
 	for (j = 1; j < MAXNETNODES; j++)
+	{
 		if (!(nodeingame[j] || SV_SendingFile(j)))
 			nodeconnected[j] = false;
+	}
 }
 
 static SINT8 getfreenode(void)
@@ -531,11 +509,13 @@ static SINT8 getfreenode(void)
 	cleanupnodes();
 
 	for (j = 0; j < MAXNETNODES; j++)
+	{
 		if (!nodeconnected[j])
 		{
 			nodeconnected[j] = true;
 			return j;
 		}
+	}
 
 	/** \warning No free node? Just in case a node might not have been freed properly,
 	  *          look if there are connected nodes that aren't in game, and forget them.
@@ -592,13 +572,12 @@ void Command_Numnodes(void)
 
 #ifdef HOLEPUNCH
 /* not one of the reserved "local" addresses */
-static boolean
-is_external_address (UINT32 p)
+static boolean is_external_address(UINT32 p)
 {
 	UINT8 a = (p & 255);
 	UINT8 b = ((p >> 8) & 255);
 
-	if (p == (UINT32)~0)/* 255.255.255.255 */
+	if (p == (UINT32)~0) /* 255.255.255.255 */
 		return 0;
 
 	switch (a)
@@ -608,7 +587,7 @@ is_external_address (UINT32 p)
 		case 127:
 			return false;
 		case 172:
-			return (b & ~15) != 16;/* 16 - 31 */
+			return (b & ~15) != 16; /* 16 - 31 */
 		case 192:
 			return b != 168;
 		default:
@@ -673,27 +652,27 @@ static boolean SOCK_Get(void)
 				break;
 			}
 #endif
-
 			// find remote node number
-			for (j = 1; j <= MAXNETNODES; j++) //include LAN
+			for (j = 1; j <= MAXNETNODES; j++) // include LAN
 			{
 				if (SOCK_cmpaddr(&fromaddress, &clientaddress[j], 0))
 				{
 					doomcom->remotenode = (INT16)j; // good packet from a game player
 					doomcom->datalength = (INT16)c;
 					nodesocket[j] = mysockets[n];
-					return false;
+					return true;
 				}
 			}
 			// not found
 
 			// find a free slot
 			j = getfreenode();
+
 			if (j > 0)
 			{
 				const time_t curTime = time(NULL);
 
-				M_Memcpy(&clientaddress[j], &fromaddress, fromlen);
+				memcpy(&clientaddress[j], &fromaddress, fromlen);
 				nodesocket[j] = mysockets[n];
 				DEBFILE(va("New node detected: node:%d address:%s\n", j,
 						SOCK_GetNodeAddress(j)));
@@ -775,7 +754,7 @@ static void SOCK_Send(void)
 	int e = 0; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once
 	size_t i, j;
 
-	if (!nodeconnected[doomcom->remotenode])
+	if (doomcom->remotenode < 0 || !nodeconnected[doomcom->remotenode])
 		return;
 
 	if (doomcom->remotenode == BROADCASTADDR)
@@ -787,6 +766,7 @@ static void SOCK_Send(void)
 				if (myfamily[i] == broadcastaddress[j].any.sa_family)
 				{
 					c = SOCK_SendToAddr(mysockets[i], &broadcastaddress[j]);
+
 					if (c == ERRSOCKET)
 					{
 						e = errno;
@@ -804,6 +784,7 @@ static void SOCK_Send(void)
 			if (myfamily[i] == clientaddress[doomcom->remotenode].any.sa_family)
 			{
 				c = SOCK_SendToAddr(mysockets[i], &clientaddress[doomcom->remotenode]);
+
 				if (c == ERRSOCKET)
 				{
 					e = errno;
@@ -816,6 +797,7 @@ static void SOCK_Send(void)
 	else
 	{
 		c = SOCK_SendToAddr(nodesocket[doomcom->remotenode], &clientaddress[doomcom->remotenode]);
+
 		if (c == ERRSOCKET)
 		{
 			e = errno;
@@ -834,7 +816,7 @@ static void SOCK_Send(void)
 static void SOCK_FreeNodenum(INT32 numnode)
 {
 	// can't disconnect from self :)
-	if (!numnode || numnode > MAXNETNODES)
+	if (numnode <= 0 || numnode > MAXNETNODES)
 		return;
 
 	DEBFILE(va("Free node %d (%s)\n", numnode, SOCK_GetNodeAddress(numnode)));
@@ -868,15 +850,11 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 
 #ifdef USE_WINSOCK
 	{ // Alam_GBC: disable the new UDP connection reset behavior for Win2k and up
-#ifdef USE_WINSOCK2
 		DWORD dwBytesReturned = 0;
 		BOOL bfalse = FALSE;
 		rc = WSAIoctl(s, SIO_UDP_CONNRESET, &bfalse, sizeof(bfalse),
 		         NULL, 0, &dwBytesReturned, NULL, NULL);
-#else
-		unsigned long falseval = false;
-		rc = ioctl(s, SIO_UDP_CONNRESET, &falseval);
-#endif
+
 		if (rc == -1)
 		{
 			e = errno;
@@ -997,7 +975,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 		e = errno;
 		I_OutputMsg("getting SO_RCVBUF failed: #%u, %s\n", e, strerror(e));
 	}
-	CONS_Printf(M_GetText("Network system buffer: %dKb\n"), opt>>10);
+	CONS_Printf(M_GetText("Network receive buffer: %dKb\n"), opt>>10);
 
 	if (opt < 64<<10) // 64k
 	{
@@ -1018,9 +996,44 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 		}
 
 		if (opt < 64<<10)
-			CONS_Alert(CONS_WARNING, M_GetText("Can't set buffer length to 64k, file transfer will be bad\n"));
+			CONS_Alert(CONS_WARNING, M_GetText("Can't set receive buffer length to 64k, file transfer will be bad\n"));
 		else
-			CONS_Printf(M_GetText("Network system buffer set to: %dKb\n"), opt>>10);
+			CONS_Printf(M_GetText("Network receive buffer set to: %dKb\n"), opt>>10);
+	}
+
+	opt = 0;
+	opts = (socklen_t)sizeof(opt);
+	rc = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, &opts);
+	if (rc <= -1)
+	{
+		e = errno;
+		I_OutputMsg("getting SO_SNDBUF failed: #%u, %s\n", e, strerror(e));
+	}
+	CONS_Printf(M_GetText("Network send buffer: %dKb\n"), opt>>10);
+
+	if (opt < 64<<10) // 64k
+	{
+		opt = 64<<10;
+		opts = (socklen_t)sizeof(opt);
+		rc = setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, opts);
+		if (rc <= -1)
+		{
+			e = errno;
+			I_OutputMsg("setting SO_SNDBUF to %dKb failed: #%u, %s\n", opt>>10, e, strerror(e));
+		}
+
+		opt = 0;
+		rc = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&opt, &opts);
+		if (rc <= -1)
+		{
+			e = errno;
+			I_OutputMsg("getting SO_SNDBUF failed: #%u, %s\n", e, strerror(e));
+		}
+
+		if (opt < 64<<10)
+			CONS_Alert(CONS_WARNING, M_GetText("Can't set send buffer length to 64k, file transfer will be bad\n"));
+		else
+			CONS_Printf(M_GetText("Network send system buffer set to: %dKb\n"), opt>>10);
 	}
 
 	rc = getsockname(s, &straddr.any, &len);
@@ -1046,14 +1059,13 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 static boolean UDP_Socket(void)
 {
 	size_t s;
-	struct my_addrinfo *ai, *runp, hints;
+	addrinfo_t *ai, *runp, hints;
 	int gaie;
 #ifdef HAVE_IPV6
 	const INT32 b_ipv6 = M_CheckParm("-ipv6");
 #endif
 	const char *serv;
 
-
 	for (s = 0; s < mysocketses; s++)
 		mysockets[s] = ERRSOCKET;
 	for (s = 0; s < MAXNETNODES+1; s++)
@@ -1075,7 +1087,7 @@ static boolean UDP_Socket(void)
 	{
 		while (M_IsNextParm())
 		{
-			gaie = I_getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
+			gaie = getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
 			if (gaie == 0)
 			{
 				runp = ai;
@@ -1089,13 +1101,13 @@ static boolean UDP_Socket(void)
 					}
 					runp = runp->ai_next;
 				}
-				I_freeaddrinfo(ai);
+				freeaddrinfo(ai);
 			}
 		}
 	}
 	else
 	{
-		gaie = I_getaddrinfo("0.0.0.0", serv, &hints, &ai);
+		gaie = getaddrinfo("0.0.0.0", serv, &hints, &ai);
 		if (gaie == 0)
 		{
 			runp = ai;
@@ -1116,7 +1128,7 @@ static boolean UDP_Socket(void)
 				}
 				runp = runp->ai_next;
 			}
-			I_freeaddrinfo(ai);
+			freeaddrinfo(ai);
 		}
 	}
 
@@ -1128,7 +1140,7 @@ static boolean UDP_Socket(void)
 		{
 			while (M_IsNextParm())
 			{
-				gaie = I_getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
+				gaie = getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
 				if (gaie == 0)
 				{
 					runp = ai;
@@ -1142,13 +1154,13 @@ static boolean UDP_Socket(void)
 						}
 						runp = runp->ai_next;
 					}
-					I_freeaddrinfo(ai);
+					freeaddrinfo(ai);
 				}
 			}
 		}
 		else
 		{
-			gaie = I_getaddrinfo("::", serv, &hints, &ai);
+			gaie = getaddrinfo("::", serv, &hints, &ai);
 			if (gaie == 0)
 			{
 				runp = ai;
@@ -1162,7 +1174,7 @@ static boolean UDP_Socket(void)
 					}
 					runp = runp->ai_next;
 				}
-				I_freeaddrinfo(ai);
+				freeaddrinfo(ai);
 			}
 		}
 	}
@@ -1216,11 +1228,7 @@ boolean I_InitTcpDriver(void)
 	if (!init_tcp_driver)
 	{
 #ifdef USE_WINSOCK
-#ifdef USE_WINSOCK2
 		const WORD VerNeed = MAKEWORD(2,2);
-#else
-		const WORD VerNeed = MAKEWORD(1,1);
-#endif
 		WSADATA WSAData;
 		const int WSAresult = WSAStartup(VerNeed, &WSAData);
 		if (WSAresult != 0)
@@ -1247,21 +1255,14 @@ boolean I_InitTcpDriver(void)
 			if (WSAresult != WSAVERNOTSUPPORTED)
 				CONS_Debug(DBG_NETPLAY, "WinSock(TCP/IP) error: %s\n",WSError);
 		}
-#ifdef USE_WINSOCK2
-		if(LOBYTE(WSAData.wVersion) != 2 ||
+
+		if (LOBYTE(WSAData.wVersion) != 2 ||
 			HIBYTE(WSAData.wVersion) != 2)
 		{
 			WSACleanup();
 			CONS_Debug(DBG_NETPLAY, "No WinSock(TCP/IP) 2.2 driver detected\n");
 		}
-#else
-		if (LOBYTE(WSAData.wVersion) != 1 ||
-			HIBYTE(WSAData.wVersion) != 1)
-		{
-			WSACleanup();
-			CONS_Debug(DBG_NETPLAY, "No WinSock(TCP/IP) 1.1 driver detected\n");
-		}
-#endif
+
 		CONS_Debug(DBG_NETPLAY, "WinSock description: %s\n",WSAData.szDescription);
 		CONS_Debug(DBG_NETPLAY, "WinSock System Status: %s\n",WSAData.szSystemStatus);
 #endif
@@ -1301,35 +1302,31 @@ void I_ShutdownTcpDriver(void)
 
 	CONS_Printf("I_ShutdownTcpDriver: ");
 #ifdef USE_WINSOCK
-	WS_addrinfocleanup();
 	WSACleanup();
 #endif
 	CONS_Printf("shut down\n");
 	init_tcp_driver = false;
 }
 
-static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const char *port, boolean test)
+static boolean SOCK_GetAddr(mysockaddr_t *sin, const char *address, const char *port, boolean test)
 {
-	struct my_addrinfo *ai = NULL, *runp, hints;
+	addrinfo_t *ai, *runp, hints;
 	int gaie;
 	size_t i;
 
 	if (!port || !port[0])
 		port = DEFAULTPORT;
 
-	memset (&hints, 0x00, sizeof (hints));
+	memset(&hints, 0x00, sizeof (hints));
 	hints.ai_flags = AI_ADDRCONFIG;
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = IPPROTO_UDP;
 
-	gaie = I_getaddrinfo(address, port, &hints, &ai);
+	gaie = getaddrinfo(address, port, &hints, &ai);
 
 	if (gaie != 0)
-	{
-		I_freeaddrinfo(ai);
 		return false;
-	}
 
 	runp = ai;
 
@@ -1356,7 +1353,7 @@ static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const
 	if (runp != NULL)
 		memcpy(sin, runp->ai_addr, runp->ai_addrlen);
 
-	I_freeaddrinfo(ai);
+	freeaddrinfo(ai);
 
 	return (runp != NULL);
 }
@@ -1369,7 +1366,7 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port)
 
 	if (newnode != -1)
 	{
-		if (!SOCK_GetAddr(&clientaddress[newnode].ip4, address, port, true))
+		if (!SOCK_GetAddr(&clientaddress[newnode], address, port, true))
 		{
 			nodeconnected[newnode] = false;
 			return -1;
@@ -1397,7 +1394,7 @@ static void rendezvous(int size)
 
 	if (tic != refreshtic)
 	{
-		if (SOCK_GetAddr(&rzv.ip4, host, (port ? port : "7777"), false))
+		if (SOCK_GetAddr(&rzv, host, (port ? port : "7777"), false))
 		{
 			refreshtic = tic;
 		}
@@ -1439,14 +1436,12 @@ static void SOCK_RegisterHolePunch(void)
 
 static boolean SOCK_OpenSocket(void)
 {
-	size_t i;
-
-	memset(clientaddress, 0, sizeof (clientaddress));
+	memset(clientaddress, 0, sizeof(clientaddress));
 
+	memset(nodeconnected, false, sizeof(nodeconnected));
 	nodeconnected[0] = true; // always connected to self
-	for (i = 1; i < MAXNETNODES; i++)
-		nodeconnected[i] = false;
 	nodeconnected[BROADCASTADDR] = true;
+
 	I_NetSend = SOCK_Send;
 	I_NetGet = SOCK_Get;
 	I_NetCloseSocket = SOCK_CloseSocket;
@@ -1486,13 +1481,13 @@ static boolean SOCK_Ban(INT32 node)
 {
 	INT32 ban;
 
-	if (node > MAXNETNODES)
+	if (node < 0 || node > MAXNETNODES)
 		return false;
 
 	ban = numbans;
 	AddBannedIndex();
 
-	M_Memcpy(&banned[ban].address, &clientaddress[node], sizeof (mysockaddr_t));
+	memcpy(&banned[ban].address, &clientaddress[node], sizeof (mysockaddr_t));
 
 	if (banned[ban].address.any.sa_family == AF_INET)
 	{
@@ -1517,11 +1512,8 @@ static boolean SOCK_SetBanUsername(const char *username)
 		username = "Direct IP ban";
 	}
 
-	if (banned[numbans - 1].username)
-	{
-		Z_Free(banned[numbans - 1].username);
-		banned[numbans - 1].username = NULL;
-	}
+	Z_Free(banned[numbans - 1].username);
+	banned[numbans - 1].username = NULL;
 
 	banned[numbans - 1].username = Z_StrDup(username);
 
@@ -1535,11 +1527,8 @@ static boolean SOCK_SetBanReason(const char *reason)
 		reason = "No reason given";
 	}
 
-	if (banned[numbans - 1].reason)
-	{
-		Z_Free(banned[numbans - 1].reason);
-		banned[numbans - 1].reason = NULL;
-	}
+	Z_Free(banned[numbans - 1].reason);
+	banned[numbans - 1].reason = NULL;
 
 	banned[numbans - 1].reason = Z_StrDup(reason);
 
@@ -1554,7 +1543,7 @@ static boolean SOCK_SetUnbanTime(time_t timestamp)
 
 static boolean SOCK_SetBanAddress(const char *address, const char *mask)
 {
-	struct my_addrinfo *ai, *runp, hints;
+	addrinfo_t *ai, *runp, hints;
 	int gaie;
 
 	if (!address)
@@ -1566,7 +1555,7 @@ static boolean SOCK_SetBanAddress(const char *address, const char *mask)
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = IPPROTO_UDP;
 
-	gaie = I_getaddrinfo(address, "0", &hints, &ai);
+	gaie = getaddrinfo(address, "0", &hints, &ai);
 	if (gaie != 0)
 		return false;
 
@@ -1611,7 +1600,7 @@ static boolean SOCK_SetBanAddress(const char *address, const char *mask)
 		runp = runp->ai_next;
 	}
 
-	I_freeaddrinfo(ai);
+	freeaddrinfo(ai);
 
 	return true;
 }
@@ -1660,8 +1649,6 @@ boolean I_InitTcpNetwork(void)
 		// FIXME: for dedicated server, numnodes needs to be set to 0 upon start
 		if (dedicated)
 			doomcom->numnodes = 0;
-/*		else if (M_IsNextParm())
-			doomcom->numnodes = (INT16)atoi(M_GetNextParm());*/
 		else
 			doomcom->numnodes = 1;
 
@@ -1746,5 +1733,3 @@ boolean I_InitTcpNetwork(void)
 
 	return ret;
 }
-
-#include "i_addrinfo.c"

src/i_time.c

@@ -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};
@@ -63,7 +63,10 @@ void I_UpdateTime(fixed_t timescale)
 	ticratescaled = (double)((float)TICRATE * FixedToFloat(timescale));
 
 	enterprecise = I_GetPreciseTime();
-	elapsedseconds = (double)(enterprecise - oldenterprecise) / I_GetPrecisePrecision();
+	const precise_t elapsed = enterprecise - oldenterprecise;
+	const UINT64 precision = I_GetPrecisePrecision();
+	// explictily do this in double precision
+	elapsedseconds = (double)elapsed / (double)precision;
 	tictimer += elapsedseconds;
 	while (tictimer > 1.0/ticratescaled)
 	{

src/i_video.h

@@ -94,17 +94,13 @@ INT32 VID_SetMode(INT32 modenum);
 	\return	name of video mode
 */
 const char *VID_GetModeName(INT32 modenum);
-void VID_PrepareModeList(void); /// note hack for SDL
 
+void VID_PrepareModeList(void);
 
 /**	\brief can video system do fullscreen
 */
 extern boolean allow_fullscreen;
 
-/**	\brief Update video system without updating frame
-*/
-void I_UpdateNoBlit(void);
-
 /**	\brief Update video system with updating frame
 */
 void I_FinishUpdate(void);
@@ -113,13 +109,6 @@ void I_FinishUpdate(void);
 */
 void I_UpdateNoVsync(void);
 
-/**	\brief	Wait for vertical retrace or pause a bit.
-
-	\param	count	max wait
-
-	\return	void
-*/
-void I_WaitVBL(INT32 count);
 
 /**	\brief	The I_ReadScreen function
 
@@ -129,13 +118,6 @@ void I_WaitVBL(INT32 count);
 */
 void I_ReadScreen(UINT8 * restrict scr, INT32 scale);
 
-/**	\brief Start disk icon
-*/
-void I_BeginRead(void);
-
-/**	\brief Stop disk icon
-*/
-void I_EndRead(void);
 
 UINT32 I_GetRefreshRate(void);
 
@@ -151,6 +133,15 @@ 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

src/info.h

@@ -19,6 +19,8 @@
 #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!!
 

src/k_hud.c

@@ -568,7 +568,7 @@ static patch_t *kp_racefinish[6];
 static patch_t *kp_positionnum[NUMPOSNUMS][NUMPOSFRAMES];
 static patch_t *kp_winnernum[NUMPOSFRAMES];
 
-static patch_t *kp_facenum[MAXPLAYERS+1];
+patch_t *kp_facenum[MAXPLAYERS+1] = {};
 static patch_t *kp_facehighlight[8];
 
 static patch_t *kp_rankbumper;
@@ -931,21 +931,21 @@ const char *K_GetItemPatch(UINT8 item, boolean tiny)
 
 //}
 
-INT32 ITEM_X, ITEM_Y;	// Item Window
-INT32 TIME_X, TIME_Y;	// Time Sticker
-INT32 LAPS_X, LAPS_Y;	// Lap Sticker
-INT32 SPDM_X, SPDM_Y;	// Speedometer
-INT32 POSI_X, POSI_Y;	// Position Number
-INT32 FACE_X, FACE_Y;	// Top-four Faces
-INT32 STCD_X, STCD_Y;	// Starting countdown
-INT32 CHEK_Y;			// CHECK graphic
-INT32 MINI_X, MINI_Y;	// Minimap
-INT32 WANT_X, WANT_Y;	// Battle WANTED poster
+static INT32 ITEM_X, ITEM_Y;	// Item Window
+static INT32 TIME_X, TIME_Y;	// Time Sticker
+static INT32 LAPS_X, LAPS_Y;	// Lap Sticker
+static INT32 SPDM_X, SPDM_Y;	// Speedometer
+static INT32 POSI_X, POSI_Y;	// Position Number
+static INT32 FACE_X, FACE_Y;	// Top-four Faces
+static INT32 STCD_X, STCD_Y;	// Starting countdown
+static INT32 CHEK_Y;			// CHECK graphic
+static INT32 MINI_X, MINI_Y;	// Minimap
+static INT32 WANT_X, WANT_Y;	// Battle WANTED poster
 
 // This is for the P2 and P4 side of splitscreen. Then we'll flip P1's and P2's to the bottom with V_SPLITSCREEN.
-INT32 ITEM2_X, ITEM2_Y;
-INT32 LAPS2_X, LAPS2_Y;
-INT32 POSI2_X, POSI2_Y;
+static INT32 ITEM2_X, ITEM2_Y;
+static INT32 LAPS2_X, LAPS2_Y;
+static INT32 POSI2_X, POSI2_Y;
 
 static void K_initKartHUD(void)
 {
@@ -1065,7 +1065,7 @@ static void K_initKartHUD(void)
 	}
 
 	if (timeinmap > 113 || forceshowhud)
-		hudtrans = cv_translucenthud.value;
+		hudtrans = (UINT8)cv_translucenthud.value;
 	else if (timeinmap > 105)
 		hudtrans = ((((INT32)timeinmap) - 105)*cv_translucenthud.value)/(113-105);
 	else
@@ -1076,12 +1076,55 @@ static void K_initKartHUD(void)
 	R_InterpolateView(R_GetTimeFrac(RTF_CAMERA), !cv_uncappedhud.value);
 }
 
+void K_KartPlayerHUDUpdate(player_t *player)
+{
+	if (player->kartstuff[k_lapanimation])
+		player->kartstuff[k_lapanimation]--;
+
+	if (player->kartstuff[k_yougotem])
+		player->kartstuff[k_yougotem]--;
+
+	if (G_BattleGametype() && (player->exiting || player->kartstuff[k_comebacktimer]))
+	{
+		if (player->exiting)
+		{
+			if (player->exiting < 6*TICRATE)
+				player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1;
+			else if (player->exiting == 6*TICRATE)
+				player->kartstuff[k_cardanimation] = 0;
+			else if (player->kartstuff[k_cardanimation] < 2*TICRATE)
+				player->kartstuff[k_cardanimation]++;
+		}
+		else
+		{
+			if (player->kartstuff[k_comebacktimer] < 6*TICRATE)
+				player->kartstuff[k_cardanimation] -= ((164-player->kartstuff[k_cardanimation])/8)+1;
+			else if (player->kartstuff[k_comebacktimer] < 9*TICRATE)
+				player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1;
+		}
+
+		if (player->kartstuff[k_cardanimation] > 164)
+			player->kartstuff[k_cardanimation] = 164;
+		if (player->kartstuff[k_cardanimation] < 0)
+			player->kartstuff[k_cardanimation] = 0;
+	}
+	else if (G_RaceGametype() && player->exiting)
+	{
+		if (player->kartstuff[k_cardanimation] < 2*TICRATE)
+			player->kartstuff[k_cardanimation]++;
+	}
+	else
+	{
+		player->kartstuff[k_cardanimation] = 0;
+	}
+}
+
 UINT8 K_GetHudColor(void)
 {
 	if (cv_colorizedhud.value && cv_colorizedhudcolor.value)
-		return cv_colorizedhudcolor.value;
+		return (UINT8)cv_colorizedhudcolor.value;
 
-	return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value);
+	return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : (UINT8)cv_playercolor.value);
 }
 
 boolean K_UseColorHud(void)
@@ -1372,8 +1415,6 @@ static void K_drawKartStats(void)
 				break;
 		}
 	}
-	else
-		spdoffset = 0;
 
 	if (G_BattleGametype() && ((speedostyle != SPEEDO_DIAL) || splitscreen))
 		spdoffset += ((stplyr->kartstuff[k_bumper] ? -5 : -8));
@@ -1483,7 +1524,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
@@ -2152,7 +2193,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++)
 	{
@@ -2860,7 +2901,7 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe
 
 	// X coordinate
 	// get difference between camangle and angle towards target
-	x = (INT32)viewangle - (INT32)R_PointToAngle(targx, targy);
+	x = (fixed_t)(viewangle - R_PointToAngle(targx, targy));
 
 	distfact = FINECOSINE((x>>ANGLETOFINESHIFT) & FINEMASK);
     if (!distfact) distfact = 1;
@@ -3775,7 +3816,7 @@ static void K_drawKartMinimap(void)
 
 		if (cv_showminimapangle.value && (minidoticon || minilighticon) && !playertimedout)
 		{
-			UINT8 *colormap;
+			UINT8 *colormap = NULL;
 			drawinfo_t dims;
 			fixed_t interpx, interpy;
 			fixed_t xoff = 0, yoff = 0;
@@ -3786,10 +3827,27 @@ static void K_drawKartMinimap(void)
 			if (encoremode)
 				ang = ANGLE_180 - ang;
 
-			if (mobj->colorized)
-				colormap = R_GetTranslationColormap(TC_RAINBOW, mobj->color, GTC_CACHE);
-			else
-				colormap = R_GetLocalTranslationColormap(mobj->skin, mobj->localskin, mobj->color, GTC_CACHE, mobj->skinlocal);
+			if (mobj->color)
+			{
+				if (mobj->colorized)
+				{
+					colormap = R_GetTranslationColormap(TC_RAINBOW, mobj->color, GTC_CACHE);
+				}
+				else
+				{
+					const INT32 skinnum = K_GetMobjLocalSkinNum(mobj->skin, mobj->localskin, mobj->skinlocal);
+
+					// special case if startcolor is not the default (160 / Green)
+					if (skinnum && skins[skinnum].starttranscolor != skins[0].starttranscolor)
+					{
+						colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE);
+					}
+					else
+					{
+						colormap = R_GetLocalTranslationColormap(mobj->skin, mobj->localskin, mobj->color, GTC_CACHE, mobj->skinlocal);
+					}
+				}
+			}
 
 			interpx = lerp(mobj->old_x, mobj->x);
 			interpy = lerp(mobj->old_y, mobj->y);
@@ -4333,7 +4391,7 @@ static void K_drawInput(void)
 			target = 0;
 		else // turning of multiple strengths!
 		{
-			target = ((abs(cmd->driftturn) - 1)/125)+1;
+			target = ((abs(cmd->driftturn) - 1)/200)+1; // was 125, do we need another toggle for this? Zzz...
 			if (target > 4)
 				target = 4;
 			if (cmd->driftturn < 0)
@@ -4387,8 +4445,10 @@ static void K_drawLapStartAnim(void)
 	UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
 	INT32 vflags = V_SNAPTOTOP|V_HUDTRANS;
 
-	fixed_t slideout = max(0, 32*(((progress - 76)*FRACUNIT) + R_GetTimeFrac(RTF_LEVEL)));
-	fixed_t slidein = max(0, 32*(((stplyr->kartstuff[k_lapanimation] - 76)*FRACUNIT) - R_GetTimeFrac(RTF_LEVEL)));
+	fixed_t slideout = 32*(((progress - 76)*FRACUNIT) + R_GetTimeFrac(RTF_LEVEL));
+	slideout = max(0, slideout);
+	fixed_t slidein = 32*(((stplyr->kartstuff[k_lapanimation] - 76)*FRACUNIT) - R_GetTimeFrac(RTF_LEVEL));
+	slidein = max(0, slidein);
 
 	// First, draw the emblem and hand
 	INT32 emblemx = (BASEVIDWIDTH << (FRACBITS - 1)) + slidein;
@@ -4423,7 +4483,9 @@ static void K_drawLapStartAnim(void)
 		V_DrawFixedPatch(leftx, y, FRACUNIT, vflags, kp_lapanim_lap[min(progress/2, 6)], NULL);
 
 		char *lapnum = va("%02d", stplyr->laps + 1);
-		for (int i = 0; i < (int)strlen(lapnum); i++)
+		const size_t laplength = strlen(lapnum);
+
+		for (int i = 0; i < (int)laplength; i++)
 		{
 			int digit = lapnum[i] - '0';
 			int frame = min(2, progress/2 - 8 - (i*2));